Changeset 269

Timestamp:

Jul 5, 1999, 9:55:10 AM (26 years ago)

Author:

phaller

Message:

Fix: HandleManager::Open32::OpenFile() as suggested by Edgar Buerkle

Location:

trunk

Files:

• include/HandleManager.h (modified) (2 diffs)
• src/kernel32/hmopen32.cpp (modified) (4 diffs)

trunk/include/HandleManager.h

@@ -1 @@
-/* $Id: HandleManager.h,v 1.1 1999-07-04 09:36:02 sandervl Exp $ */
+/* $Id: HandleManager.h,v 1.2 1999-07-05 07:55:09 phaller Exp $ */
 
 /*
@@ -51 +51 @@
       /* all handles to our special pseudo-devices are ORed with this define */
    /* this allows us to determine quickly how to where to route requests to. */
-#define HM_HANDLE_ID   0xDEAD0000
+#define HM_HANDLE_ID   0x77770000
 #define HM_HANDLE_MASK 0x0000FFFF
 

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.5 1999-06-29 11:02:52 phaller Exp $ */
+/* $Id: hmopen32.cpp,v 1.6 1999-07-05 07:55:10 phaller Exp $ */
 
 /*
@@ -517 +517 @@
 {
   HFILE hFile;
+  FILETIME filetime;
+  WORD filedatetime[2];
 
   dprintfl(("KERNEL32: HandleManager::Open32::OpenFile %s(%s,%08x,%08x,%08x) - stub?\n",
@@ -528 +530 @@
              "\\\\.\\") == 0)
     lpFileName+=4;
+
+  // filling OFSTRUCT
+  pOFStruct->cBytes = sizeof(OFSTRUCT);
+  pOFStruct->nErrCode = 0;
 
   hFile = O32_OpenFile(lpFileName,
@@ -535 +541 @@
   {
     pHMHandleData->hWinHandle = hFile;
+    GetFileTime(hFile,
+                NULL,
+                NULL,
+                &filetime );
+    FileTimeToDosDateTime(&filetime,
+                          &filedatetime[0],
+                          &filedatetime[1] );
+    memcpy(pOFStruct->reserved,
+           filedatetime,
+           sizeof(pOFStruct->reserved) );
     return (NO_ERROR);
   }
 
-  //@@@PH: Edgar Buerkle suspects wrong return value here, should be 0 in case of success
+  // error branch
   hFile = O32_GetLastError();
-  dprintf(("KERNEL32: HandleManager::Open32::OpenFile returns %08xh\n",
-           hFile));
-
-  return(hFile); // return error cause
+  pOFStruct->nErrCode = hFile;
+  dprintf(("KERNEL32: HandleManager::Open32::OpenFile Error %08xh\n",
+            pOFStruct->nErrCode));
+
+  return(hFile);
 }