提交: 34bc3ec3c8dcdc47f52ced2a8119bf0496034bfa - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• 修订版: 34bc3ec3c8dcdc47f52ced2a8119bf0496034bfa (tree)
• 时间: 2020-05-15 00:10:58
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

layer_for_unicode 内で未実装だったAPIを実装

- _CopyFileW()
- _DeleteFileW()
- _MoveFileW()
- _CreateFileW()
- _FindFirstFileW()
- _FindNextFileW()
- _RemoveDirectoryW()

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@8772 f5f01b69-1e22-0410-acbf-894ab4bd6246

更改概述

• modified: teraterm/common/compat_win.cpp
• modified: teraterm/common/compat_win.h
• modified: teraterm/common/layer_for_unicode.cpp

差异

--- a/teraterm/common/compat_win.cpp
+++ b/teraterm/common/compat_win.cpp
@@ -73,7 +73,7 @@ BOOL (WINAPI *pSetCurrentDirectoryW)(LPCWSTR lpPathName);
 // user32
 int (WINAPI *pGetSystemMetricsForDpi)(int nIndex, UINT dpi);
 
-// kernel32.dll
+// kernel32
 DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR lpFileName);
 void (WINAPI *pOutputDebugStringW)(LPCWSTR lpOutputString);
 HWND (WINAPI *pGetConsoleWindow)(void);
@@ -85,6 +85,15 @@ BOOL (WINAPI *pCreateProcessW)(LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
 							   LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles,
 							   DWORD dwCreationFlags, LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
 							   LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
+BOOL (WINAPI *pCopyFileW)(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists);
+BOOL (WINAPI *pDeleteFileW)(LPCWSTR lpFileName);
+BOOL (WINAPI *pMoveFileW)(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName);
+HANDLE (WINAPI *pCreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
+							  LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition,
+							  DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
+HANDLE (WINAPI *pFindFirstFileW)(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData);
+BOOL (WINAPI *pFindNextFileW)(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData);
+BOOL(WINAPI *pRemoveDirectoryW)(LPCWSTR lpPathName);
 
 // gdi32
 int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
@@ -229,6 +238,13 @@ static const APIInfo Lists_kernel32[] = {
 	{ "GetPrivateProfileStringW", (void **)&pGetPrivateProfileStringW },
 	{ "WritePrivateProfileStringW", (void **)&pWritePrivateProfileStringW },
 	{ "CreateProcessW", (void **)&pCreateProcessW },
+	{ "CopyFileW", (void **)&pCopyFileW },
+	{ "DeleteFileW", (void **)&pDeleteFileW },
+	{ "MoveFileW", (void **)&pMoveFileW },
+	{ "CreateFileW", (void **)&pCreateFileW },
+	{ "FindFirstFileW", (void **)&pFindFirstFileW },
+	{ "FindNextFileW", (void **)&pFindNextFileW },
+	{ "RemoveDirectoryW", (void **)&pRemoveDirectoryW },
 #endif
 	{ "GetConsoleWindow", (void **)&pGetConsoleWindow },
 	{},
@@ -317,6 +333,13 @@ void WinCompatInit()
 		pSHBrowseForFolderW = NULL;
 		pSHGetPathFromIDListW = NULL;
 		pCreateProcessW = NULL;
+		pCopyFileW = NULL;
+		pDeleteFileW = NULL;
+		pMoveFileW = NULL;
+		pCreateFileW = NULL;
+		pFindFirstFileW = NULL;
+		pFindNextFileW = NULL;
+		pRemoveDirectoryW = NULL;
 	}
 
 	// GetConsoleWindow特別処理

--- a/teraterm/common/compat_win.h
+++ b/teraterm/common/compat_win.h
@@ -82,7 +82,6 @@ extern BOOL(WINAPI *pSetWindowTextW)(HWND hWnd, LPCWSTR lpString);
 extern DWORD(WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault,
 												LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
 extern UINT(WINAPI *pDragQueryFileW)(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch);
-extern DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR lpFileName);
 extern BOOL (WINAPI *pSetDlgItemTextW)(HWND hDlg, int nIDDlgItem, LPCWSTR lpString);
 extern BOOL (WINAPI *pGetDlgItemTextW)(HWND hDlg, int nIDDlgItem, LPWSTR lpString, int cchMax);
 extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
@@ -97,7 +96,6 @@ extern BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT lpRect, DWORD dwStyle, BO
 extern BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags);
 extern int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
 extern BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
-extern HWND (WINAPI *pGetConsoleWindow)(void);
 extern int (WINAPI *pMessageBoxW)(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
 extern INT_PTR (WINAPI *pDialogBoxIndirectParamW)(HINSTANCE hInstance, LPCDLGTEMPLATEW hDialogTemplate, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
 extern HWND (WINAPI *pCreateDialogIndirectParamW)(HINSTANCE hInstance, LPCDLGTEMPLATEW lpTemplate,
@@ -121,7 +119,6 @@ extern LONG_PTR (WINAPI *pSetWindowLongPtrW)(HWND hWnd, int nIndex, LONG_PTR dwN
 #endif
 extern LRESULT (WINAPI *pCallWindowProcW)(WNDPROC lpPrevWndFunc,
 										  HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-extern void (WINAPI *pOutputDebugStringW)(LPCWSTR lpOutputString);
 extern DWORD (WINAPI *pGetCurrentDirectoryW)(DWORD nBufferLength, LPWSTR lpBuffer);
 extern BOOL (WINAPI *pSetCurrentDirectoryW)(LPCWSTR lpPathName);
 extern BOOL (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW ofnW);
@@ -136,6 +133,28 @@ extern BOOL (WINAPI *pCreateProcessW)(LPCWSTR lpApplicationName, LPWSTR lpComman
 									  LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
 extern int (WINAPI *pGetSystemMetricsForDpi)(int  nIndex, UINT dpi);
 
+// kernel32
+extern DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR lpFileName);
+extern void (WINAPI *pOutputDebugStringW)(LPCWSTR lpOutputString);
+extern HWND (WINAPI *pGetConsoleWindow)(void);
+extern DWORD (WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault,
+												 LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
+extern BOOL (WINAPI *pWritePrivateProfileStringW)(LPCWSTR lpAppName,LPCWSTR lpKeyName,LPCWSTR lpString,LPCWSTR lpFileName);
+extern BOOL (WINAPI *pCreateProcessW)(LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
+									  LPSECURITY_ATTRIBUTES lpProcessAttributes,
+									  LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles,
+									  DWORD dwCreationFlags, LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
+									  LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
+extern BOOL (WINAPI *pCopyFileW)(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists);
+extern BOOL (WINAPI *pDeleteFileW)(LPCWSTR lpFileName);
+extern BOOL (WINAPI *pMoveFileW)(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName);
+extern HANDLE (WINAPI *pCreateFileW)(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
+									 LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition,
+									 DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
+extern HANDLE (WINAPI *pFindFirstFileW)(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData);
+extern BOOL (WINAPI *pFindNextFileW)(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData);
+extern BOOL(WINAPI *pRemoveDirectoryW)(LPCWSTR lpPathName);
+
 // shlobj_core.h
 extern LPITEMIDLIST (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);
 extern BOOL (WINAPI *pSHGetPathFromIDListW)(LPITEMIDLIST pidl, LPWSTR pszPath);

--- a/teraterm/common/layer_for_unicode.cpp
+++ b/teraterm/common/layer_for_unicode.cpp
@@ -33,6 +33,12 @@
  */
 
 #include <windows.h>
+#if !defined(_CRTDBG_MAP_ALLOC)
+#define _CRTDBG_MAP_ALLOC
+#endif
+#include <stdlib.h>
+#include <crtdbg.h>
+#include <assert.h>
 
 #include "codeconv.h"
 #include "compat_win.h"
@@ -693,38 +699,103 @@ BOOL _CreateProcessW(LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
 
 BOOL _CopyFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists)
 {
-	return CopyFileW(lpExistingFileName, lpNewFileName, bFailIfExists);
+	if (pCopyFileW != NULL) {
+		return pCopyFileW(lpExistingFileName, lpNewFileName, bFailIfExists);
+	}
+	char *lpExistingFileNameA = ToCharW(lpExistingFileName);
+	char *lpNewFileNameA = ToCharW(lpNewFileName);
+	BOOL r = CopyFileA(lpExistingFileNameA, lpNewFileNameA, bFailIfExists);
+	free(lpExistingFileNameA);
+	free(lpNewFileNameA);
+	return r;
 }
 
 BOOL _DeleteFileW(LPCWSTR lpFileName)
 {
-	return DeleteFileW(lpFileName);
+	if (pDeleteFileW != NULL) {
+		return pDeleteFileW(lpFileName);
+	}
+	char *lpFileNameA = ToCharW(lpFileName);
+	BOOL r = DeleteFileA(lpFileNameA);
+	free(lpFileNameA);
+	return r;
 }
 
 BOOL _MoveFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName)
 {
-	return MoveFileW(lpExistingFileName, lpNewFileName);
+	if (pMoveFileW != NULL) {
+		return pMoveFileW(lpExistingFileName, lpNewFileName);
+	}
+	char *lpExistingFileNameA = ToCharW(lpExistingFileName);
+	char *lpNewFileNameA = ToCharW(lpNewFileName);
+	BOOL r = MoveFileA(lpExistingFileNameA, lpNewFileNameA);
+	free(lpExistingFileNameA);
+	free(lpNewFileNameA);
+	return r;
 }
 
 HANDLE _CreateFileW(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 					LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
 					HANDLE hTemplateFile)
 {
-	return CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition,
-					   dwFlagsAndAttributes, hTemplateFile);
+	if (pCreateFileW != NULL) {
+		return pCreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition,
+							dwFlagsAndAttributes, hTemplateFile);
+	}
+
+	char *lpFileNameA = ToCharW(lpFileName);
+	HANDLE handle = CreateFileA(lpFileNameA, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition,
+								dwFlagsAndAttributes, hTemplateFile);
+	free(lpFileNameA);
+	return handle;
+}
+
+static void FindDataAW(const WIN32_FIND_DATAA *a, WIN32_FIND_DATAW *w)
+{
+	w->dwFileAttributes = a->dwFileAttributes;
+	w->ftCreationTime = a->ftCreationTime;
+	w->ftLastAccessTime = a->ftLastAccessTime;
+	w->ftLastWriteTime = a->ftLastWriteTime;
+	w->nFileSizeHigh = a->nFileSizeHigh;
+	w->nFileSizeLow = a->nFileSizeLow;
+	w->dwReserved0 = a->dwReserved0;
+	w->dwReserved1 = a->dwReserved1;
+	::MultiByteToWideChar(CP_ACP, 0, a->cFileName, _countof(a->cFileName), w->cFileName, _countof(w->cFileName));
+	::MultiByteToWideChar(CP_ACP, 0, a->cAlternateFileName, _countof(a->cAlternateFileName), w->cAlternateFileName, _countof(w->cAlternateFileName));
 }
 
 HANDLE _FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData)
 {
-	return FindFirstFileW(lpFileName, lpFindFileData);
+	if (pFindFirstFileW != NULL) {
+		return pFindFirstFileW(lpFileName, lpFindFileData);
+	}
+
+	WIN32_FIND_DATAA find_file_data;
+	char *lpFileNameA = ToCharW(lpFileName);
+	HANDLE handle = FindFirstFileA(lpFileNameA, &find_file_data);
+	free(lpFileNameA);
+	FindDataAW(&find_file_data, lpFindFileData);
+	return handle;
 }
 
 BOOL _FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData)
 {
-	return FindNextFileW(hFindFile, lpFindFileData);
+	if (pFindNextFileW != NULL) {
+		return pFindNextFileW(hFindFile, lpFindFileData);
+	}
+	WIN32_FIND_DATAA find_file_data;
+	BOOL r = FindNextFileA(hFindFile, &find_file_data);
+	FindDataAW(&find_file_data, lpFindFileData);
+	return r;
 }
 
 BOOL _RemoveDirectoryW(LPCWSTR lpPathName)
 {
-	return RemoveDirectoryW(lpPathName);
+	if (pRemoveDirectoryW != NULL) {
+		return pRemoveDirectoryW(lpPathName);
+	}
+	char *lpPathNameA = ToCharW(lpPathName);
+	BOOL r = RemoveDirectoryA(lpPathNameA);
+	free(lpPathNameA);
+	return r;
 }