Changeset 3404 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Apr 16, 2000, 12:42:13 PM (25 years ago)

Author:

sandervl

Message:

put back dll search method + loadlibraryex fix

File:

• trunk/src/kernel32/wprocess.cpp (modified) (18 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.78 2000-04-16 07:07:01 bird Exp $ */
+/* $Id: wprocess.cpp,v 1.79 2000-04-16 10:42:13 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
  *
  */
-
-
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
 #include <odin.h>
 #include <odinwrap.h>
@@ -55 +49 @@
 
 
-/******************************************************************************
-*   Global Variables                                                          *
-******************************************************************************/
+//******************************************************************************
+//******************************************************************************
 BOOL      fFreeLibrary = FALSE;
 BOOL      fIsOS2Image = FALSE;  //TRUE  -> Odin32 OS/2 application (not converted!)
@@ -69 +62 @@
 static THDB     *threadList = 0;
 static VMutex    threadListMutex;
-
-
-
 //******************************************************************************
 //******************************************************************************
@@ -365 +355 @@
 VOID WIN32API ExitProcess(DWORD exitcode)
 {
-    dprintf(("KERNEL32: ExitProcess %d\n", exitcode));
-    dprintf(("KERNEL32: ExitProcess FS = %x\n", GetFS()));
+    dprintf(("KERNEL32:  ExitProcess %d\n", exitcode));
+    dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
 
     SetOS2ExceptionChain(-1);
@@ -425 +415 @@
 }
 /******************************************************************************/
-//******************************************************************************
-HINSTANCE16 WIN32API LoadLibrary16(LPCTSTR lpszLibFile)
-{
-    dprintf(("ERROR: LoadLibrary16 %s, not implemented", lpszLibFile));
-    return 0;
-}
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API FreeLibrary16(HINSTANCE16 hinstance)
-{
-    dprintf(("ERROR: FreeLibrary16 %x, not implemented", hinstance));
-}
-//******************************************************************************
-//******************************************************************************
-FARPROC WIN32API GetProcAddress16(HMODULE hModule, LPCSTR lpszProc)
-{
-    dprintf(("ERROR: GetProcAddress16 %x %x, not implemented", hModule, lpszProc));
-    return 0;
-}
-//******************************************************************************
-
+/******************************************************************************/
 /**
  * LoadLibraryA can be used to map a DLL module into the calling process's
@@ -676 +646 @@
                  lpszLibFile, hFile, dwFlags));
         SetLastError(ERROR_INVALID_PARAMETER);
+        return NULL;
     }
 
@@ -990 +961 @@
 //******************************************************************************
 //******************************************************************************
+HINSTANCE16 WIN32API LoadLibrary16(LPCTSTR lpszLibFile)
+{
+    dprintf(("ERROR: LoadLibrary16 %s, not implemented", lpszLibFile));
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API FreeLibrary16(HINSTANCE16 hinstance)
+{
+    dprintf(("ERROR: FreeLibrary16 %x, not implemented", hinstance));
+}
+//******************************************************************************
+//******************************************************************************
+FARPROC WIN32API GetProcAddress16(HMODULE hModule, LPCSTR lpszProc)
+{
+    dprintf(("ERROR: GetProcAddress16 %x %x, not implemented", hModule, lpszProc));
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
 LPCSTR WIN32API GetCommandLineA()
 {
@@ -1000 +991 @@
     cmdline = O32_GetCommandLine();
 
-  dprintf(("KERNEL32: GetCommandLine %s\n", cmdline));
-  dprintf(("KERNEL32: FS = %x\n", GetFS()));
+  dprintf(("KERNEL32:  GetCommandLine %s\n", cmdline));
+  dprintf(("KERNEL32:  FS = %x\n", GetFS()));
   return(cmdline);
 }
@@ -1011 +1002 @@
          char *asciicmdline = NULL;
 
-    dprintf(("KERNEL32: FS = %x\n", GetFS()));
+    dprintf(("KERNEL32:  FS = %x\n", GetFS()));
 
     if(UnicodeCmdLine)
@@ -1026 +1017 @@
         UnicodeCmdLine = (WCHAR *)malloc(strlen(asciicmdline)*2 + 2);
         AsciiToUnicode(asciicmdline, UnicodeCmdLine);
-        dprintf(("KERNEL32: OS2GetCommandLineW: %s\n", asciicmdline));
+        dprintf(("KERNEL32:  OS2GetCommandLineW: %s\n", asciicmdline));
         return(UnicodeCmdLine);
     }
-    dprintf(("KERNEL32: OS2GetCommandLineW: asciicmdline == NULL\n"));
+    dprintf(("KERNEL32:  OS2GetCommandLineW: asciicmdline == NULL\n"));
     return NULL;
 }
@@ -1070 +1061 @@
  DWORD rc;
 
-    dprintf(("KERNEL32: OSLibGetModuleFileNameW\n"));
+    dprintf(("KERNEL32:  OSLibGetModuleFileNameW\n"));
     rc = GetModuleFileNameA(hModule, asciifilename, nSize);
     if(rc)      AsciiToUnicode(asciifilename, lpFileName);
@@ -1121 +1112 @@
   }
 
-  dprintf(("KERNEL32: GetModuleHandle %s returned %X\n", lpszModule, hMod));
+  dprintf(("KERNEL32:  GetModuleHandle %s returned %X\n", lpszModule, hMod));
   return(hMod);
 }
@@ -1133 +1124 @@
     astring = UnicodeToAsciiString((LPWSTR)arg1);
     rc = GetModuleHandleA(astring);
-    dprintf(("KERNEL32: OS2GetModuleHandleW %s returned %X\n", astring, rc));
+    dprintf(("KERNEL32:  OS2GetModuleHandleW %s returned %X\n", astring, rc));
     FreeAsciiString(astring);
     return(rc);
@@ -1203 +1194 @@
         sprintf(cmdline, "PE.EXE %s", lpCommandLine);
     }
-    dprintf(("KERNEL32: CreateProcess %s\n", cmdline));
+    dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
     rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline,lpProcessAttributes,
                          lpThreadAttributes, bInheritHandles, dwCreationFlags,
@@ -1229 +1220 @@
 
     if(lpProcessInfo)
-      dprintf(("KERNEL32: CreateProcess returned %d hPro:%x hThr:%x pid:%x tid:%x\n",
+      dprintf(("KERNEL32:  CreateProcess returned %d hPro:%x hThr:%x pid:%x tid:%x\n",
                rc, lpProcessInfo->hProcess, lpProcessInfo->hThread,
                    lpProcessInfo->dwProcessId,lpProcessInfo->dwThreadId));
     else
-      dprintf(("KERNEL32: CreateProcess returned %d\n", rc));
+      dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));
     return(rc);
 }
@@ -1296 +1287 @@
  ULONG     ulAPIOrdinal;
 
-  winmod = Win32ImageBase::findModule(hModule);
+  if(hModule == 0 || hModule == -1 || (WinExe && hModule == WinExe->getInstanceHandle())) {
+    winmod = WinExe;
+  }
+  else  winmod = (Win32ImageBase *)Win32DllBase::findModule((HINSTANCE)hModule);
+
   if(winmod) {
         ulAPIOrdinal = (ULONG)lpszProc;
@@ -1310 +1305 @@
   proc = O32_GetProcAddress(hModule, lpszProc);
   if(HIWORD(lpszProc))
-    dprintf(("KERNEL32: GetProcAddress %s from %X returned %X\n", lpszProc, hModule, proc));
-  else  dprintf(("KERNEL32: GetProcAddress %x from %X returned %X\n", lpszProc, hModule, proc));
+    dprintf(("KERNEL32:  GetProcAddress %s from %X returned %X\n", lpszProc, hModule, proc));
+  else  dprintf(("KERNEL32:  GetProcAddress %x from %X returned %X\n", lpszProc, hModule, proc));
   return(proc);
 }