various converti2 fixes

diff --git a/Client Applications/converti2/converti2.cpp b/Client Applications/converti2/converti2.cpp
index d534d81c8dc9433e05453c7b3de38c05a97935d2..1d8d5e79619444325b3bea2cda1c423df42190a3 100644 (file)
--- a/Client Applications/converti2/converti2.cpp
+++ b/Client Applications/converti2/converti2.cpp
@@ -447,7 +447,7 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
 
                                                // then write the distance amount of 00's
                                                if(diffSize > 1000) {
-                                                       printf("WARNING! The distance to the next prefix is %i. Do you want to continue writing %i bytes of 0x00? Press y to continue", diffSize, diffSize);
+                                                       printf("WARNING! The distance to the next prefix is %i. Do you want to continue writing %i bytes of 0x00? Press y to continue", diffSize, (diffSize*m_indexrowsizebytes));
                                                        #ifdef _WIN32
                                                        if ( _getch() != 'y' ) {
                                                        #else

diff --git a/Client Applications/converti2/converti2.vcxproj b/Client Applications/converti2/converti2.vcxproj
index 97d3dad6bbcf1e67b7037ecc05b3be8d6a3ff526..90f75b90f0f0b0d7e1d82e1dbfb663e7026e242a 100644 (file)
--- a/Client Applications/converti2/converti2.vcxproj
+++ b/Client Applications/converti2/converti2.vcxproj
@@ -69,7 +69,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../../Common/rt api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/Client Applications/win_build/clientapps.suo b/Client Applications/win_build/clientapps.suo
index 0fb8f66ce3b67abb0e9f945f94181b9fae3bf99a..6791d071f0f7d77f1bb26b394f9726ae43b406d0 100644 (file)
Binary files a/Client Applications/win_build/clientapps.suo and b/Client Applications/win_build/clientapps.suo differ

diff --git a/Common/rt api/RTReader.cpp b/Common/rt api/RTReader.cpp
index f64d603cfdd40369e0d1e3f0af4565afbf6c6b66..7fec6672c4caea50520166bab31e9ef8f6f3297a 100644 (file)
--- a/Common/rt api/RTReader.cpp
+++ b/Common/rt api/RTReader.cpp
@@ -13,10 +13,10 @@ int RTReader::ReadChains(unsigned int &numChains, RainbowChain *pData)
 {
        unsigned int numRead = fread(pData, 1, 16 * numChains, m_pFile);
        numChains = numRead / 16;
+       m_chainPosition += numChains;
        return 0;
 }
-unsigned int RTReader::GetChainsLeft()
+UINT4 RTReader::GetChainsLeft()
 {
-       unsigned int len = GetFileLen(m_pFile);
-       return len / 16 - m_chainPosition;
+       return (GetFileLen(m_pFile) / 16) - m_chainPosition;
 }