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

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

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

trunk/src/kernel32/hmfile.cpp

@@ -35 +35 @@
 #include "mmap.h"
 #include "oslibdos.h"
+#include <customloader.h>
 
 #define DBG_LOCALLOG    DBG_hmfile
@@ -97 +98 @@
   if (hFile != INVALID_HANDLE_ERROR)
   {
-        pHMHandleData->dwUserData = (DWORD) new HMFileInfo((LPSTR)lpFileName, lpSecurityAttributes);
+        pHMHandleData->dwUserData = (DWORD) new HMFileInfo(hFile, (LPSTR)lpFileName, lpSecurityAttributes);
         pHMHandleData->hHMHandle  = hFile;
         return (NO_ERROR);
@@ -261 +262 @@
     
         if(hFile != HFILE_ERROR) {
-            pHMHandleData->dwUserData = (DWORD) new HMFileInfo((LPSTR)lpFileName, NULL);
+            pHMHandleData->dwUserData = (DWORD) new HMFileInfo(hFile, (LPSTR)lpFileName, NULL);
         }
         return (NO_ERROR);
@@ -302 +303 @@
                                         PHMHANDLEDATA pHMSrcHandle,
                                         HANDLE  destprocess,
-                                        PHANDLE desthandle,
                                         DWORD   fdwAccess,
                                         BOOL    fInherit,
@@ -311 +311 @@
  DWORD rc;
 
-  dprintf(("KERNEL32:HMDeviceFileClass::DuplicateHandle (%08x,%08x,%08x,%08x,%08x)",
+  dprintf(("KERNEL32:HMDeviceFileClass::DuplicateHandle (%08x,%08x,%08x,%08x)",
            pHMHandleData,
            srcprocess,
            pHMSrcHandle->hHMHandle,
-           destprocess,
-           desthandle));
+           destprocess));
 
   //TODO: Inheritance of file handles won't work!
@@ -345 +344 @@
             memcpy(pHMHandleData, &duphdata, sizeof(duphdata));
 
-            if(fInherit) SetHandleInformation(pHMHandleData, ~HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
+            SetHandleInformation(pHMHandleData, HANDLE_FLAG_INHERIT, (fInherit) ? HANDLE_FLAG_INHERIT : 0);
 
             SetLastError(ERROR_SUCCESS);
@@ -360 +359 @@
     }
 
-    rc = OSLibDosDupHandle(pHMSrcHandle->hHMHandle,
-                           desthandle);
+    pHMHandleData->hHMHandle = 0;
+    rc = OSLibDosDupHandle(pHMSrcHandle->hHMHandle, &pHMHandleData->hHMHandle);
     if (rc)
     {
@@ -370 +369 @@
     }
     else {
-      if(fInherit) SetHandleInformation(pHMHandleData, ~HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
+      SetHandleInformation(pHMHandleData, HANDLE_FLAG_INHERIT, (fInherit) ? HANDLE_FLAG_INHERIT : 0);
 
       SetLastError(ERROR_SUCCESS);
-      pHMHandleData->hHMHandle = *desthandle;
       return TRUE;    // OK
     }
@@ -620 +618 @@
            nrpages++;
  
-       map->commitRange((ULONG)lpBuffer, offset & ~0xfff, TRUE, nrpages);
+       map->commitRange((ULONG)lpBuffer, offset & ~0xfff, FALSE, nrpages);
        map->Release();
   }
@@ -844 +842 @@
 {
   DWORD ret;
+  HMFileInfo *fileInfo = (HMFileInfo *)pHMHandleData->dwUserData;
 
   dprintfl(("KERNEL32: HMDeviceFileClass::SetFilePointer %s(%08xh,%08xh,%08xh,%08xh)\n",
@@ -852 +851 @@
            dwMoveMethod));
 
+  if(fileInfo && fileInfo->dwLXOffset) 
+  {
+      switch(dwMoveMethod) 
+      {
+      case FILE_BEGIN:
+          dprintf(("SetFilePointer FILE_BEGIN (LX) -> change offset from %x to %x", lDistanceToMove, lDistanceToMove+fileInfo->dwLXOffset));
+          lDistanceToMove += fileInfo->dwLXOffset;
+          break;
+
+      case FILE_END:
+          //Could overshoot the virtual beginning of the PE file
+          lDistanceToMove -= MAGIC_STUBEXE_SIZE;
+          dprintf(("SetFilePointer FILE_END -> might be dangerous!!"));
+          break;
+
+      }
+  }
   ret = OSLibDosSetFilePointer(pHMHandleData->hHMHandle,
                                lDistanceToMove,
@@ -1169 +1185 @@
   }
 
-  pHMHandleData->dwUserData = (DWORD) new HMFileInfo((LPSTR)lpFileName, lpSecurityAttributes);
+  pHMHandleData->dwUserData = (DWORD) new HMFileInfo(0, (LPSTR)lpFileName, lpSecurityAttributes);
   pHMHandleData->hHMHandle  = 0x8000000;
   return (NO_ERROR);
@@ -1282 +1298 @@
   }
   FindClose(hFind);
+
+  if(fileInfo->dwLXOffset) 
+  {
+      //subtract the LX header and magic qword from the file size
+      dprintf(("GetFileSize (LX) -> change size from %x to %x", finddata.nFileSizeLow, finddata.nFileSizeLow-fileInfo->dwLXOffset-MAGIC_STUBEXE_SIZE));
+      finddata.nFileSizeLow -= (fileInfo->dwLXOffset+MAGIC_STUBEXE_SIZE);
+  }
   return finddata.nFileSizeLow;
 }
@@ -1329 +1352 @@
 //******************************************************************************
 //******************************************************************************
-HMFileInfo::HMFileInfo(LPSTR lpszFileName, PVOID lpSecurityAttributes)
+HMFileInfo::HMFileInfo(HANDLE hFile, LPSTR lpszFileName, PVOID lpSecurityAttributes)
 {
   this->lpszFileName = (LPSTR)malloc(strlen(lpszFileName)+1);
@@ -1337 +1360 @@
   strcpy(this->lpszFileName, lpszFileName);
   this->lpSecurityAttributes = lpSecurityAttributes;
+  dwLXOffset = 0;
+
+  //Only check files that end with .exe for now; they might be prepended with
+  //an LX header. We need to skip that to present the original file to the
+  //caller
+  if(hFile && !stricmp(lpszFileName + strlen(lpszFileName) - 4, ".EXE")) 
+  {
+      ULONG action, ulRead, signature, ulFileSize;
+      ULONG magic[2];
+      IMAGE_DOS_HEADER doshdr;
+
+      //read dos header
+      if(!OSLibDosRead(hFile, (LPVOID)&doshdr, sizeof(doshdr), &ulRead)) {
+          goto failure;
+      }
+      if(OSLibDosSetFilePointer(hFile, doshdr.e_lfanew, NULL, FILE_BEGIN) != doshdr.e_lfanew) {
+          goto failure;
+      }
+      //read signature dword
+      if(!OSLibDosRead(hFile, (LPVOID)&signature, sizeof(signature), &ulRead)) {
+          goto failure;
+      }
+
+      //Make sure it's an LX executable before continueing
+      if(doshdr.e_magic != IMAGE_DOS_SIGNATURE || (WORD)signature != IMAGE_OS2_SIGNATURE_LX) 
+      {
+          goto failure;
+      }
+
+      //magic signature located at 8 bytes from file end
+      if(OSLibDosSetFilePointer(hFile, -8, NULL, FILE_END) == -1) {
+          goto failure;
+      }
+      //read magic signature + pe offset
+      if(!OSLibDosRead(hFile, (LPVOID)&magic[0], sizeof(magic), &ulRead)) {
+          goto failure;
+      }
+      if(magic[0] != MAGIC_STUBEXE_SIGNATURE || magic[1] > ulFileSize) {
+          goto failure;
+      }
+      //this is the offset of the PE image inside our LX executable
+      dwLXOffset = magic[1];
+
+      dprintf(("LX wrapper: PE file %s starts at %x", lpszFileName, dwLXOffset));
+      //reset file pointer to PE image start
+      if(OSLibDosSetFilePointer(hFile, dwLXOffset, NULL, FILE_BEGIN) != dwLXOffset) {
+          DebugInt3();
+      }
+      goto end;
+
+failure:
+      //reset file pointer to file start
+      if(OSLibDosSetFilePointer(hFile, 0, NULL, FILE_BEGIN) != 0) {
+          DebugInt3();
+      }
+  }
+end:
+  return;
 }
 //******************************************************************************