Changeset 4629 for pjproject/branches/projects/winphone/pjlib/src/pj/file_access_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_access_win32.c (modified) (8 diffs)

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

@@ -34 +34 @@
 #endif
 
+static pj_status_t get_file_size(HANDLE hFile, pj_off_t *size)
+{
+#ifdef PJ_WIN32_WINPHONE  
+    FILE_STANDARD_INFO fileInfo;
+
+    if (GetFileInformationByHandleEx(hFile, FileStandardInfo, &fileInfo,
+                                     sizeof(FILE_STANDARD_INFO))) 
+    {
+        *size = fileInfo.AllocationSize.QuadPart;       
+    } else {    
+        *size = -1;
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+#else
+    DWORD sizeLo, sizeHi;
+
+    sizeLo = GetFileSize(hFile, &sizeHi);
+    if (sizeLo == INVALID_FILE_SIZE) {
+        DWORD dwStatus = GetLastError();
+        if (dwStatus != NO_ERROR) {            
+            *size = -1;
+            return PJ_RETURN_OS_ERROR(dwStatus);
+        }
+    }
+    *size = sizeHi;
+    *size = ((*size) << 32) + sizeLo;
+#endif
+    return PJ_SUCCESS;
+}
+
 static HANDLE WINAPI create_file(LPCTSTR filename, DWORD desired_access,
                                  DWORD share_mode, 
@@ -41 +71 @@
                                  HANDLE template_file)
 {
-#ifdef PJ_WIN32_WINPHONE  
+#ifdef PJ_WIN32_WINPHONE
+    PJ_UNUSED_ARG(security_attributes);
+    PJ_UNUSED_ARG(flags_and_attributes);
+    PJ_UNUSED_ARG(template_file);
+
     return CreateFile2(filename, desired_access, share_mode, 
                        creation_disposition, NULL);
@@ -81 +115 @@
 {
     PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
-    HANDLE hFile;
-    DWORD sizeLo, sizeHi;
+    HANDLE hFile;    
     pj_off_t size;
 
@@ -95 +128 @@
         return -1;
 
-    sizeLo = GetFileSize(hFile, &sizeHi);
-    if (sizeLo == INVALID_FILE_SIZE) {
-        DWORD dwStatus = GetLastError();
-        if (dwStatus != NO_ERROR) {
-            CloseHandle(hFile);
-            return -1;
-        }
-    }
-
-    size = sizeHi;
-    size = (size << 32) + sizeLo;
+    get_file_size(hFile, &size);
 
     CloseHandle(hFile);
@@ -158 +181 @@
                                          pj_time_val *time_val)
 {
-    FILETIME local_file_time;
+    //FILETIME local_file_time;
     SYSTEMTIME localTime;
     pj_parsed_time pt;
 
-    if (!FileTimeToLocalFileTime(file_time, &local_file_time))
-        return PJ_RETURN_OS_ERROR(GetLastError());
+    //if (!FileTimeToLocalFileTime(file_time, &local_file_time))
+    //  return PJ_RETURN_OS_ERROR(GetLastError());
 
     if (!FileTimeToSystemTime(file_time, &localTime))
@@ -192 +215 @@
     PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
     HANDLE hFile;
-    DWORD sizeLo, sizeHi;
     FILETIME creationTime, accessTime, writeTime;
+#ifdef PJ_WIN32_WINPHONE
+    FILE_BASIC_INFO fileInfo;
+#endif
 
     PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL);
@@ -204 +229 @@
     if (hFile == INVALID_HANDLE_VALUE)
         return PJ_RETURN_OS_ERROR(GetLastError());
-
-    sizeLo = GetFileSize(hFile, &sizeHi);
-    if (sizeLo == INVALID_FILE_SIZE) {
-        DWORD dwStatus = GetLastError();
-        if (dwStatus != NO_ERROR) {
-            CloseHandle(hFile);
-            return PJ_RETURN_OS_ERROR(dwStatus);
-        }
-    }
-
-    stat->size = sizeHi;
-    stat->size = (stat->size << 32) + sizeLo;
-
+    
+    if (get_file_size(hFile, &stat->size) != PJ_SUCCESS) {
+        CloseHandle(hFile);
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+#ifdef PJ_WIN32_WINPHONE
+    if (GetFileInformationByHandleEx(hFile, FileBasicInfo, &fileInfo,
+                                     sizeof(FILE_BASIC_INFO))) 
+    {
+        creationTime.dwLowDateTime = fileInfo.CreationTime.LowPart;
+        creationTime.dwHighDateTime = fileInfo.CreationTime.HighPart;
+        accessTime.dwLowDateTime = fileInfo.LastAccessTime.LowPart;
+        accessTime.dwHighDateTime = fileInfo.LastAccessTime.HighPart;
+        writeTime.dwLowDateTime = fileInfo.LastWriteTime.LowPart;
+        writeTime.dwHighDateTime = fileInfo.LastWriteTime.HighPart;
+    } else {    
+        CloseHandle(hFile);
+        return PJ_RETURN_OS_ERROR(GetLastError());
+    }
+#else
     if (GetFileTime(hFile, &creationTime, &accessTime, &writeTime)==FALSE) {
         DWORD dwStatus = GetLastError();
@@ -222 +254 @@
         return PJ_RETURN_OS_ERROR(dwStatus);
     }
+#endif
 
     CloseHandle(hFile);