Changeset 21426 for trunk/src

Timestamp:

Aug 27, 2010, 12:32:58 AM (15 years ago)

Author:

dmik

Message:

Attempted to make Odin work in LIBPATHSTRICT=T mode by replacing DosQueryModuleHandle() with the custom made DosQueryModuleHandleStrict().

Location:

trunk/src

Files:

• custombuild/initterm.cpp (modified) (1 diff)
• kernel32/console.cpp (modified) (2 diffs)
• kernel32/initterm.cpp (modified) (1 diff)
• kernel32/oslibdos.cpp (modified) (4 diffs)
• kernel32/oslibmisc.cpp (modified) (3 diffs)
• user32/pmwindow.cpp (modified) (1 diff)

trunk/src/custombuild/initterm.cpp

@@ -250 +250 @@
     HMODULE hModule;
 
-    DosQueryModuleHandle("WGSS50", &hModule);
+    DosQueryModuleHandleStrict("WGSS50", &hModule);
     return O32__DLL_InitTerm(hModule, 0);
 }

trunk/src/kernel32/console.cpp

@@ -73 +73 @@
 #include <win32api.h>
 #include <misc.h>
+#include <odincrt.h>
 
 #include "conwin.h"          // Windows Header for console only
@@ -376 +377 @@
 
                                     /* obtain module handle to our resources */
-  rc = DosQueryModuleHandle("KERNEL32",
-                            &ConsoleGlobals.hmodResource);
+  rc = DosQueryModuleHandleStrict("KERNEL32",
+                                  &ConsoleGlobals.hmodResource);
   if (rc != NO_ERROR)
     dprintf(("KERNEL32/CONSOLE: Can't get handle to KERNEL32 (%u).\n",

trunk/src/kernel32/initterm.cpp

@@ -159 +159 @@
         loadNr = globLoadNr++;
     }
-    DosQueryModuleHandle("WGSS50", &hModule);
+    DosQueryModuleHandleStrict("WGSS50", &hModule);
     _O32__DLL_InitTerm(hModule, 0);
-    DosQueryModuleHandle("KERNEL32", &hModule);
+    DosQueryModuleHandleStrict("KERNEL32", &hModule);
     return DLLENTRYPOINT_NAME(hModule, 0);
 }

trunk/src/kernel32/oslibdos.cpp

@@ -36 +36 @@
 #include <win\winioctl.h>
 #include <misc.h>
+#include <odincrt.h>
 #include "initterm.h"
 #include "oslibdos.h"
@@ -126 +127 @@
  HMODULE hDoscalls;
 
-  if(DosQueryModuleHandle("DOSCALLS", &hDoscalls) != NO_ERROR) {
+  if(DosQueryModuleHandleStrict("DOSCALLS", &hDoscalls) != NO_ERROR) {
     return;
   }
@@ -3262 +3263 @@
 
         HMODULE hDoscalls;
-        if(DosQueryModuleHandle("DOSCALLS", &hDoscalls) == NO_ERROR) {
+        if(DosQueryModuleHandleStrict("DOSCALLS", &hDoscalls) == NO_ERROR) {
             DosQueryProcAddr(hDoscalls, 564, NULL, (PFN *)&pfnDosSetThreadAffinity);
         }
@@ -3306 +3307 @@
 
         HMODULE hDoscalls;
-        if(DosQueryModuleHandle("DOSCALLS", &hDoscalls) == NO_ERROR) {
+        if(DosQueryModuleHandleStrict("DOSCALLS", &hDoscalls) == NO_ERROR) {
             DosQueryProcAddr(hDoscalls, 563, NULL, (PFN *)&pfnDosQueryThreadAffinity);
         }

trunk/src/kernel32/oslibmisc.cpp

@@ -24 +24 @@
 #include "oslibmisc.h"
 #include <misc.h>
+#include <odincrt.h>
 
 #define DBG_LOCALLOG    DBG_oslibmisc
@@ -104 +105 @@
   else
   {
-    rc = DosQueryModuleHandle(pszModule,              /* query module handle */
-                              &hModule);
+    rc = DosQueryModuleHandleStrict(pszModule,        /* query module handle */
+                                    &hModule);
 
     if (rc != NO_ERROR)                                  /* check for errors */
@@ -122 +123 @@
  APIRET  rc;
 
-  rc = DosQueryModuleHandle(modname,              /* query module handle */
-                            &hModule);
+  rc = DosQueryModuleHandleStrict(modname,            /* query module handle */
+                                  &hModule);
   if(rc)
     return(-1);

trunk/src/user32/pmwindow.cpp

@@ -329 +329 @@
 
         DspInitSystemDriverName(szDisplay, sizeof(szDisplay));
-        DosQueryModuleHandle(szDisplay, &hModDisplay);
+        DosQueryModuleHandleStrict(szDisplay, &hModDisplay);
 
         hbmFrameMenu[PMMENU_MINBUTTON] = GpiLoadBitmap(hdc, hModDisplay, SBMP_MINBUTTON, 0, 0);