MoveFileA handled

3 files changed, 38 insertions, 1 deletions

diff --git a/pr/include/md/_win32_unicode.h b/pr/include/md/_win32_unicode.h
index bc433cb5..5efdd7b5 100644
--- a/pr/include/md/_win32_unicode.h
+++ b/pr/include/md/_win32_unicode.h
@@ -87,6 +87,13 @@ _MD_DeleteFileA(
     LPCSTR lpFileName
     );
 
+BOOL
+WINAPI
+_MD_MoveFileA(
+    LPCSTR lpExistingFileName,
+    LPCSTR lpNewFileName
+    );
+
 #endif /* WINCE */
 
 #endif /* nspr_win32_unicode_h___ */
diff --git a/pr/src/md/windows/w32unicode.c b/pr/src/md/windows/w32unicode.c
index 9f6444d7..051c4e96 100644
--- a/pr/src/md/windows/w32unicode.c
+++ b/pr/src/md/windows/w32unicode.c
@@ -299,4 +299,34 @@ _MD_DeleteFileA(
     return retval;
 }
 
+BOOL
+WINAPI
+_MD_MoveFileA(
+    LPCSTR lpExistingFileName,
+    LPCSTR lpNewFileName
+    )
+{
+    BOOL retval = FALSE;
+    LPWSTR wideStr = NULL;
+    WCHAR widePath[MAX_PATH + 1];
+    LPWSTR wideNewStr = NULL;
+    WCHAR wideNewPath[MAX_PATH + 1];
+
+    wideStr = _PR_MD_A2W(lpExistingFileName, widePath, sizeof(widePath) / sizeof(WCHAR));
+    wideNewStr = _PR_MD_A2W(lpNewFileName, wideNewPath, sizeof(wideNewPath) / sizeof(WCHAR));
+    if(NULL != wideStr && NULL != wideNewStr)
+    {
+        retval = MoveFileW(
+            wideStr,
+            wideNewStr
+            );
+    }
+    else
+    {
+        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
+    }
+
+    return retval;
+}
+
 #endif /* WINCE */
\ No newline at end of file
diff --git a/pr/src/md/windows/w95io.c b/pr/src/md/windows/w95io.c
index 06a5ae42..cffba103 100644
--- a/pr/src/md/windows/w95io.c
+++ b/pr/src/md/windows/w95io.c
@@ -1162,7 +1162,7 @@ _PR_MD_RENAME(const char *from, const char *to)
 #if !defined(WINCE)
         MoveFile(from, to)
 #else
-        MoveFileA(from, to)
+        _MD_MoveFileA(from, to)
 #endif
         ) {
         return 0;