Tera TermRevision: 8763
https://osdn.net/projects/ttssh2/scm/svn/commits/8763
Author: zmatsuo
Date: 2020-05-02 22:25:14 +0900 (Sat, 02 May 2020)
Log Message:
-----------
マクロで使用しているWin32 APIをlayer for unicodeに追加
- 次のAPIのエントリを追加
- _CopyFileW()
- _DeleteFileW()
- _MoveFileW()
- _CreateFileW()
- _FindFirstFileW()
- _FindNextFileW()
- _RemoveDirectoryW()
- 中身は未実装
- teraterm/ttpmacro/ttl.cpp は追加した API を使用
- r8713
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8713
Modified Paths:
--------------
trunk/teraterm/common/layer_for_unicode.cpp
trunk/teraterm/common/layer_for_unicode.h
trunk/teraterm/ttpmacro/ttl.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/layer_for_unicode.cpp
===================================================================
--- trunk/teraterm/common/layer_for_unicode.cpp 2020-05-02 13:25:04 UTC (rev 8762)
+++ trunk/teraterm/common/layer_for_unicode.cpp 2020-05-02 13:25:14 UTC (rev 8763)
@@ -690,3 +690,41 @@
return r;
}
+
+BOOL _CopyFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists)
+{
+ return CopyFileW(lpExistingFileName, lpNewFileName, bFailIfExists);
+}
+
+BOOL _DeleteFileW(LPCWSTR lpFileName)
+{
+ return DeleteFileW(lpFileName);
+}
+
+BOOL _MoveFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName)
+{
+ return MoveFileW(lpExistingFileName, lpNewFileName);
+}
+
+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);
+}
+
+HANDLE _FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData)
+{
+ return FindFirstFileW(lpFileName, lpFindFileData);
+}
+
+BOOL _FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData)
+{
+ return FindNextFileW(hFindFile, lpFindFileData);
+}
+
+BOOL _RemoveDirectoryW(LPCWSTR lpPathName)
+{
+ return RemoveDirectoryW(lpPathName);
+}
Modified: trunk/teraterm/common/layer_for_unicode.h
===================================================================
--- trunk/teraterm/common/layer_for_unicode.h 2020-05-02 13:25:04 UTC (rev 8762)
+++ trunk/teraterm/common/layer_for_unicode.h 2020-05-02 13:25:14 UTC (rev 8763)
@@ -125,6 +125,15 @@
LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles,
DWORD dwCreationFlags, LPVOID lpEnvironment, LPCWSTR lpCurrentDirectory,
LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
+BOOL _CopyFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName, BOOL bFailIfExists);
+BOOL _DeleteFileW(LPCWSTR lpFileName);
+BOOL _MoveFileW(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName);
+HANDLE _CreateFileW(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
+ LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
+ HANDLE hTemplateFile);
+HANDLE _FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData);
+BOOL _FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData);
+BOOL _RemoveDirectoryW(LPCWSTR lpPathName);
// gdi32.lib
int _AddFontResourceW(LPCWSTR lpFileName);
Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp 2020-05-02 13:25:04 UTC (rev 8762)
+++ trunk/teraterm/ttpmacro/ttl.cpp 2020-05-02 13:25:14 UTC (rev 8763)
@@ -1271,7 +1271,7 @@
return Err;
}
- ret = CopyFileW(wc::fromUtf8(FName1), wc::fromUtf8(FName2), FALSE);
+ ret = _CopyFileW(wc::fromUtf8(FName1), wc::fromUtf8(FName2), FALSE);
if (ret == 0) {
SetResult(-4);
return Err;
@@ -1341,7 +1341,7 @@
return Err;
}
- if (DeleteFileW(wc::fromUtf8(FName)) != 0) {
+ if (_DeleteFileW(wc::fromUtf8(FName)) != 0) {
SetResult(-1);
}
else {
@@ -1728,7 +1728,7 @@
goto end;
}
- hFile = CreateFileW(wc::fromUtf8(FName), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
+ hFile = _CreateFileW(wc::fromUtf8(FName), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) {
goto end;
@@ -1923,7 +1923,7 @@
Err = 0;
// \x83t\x83@\x83C\x83\x8B\x83I\x81[\x83v\x83\x93\x81A\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x8Fꍇ\x82͐V\x8BK\x8D쐬
- hFile = CreateFileW(wc::fromUtf8(FName), GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ hFile = _CreateFileW(wc::fromUtf8(FName), GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) {
goto end;
}
@@ -2035,7 +2035,7 @@
i++;
if (i<NumDirHandle)
{
- DirHandle[i] = FindFirstFileW(wc::fromUtf8(Dir),&data);
+ DirHandle[i] = _FindFirstFileW(wc::fromUtf8(Dir),&data);
if (DirHandle[i]!= INVALID_HANDLE_VALUE)
SetStrVal(Name,(u8)data.cFileName);
else
@@ -2071,7 +2071,7 @@
if ((DH>=0) && (DH<NumDirHandle) &&
(DirHandle[DH]!= INVALID_HANDLE_VALUE) &&
- (FindNextFileW(DirHandle[DH],&data) != FALSE))
+ (_FindNextFileW(DirHandle[DH],&data) != FALSE))
{
SetStrVal(Name,(u8)data.cFileName);
SetResult(1);
@@ -2140,7 +2140,7 @@
return Err;
}
- if (RemoveDirectoryW(wc::fromUtf8(FName)) == 0) {
+ if (_RemoveDirectoryW(wc::fromUtf8(FName)) == 0) {
SetResult(2);
}
else {