Corrected Problem With Pageant Key Removal

NoMoreFood · Mar 15, 2017 · 670734e · 670734e
1 parent 2bdf0bb
commit 670734e
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 19 deletions.
diff --git a/executables/pageant.exe b/executables/pageant.exe
diff --git a/executables/plink.exe b/executables/plink.exe
diff --git a/executables/pscp.exe b/executables/pscp.exe
diff --git a/executables/psftp.exe b/executables/psftp.exe
diff --git a/executables/putty.exe b/executables/putty.exe
diff --git a/executables/puttygen.exe b/executables/puttygen.exe
diff --git a/executables/puttytel.exe b/executables/puttytel.exe
diff --git a/executables/testbn.exe b/executables/testbn.exe
diff --git a/executables/x64/pageant.exe b/executables/x64/pageant.exe
diff --git a/executables/x64/plink.exe b/executables/x64/plink.exe
diff --git a/executables/x64/pscp.exe b/executables/x64/pscp.exe
diff --git a/executables/x64/psftp.exe b/executables/x64/psftp.exe
diff --git a/executables/x64/putty.exe b/executables/x64/putty.exe
diff --git a/executables/x64/puttygen.exe b/executables/x64/puttygen.exe
diff --git a/executables/x64/puttytel.exe b/executables/x64/puttytel.exe
diff --git a/executables/x64/testbn.exe b/executables/x64/testbn.exe
diff --git a/installer/build.cmd b/installer/build.cmd
@@ -1,5 +1,6 @@
 @ECHO OFF
 
+PUSHD "%~dp0"
 SET VER=0.68
 IF DEFINED ProgramFiles SET PATH=%PATH%;%ProgramFiles%\WiX Toolset v3.11\bin
 IF DEFINED ProgramFiles(x86) SET PATH=%PATH%;%ProgramFiles(x86)%\WiX Toolset v3.11\bin

diff --git a/installer/puttycac-0.68-installer.msi b/installer/puttycac-0.68-installer.msi
diff --git a/installer/puttycac-64bit-0.68-installer.msi b/installer/puttycac-64bit-0.68-installer.msi
diff --git a/windows/VS2017/pageant/pageant.vcxproj b/windows/VS2017/pageant/pageant.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/plink/plink.vcxproj b/windows/VS2017/plink/plink.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/pscp/pscp.vcxproj b/windows/VS2017/pscp/pscp.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/psftp/psftp.vcxproj b/windows/VS2017/psftp/psftp.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/putty/putty.vcxproj b/windows/VS2017/putty/putty.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/puttygen/puttygen.vcxproj b/windows/VS2017/puttygen/puttygen.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/puttytel/puttytel.vcxproj b/windows/VS2017/puttytel/puttytel.vcxproj
@@ -168,7 +168,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -256,7 +256,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/VS2017/testbn/testbn.vcxproj b/windows/VS2017/testbn/testbn.vcxproj
@@ -166,7 +166,7 @@
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>gdi32.lib;comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <IgnoreAllDefaultLibraries>
@@ -252,7 +252,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OutputFile>..\..\..\executables\$(TargetFileName)</OutputFile>
+      <OutputFile>..\..\..\executables\x64\$(TargetFileName)</OutputFile>
       <AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/windows/winpgnt.c b/windows/winpgnt.c
@@ -701,7 +701,10 @@ static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
 	    if (HIWORD(wParam) == BN_CLICKED ||
 		HIWORD(wParam) == BN_DOUBLECLICKED) {
 		int i;
-		int rCount, sCount, cCount; /* PuTTY CAPI marker */
+		int rCount, sCount;
+#ifdef PUTTY_CAC
+		int cCount; 
+#endif // PUTTY_CAC 
 		int *selectedArray;
 
 		/* our counter within the array of selected items */
@@ -739,9 +742,8 @@ static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
 		for (i = cCount - 1; (itemNum >= 0) && (i >= 0); i--) {
 			ckey = pageant_nth_capi_key(i);
 
-			if (selectedArray[itemNum] == rCount + i) {
+			if (selectedArray[itemNum] == rCount + sCount + i) {
 				pageant_delete_capi_key(ckey);
-				sfree(ckey);
 				itemNum--;
 			}
 		}