Changeset 7075 for trunk/src

Timestamp:

Oct 16, 2001, 1:40:36 PM (24 years ago)

Author:

sandervl

Message:

custom build fixes

Location:

trunk/src

Files:

• custombuild/initterm.cpp (modified) (1 diff)
• kernel32/windlllx.cpp (modified) (2 diffs)
• kernel32/winimagelx.cpp (modified) (3 diffs)

trunk/src/custombuild/initterm.cpp

@@ -251 +251 @@
 
     DosQueryModuleHandle("WGSS50", &hModule);
-    O32__DLL_InitTerm(hModule, 0);
-    DosQueryModuleHandle("XXODIN32", &hModule);
-    return inittermKernel32(hModule, 0);
+    return O32__DLL_InitTerm(hModule, 0);
 }
 //******************************************************************************

trunk/src/kernel32/windlllx.cpp

@@ -1 @@
-/* $Id: windlllx.cpp,v 1.22 2001-08-06 19:36:42 sandervl Exp $ */
+/* $Id: windlllx.cpp,v 1.23 2001-10-16 11:39:38 sandervl Exp $ */
 
 /*
@@ -95 +95 @@
        return 0;
    }
+   //clear name override in case dll init loads another dll
+   lpszCustomDllName = NULL;
+
    if(!fPeLoader) {
        windll->AddRef();

trunk/src/kernel32/winimagelx.cpp

@@ -1 @@
-/* $Id: winimagelx.cpp,v 1.12 2001-08-06 19:36:42 sandervl Exp $ */
+/* $Id: winimagelx.cpp,v 1.13 2001-10-16 11:39:39 sandervl Exp $ */
 
 /*
@@ -111 +111 @@
   if(rc)
   {
-        dprintf(("Win32LxImage::getApi -> rc = %d", rc));
+        dprintf(("Win32LxImage::getApi %x %s -> rc = %d", hinstanceOS2, name, rc));
         return(0);
   }
@@ -125 +125 @@
   rc = DosQueryProcAddr(hinstanceOS2, dwOrdinalBase+ordinal, NULL, (PFN *)&apiaddr);
   if(rc) {
-        dprintf(("Win32LxImage::getApi -> rc = %d", rc));
+        dprintf(("Win32LxImage::getApi %x %d -> rc = %d", hinstanceOS2, ordinal, rc));
         return(0);
   }