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

Timestamp:

Aug 18, 1999, 7:18:01 PM (26 years ago)

Author:

sandervl

Message:

PE loader changes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.21 1999-08-18 12:24:17 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.22 1999-08-18 17:18:01 sandervl Exp $ */
 
 /*
@@ -440 +440 @@
   return hDll;
 }
-
-
 //******************************************************************************
 //******************************************************************************
@@ -452 +450 @@
   hDll = O32_LoadLibrary(lpszLibFile);
   if(hDll) {
-    return hDll;    //converted dll or win32k took care of it
+        return hDll;    //converted dll or win32k took care of it
   }
 
@@ -597 +595 @@
     if(rc)      AsciiToUnicode(asciifilename, lpFileName);
     free(asciifilename);
+    return(rc);
+}
+//******************************************************************************
+//NOTE: GetModuleHandleA does NOT support files with multiple dots (i.e. 
+//      very.weird.exe)
+//******************************************************************************
+HANDLE WIN32API GetModuleHandleA(LPCTSTR lpszModule)
+{
+ HANDLE    hMod;
+ Win32Dll *windll;
+ char      szModule[CCHMAXPATH];
+ BOOL      fDllModule = FALSE;
+
+  if(lpszModule == NULL) {
+        hMod = WinExe->getInstanceHandle();
+  }
+  else {
+        strcpy(szModule, StripPath((char *)lpszModule));
+        strupr(szModule);
+        if(strstr(szModule, ".DLL")) {
+                fDllModule = TRUE;
+        }
+        else {
+                if(!strstr(szModule, ".")) {
+                        //if there's no extension or trainling dot, we 
+                        //assume it's a dll (see Win32 SDK docs)
+                        fDllModule = TRUE;
+                }
+        }
+        char *dot = strstr(szModule, ".");
+        if(dot)
+                *dot = 0;
+
+        if(!fDllModule && !strcmpi(lpszModule, WinExe->getModuleName())) {
+                hMod = WinExe->getInstanceHandle();
+        }
+        else {
+                windll = Win32Dll::findModule(szModule);
+                if(windll) {
+                        hMod = windll->getInstanceHandle();
+                }
+                else    hMod = OS2iGetModuleHandleA( (PSZ) lpszModule);
+        }
+  }
+
+  eprintf(("KERNEL32:  GetModuleHandle %s returned %X\n", lpszModule, hMod));
+  return(hMod);
+}
+//******************************************************************************
+//******************************************************************************
+HMODULE WIN32API GetModuleHandleW(LPCWSTR arg1)
+{
+ HMODULE rc;
+ char   *astring;
+
+    astring = UnicodeToAsciiString((LPWSTR)arg1);
+    rc = GetModuleHandleA(astring);
+    dprintf(("KERNEL32:  OS2GetModuleHandleW %s returned %X\n", astring, rc));
+    FreeAsciiString(astring);
     return(rc);
 }