Commit: 1970bc4212a46498a13f7e010701729156842689 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: 1970bc4212a46498a13f7e010701729156842689 (tree)
• Tiempo: 2016-06-14 21:45:08
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of drag-and-drop handling.
Change behavior of workaround for deadlock.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource_eng/ffftp.rc
• modified: common.h
• modified: filelist.c
• modified: toolmenu.c

Diferencia incremental

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/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,133,294,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP Ver 1.99a",-1,113,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20160614",-1,113,11,90,8
     CTEXT           "FFFTPはfreewareです",-1,7,279,305,8
     CTEXT           "Copyright(C) 1997-2010 Sota & ご協力いただいた方々\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, うなー, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ふうせん)",-1,7,25,305,44,SS_NOPREFIX
     CTEXT           "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,1,0
- PRODUCTVERSION 1,99,1,0
+ FILEVERSION 1,99,1,1
+ PRODUCTVERSION 1,99,1,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
             VALUE "Comments", "これはフリーソフトウエアです。"
             VALUE "CompanyName", "Sota, FFFTP Project"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 1, 0"
+            VALUE "FileVersion", "1, 99, 1, 1"
             VALUE "InternalName", "FFFTP"
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ご協力いただいた方々\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, うなー, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ふうせん)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 1, 0"
+            VALUE "ProductVersion", "1, 99, 1, 1"
         END
     END
     BLOCK "VarFileInfo"

--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP Ver 1.99a",-1,110,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20160614",-1,110,11,90,8
     CTEXT           "FFFTP is freeware",-1,7,281,301,8
     CTEXT           "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44
     CTEXT           "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,1,0
- PRODUCTVERSION 1,99,1,0
+ FILEVERSION 1,99,1,1
+ PRODUCTVERSION 1,99,1,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
             VALUE "Comments", "This software is Free Software"
             VALUE "CompanyName", "Sota, FFFTP Project"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 1, 0"
+            VALUE "FileVersion", "1, 99, 1, 1"
             VALUE "InternalName", "FFFTP"
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 1, 0"
+            VALUE "ProductVersion", "1, 99, 1, 1"
         END
     END
     BLOCK "VarFileInfo"

--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
 //#define PROGRAM_VERSION_NUM		1972		/* バージョン */
 // 64ビット対応
 #ifdef _WIN64
-#define VER_STR					"1.99a 64bit"
+#define VER_STR					"1.99a-20160614 64bit"
 #else
-#define VER_STR					"1.99a"
+#define VER_STR					"1.99a-20160614"
 #endif
 #define VER_NUM					1990		/* 設定バージョン */
 #define PROGRAM_VERSION_NUM		1990		/* バージョン */
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2016051400	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2016061400	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク

--- a/filelist.c
+++ b/filelist.c
@@ -178,6 +178,8 @@ static int IgnoreOld = NO;
 static int IgnoreExist = NO;
 
 static int Dragging = NO;
+// 特定の操作を行うと異常終了するバグ修正
+static int DragFirstTime = NO;
 
 static int StratusMode;			/* 0=ファイル, 1=ディレクトリ, 2=リンク */
 
@@ -542,7 +544,9 @@ static void doTransferRemoteFile(void)
 	// FFFTPにダウンロード要求を出し、ダウンロードの完了を待つ。
 	PostMessage(GetMainHwnd(), WM_COMMAND, MAKEWPARAM(MENU_DOWNLOAD, 0), 0);
 
-	for (i = 0 ; i < 10 ; i++) {
+	// 特定の操作を行うと異常終了するバグ修正
+//	for (i = 0 ; i < 10 ; i++) {
+	for (i = 0 ; i < 1000 ; i++) {
 		MSG msg;
 
 		if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
@@ -561,7 +565,20 @@ static void doTransferRemoteFile(void)
 	// OLE D&D中にメインウィンドウをユーザに操作させると、おかしくなるので、
 	// 隠しモーダルダイアログを作る。
 	// (2007.9.11 yutaka)
-	DialogBox(GetFtpInst(), MAKEINTRESOURCE(IDD_OLEDRAG), GetMainHwnd(), (DLGPROC)doOleDlgProc);
+	// 特定の操作を行うと異常終了するバグ修正
+//	DialogBox(GetFtpInst(), MAKEINTRESOURCE(IDD_OLEDRAG), GetMainHwnd(), (DLGPROC)doOleDlgProc);
+	while(1)
+	{
+		MSG msg;
+		if(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+		{
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+		else if(AskTransferNow() == NO)
+			break;
+		Sleep(10);
+	}
 
 	// ダウンロード先を元に戻す
 	SetLocalDirHist(LocDir);
@@ -897,6 +914,8 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 			return(CallWindowProc(ProcPtr, hWnd, message, wParam, lParam));
 
  		case WM_DRAGDROP:  
+			// 特定の操作を行うと異常終了するバグ修正
+			DragFirstTime = YES;
  			// OLE D&Dを開始する (yutaka)
  			doDragDrop(hWnd, message, wParam, lParam);
  			return (TRUE);
@@ -920,9 +939,13 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
  					char *PathDir;
 
 					// 特定の操作を行うと異常終了するバグ修正
-					GetCursorPos(&Point);
-					hWndPnt = WindowFromPoint(Point);
-					hWndParent = GetParent(hWndPnt);
+					if(DragFirstTime == YES)
+					{
+						GetCursorPos(&Point);
+						hWndPnt = WindowFromPoint(Point);
+						hWndParent = GetParent(hWndPnt);
+					}
+					DragFirstTime = NO;
 					DisableUserOpe();
 					CancelFlg = NO;
 

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -927,6 +927,9 @@ void EnableUserOpe(void)
 		// バグ修正
 //		HideUI = NO;
 
+		// バグ修正
+		SetFocus(GetMainHwnd());
+
 		MakeButtonsFocus();
 	}
 	return;