Commit: 9b756a48d7a13d5080350823d8117f217535cd62 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 9b756a48d7a13d5080350823d8117f217535cd62 (tree)
• Hora: 2012-02-11 23:19:36
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix codes for debugging.
Recompile executable files.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: main.c
• modified: putty/Release/PuTTY.dll
• modified: putty/x64/Release/PuTTY.dll
• modified: socketwrapper.c

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

--- a/main.c
+++ b/main.c
@@ -258,66 +258,68 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 
 	// プロセス保護
 #ifdef ENABLE_PROCESS_PROTECTION
-	DWORD ProtectLevel;
-	char* pCommand;
-	char Option[FMAX_PATH+1];
-	ProtectLevel = PROCESS_PROTECTION_NONE;
-	pCommand = lpszCmdLine;
-	while(pCommand = GetToken(pCommand, Option))
 	{
-		if(strcmp(Option, "--protect") == 0)
+		DWORD ProtectLevel;
+		char* pCommand;
+		char Option[FMAX_PATH+1];
+		ProtectLevel = PROCESS_PROTECTION_NONE;
+		pCommand = lpszCmdLine;
+		while(pCommand = GetToken(pCommand, Option))
 		{
-			ProtectLevel = PROCESS_PROTECTION_DEFAULT;
-			break;
-		}
-		else if(strcmp(Option, "--protect-high") == 0)
-		{
-			ProtectLevel = PROCESS_PROTECTION_HIGH;
-			break;
-		}
-		else if(strcmp(Option, "--protect-medium") == 0)
-		{
-			ProtectLevel = PROCESS_PROTECTION_MEDIUM;
-			break;
+			if(strcmp(Option, "--protect") == 0)
+			{
+				ProtectLevel = PROCESS_PROTECTION_DEFAULT;
+				break;
+			}
+			else if(strcmp(Option, "--protect-high") == 0)
+			{
+				ProtectLevel = PROCESS_PROTECTION_HIGH;
+				break;
+			}
+			else if(strcmp(Option, "--protect-medium") == 0)
+			{
+				ProtectLevel = PROCESS_PROTECTION_MEDIUM;
+				break;
+			}
+			else if(strcmp(Option, "--protect-low") == 0)
+			{
+				ProtectLevel = PROCESS_PROTECTION_LOW;
+				break;
+			}
 		}
-		else if(strcmp(Option, "--protect-low") == 0)
+		if(ProtectLevel != PROCESS_PROTECTION_NONE)
 		{
-			ProtectLevel = PROCESS_PROTECTION_LOW;
-			break;
-		}
-	}
-	if(ProtectLevel != PROCESS_PROTECTION_NONE)
-	{
-		SetProcessProtectionLevel(ProtectLevel);
-		if(!InitializeLoadLibraryHook())
-		{
-			MessageBox(NULL, MSGJPN321, "FFFTP", MB_OK | MB_ICONERROR);
-			return 0;
-		}
+			SetProcessProtectionLevel(ProtectLevel);
+			if(!InitializeLoadLibraryHook())
+			{
+				MessageBox(NULL, MSGJPN321, "FFFTP", MB_OK | MB_ICONERROR);
+				return 0;
+			}
 #ifndef _DEBUG
-		if(IsDebuggerPresent())
-		{
-			MessageBox(NULL, MSGJPN322, "FFFTP", MB_OK | MB_ICONERROR);
-			return 0;
-		}
+			if(IsDebuggerPresent())
+			{
+				MessageBox(NULL, MSGJPN322, "FFFTP", MB_OK | MB_ICONERROR);
+				return 0;
+			}
 #endif
-		if(!UnloadUntrustedModule())
-		{
-			MessageBox(NULL, MSGJPN323, "FFFTP", MB_OK | MB_ICONERROR);
-			return 0;
-		}
+			if(!UnloadUntrustedModule())
+			{
+				MessageBox(NULL, MSGJPN323, "FFFTP", MB_OK | MB_ICONERROR);
+				return 0;
+			}
 #ifndef _DEBUG
-		if(RestartProtectedProcess(" --restart"))
-			return 0;
+			if(RestartProtectedProcess(" --restart"))
+				return 0;
 #endif
-		if(!EnableLoadLibraryHook(TRUE))
-		{
-			MessageBox(NULL, MSGJPN324, "FFFTP", MB_OK | MB_ICONERROR);
-			return 0;
+			if(!EnableLoadLibraryHook(TRUE))
+			{
+				MessageBox(NULL, MSGJPN324, "FFFTP", MB_OK | MB_ICONERROR);
+				return 0;
+			}
 		}
+		else
+			InitializeLoadLibraryHook();
 	}
-	else
-		InitializeLoadLibraryHook();
 #endif
 
 	// マルチコアCPUの特定環境下でファイル通信中にクラッシュするバグ対策

Binary files a/putty/Release/PuTTY.dll and b/putty/Release/PuTTY.dll differ

Binary files a/putty/x64/Release/PuTTY.dll and b/putty/x64/Release/PuTTY.dll differ

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -1046,8 +1046,16 @@ BOOL LoadPuTTY()
 	RegisterTrustedModuleSHA1Hash("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00");
 #endif
 	// デバッグ用
-//	g_hPuTTY = LoadLibrary("putty.dll");
-	g_hPuTTY = LoadLibrary("C:\\SourceForge\\ffftp\\putty\\Debug\\PuTTY.dll");
+#ifdef _DEBUG
+	{
+		char Path[MAX_PATH];
+		GetModuleFileName(NULL, Path, MAX_PATH);
+		strcpy(strrchr(Path, '\\'), "\\..\\putty\\Debug\\PuTTY.dll");
+		g_hPuTTY = LoadLibrary(Path);
+	}
+#else
+	g_hPuTTY = LoadLibrary("putty.dll");
+#endif
 	if(!g_hPuTTY
 		|| !(p_SFTP_Create = (_SFTP_Create)GetProcAddress(g_hPuTTY, "SFTP_Create"))
 		|| !(p_SFTP_Destroy = (_SFTP_Destroy)GetProcAddress(g_hPuTTY, "SFTP_Destroy"))