From 26b544e35351c8b5038ae4ba89f9fc04c4863ffe Mon Sep 17 00:00:00 2001
From: Martin Westergaard <admin@freerainbowtables.com>
Date: Sun, 31 Oct 2010 14:23:26 +0100
Subject: [PATCH 1/1] various converti2 fixes

---
 Client Applications/converti2/converti2.cpp   |   2 +-
 .../converti2/converti2.vcxproj               |   2 +-
 Client Applications/win_build/clientapps.suo  | Bin 13312 -> 17408 bytes
 Common/rt api/RTReader.cpp                    |   6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Client Applications/converti2/converti2.cpp b/Client Applications/converti2/converti2.cpp
index d534d81..1d8d5e7 100644
--- 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 97d3dad..90f75b9 100644
--- 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
GIT binary patch
delta 2515
zcmchZYfPJE6vv;ZH`;OCfN~uzP+Vy!ZP_TW0Rvi?Y>Nz>3Ro8jV~%c6Mw-cO1E;&_
z0HH_boZy^Jr$%(xeK1B1*)YqZA4oL&vY4@CF<w3_ChWs7q5hvzP>7JYh;Q@b{Xge@
z-*cYZIS)Pidrt9zA}$##zRqQFj4=w4>`K!>#DiI%&zFFEB3KWSfEEb*>{w+t_sDkg
zAWD{L!X|%-o0x6;mP_%N8K^^cL(U>0>C3DPPpHh>Ca>nQ0b%$-ksC4yQ7RgO*r1-o
z=OOlkM&JYoz(MdDpesRoT^mF@=m4Fd3mgGQK{x0DpDAq;6<Z6n4$yd(-V=$)Yj$uI
z7h?+xSiRH1yCh1C!Ka$HxWg(qU6Wb7)8YNn!sHOfg4kEwzS)dlr`c*Pvs=q7#_YU2
zvvE^SvE5i=&dWCD6qlOKS$Vdy?BdcRU74AVdROz|hE^JnG;l`0Mb;=|;6F4FgWOS*
z$_O;z+}}Bcn9dC$)Dc}yw(tUv+NR>cFog%6%f&Jrqjq(LEGl54Y4xNs1r4z(Vt|TV
z2&dFL6Qh?)5s6H33Erah`#2w_K}`cWlX7WXE2GCWC3M%=MLLav`ZbfDWQXzhn=Zvb
z&FHqvLmg9+;rpLlx!80j|IUd09GUZ7zot#VG2=k2sFQBTR`3Gh9X%8a)XDOgm3+x|
z(RJ!cxu)WxyGkJXCAUNLQhRCzJsO_t(Y5g^YS(R7aT)AlJNY}m6JknAGrAjOi?IY(
zpeY>SqC@f9=Hel|le!ZF(J`-skC?cU_y%97yD=*;<xn)3z9n*Q0T$bz&B!SI_#u~a
zv8TaweYC5o$<^#=b!+Qd8XZ-;s~YO|V#P&_k5)N`LvJV@{jXxEmyDzQuYq_^=udOH
zZTPy1GcGoOxEhNdHXD{s;j)XA5X9`u%^{5&b-WcjdTX|eHR0!C&CJ1CnH%+}j<uj}
zI9L_i4I0qii@&Wblhxx%3wkf3JH`*W8{Zdri%e3k@>er8o``KoZgYj$e>83G^_aDM
z6D7-2l_EJMfj8vC5JTPvmg^izzjF339dBg!3;6gLcoDn=j)N26Bsc|L2CsnApcnLk
ze();rS6UP*&)@VA^cnCvI1AnY=fImlyg!2bTLJyHDB2eSjdyXs7|`$Ieo5%D%6d*~
zjnT{OZ0tHZYE;+a)rCt`Baz4U)!q{&wU_5NAi`aR7NPC`Ll%_OK7~m0mpE)vfqnJs
zNQpQ!7cMbe92fMX;ih`?f|arKfVN+yDMPRKiHrmO!n%bjm0M|#)=3WKlLa<p$x69W
zzD%~r;k;Sonq}qh7w4Kdy@RMv(}*)iA3C3T3RwH$>p6<hL{ZnqbrfsT^A^g`7TW%e
z_c?zZpSEt_m_}iW@LS(Rj6QQnPGebx{Gjm0T_SaJ=tA1#YtAF6_zwdUH)~4a*?!|Y
zXo`#p7_I&!PexNKOybCT58`vo;0~Iw<QJ|ubxVgXNtzxx|MSz;6Z_)t&77_NLyC@-
zpkSe6r7I8fpBKU5?46Z=aMybHUer%1i8aTS@R!d$RBRGQx;|!ZI&PKA`eq-PzW?IB
Ov}Vtx@4DjfR>GfII-H>Z

delta 747
zcmX|8O=uHQ5Pp;0&F-3{vCXeEF^LT^hFY5_+SbOVCjJ*Tf<irrCu99NNe)ddnu7<y
zT9VGqi=G5;rt8r|q=J@0?V%S>dhnzo9u~wRUFU6geai>md^0=q-Z#xh(41+N06LTJ
zLEJV?6TPmg#L0H&;xkwhr$E7!C+XY#-5#G^1A#HtjpLlSszN{UFag^W*(IN-&q~vF
zk4^W8m-jeDS*vMOZpJv7A>k(B7U4GG4#6sTEoa-8(#uNOr9zOzK7!RZKz(;z0Ewww
z@s|g6!&7xBy%hQF8ol15feJE(yB*2!FADNki7|n_!FKK#b^|#O@O$8jLf0^Tb{*D(
z8<r5U1@~Se-z1z1om0U>yvM0DLK?1!c_~4{eQbm^anJu$cteR%;Iakx2$2sieJhfc
z1ZsjGV-evvWBNq=26yl|c8b^WSE7Vx6DP5dT*ubX5qz2);!ofQ-zM^Mot!GLyJ#k_
zVk{L6?W7oc5nTHN6!2Bl@N-myA|F6*)JVC<M%hvNDrlxESdJ92xo^d~c!jd_*ci}6
zFEMT|8UqjEG&a)bRVI=auyywokuQK-=~e!xN25?7&_U=g@64m|HGB}$@JA*n9j2Qy
ze3ChUKQnzGBJ4M@ICdFdj^_1N?lIt}K_Bo%EO1E_Sj7p>^zy0B$r1_bF!mR)doT@-
zQDK}fq{$rq>_yAGS0}1^>5xEckCVoiW<97rY%K|m;RT#lD)?@4e7VpCyrz`?0Z+u&
A3;+NC

diff --git a/Common/rt api/RTReader.cpp b/Common/rt api/RTReader.cpp
index f64d603..7fec667 100644
--- 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;
 }
-- 
2.39.2