Changeset 126 for pjproject/trunk/pjlib/src/pj/file_access_win32.c

Timestamp:

Jan 20, 2006 9:03:36 PM (18 years ago)

Author:

bennylp

Message:

Completed testing for WinCE port

File:

• pjproject/trunk/pjlib/src/pj/file_access_win32.c (modified) (6 diffs)

pjproject/trunk/pjlib/src/pj/file_access_win32.c

@@ -18 +18 @@
  */
 #include <pj/file_access.h>
-#include <pj/compat/unicode.h>
+#include <pj/unicode.h>
 #include <pj/assert.h>
 #include <pj/errno.h>
@@ -36 +36 @@
     PJ_ASSERT_RETURN(filename != NULL, 0);
 
-    hFile = CreateFile(PJ_NATIVE_STRING(filename,wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename), READ_CONTROL, 
                        FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -59 +59 @@
     PJ_ASSERT_RETURN(filename != NULL, -1);
 
-    hFile = CreateFile(PJ_NATIVE_STRING(filename, wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename, wfilename), READ_CONTROL, 
                        FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -91 +91 @@
     PJ_ASSERT_RETURN(filename != NULL, PJ_EINVAL);
 
-    if (DeleteFile(PJ_NATIVE_STRING(filename,wfilename)) == FALSE)
+    if (DeleteFile(PJ_STRING_TO_NATIVE(filename,wfilename)) == FALSE)
         return PJ_RETURN_OS_ERROR(GetLastError());
 
@@ -110 +110 @@
 
 #if PJ_WIN32_WINNT >= 0x0400
-    rc = MoveFileEx(PJ_NATIVE_STRING(oldname,woldname), 
-                    PJ_NATIVE_STRING(newname,wnewname), 
+    rc = MoveFileEx(PJ_STRING_TO_NATIVE(oldname,woldname), 
+                    PJ_STRING_TO_NATIVE(newname,wnewname), 
                     MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING);
 #else
-    rc = MoveFile(PJ_NATIVE_STRING(oldname, woldname), 
-                  PJ_NATIVE_STRING(newname, wnewname));
+    rc = MoveFile(PJ_STRING_TO_NATIVE(oldname, woldname), 
+                  PJ_STRING_TO_NATIVE(newname, wnewname));
 #endif
 
@@ -167 +167 @@
     PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL);
 
-    hFile = CreateFile(PJ_NATIVE_STRING(filename,wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename), READ_CONTROL, 
                        FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);