Changeset 3993 for trunk/src/kernel32/windlllx.cpp

Timestamp:

Aug 11, 2000, 12:56:27 PM (25 years ago)

Author:

sandervl

Message:

Updates for fake system dll headers

File:

• trunk/src/kernel32/windlllx.cpp (modified) (10 diffs)

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.11 2000-07-18 18:37:29 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.12 2000-08-11 10:56:18 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
 //Create LX Dll object and send process attach message
 //System dlls set EntryPoint to 0
+//Parameters:
+//  HINSTANCE hInstance         - OS/2 module handle
+//  WIN32DLLENTRY EntryPoint    - Win32 dll entrypoint address
+//  PVOID pResData              - pointer to win32 resource data
+//  DWORD MajorImageVersion     - major image/os version (for fake win32 header)
+//  DWORD MinorImageVersion     - minor image/os version (for fake win32 header)
+//  DWORD Subsystem             - subsystem type (for fake win32 header)
+//                                (IMAGE_SUBSYSTEM_WINDOWS_CUI/IMAGE_SUBSYSTEM_WINDOWS_GUI)
+//
 //Returns: Odin32 module handle
 //******************************************************************************
 DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, 
-                             PVOID pResData)
-{
- Win32LxDll *windll;
+                             PVOID pResData, 
+                             DWORD MajorImageVersion, 
+                             DWORD MinorImageVersion,
+                             DWORD Subsystem)
+{ 
+ APIRET        rc;
+ Win32LxDll    *windll;
  Win32DllBase *windlldep;
-
-   windll = (Win32LxDll *)Win32DllBase::findModule(hInstance);
-   if(windll) {
-        char *name = OSLibGetDllName(hInstance);
-        dprintf(("RegisterLxDll: Register existing dll %x %s", hInstance, name));
-        return FALSE;
-   }
-   windll = new Win32LxDll(hInstance, EntryPoint, pResData);
+ char          szFileName[CCHMAXPATH], szErrName[CCHMAXPATH];
+
+   if(OSLibGetDllName(hInstance, szFileName, sizeof(szFileName)) == FALSE) {
+        dprintf(("ERROR: RegisterLxDll: OSLibGetDllName %x failed!!", hInstance));
+        return 0;
+   }
+   //Make sure DosLoadModule is called at least 
+   //once for a dll (to make sure OS/2 doesn't unload the dll when it's
+   //still needed)
+   rc = DosLoadModule(szErrName, sizeof(szErrName), szFileName, &hInstance);
+   if(rc != 0) { 
+        dprintf(("ERROR: RegisterLxDll: DosLoadModule %s failed (rc=%d)!!", szFileName, rc));
+        return 0;
+   }
+   windll = new Win32LxDll(hInstance, EntryPoint, pResData, MajorImageVersion,
+                           MinorImageVersion, Subsystem);
    if(windll == NULL) {
         dprintf(("RegisterLxDll: windll == NULL!!!"));
-        return FALSE;
+        return 0;
    }
    if(!fPeLoader) {
@@ -74 +95 @@
    char             modulename[CCHMAXPATH];
    char             modsize;
-   APIRET           rc;
    int              i;
 
@@ -118 +138 @@
 BOOL WIN32API UnregisterLxDll(HINSTANCE hInstance)
 {
- Win32LxDll *windll;
+ Win32DllBase *windll;
 
    //Don't proceed for pe2lx/win32k (os/2 dll unload dependency bug)
@@ -125 +145 @@
         return TRUE;
 
-   windll = (Win32LxDll *)Win32DllBase::findModule(hInstance);
+   windll = Win32DllBase::findModule(hInstance);
    if(!windll) {
         dprintf(("UnregisterLxDll: Can't find dll with handle %x (already deleted)", hInstance));
@@ -137 +157 @@
 //******************************************************************************
 //******************************************************************************
-Win32LxDll::Win32LxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, PVOID pResData) 
+Win32LxDll::Win32LxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, PVOID pResData,
+                       DWORD MajorImageVersion, DWORD MinorImageVersion,
+                       DWORD Subsystem) 
                 : Win32ImageBase(hInstance),
                   Win32LxImage(hInstance, pResData), 
@@ -146 +168 @@
         fAttachedToProcess = TRUE;
   }
+  hinstanceOS2 = hInstance;
+  //new win32 instance handle must be pointer to PE header
+  hinstance = (HINSTANCE)buildHeader(MajorImageVersion, MinorImageVersion,
+                                     Subsystem);
 }
 //******************************************************************************
@@ -151 +177 @@
 Win32LxDll::~Win32LxDll()
 {
-}
-//******************************************************************************
-//Load it again so OS/2 takes care of the reference count (to make sure
-//a dll isn't unloaded when the win32 app still needs it)
-//******************************************************************************
-void Win32LxDll::loadLibrary()
-{
- char   szModuleFailure[CCHMAXPATH] = "";
- ULONG  hInstanceNewDll;
- APIRET rc;
-
-  if(fLoadLibrary) {
-        DebugInt3();
-        return;
-  }
-
-  dprintf(("Win32LxDll::loadLibrary %s", getModuleName()));
-  rc = DosLoadModule(szModuleFailure, sizeof(szModuleFailure), getFullPath(), (HMODULE *)&hInstanceNewDll);
-  if(rc) {
-        dprintf(("DosLoadModule returned %X for %s\n", rc, szModuleFailure));
-        DebugInt3(); //should NEVER happen
-        return;
-  }
-  //only do this once, so set the fLoadLibrary flag to true
-  setLoadLibrary();
 }
 //******************************************************************************
@@ -227 +228 @@
  ULONG     ret;
  APIRET    rc;
- BOOL      fLoadLib = fLoadLibrary;
-
-  if(fDisableUnload) {//only set for kernel32.dll
-        fLoadLib = FALSE;
-  }
-  hinst = hinstance;
+
+  hinst = hinstanceOS2;
   ret = Win32DllBase::Release();
-  if(ret == 0 && fLoadLib) {
+  if(ret == 0 && !fDisableUnload) {//only set for kernel32.dll (fDisableUnload)
         //DosFreeModule sends a termination message to the dll.
         //The LX dll informs us when it's removed (UnregisterDll call)
@@ -252 +249 @@
 //******************************************************************************
 //******************************************************************************
+void Win32LxDll::setDllHandleOS2(HINSTANCE hInstanceOS2) 
+{ 
+  //Loaded with LoadLibrary(Ex); no need for a 2nd DosLoadModule
+  //Dlls that are indirectly loaded (i.e. GDI32->KERNEL32 dependancy) need
+  //this additional DosLoadModule (and setDllHandleOS2 isn't called for those)
+  if(this->hinstanceOS2) {
+        DosFreeModule(this->hinstanceOS2);
+  }
+  this->hinstanceOS2 = hInstanceOS2;
+}
+//******************************************************************************
+//******************************************************************************
+Win32LxDll *Win32LxDll::findModuleByOS2Handle(HINSTANCE hinstance)
+{
+   dlllistmutex.enter();
+
+   Win32LxDll *mod = (Win32LxDll*)Win32DllBase::head;
+   while(mod != NULL) {
+        dbgCheckObj(mod);
+        if(mod->isLxDll() && mod->hinstanceOS2 == hinstance) {
+                dlllistmutex.leave();
+                return(mod);
+        }
+        mod = (Win32LxDll*)mod->next;
+   }
+   dlllistmutex.leave();
+   return(NULL);
+}
+//******************************************************************************
+//******************************************************************************