Permalink
Browse files

Corrected Problem With Pageant Key Removal

  • Loading branch information...
NoMoreFood committed Mar 15, 2017
1 parent 2bdf0bb commit 670734edc45082af88b99ded71e26d5081b96a6f
View
BIN +0 Bytes (100%) executables/pageant.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/plink.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/pscp.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/psftp.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/putty.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/puttygen.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/puttytel.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/testbn.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/pageant.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/plink.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/pscp.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/psftp.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/putty.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/puttygen.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/puttytel.exe
Binary file not shown.
View
BIN +0 Bytes (100%) executables/x64/testbn.exe
Binary file not shown.
View
@@ -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
View
Binary file not shown.
View
Binary file not shown.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
View
@@ -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--;
}
}

0 comments on commit 670734e

Please sign in to comment.