Changeset 10083 for trunk/src/kernel32/lfile.cpp

Timestamp:

May 12, 2003, 5:29:09 PM (22 years ago)

Author:

sandervl

Message:

_lopen: wrong parsing of mode parameter

File:

• trunk/src/kernel32/lfile.cpp (modified) (3 diffs)

trunk/src/kernel32/lfile.cpp

@@ -1 @@
-/* $Id: lfile.cpp,v 1.7 2000-06-16 00:04:30 phaller Exp $ */
+/* $Id: lfile.cpp,v 1.8 2003-05-12 15:29:09 sandervl Exp $ */
 
 /*
@@ -105 +105 @@
 
 HFILE WIN32API _lopen(LPCSTR pszFileName,
-                      int    arg2)
+                      int    mode)
 {
    ULONG  ulAccess = 0;
@@ -113 +113 @@
    dprintf(("KERNEL32: _lopen(%s, %08xh)\n",
             pszFileName,
-            arg2));
-
-   if (arg2 & ~(OF_READ|OF_READWRITE|OF_WRITE|OF_SHARE_COMPAT|OF_SHARE_DENY_NONE|OF_SHARE_DENY_READ|OF_SHARE_DENY_WRITE|OF_SHARE_EXCLUSIVE))
+            mode));
+
+   if (mode & ~(OF_READ|OF_READWRITE|OF_WRITE|OF_SHARE_COMPAT|OF_SHARE_DENY_NONE|OF_SHARE_DENY_READ|OF_SHARE_DENY_WRITE|OF_SHARE_EXCLUSIVE))
       dprintf(("KERNEL32: (warn) _lopen has unknown flag(s) set.\n"));
 
    /* Access */
-   ulAccess |= arg2 & OF_READ      ? GENERIC_READ                 : 0;
-   ulAccess |= arg2 & OF_WRITE     ? GENERIC_WRITE                : 0;
-   ulAccess |= arg2 & OF_READWRITE ? GENERIC_READ | GENERIC_WRITE : 0;
+   switch(mode & 0x03)
+   {
+   case OF_READ:      ulAccess = GENERIC_READ; break;
+   case OF_WRITE:     ulAccess = GENERIC_WRITE; break;
+   case OF_READWRITE: ulAccess = GENERIC_READ | GENERIC_WRITE; break;
+   default:           ulAccess = 0; break;
+   }
 
    /* Share */
-   ulShare = arg2 & (OF_SHARE_COMPAT | OF_SHARE_DENY_NONE | OF_SHARE_DENY_READ | OF_SHARE_DENY_WRITE | OF_SHARE_EXCLUSIVE);
+   ulShare = mode & (OF_SHARE_COMPAT | OF_SHARE_DENY_NONE | OF_SHARE_DENY_READ | OF_SHARE_DENY_WRITE | OF_SHARE_EXCLUSIVE);
    if (ulShare == OF_SHARE_DENY_READ)
       ulShare = FILE_SHARE_WRITE;