Changeset 21564 for trunk/src/kernel32/hmfile.cpp

Timestamp:

Jan 19, 2011, 10:56:46 PM (15 years ago)

Author:

dmik

Message:

kernel32: Implemented generating the high/low index values (using a CRC32 and a hash function on the fuill file name) and filling up the volume serial number in the BY_HANDLE_FILE_INFORMATION structure returned by GetFileInformationByHandle().

File:

• trunk/src/kernel32/hmfile.cpp (modified) (26 diffs)

trunk/src/kernel32/hmfile.cpp

@@ -42 +42 @@
 static void ParsePath(LPCSTR lpszFileName, LPSTR lpszParsedFileName, DWORD length);
 
+
+class HMFileInfo
+{
+public:
+  HMFileInfo(HANDLE hFile, LPSTR lpszFileName, PVOID lpSecurityAttributes);
+ ~HMFileInfo();
+
+  char *lpszFileName;
+  PVOID lpSecurityAttributes;
+  DWORD dwLXOffset;
+};
+
+
 /*****************************************************************************
  * Name      : DWORD HMDeviceFileClass::CreateFile
@@ -52 +65 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : NO_ERROR - API succeeded
  *             other    - what is to be set in SetLastError
@@ -74 +87 @@
            lpSecurityAttributes,
            pHMHandleDataTemplate));
-  
+
   ParsePath(lpFileName, filepath, sizeof(filepath));
 
@@ -120 +133 @@
  * Remark    : TODO: Check if this implementation is complete and 100% correct
  *                           UTC Time or Localtime ?
- *                   GetFileTime is changed, Returns UTC-time yet !!!!! 
+ *                   GetFileTime is changed, Returns UTC-time yet !!!!!
  * Status    : NO_ERROR - API succeeded
  *             other    - what is to be set in SetLastError
@@ -187 +200 @@
         #if 1 /* Canonicalize the path should be the right thing to do I think... */
         GetFullPathNameA(lpFileName, sizeof(filepath), filepath, NULL);
-        #else                        
+        #else
         ParsePath(lpFileName, filepath, sizeof(filepath));
         #endif
@@ -201 +214 @@
     strncpy((char *)pOFStruct->szPathName, lpFileName, OFS_MAXPATHNAME);
     pOFStruct->szPathName[OFS_MAXPATHNAME-1] = 0;
-    
-
-    /* 
+
+
+    /*
      * Do the parse stuff now and do a quick exit.
-     * Based on testcase (5) and MSDN: 
+     * Based on testcase (5) and MSDN:
      *      "OF_PARSE   Fills the OFSTRUCT structure but carries out no other action."
      */
@@ -217 +230 @@
         return NO_ERROR;
     }
-    
+
 
     hFile = OSLibDosOpenFile((LPSTR)lpFileName, fuMode);
-    
+
     if(hFile != INVALID_HANDLE_ERROR)
     {
@@ -229 +242 @@
                     NULL,
                     &filetime );
-    
-        /* UTC Time or Localtime ? GetFileTime Returns UTC-time yet ? !!!!! */ 
+
+        /* UTC Time or Localtime ? GetFileTime Returns UTC-time yet ? !!!!! */
         FileTimeToDosDateTime(&filetime,
                               &filedatetime[0],
                               &filedatetime[1] );
         memcpy(pOFStruct->reserved, filedatetime, sizeof(pOFStruct->reserved));
-    
+
         if(fuMode & OF_DELETE)
         {
@@ -247 +260 @@
             hFile = HFILE_ERROR;
         }
-    
+
         if((fuMode & OF_VERIFY))
         {//TODO: what's this?? we copy the time above...
@@ -257 +270 @@
             hFile = HFILE_ERROR;
         }
-    
+
         pOFStruct->nErrCode = GetLastError();
         pHMHandleData->hHMHandle = hFile;
-    
+
         if(hFile != HFILE_ERROR) {
             pHMHandleData->dwUserData = (DWORD) new HMFileInfo(hFile, (LPSTR)lpFileName, NULL);
@@ -268 +281 @@
     else {
         DWORD rc = GetLastError();
-    
+
         if(fuMode & OF_EXIST)
         {
@@ -393 +406 @@
  * Result    : TRUE / FALSE
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -617 +630 @@
        if((nNumberOfBytesToWrite+offset) & 0xfff)
            nrpages++;
- 
+
        map->commitRange((ULONG)lpBuffer, offset & ~0xfff, FALSE, nrpages);
        map->Release();
@@ -697 +710 @@
               lpHMDeviceName, pHMHandleData, pHFI));
 
-    if(OSLibDosGetFileInformationByHandle(pHMHandleData->hHMHandle,
+    HMFileInfo *fileInfo = (HMFileInfo *)pHMHandleData->dwUserData;
+    if(OSLibDosGetFileInformationByHandle(fileInfo->lpszFileName,
+                                          pHMHandleData->hHMHandle,
                                           pHFI))
     {
@@ -853 +868 @@
   if(fileInfo && fileInfo->dwLXOffset)
   {
-      switch(dwMoveMethod) 
+      switch(dwMoveMethod)
       {
       case FILE_BEGIN:
@@ -1106 +1121 @@
  * Variables :
  * Result    : BOOLEAN
- * Remark    : 
+ * Remark    :
  * Status    :
  *
@@ -1130 +1145 @@
 //
 // When the application opens a file with CreateFile and 0 for desired access,
-// then we need to create a handle with limited access. 
+// then we need to create a handle with limited access.
 //
 // MSDN:
 //
-// If this parameter is zero, the application can query file and device attributes 
-// without accessing the device. This is useful if an application wants to determine 
+// If this parameter is zero, the application can query file and device attributes
+// without accessing the device. This is useful if an application wants to determine
 // the size of a floppy disk drive and the formats it supports without requiring
 // a floppy in the drive. It can also be used to test for the file's or directory's
@@ -1153 +1168 @@
  * Variables :
  * Result    :
- * Remark    : 
+ * Remark    :
  * Status    : NO_ERROR - API succeeded
  *             other    - what is to be set in SetLastError
@@ -1173 +1188 @@
            lpSecurityAttributes,
            pHMHandleDataTemplate));
-  
+
   ParsePath(lpFileName, filepath, sizeof(filepath));
 
@@ -1242 +1257 @@
   WIN32_FIND_DATAA finddata;
   HANDLE hFind;
-    
+
   hFind = FindFirstFileA(fileInfo->lpszFileName, &finddata);
   if(hFind == INVALID_HANDLE_VALUE) {
@@ -1290 +1305 @@
   WIN32_FIND_DATAA finddata;
   HANDLE hFind;
-    
+
   hFind = FindFirstFileA(fileInfo->lpszFileName, &finddata);
   if(hFind == INVALID_HANDLE_VALUE) {
@@ -1300 +1315 @@
   FindClose(hFind);
 
-  if(fileInfo->dwLXOffset) 
+  if(fileInfo->dwLXOffset)
   {
       //subtract the LX header and magic qword from the file size
@@ -1314 +1329 @@
  * Variables :
  * Result    : BOOLEAN
- * Remark    : 
+ * Remark    :
  * Status    :
  *
@@ -1355 +1370 @@
 HMFileInfo::HMFileInfo(HANDLE hFile, LPSTR lpszFileName, PVOID lpSecurityAttributes)
 {
+  // get the full path (this is necessary in particular for GetFileInformationByHandle)
+  char fullPath[260];
+  if (!OSLibDosQueryPathInfo(lpszFileName, FIL_QUERYFULLNAME, fullPath, sizeof(fullPath))) {
+      lpszFileName = fullPath;
+  }
+
   this->lpszFileName = (LPSTR)malloc(strlen(lpszFileName)+1);
   if(!this->lpszFileName) {
@@ -1366 +1387 @@
   //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 && !stricmp(lpszFileName + strlen(lpszFileName) - 4, ".EXE"))
   {
       ULONG action, ulRead, signature, ulFileSize;
@@ -1385 +1406 @@
 
       //Make sure it's an LX executable before continueing
-      if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || (WORD)signature != IMAGE_OS2_SIGNATURE_LX) 
+      if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || (WORD)signature != IMAGE_OS2_SIGNATURE_LX)
       {
           goto failure;