提交: 54acfb6a8f762c54a1833a6c3e6f87df9d2992ea - Tera_Term_Testing (git)

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

Commit MetaInfo

• 修订版: 54acfb6a8f762c54a1833a6c3e6f87df9d2992ea (tree)
• 时间: 2020-04-12 00:57:11
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

_CreateProcessW() を追加

- マクロの exec が動作するのを確認

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

更改概述

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

差异

--- a/teraterm/common/compat_win.cpp
+++ b/teraterm/common/compat_win.cpp
@@ -77,6 +77,11 @@ HWND (WINAPI *pGetConsoleWindow)(void);
 DWORD (WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault,
 										 LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
 BOOL (WINAPI *pWritePrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpString, LPCWSTR lpFileName);
+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);
 
 // gdi32.lib
 int (WINAPI *pAddFontResourceExW)(LPCWSTR name, DWORD fl, PVOID res);
@@ -219,6 +224,7 @@ static const APIInfo Lists_kernel32[] = {
 	{ "SetCurrentDirectoryW", (void **)&pSetCurrentDirectoryW },
 	{ "GetPrivateProfileStringW", (void **)&pGetPrivateProfileStringW },
 	{ "WritePrivateProfileStringW", (void **)&pWritePrivateProfileStringW },
+	{ "CreateProcessW", (void **)&pCreateProcessW },
 #endif
 	{ "GetConsoleWindow", (void **)&pGetConsoleWindow },
 	{},
@@ -304,6 +310,9 @@ void WinCompatInit()
 		pGetCurrentDirectoryW = NULL;
 		pSetCurrentDirectoryW = NULL;
 		pGetOpenFileNameW = NULL;
+		pSHBrowseForFolderW = NULL;
+		pSHGetPathFromIDListW = NULL;
+		pCreateProcessW = NULL;
 	}
 
 	// GetConsoleWindow特別処理

--- a/teraterm/common/compat_win.h
+++ b/teraterm/common/compat_win.h
@@ -129,6 +129,11 @@ extern BOOL (WINAPI *pGetSaveFileNameW)(LPOPENFILENAMEW ofnW);
 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);
 
 // shlobj_core.h
 extern LPITEMIDLIST (WINAPI *pSHBrowseForFolderW)(LPBROWSEINFOW lpbi);

--- a/teraterm/common/layer_for_unicode.cpp
+++ b/teraterm/common/layer_for_unicode.cpp
@@ -656,3 +656,37 @@ BOOL _WritePrivateProfileStringW(LPCWSTR lpAppName,LPCWSTR lpKeyName,LPCWSTR lpS
 	free(fileA);
 	return r;
 }
+
+BOOL _CreateProcessW(LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
+					 LPSECURITY_ATTRIBUTES lpProcessAttributes,
+					 LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles,
+					 DWORD dwCreationFlags, LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
+					 LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation)
+{
+	if (pCreateProcessW != NULL) {
+		return pCreateProcessW(lpApplicationName, lpCommandLine,
+							   lpProcessAttributes,
+							   lpThreadAttributes,  bInheritHandles,
+							   dwCreationFlags,  lpEnvironment,  lpCurrentDirectory,
+							   lpStartupInfo,  lpProcessInformation);
+	}
+
+	// 取り合えず、ttl.cppで使っている分だけ
+	STARTUPINFOA suiA;
+	memset(&suiA, 0, sizeof(suiA));
+	suiA.cb = lpStartupInfo->cb;
+	suiA.wShowWindow = lpStartupInfo->wShowWindow;
+	suiA.dwFlags = suiA.dwFlags;
+
+	char *appA = ToCharW(lpApplicationName);
+	char *cmdA = ToCharW(lpCommandLine);
+	char *curA = ToCharW(lpCurrentDirectory);
+	BOOL r =
+		CreateProcessA(appA, cmdA, lpProcessAttributes, lpThreadAttributes, bInheritHandles,
+					   dwCreationFlags, lpEnvironment, curA, &suiA, lpProcessInformation);
+	free(appA);
+	free(cmdA);
+	free(curA);
+
+	return r;
+}

--- a/teraterm/common/layer_for_unicode.h
+++ b/teraterm/common/layer_for_unicode.h
@@ -120,6 +120,11 @@ void _OutputDebugStringW(LPCWSTR lpOutputString);
 DWORD _GetPrivateProfileStringW(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault,
 								LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
 BOOL _WritePrivateProfileStringW(LPCWSTR lpAppName,LPCWSTR lpKeyName,LPCWSTR lpString,LPCWSTR lpFileName);
+BOOL _CreateProcessW(LPCWSTR lpApplicationName, LPWSTR lpCommandLine,
+					 LPSECURITY_ATTRIBUTES lpProcessAttributes,
+					 LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles,
+					 DWORD dwCreationFlags, LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
+					 LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
 
 // gdi32.lib
 int _AddFontResourceW(LPCWSTR lpFileName);