Changeset 14606

Timestamp:

Aug 18, 2000, 8:16:34 PM (25 years ago)

Author:

sandervl

Message:

create additional keys during install (display driver related) + extra logging for GetProcAddress

Location:

tags/trunk/src/kernel32

Files:

• initsystem.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (3 diffs)

tags/trunk/src/kernel32/initsystem.cpp ¶

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.11 2000-08-01 23:20:29 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.12 2000-08-18 18:16:33 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -66 +66 @@
 #define DIR_PROGRAM_COMMON      "CommonFilesDir"
 #define DIR_SHARED              "SharedDir"
+#define HARDWARE_VIDEO_GRADD    "\\REGISTRY\\Machine\\System\\CurrentControlSet\\Services\\Gradd\\Device0"
+#define HARDWARE_VIDEO_GRADD_DESCRIPTION "OS/2 Display driver"
+#define HARDWARE_VIDEO_VGA      "\\REGISTRY\\Machine\\System\\CurrentControlSet\\Services\\VgaSave\\Device0"
+#define HARDWARE_VIDEO_VGA_DESCRIPTION   "OS/2 VGA Display driver"
+#define HARDWARE_VIDEO_COMPATIBLE "\\Device\\Video1"
 
 //******************************************************************************
@@ -346 +351 @@
    RegCloseKey(hkey);
 
+   //[HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\VIDEO]
+   //"\\Device\\Video0"="\\REGISTRY\\Machine\\System\\ControlSet001\\Services\\mga64\\Device0"
+   //"\\Device\\Video1"="\\REGISTRY\\Machine\\System\\ControlSet001\\Services\\VgaSave\\Device0"
+   //"VgaCompatible"="\\Device\\Video1"
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DEVICEMAP\\VIDEO",&hkey)!=ERROR_SUCCESS) {
+        goto initreg_error;
+   }
+   RegSetValueExA(hkey,"\\Device\\Video0",0,REG_SZ, (LPBYTE)HARDWARE_VIDEO_GRADD, sizeof(HARDWARE_VIDEO_GRADD));
+   RegSetValueExA(hkey,"\\Device\\Video1",0,REG_SZ, (LPBYTE)HARDWARE_VIDEO_VGA, sizeof(HARDWARE_VIDEO_VGA));
+   RegSetValueExA(hkey, "VgaCompatible", 0,REG_SZ, (LPBYTE)HARDWARE_VIDEO_COMPATIBLE, sizeof(HARDWARE_VIDEO_COMPATIBLE));
+   RegCloseKey(hkey);
+
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Services\\Gradd\\Device0",&hkey)!=ERROR_SUCCESS) {
+        goto initreg_error;
+   }
+   RegSetValueExA(hkey,"Device Description", 0, REG_SZ, (LPBYTE)HARDWARE_VIDEO_GRADD_DESCRIPTION, sizeof(HARDWARE_VIDEO_GRADD_DESCRIPTION));
+   RegCloseKey(hkey);
+
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Services\\VgaSave\\Device0",&hkey)!=ERROR_SUCCESS) {
+        goto initreg_error;
+   }
+   RegSetValueExA(hkey,"Device Description", 0, REG_SZ, (LPBYTE)HARDWARE_VIDEO_VGA_DESCRIPTION, sizeof(HARDWARE_VIDEO_VGA_DESCRIPTION));
+   RegCloseKey(hkey);
+  
    return TRUE;
 

tags/trunk/src/kernel32/wprocess.cpp ¶

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.88 2000-08-17 18:22:18 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.89 2000-08-18 18:16:34 sandervl Exp $ */
 
 /*
@@ -1355 +1355 @@
 
   if(hModule == 0 || hModule == -1 || (WinExe && hModule == WinExe->getInstanceHandle())) {
-    winmod = WinExe;
+        winmod = WinExe;
   }
   else  winmod = (Win32ImageBase *)Win32DllBase::findModule((HINSTANCE)hModule);
@@ -1374 +1374 @@
                 SetLastError(ERROR_PROC_NOT_FOUND);
         }
+        if(HIWORD(lpszProc))
+                dprintf(("KERNEL32:  GetProcAddress %s from %X returned %X\n", lpszProc, hModule, proc));
+        else    dprintf(("KERNEL32:  GetProcAddress %x from %X returned %X\n", lpszProc, hModule, proc));
         return proc;
   }