Changeset 1381

Timestamp:

Jun 22, 2007 11:30:44 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #340: File access problem on WinCE

File:

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

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

@@ -26 +26 @@
 #include <time.h>
 
+#if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0
+    /* WinCE lacks READ_CONTROL so we must use GENERIC_READ */
+#   define CONTROL_ACCESS   GENERIC_READ
+#else
+#   define CONTROL_ACCESS   READ_CONTROL
+#endif
+
+
 /*
  * pj_file_exists()
@@ -37 +45 @@
 
     hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 
-                       READ_CONTROL, 
+                       CONTROL_ACCESS, 
                        FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -61 +69 @@
 
     hFile = CreateFile(PJ_STRING_TO_NATIVE(filename, wfilename,sizeof(wfilename)), 
-                       READ_CONTROL, 
+                       CONTROL_ACCESS, 
                        FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -170 +178 @@
 
     hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 
-                       READ_CONTROL, 
+                       CONTROL_ACCESS, 
                        FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);