Fix bugs of UTF-8 to UTF-16 API bridge.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 45fa428..efacc0d 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 4811ce9..1b7f803 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/mbswrapper.c b/mbswrapper.c
index 36561a8..3e55ce0 100644 (file)
--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -1846,6 +1846,20 @@ END_ROUTINE
        return r;\r
 }\r
 \r
+BOOL CopyFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExists)\r
+{\r
+       BOOL r = FALSE;\r
+       wchar_t* pw0 = NULL;\r
+       wchar_t* pw1 = NULL;\r
+START_ROUTINE\r
+       pw0 = DuplicateMtoW(lpExistingFileName, -1);\r
+       pw1 = DuplicateMtoW(lpNewFileName, -1);\r
+       r = CopyFileW(pw0, pw1, bFailIfExists);\r
+END_ROUTINE\r
+       FreeDuplicatedString(pw0);\r
+       return r;\r
+}\r
+\r
 int mkdirM(const char * _Path)\r
 {\r
        int r = 0;\r

diff --git a/mbswrapper.h b/mbswrapper.h
index f1040b9..ec153ed 100644 (file)
--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -158,6 +158,9 @@ BOOL sndPlaySoundM(LPCSTR pszSound, UINT fuSound);
 #undef SetClipboardData\r
 #define SetClipboardData SetClipboardDataM\r
 HANDLE SetClipboardDataM(UINT uFormat, HANDLE hMem);\r
+#undef CopyFile\r
+#define CopyFile CopyFileM\r
+BOOL CopyFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExists);\r
 #undef mkdir\r
 #define mkdir _mkdirM\r
 int mkdirM(const char * _Path);\r