Changeset 4430 for trunk/src

Timestamp:

Oct 5, 2000, 3:47:06 PM (25 years ago)

Author:

sandervl

Message:

GetWindow & EnumDisplaySettingsA fixes

Location:

trunk/src/user32

Files:

• HOOK.CPP (modified) (4 diffs)
• display.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.14 2000-05-12 18:09:39 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.15 2000-10-05 13:47:06 sandervl Exp $ */
 
 /*
@@ -269 +269 @@
     }
 
-    dprintf(("Setting hook %d: %08x %04x %08lx\n",
-             id, (UINT)proc, hModule, dwThreadId ));
+    dprintf(("Setting hook %d: %08x %04x %08lx\n", id, (UINT)proc, hModule, dwThreadId ));
 
 #ifndef __WIN32OS2__
@@ -646 +645 @@
 BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 {
-    if (CHECK_MAGIC(hhook) == FALSE)
+    if (CHECK_MAGIC(hhook) == FALSE) {
+        dprintf(("ERROR: UnhookWindowsHookEx invalid hook %x", hhook));
         return FALSE;
+    }
 
     return HOOK_RemoveHook( (HOOKDATA *)hhook );
@@ -664 +665 @@
     HOOKDATA *oldhook;
 
-    if (CHECK_MAGIC(hhook) == FALSE)
+    if (CHECK_MAGIC(hhook) == FALSE) {
+        dprintf(("ERROR: CallNextHookEx invalid hook %x", hhook));
         return FALSE;
-
+    }
     if (!(next = HOOK_GetNextHook( hhook ))) return 0;
 

trunk/src/user32/display.cpp

@@ -1 @@
-/* $Id: display.cpp,v 1.8 2000-10-03 17:29:20 sandervl Exp $ */
+/* $Id: display.cpp,v 1.9 2000-10-05 13:47:06 sandervl Exp $ */
 /*
  * Display/Monitor Win32 apis
@@ -295 +295 @@
         memset(devmode, 0, sizeof(*devmode));
         devmode->dmSize = sizeof(*devmode);
+        devmode->dmDisplayFrequency = 70; //todo: get real refresh rate
         if(n==0) {
                 devmode->dmBitsPerPel = ScreenBitsPerPel;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.212 2000-09-07 18:14:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.213 2000-10-05 13:47:06 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2768 +2768 @@
     {
     case GW_HWNDFIRST:
-        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
-        window = GetWindowFromOS2Handle(hwndRelated);
-        if(window) {
-             hwndRelated = window->getWindowHandle();
-        }
-        else hwndRelated = 0;
+        if(getParent()) {
+            window = (Win32BaseWindow *)getParent();
+            hwndRelated = OSLibWinQueryWindow(window->getOS2WindowHandle(), QWOS_TOP);
+        }
+        else hwndRelated = 0; //TODO: not correct; should get first child in z-order of desktop
         break;
 
@@ -2810 +2809 @@
 
     case GW_CHILD:
-        if(getFirstChild()) {
-            hwndRelated = ((Win32BaseWindow *)getFirstChild())->getWindowHandle();
-        }
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
         break;
     }