Changeset 22025 for trunk/src

Timestamp:

Sep 28, 2012, 6:56:57 PM (13 years ago)

Author:

dmik

Message:

kernel32: Implement GetFileInformationByHandle for directories.

Location:

trunk/src/kernel32

Files:

• hmfile.cpp (modified) (3 diffs)
• hmfile.h (modified) (2 diffs)
• oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/hmfile.cpp

@@ -1207 +1207 @@
   }
 
-  pHMHandleData->dwUserData = (DWORD) new HMFileInfo(0, (LPSTR)lpFileName, lpSecurityAttributes);
-  pHMHandleData->hHMHandle  = 0x8000000;
+  pHMHandleData->dwUserData = (DWORD) new HMFileInfo(INVALID_HANDLE_VALUE,
+                                                     (LPSTR)lpFileName, lpSecurityAttributes);
+  pHMHandleData->hHMHandle  = 0x80000000; // make sure _HMHandleQuery won't fail
   return (NO_ERROR);
 
@@ -1329 +1330 @@
   return finddata.nFileSizeLow;
 }
+/*****************************************************************************
+ * Name      : BOOL HMDeviceFileInfoClass::GetFileInformationByHandle
+ * Purpose   : determine the handle type
+ * Parameters: PHMHANDLEDATA               pHMHandleData
+ *             BY_HANDLE_FILE_INFORMATION* pHFI
+ * Variables :
+ * Result    : API returncode
+ * Remark    :
+ * Status    :
+ *****************************************************************************/
+
+BOOL HMDeviceInfoFileClass::GetFileInformationByHandle(PHMHANDLEDATA               pHMHandleData,
+                                                       BY_HANDLE_FILE_INFORMATION* pHFI)
+{
+    dprintfl(("KERNEL32: HMDeviceInfoFileClass::GetFileInformationByHandle %s(%08xh,%08xh)\n",
+              lpHMDeviceName, pHMHandleData, pHFI));
+
+    HMFileInfo *fileInfo = (HMFileInfo *)pHMHandleData->dwUserData;
+    dprintf(("*** %s", fileInfo->lpszFileName));
+    if(OSLibDosGetFileInformationByHandle(fileInfo->lpszFileName,
+                                          INVALID_HANDLE_VALUE,
+                                          pHFI))
+    {
+        return TRUE;
+    }
+    dprintf(("GetFileInformationByHandle failed with error %d", GetLastError()));
+    return FALSE;
+}
 /******************************************************************************
  * Name      : DWORD HMDeviceFileClass::GetFileNameFromHandle
@@ -1393 +1422 @@
   //an LX header. We need to skip that to present the original file to the
   //caller
-  if(hFile && !stricmp(lpszFileName + strlen(lpszFileName) - 4, ".EXE"))
+  if((hFile != INVALID_HANDLE_VALUE) && !stricmp(lpszFileName + strlen(lpszFileName) - 4, ".EXE"))
   {
       ULONG action, ulRead, signature, ulFileSize;

trunk/src/kernel32/hmfile.h

@@ -80 +80 @@
   virtual DWORD GetFileType (PHMHANDLEDATA pHMHandleData);
 
-       /* this is a handler method for calls to GetFileInformationByHandle() */
+  /* this is a handler method for calls to GetFileInformationByHandle() */
   virtual BOOL GetFileInformationByHandle(PHMHANDLEDATA pHMHandleData,
                                           BY_HANDLE_FILE_INFORMATION* pHFI);
@@ -178 +178 @@
   virtual DWORD GetFileType (PHMHANDLEDATA pHMHandleData);
 
+  /* this is a handler method for calls to GetFileInformationByHandle() */
+  virtual BOOL GetFileInformationByHandle(PHMHANDLEDATA pHMHandleData,
+                                          BY_HANDLE_FILE_INFORMATION* pHFI);
+
   virtual BOOL GetFileNameFromHandle(PHMHANDLEDATA pHMHandleData, LPSTR lpszFileName, DWORD cbFileName);
 

trunk/src/kernel32/oslibdos.cpp

@@ -1428 +1428 @@
    APIRET      rc;
 
+   if (lpFileName == NULL && hFile == INVALID_HANDLE_VALUE_W)
+   {
+       SetLastError(ERROR_INVALID_PARAMETER_W);
+       return FALSE;
+   }
+
    // NOTE: On HPFS386, doing FIL_QUERYEASIZE on a write-only file will
    // fail with ERROR_ACCESS_DENIED. Since we don't actually care about EAs
@@ -1436 +1442 @@
         FILESTATUS3L statusL = { 0 };
 
-        rc = DosQueryFileInfo(hFile, FIL_STANDARDL,
-                              &statusL, sizeof(statusL));
+        rc = hFile != INVALID_HANDLE_VALUE_W ?
+                    DosQueryFileInfo(hFile, FIL_STANDARDL,
+                                     &statusL, sizeof(statusL)) :
+                    DosQueryPathInfo(lpFileName, FIL_STANDARDL,
+                                     &statusL, sizeof(statusL));
         if(rc == NO_ERROR)
         {
@@ -1476 +1485 @@
         FILESTATUS3  status  = { 0 };
 
-        rc = DosQueryFileInfo(hFile, FIL_STANDARD, &status,
-                              sizeof(status));
+        rc = hFile != INVALID_HANDLE_VALUE_W ?
+                    DosQueryFileInfo(hFile, FIL_STANDARD, &status,
+                                     sizeof(status)) :
+                    DosQueryPathInfo(lpFileName, FIL_STANDARD, &status,
+                                     sizeof(status));
         if(rc == NO_ERROR)
         {