View | Details | Raw Unified
Collapse All | Expand All

(-) truecrypt-5.0-source.org/Platform/StringConverter.cpp (+4 lines)
 Lines 32-43    Link Here  
		return s.str();
		return s.str();
	}
	}

            

              
              
#if __WORDSIZE == 32

            

        
	wstring StringConverter::FromNumber (int64 number)
	wstring StringConverter::FromNumber (int64 number)

        
	{
	{

        
		wstringstream s;
		wstringstream s;

        
		s << number;
		s << number;

        
		return s.str();
		return s.str();

        
	}
	}

            

              
              
#endif

            

        

        
	wstring StringConverter::FromNumber (int number)
	wstring StringConverter::FromNumber (int number)

        
	{
	{

  

    

    

       Lines 60-71
       
    
  Link Here 
    

  

        
		return s.str();
		return s.str();

        
	}
	}

        

            

              
              
#if __WORDSIZE == 32

            

        
	wstring StringConverter::FromNumber (uint64 number)
	wstring StringConverter::FromNumber (uint64 number)

        
	{
	{

        
		wstringstream s;
		wstringstream s;

        
		s << number;
		s << number;

        
		return s.str();
		return s.str();

        
	}
	}

            

              
              
#endif

            

        

        
	string StringConverter::GetTrailingNumber (const string &str)
	string StringConverter::GetTrailingNumber (const string &str)

        
	{
	{



(-) truecrypt-5.0-source.org/Main/Forms/VolumeSizeWizardPage.cpp
      (-1 / +13 lines)




  

    

    

       Lines 19-29
       
    
  Link Here 
    

  

        
	public:
	public:

        
		static wstring FromNumber (double number);
		static wstring FromNumber (double number);

        
		static wstring FromNumber (int number);
		static wstring FromNumber (int number);

            

              
              
#if __WORDSIZE == 32

            

        
		static wstring FromNumber (int64 number);
		static wstring FromNumber (int64 number);

            

              
              
#endif

            

        
		static wstring FromNumber (long number);
		static wstring FromNumber (long number);

        
		static wstring FromNumber (unsigned int number);
		static wstring FromNumber (unsigned int number);

        
		static wstring FromNumber (unsigned long number);
		static wstring FromNumber (unsigned long number);

            

              
              
#if __WORDSIZE == 32

            

        
		static wstring FromNumber (uint64 number);
		static wstring FromNumber (uint64 number);

            

              
              
#endif

            

        
		static string GetTrailingNumber (const string &str);
		static string GetTrailingNumber (const string &str);

        
		static string GetTypeName (const type_info &typeInfo);
		static string GetTypeName (const type_info &typeInfo);

        
		static wstring QuoteSpaces (const wstring &str);
		static wstring QuoteSpaces (const wstring &str);

  

    

    

       Lines 270-276
      namespace TrueCrypt 
    
  Link Here 
    

  

        
		// shared_ptr, make_shared, StringConverter, foreach
		// shared_ptr, make_shared, StringConverter, foreach

        
		list <shared_ptr <uint64> > numList;
		list <shared_ptr <uint64> > numList;

        
		
		

            

              
              
#if __WORDSIZE == 32

            

        
		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL))));
		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL))));

            

              
              
#else

            

            

              
              
		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeUL))));

            

            

              
              
#endif

            

        
		numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
		numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));

        
		numList.push_front (make_shared <uint64> (3));
		numList.push_front (make_shared <uint64> (3));

        

  

    

    

       Lines 27-37
      namespace TrueCrypt 
    
  Link Here 
    

  

        
		StringFormatterArg (const wstring &str) :	Empty (false), Referenced (false), StringArg (str) { }
		StringFormatterArg (const wstring &str) :	Empty (false), Referenced (false), StringArg (str) { }

        
		StringFormatterArg (const wxString &str) :	Empty (false), Referenced (false), StringArg (str) { }
		StringFormatterArg (const wxString &str) :	Empty (false), Referenced (false), StringArg (str) { }

        
		StringFormatterArg (int number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (int number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

            

              
              
#if __WORDSIZE == 32

            

        
		StringFormatterArg (int64 number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (int64 number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

            

              
              
#endif

            

        
		StringFormatterArg (long number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (long number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

        
		StringFormatterArg (unsigned int number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (unsigned int number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

        
		StringFormatterArg (unsigned long number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (unsigned long number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

            

              
              
#if __WORDSIZE == 32

            

        
		StringFormatterArg (uint64 number) :		Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
		StringFormatterArg (uint64 number) :		Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }

            

              
              
#endif

            

        

        
		operator wxString () { Referenced = true; return StringArg; }
		operator wxString () { Referenced = true; return StringArg; }

        

  

    

    

       Lines 55-61
      namespace TrueCrypt 
    
  Link Here 
    

  

        
	{
	{

        
		uint64 prefixMult = 1;
		uint64 prefixMult = 1;

        
		if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND)
		if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND)

            

              
			prefixMult = reinterpret_cast <int> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));

              
			prefixMult = reinterpret_cast <uint64> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));

            

        
		
		

        
		uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));
		uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));

        
		if (val <= 0x7fffFFFFffffFFFFull / prefixMult)
		if (val <= 0x7fffFFFFffffFFFFull / prefixMult)