Changeset 5539 for pjproject/trunk/pjlib/src/pj/file_io_win32.c

Timestamp:

Jan 23, 2017 4:32:34 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (2 props)
• pjlib/src/pj/file_io_win32.c (modified) (7 diffs)

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

@@ -22 +22 @@
 #include <pj/errno.h>
 #include <pj/assert.h>
+#include <pj/string.h>
 
 #include <windows.h>
@@ -28 +29 @@
 #   define INVALID_SET_FILE_POINTER     ((DWORD)-1)
 #endif
+
+static pj_status_t set_file_pointer(pj_oshandle_t fd,
+    pj_off_t offset,
+    pj_off_t* newPos,
+    DWORD dwMoveMethod)
+{
+#if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8
+    LARGE_INTEGER liDistance, liNewPos;
+
+    liDistance.QuadPart = offset;
+    if (!SetFilePointerEx(fd, liDistance, &liNewPos, dwMoveMethod)) {
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+    *newPos = liNewPos.QuadPart;
+#else
+    DWORD dwNewPos;
+    LONG  hi32;
+
+    hi32 = (LONG)(offset >> 32);
+
+    dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod);
+    if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) {
+        DWORD dwStatus = GetLastError();
+        if (dwStatus != 0)
+            return PJ_RETURN_OS_ERROR(dwStatus);
+        /* dwNewPos actually is not an error. */
+    }
+    *newPos = hi32;
+    *newPos = (*newPos << 32) + dwNewPos;
+#endif
+
+    return PJ_SUCCESS;
+}
 
 /**
@@ -46 +80 @@
                                   pj_oshandle_t *fd)
 {
-    PJ_DECL_UNICODE_TEMP_BUF(wpathname,256)
+    PJ_DECL_UNICODE_TEMP_BUF(wpathname, 256)
     HANDLE hFile;
     DWORD dwDesiredAccess = 0;
@@ -87 +121 @@
 
     dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    
     dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL;
 
-    hFile = CreateFile(PJ_STRING_TO_NATIVE(pathname,wpathname,sizeof(wpathname)), 
+#if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8  
+    hFile = CreateFile2(PJ_STRING_TO_NATIVE(pathname,
+                        wpathname, sizeof(wpathname)),
+                        dwDesiredAccess, dwShareMode, dwCreationDisposition,
+                        NULL);
+#else
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(pathname,
+                       wpathname, sizeof(wpathname)),
                        dwDesiredAccess, dwShareMode, NULL,
-                       dwCreationDisposition, dwFlagsAndAttributes, NULL);
+                       dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
     if (hFile == INVALID_HANDLE_VALUE) {
+        DWORD lastErr = GetLastError(); 
         *fd = 0;
-        return PJ_RETURN_OS_ERROR(GetLastError());
+        return PJ_RETURN_OS_ERROR(lastErr);
     }
 
@@ -181 +226 @@
 {
     DWORD dwMoveMethod;
-    DWORD dwNewPos;
-    LONG  hi32;
+    pj_off_t newPos;
 
     if (whence == PJ_SEEK_SET)
@@ -195 +239 @@
     }
 
-    hi32 = (LONG)(offset >> 32);
-    dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod);
-    if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) {
-        DWORD dwStatus = GetLastError();
-        if (dwStatus != 0)
-            return PJ_RETURN_OS_ERROR(dwStatus);
-        /* dwNewPos actually is not an error. */
+    if (set_file_pointer(fd, offset, &newPos, dwMoveMethod) != PJ_SUCCESS) {
+        return PJ_RETURN_OS_ERROR(GetLastError());
     }
 
@@ -210 +249 @@
                                     pj_off_t *pos)
 {
-    LONG hi32 = 0;
-    DWORD lo32;
-
-    lo32 = SetFilePointer(fd, 0, &hi32, FILE_CURRENT);
-    if (lo32 == (DWORD)INVALID_SET_FILE_POINTER) {
-        DWORD dwStatus = GetLastError();
-        if (dwStatus != 0)
-            return PJ_RETURN_OS_ERROR(dwStatus);
-    }
-
-    *pos = hi32;
-    *pos = (*pos << 32) + lo32;
+    if (set_file_pointer(fd, 0, pos, FILE_CURRENT) != PJ_SUCCESS) {
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+
     return PJ_SUCCESS;
 }