[Ttssh2-commit] [8613] sendfiledlg が Windows 95 で動作するよう修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2020年 3月 22日 (日) 01:00:17 JST


Revision: 8613
          https://osdn.net/projects/ttssh2/scm/svn/commits/8613
Author:   zmatsuo
Date:     2020-03-22 01:00:16 +0900 (Sun, 22 Mar 2020)
Log Message:
-----------
sendfiledlg が Windows 95 で動作するよう修正

- 次の WIN32 API が存在するが正しく動作しないので無効化
  - GetFileAttributesW()
  - DragQueryFileW()

Modified Paths:
--------------
    trunk/teraterm/common/compat_win.cpp

-------------- next part --------------
Modified: trunk/teraterm/common/compat_win.cpp
===================================================================
--- trunk/teraterm/common/compat_win.cpp	2020-03-21 16:00:07 UTC (rev 8612)
+++ trunk/teraterm/common/compat_win.cpp	2020-03-21 16:00:16 UTC (rev 8613)
@@ -49,8 +49,6 @@
 BOOL (WINAPI *pModifyMenuW)(HMENU hMnu, UINT uPosition, UINT uFlags, UINT_PTR uIDNewItem, LPCWSTR lpNewItem);
 int(WINAPI *pGetMenuStringW)(HMENU hMenu, UINT uIDItem, LPWSTR lpString, int cchMax, UINT flags);
 BOOL(WINAPI *pSetWindowTextW)(HWND hWnd, LPCWSTR lpString);
-DWORD (WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault, LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
-DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR lpFileName);
 BOOL (WINAPI *pSetDlgItemTextW)(HWND hDlg, int nIDDlgItem, LPCWSTR lpString);
 BOOL (WINAPI *pGetDlgItemTextW)(HWND hDlg, int nIDDlgItem, LPWSTR lpString, int cchMax);
 BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
@@ -61,7 +59,6 @@
 HRESULT (WINAPI *pGetDpiForMonitor)(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, UINT *dpiX, UINT *dpiY);
 BOOL (WINAPI *pAdjustWindowRectEx)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle);
 BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
-HWND (WINAPI *pGetConsoleWindow)(void);
 int (WINAPI *pMessageBoxW)(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
 INT_PTR (WINAPI *pDialogBoxIndirectParamW)(HINSTANCE hInstance, LPCDLGTEMPLATEW hDialogTemplate, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
 HWND (WINAPI *pCreateDialogIndirectParamW)(HINSTANCE hInstance, LPCDLGTEMPLATEW lpTemplate,
@@ -73,6 +70,11 @@
 #endif
 LRESULT (WINAPI *pCallWindowProcW)(WNDPROC lpPrevWndFunc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
 
+// kernel32.dll
+DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR lpFileName);
+DWORD (WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault, LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
+HWND (WINAPI *pGetConsoleWindow)(void);
+
 // gdi32.lib
 int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
 BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
@@ -251,8 +253,7 @@
 
 	// 9x\x93\xC1\x95ʏ\x88\x97\x9D
 	if (!IsWindowsNTKernel()) {
-		// Windows 9x \x82ɑ\xB6\x8D݂\xB5\x82Ă\xA2\x82\xE9API(\x8A‹\xAB\x88ˑ\xB6?)
-		// \x90\xB3\x82\xB5\x82\xAD\x93\xAE\x8D삵\x82Ȃ\xA2\x82̂Ŗ\xB3\x8C\xF8\x82Ƃ\xB7\x82\xE9
+		// Windows 9x \x82ɑ\xB6\x8D݂\xB5\x82Ă\xA2\x82邪\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x8D삵\x82Ȃ\xA2\x82\xBD\x82ߖ\xB3\x8C\x{27B0B7}\x82\xE9
 		pGetPrivateProfileStringW = NULL;
 		pSetWindowTextW = NULL;
 		pSetDlgItemTextW = NULL;
@@ -267,6 +268,8 @@
 		pGetWindowTextW = NULL;
 		pGetWindowTextLengthW = NULL;
 		pShell_NotifyIconW = NULL;
+		pGetFileAttributesW = NULL;
+		pDragQueryFileW = NULL;
 	}
 
 	// GetConsoleWindow\x93\xC1\x95ʏ\x88\x97\x9D


Ttssh2-commit メーリングリストの案内
Back to archive index