Changeset 4555 for trunk/src

Timestamp:

Nov 5, 2000, 2:40:47 PM (25 years ago)

Author:

sandervl

Message:

Use DosLoadModule instead of O32_LoadLibrary; changed log strings in exception dump (.dll/.exe)

Location:

trunk/src/kernel32

Files:

• exceptstackdump.cpp (modified) (7 diffs)
• oslibdos.cpp (modified) (2 diffs)
• oslibdos.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/exceptstackdump.cpp

@@ -1 @@
-/* $Id: exceptstackdump.cpp,v 1.2 2000-05-13 07:16:11 sandervl Exp $ */
+/* $Id: exceptstackdump.cpp,v 1.3 2000-11-05 13:40:45 sandervl Exp $ */
 /*
  * Stack dump code
@@ -240 +240 @@
 //              dprintf(("skiploop %x (rc %x, Attr %x Size %d)\n", *stacktop, rc, Attr, Size));
                 if(WinExe && WinExe->insideModule(addr) && WinExe->insideModuleCode(addr)) {
-                        sprintf(Name, "%s.EXE", WinExe->getModuleName());
+                        sprintf(Name, "%s", WinExe->getModuleName());
                         dprintf(("%-13s      at 0x%08x\n", Name, addr));
                 }
@@ -246 +246 @@
                         Win32DllBase *dll = Win32DllBase::findModuleByAddr(addr);
                         if(dll && dll->insideModuleCode(addr)) {
-                                sprintf(Name, "%s.DLL", dll->getModuleName());
+                                sprintf(Name, "%s", dll->getModuleName());
                                 dprintf(("%-13s      at 0x%08x\n", Name, addr));
                         }
@@ -291 +291 @@
         else {
                 if(WinExe && WinExe->insideModule(addr) && WinExe->insideModuleCode(addr)) {
-                        sprintf(Name, "%s.EXE", WinExe->getModuleName());
+                        sprintf(Name, "%s", WinExe->getModuleName());
                         dprintf(("%-13s      at 0x%08x\n", Name, addr));
                 }
@@ -297 +297 @@
                         Win32DllBase *dll = Win32DllBase::findModuleByAddr(addr);
                         if(dll && dll->insideModuleCode(addr)) {
-                                sprintf(Name, "%s.DLL", dll->getModuleName());
+                                sprintf(Name, "%s", dll->getModuleName());
                                 dprintf(("%-13s      at 0x%08x\n", Name, addr));
                         }
@@ -309 +309 @@
   addr = pCtxRec->ctx_RegEip;   
   if(WinExe && WinExe->insideModule(addr) && WinExe->insideModuleCode(addr)) {
-     sprintf(Name, "%s.EXE", WinExe->getModuleName());
+     sprintf(Name, "%s", WinExe->getModuleName());
      dprintf(("%-13s      at 0x%08x\n", Name, addr));
   }
@@ -315 +315 @@
      Win32DllBase *dll = Win32DllBase::findModuleByAddr(addr);
      if(dll && dll->insideModuleCode(addr)) {
-        sprintf(Name, "%s.DLL", dll->getModuleName());
+        sprintf(Name, "%s", dll->getModuleName());
         dprintf(("%-13s      at 0x%08x\n", Name, addr));
      }

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.49 2000-10-10 17:14:04 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.50 2000-11-05 13:40:45 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2037 +2037 @@
 
 
+HINSTANCE OSLibDosLoadModule(LPSTR szModName)
+{
+ APIRET  rc;
+ HMODULE hModule = NULLHANDLE;
+ char    name[ CCHMAXPATH ];
+
+  rc = DosLoadModule(name, CCHMAXPATH, szModName, &hModule);
+  if(rc) {
+      SetLastError(error2WinError(rc,ERROR_FILE_NOT_FOUND));
+      return 0;
+  }
+  SetLastError(ERROR_SUCCESS_W);
+  return hModule;
+}
+
 ULONG OSLibDosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf)
 {

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.25 2000-10-09 22:51:19 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.26 2000-11-05 13:40:46 sandervl Exp $ */
 
 /*
@@ -285 +285 @@
 ULONG OSLibDosQueryModuleName(ULONG hModule, int cchName, char *pszName);
 ULONG OSLibDosQueryDir(DWORD length, LPSTR lpszCurDir);
+
+HINSTANCE OSLibDosLoadModule(LPSTR szModName);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.63 2000-10-23 13:42:45 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.64 2000-11-05 13:40:46 sandervl Exp $ */
 
 /*
@@ -777 +777 @@
   realBaseAddress = 0;
 
-  //Allocated in peldr.dll
+  //Allocated in by pe.exe
   if(reservedMem && reservedMem == oh.ImageBase) {
     realBaseAddress = oh.ImageBase;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.106 2000-10-23 13:42:47 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.107 2000-11-05 13:40:47 sandervl Exp $ */
 
 /*
@@ -791 +791 @@
      *  Endif
      */
-    //only call Open32 if LX binary or win32k process
+    //only call OS/2 if LX binary or win32k process
     if(!fPeLoader || fPE != ERROR_SUCCESS)
     {
-        hDll = O32_LoadLibrary(szModname);
+        hDll = OSLibDosLoadModule(szModname);
         if (hDll)
         {
@@ -818 +818 @@
                 return hDll; //happens when LoadLibrary is called in kernel32's initterm (nor harmful)
 
-            dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): returns 0x%x. Loaded %s using O32_LoadLibrary.",
+            dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): returns 0x%x. Loaded %s using DosLoadModule.",
                      lpszLibFile, hFile, dwFlags, hDll, szModname));
             return pModule->getInstanceHandle();
         }
-        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): O32_LoadLibrary(%s) failed. LastError=%d",
+        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x): DosLoadModule (%s) failed. LastError=%d",
                  lpszLibFile, hFile, dwFlags, szModname, GetLastError()));
     }