Changeset 113 for trunk/src/kernel32/hmopen32.cpp

Timestamp:

Jun 17, 1999, 8:44:06 PM (26 years ago)

Author:

phaller

Message:

Fix: Bugfix in handlemanager

File:

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

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.1 1999-06-17 18:21:43 phaller Exp $ */
+/* $Id: hmopen32.cpp,v 1.2 1999-06-17 18:44:06 phaller Exp $ */
 
 /*
@@ -87 +87 @@
 {
   HFILE hFile;
+  HFILE hTemplate;
 
   dprintf(("KERNEL32: HandleManager::Open32::CreateFile %s(%s,%08x,%08x,%08x) - stub?\n",
@@ -100 +101 @@
     lpFileName+=4;
 
+  // create from template
+  if (pHMHandleDataTemplate != NULL)
+     hTemplate = pHMHandleDataTemplate->hWinHandle;
+  else
+     hTemplate = 0;
+
   hFile = O32_CreateFile(lpFileName,
                          pHMHandleData->dwAccess,
                          pHMHandleData->dwShare,
-                         (PSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                         //(LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                         NULL,
                          pHMHandleData->dwCreation,
                          pHMHandleData->dwFlags,
-                         pHMHandleDataTemplate->hWinHandle);
+                         hTemplate);
   if (hFile != INVALID_HANDLE_ERROR)
+  {
      pHMHandleData->hWinHandle = hFile;
-
-  return(hFile);
+     return (NO_ERROR);
+  }
+  else
+    return(O32_GetLastError());
 }