Changeset 4777 for pjproject/branches/projects/winphone/pjlib/src/pj/file_access_win32.c

Timestamp:

Mar 5, 2014 6:48:59 AM (10 years ago)

Author:

riza

Message:

Re #1704:

• Fix duplicate code on os_winphone.h
• Change the use of PJ_WIN32_WINPHONE to follow the code convention
• Fix incorrect link of the Thread library
• Handle exception raised from select() API. However the break window will still be shown when debugging on Visual Studio. To disable it, from Debug>Exceptions>Win32 Exceptions> unmark the "An invalid handle was specified” exception.

File:

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

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

@@ -36 +36 @@
 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))) 
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE  
+    FILE_COMPRESSION_INFO fileInfo;
+
+    if (GetFileInformationByHandleEx(hFile, FileCompressionInfo, &fileInfo,
+                                     sizeof(FILE_COMPRESSION_INFO))) 
     {
-        *size = fileInfo.AllocationSize.QuadPart;       
+        *size = fileInfo.CompressedFileSize.QuadPart;   
     } else {    
         *size = -1;
@@ -71 +71 @@
                                  HANDLE template_file)
 {
-#ifdef PJ_WIN32_WINPHONE
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
     PJ_UNUSED_ARG(security_attributes);
     PJ_UNUSED_ARG(flags_and_attributes);
@@ -216 +216 @@
     HANDLE hFile;
     FILETIME creationTime, accessTime, writeTime;
-#ifdef PJ_WIN32_WINPHONE
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
     FILE_BASIC_INFO fileInfo;
 #endif
@@ -234 +234 @@
         return PJ_RETURN_OS_ERROR(GetLastError());
     }
-#ifdef PJ_WIN32_WINPHONE
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
     if (GetFileInformationByHandleEx(hFile, FileBasicInfo, &fileInfo,
                                      sizeof(FILE_BASIC_INFO)))