From 384b13183dc0aa78f96245d1d27ac534cee24e24 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sat, 2 Oct 2010 22:17:45 +0800 Subject: [PATCH] Fixed issue #568: push using ssh private key with a password fails the first time Pageant return directly. Need wait for load key finish. pageant key -c touch tmp.file. We wait for tmp.file exist. Signed-off-by: Frank Li --- src/TortoiseGit.sln | 63 +++++ src/TortoiseGitSetup/FeaturesFragment.wxi | 1 + src/TortoiseGitSetup/Includes.wxi | 4 +- src/TortoiseGitSetup/StructureFragment.wxi | 4 + src/TortoiseProc/AppUtils.cpp | 30 ++- src/touch/ReadMe.txt | 55 ++++ src/touch/Resource.h | 31 +++ src/touch/small.ico | Bin 0 -> 23558 bytes src/touch/stdafx.cpp | 8 + src/touch/stdafx.h | 21 ++ src/touch/targetver.h | 24 ++ src/touch/touch.cpp | 192 ++++++++++++++ src/touch/touch.h | 3 + src/touch/touch.ico | Bin 0 -> 23558 bytes src/touch/touch.rc | 150 +++++++++++ src/touch/touch.vcproj | 411 +++++++++++++++++++++++++++++ 16 files changed, 994 insertions(+), 3 deletions(-) create mode 100644 src/touch/ReadMe.txt create mode 100644 src/touch/Resource.h create mode 100644 src/touch/small.ico create mode 100644 src/touch/stdafx.cpp create mode 100644 src/touch/stdafx.h create mode 100644 src/touch/targetver.h create mode 100644 src/touch/touch.cpp create mode 100644 src/touch/touch.h create mode 100644 src/touch/touch.ico create mode 100644 src/touch/touch.rc create mode 100644 src/touch/touch.vcproj diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln index dc8410408..e6d2dd967 100644 --- a/src/TortoiseGit.sln +++ b/src/TortoiseGit.sln @@ -159,6 +159,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cache", "..\test\Cache\Cach {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touch", "touch\touch.vcproj", "{84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_static|Mixed Platforms = debug_static|Mixed Platforms @@ -2380,6 +2382,67 @@ Global {948733DE-FC5A-46C2-8CD6-429017508D63}.Release|Mixed Platforms.Build.0 = Release|Win32 {948733DE-FC5A-46C2-8CD6-429017508D63}.Release|Win32.ActiveCfg = Release|Win32 {948733DE-FC5A-46C2-8CD6-429017508D63}.Release|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.debug_static|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.debug_static|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.debug_static|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Debug|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Debug|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Debug|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Debug|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Debug|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Debug|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Debug|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Release|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Release|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Release|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Release|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL ASM Release|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Debug|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Debug|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Debug|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Debug|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Release|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Release|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Release|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Release|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.DLL Release|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Debug|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Debug|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Debug|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Debug|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Release|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Release|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Release|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Release|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB ASM Release|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Debug|Mixed Platforms.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Debug|Win32.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Debug|Win32.Build.0 = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Debug|x64.ActiveCfg = Debug|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Release|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Release|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Release|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Release|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.LIB Release|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.release_static|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.release_static|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.release_static|x64.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|Mixed Platforms.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|Win32.ActiveCfg = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|Win32.Build.0 = Release|Win32 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|x64.ActiveCfg = Release|x64 + {84E07810-9AD4-4E0E-A7F7-FAD9A8CDFC7F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi index 2dd1b8fca..dc4c42d37 100644 --- a/src/TortoiseGitSetup/FeaturesFragment.wxi +++ b/src/TortoiseGitSetup/FeaturesFragment.wxi @@ -32,6 +32,7 @@ + diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi index f6a7789d4..18c21ea48 100644 --- a/src/TortoiseGitSetup/Includes.wxi +++ b/src/TortoiseGitSetup/Includes.wxi @@ -117,7 +117,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi index 619012509..eced93638 100644 --- a/src/TortoiseGitSetup/StructureFragment.wxi +++ b/src/TortoiseGitSetup/StructureFragment.wxi @@ -432,6 +432,10 @@ out everything for now, leaving these enabled as they are would make the install + + + +