Changeset 6468 for trunk/src

Timestamp:

Aug 6, 2001, 6:01:11 PM (24 years ago)

Author:

sandervl

Message:

CreateProcess & memory map fixes

Location:

trunk/src/kernel32

Files:

• hmmmap.cpp (modified) (2 diffs)
• initkernel32.cpp (modified) (4 diffs)
• initterm.cpp (modified) (3 diffs)
• mmap.cpp (modified) (9 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/hmmmap.cpp

@@ -1 @@
-/* $Id: hmmmap.cpp,v 1.17 2001-04-26 13:22:46 sandervl Exp $ */
+/* $Id: hmmmap.cpp,v 1.18 2001-08-06 16:01:10 sandervl Exp $ */
 
 /*
@@ -213 +213 @@
   dprintf(("HMDeviceMemMapClass::CloseHandle %x", pHMHandleData->dwUserData));
   if(pHMHandleData->dwUserData == NULL || pHMHandleData->dwInternalType != HMTYPE_MEMMAP) {
-        dprintf(("MapViewOfFileEx: invalid handle data!"));
+        dprintf(("HMDeviceMemMapClass::CloseHandle: invalid handle data!"));
         return FALSE;
   }

trunk/src/kernel32/initkernel32.cpp

@@ -65 +65 @@
 }
 
-//Global DLL Data
-#pragma data_seg(_GLOBALDATA)
-int globLoadNr = 0;
-#pragma data_seg()
-
        ULONG   flAllocMem = 0;    /* flag to optimize DosAllocMem to use all the memory on SMP machines */
        ULONG   ulMaxAddr = 0x20000000; /* end of user address space. */
@@ -89 +84 @@
     APIRET rc;
     ULONG  ulSysinfo, version[2];
-    static BOOL fInit = FALSE;
     
     /*-------------------------------------------------------------------------*/
@@ -97 +91 @@
     /*-------------------------------------------------------------------------*/
 
-    if(fInit == TRUE && ulFlag == 0) {
-        return 1; //already initialized
-    }
-    fInit = TRUE;
     switch (ulFlag)
     {
@@ -121 +111 @@
                 }
             }
-
-            loadNr = globLoadNr++;
 
             strcpy(kernel32Path, OSLibGetDllName(hModule));

trunk/src/kernel32/initterm.cpp

@@ -60 +60 @@
 BOOL  fVersionWarp3 = FALSE;
 
+//Global DLL Data
+#pragma data_seg(_GLOBALDATA)
+int globLoadNr = 0;
+#pragma data_seg()
+
+static BOOL fInit = FALSE;
+
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -88 +95 @@
     /*-------------------------------------------------------------------------*/
 
+    if(fInit == TRUE && ulFlag == 0) {
+        return 1; //already initialized
+    }
+    fInit = TRUE;
     switch (ulFlag)
     {
@@ -147 +158 @@
     HMODULE hModule;
 
+    if(!fInit) {
+        loadNr = globLoadNr++;
+    }
     DosQueryModuleHandle("WGSS50", &hModule);
     O32__DLL_InitTerm(hModule, 0);
     DosQueryModuleHandle("KERNEL32", &hModule);
-    return inittermKernel32(hModule, 0);
+    return DLLENTRYPOINT_NAME(hModule, 0);
 }
 //******************************************************************************

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.51 2001-05-28 11:26:06 phaller Exp $ */
+/* $Id: mmap.cpp,v 1.52 2001-08-06 16:01:11 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
     mSize      = size;
     mProtFlags = fdwProtect;
-    mProcessId  = GetCurrentProcess();
+    mProcessId  = GetCurrentProcessId();
 
     if(lpszName) {
@@ -89 +89 @@
     mSize      = size;
     mProtFlags = PAGE_READWRITE;
-    mProcessId = GetCurrentProcess();
+    mProcessId = GetCurrentProcessId();
 
     pMapping   = (LPVOID)baseAddress;
@@ -104 +104 @@
     {
 #if 0
-        if(DuplicateHandle(mProcessId, hMemFile, GetCurrentProcess(),
+        if(DuplicateHandle(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
                            &hMemFile, 0, FALSE, DUPLICATE_SAME_ACCESS) == FALSE)
 #else
@@ -114 +114 @@
         else    dwOdinOptions = DUPLICATE_ACCESS_READWRITE | DUPLICATE_SHARE_DENYNONE;
 
-        if(HMDuplicateHandleOdin(mProcessId, hMemFile, GetCurrentProcess(),
+        if(HMDuplicateHandleOdin(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
                            &hMemFile, 0, FALSE, DUPLICATE_SAME_ACCESS, dwOdinOptions) == FALSE)
 #endif
@@ -194 +194 @@
 void Win32MemMap::Release()
 {
-#ifdef DEBUG
     dprintf(("Win32MemMap::Release %s (%d)", lpszMapName, referenced-1));
-#endif
     --referenced;
     if(nrMappings == 0 && referenced == 0) {
@@ -337 +335 @@
 LPVOID Win32MemMap::mapViewOfFile(ULONG size, ULONG offset, ULONG fdwAccess)
 {
- DWORD processId = GetCurrentProcess();
+ DWORD processId = GetCurrentProcessId();
 
     mapMutex.enter();
@@ -551 +549 @@
 {
  Win32MemMap *map = memmaps, *nextmap;
- DWORD processId = GetCurrentProcess();
+ DWORD processId = GetCurrentProcessId();
 
   //delete all maps created by this process
@@ -587 +585 @@
     mSize    = size;
     mOffset  = offset;
-    mProcessId = GetCurrentProcess();
+    mProcessId = GetCurrentProcessId();
     pShareViewAddr = NULL;
 

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.131 2001-07-28 18:03:38 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.132 2001-08-06 16:01:11 sandervl Exp $ */
 
 /*
@@ -139 +139 @@
     //Allocate one dword to store the flat address of our TEB
     if(fMainThread) {
+        dprintf(("InitializeTIB Process handle %x, id %x", GetCurrentProcess(), GetCurrentProcessId()));
+
         TIBFlatPtr = (DWORD *)OSLibAllocThreadLocalMemory(1);
         if(TIBFlatPtr == 0) {
@@ -1642 +1644 @@
     // it is also valid in Win32.
     DWORD dwError = GetLastError();
-    if (ERROR_INVALID_EXE_SIGNATURE != dwError && ERROR_FILE_NOT_FOUND != dwError)
+    if (ERROR_INVALID_EXE_SIGNATURE != dwError && ERROR_FILE_NOT_FOUND != dwError && ERROR_ACCESS_DENIED != dwError)
     {
         dprintf(("CreateProcess: O32_CreateProcess failed with rc=%d, not PE-executable !",