Changeset 4629 for pjproject/branches/projects/winphone/pjlib/src/pj/file_io_win32.c

Timestamp:

Oct 22, 2013 3:34:41 AM (11 years ago)

Author:

riza

Message:

Re #1704: fixed some build warnings and errors

File:

• pjproject/branches/projects/winphone/pjlib/src/pj/file_io_win32.c (modified) (4 diffs)

pjproject/branches/projects/winphone/pjlib/src/pj/file_io_win32.c

@@ -185 +185 @@
 */
 
+static pj_status_t set_file_pointer(pj_oshandle_t fd,
+                                    pj_off_t offset,
+                                    pj_off_t* newPos,
+                                    DWORD dwMoveMethod)
+{
+#ifdef PJ_WIN32_WINPHONE
+    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;
+}
+
 PJ_DEF(pj_status_t) pj_file_setpos( pj_oshandle_t fd,
                                     pj_off_t offset,
@@ -190 +223 @@
 {
     DWORD dwMoveMethod;
-    DWORD dwNewPos;
-    LONG  hi32;
+    pj_off_t newPos;
 
     if (whence == PJ_SEEK_SET)
@@ -202 +234 @@
         pj_assert(!"Invalid whence in file_setpos");
         return PJ_EINVAL;
-    }
-
-    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());
     }
 
@@ -219 +246 @@
                                     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;
 }