Changeset 10316 for trunk/src/user32/window.cpp

Timestamp:

Nov 12, 2003, 3:13:26 PM (22 years ago)

Author:

sandervl

Message:

Visible & Clip region changes

File:

• trunk/src/user32/window.cpp (modified) (6 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.136 2003-06-25 17:02:04 sandervl Exp $ */
+/* $Id: window.cpp,v 1.137 2003-11-12 14:10:21 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -44 +44 @@
 #include <winuser32.h>
 #include "hook.h"
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_window
@@ -711 +712 @@
 {
     HWND hwndAncestor = 0;
+    Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetAncestor, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
 
     if (type == GA_PARENT)
@@ -719 +728 @@
         }
         //else no child -> no parent (GetParent returns owner otherwise!)
-        return hwndAncestor;
-    }
-    dprintf(("Unsupported type %d", type));
-    return 0;
+    }
+    else 
+    if (type == GA_ROOT) 
+    {
+         hwndAncestor = window->GetTopParent();
+    }
+    else
+    if (type == GA_ROOTOWNER) 
+    {
+         if(hwnd != GetDesktopWindow()) 
+         {
+             hwndAncestor = hwnd;
+             for(;;)
+             {
+                HWND parent = GetParent( hwndAncestor );
+                if (!parent) break;
+                hwndAncestor = parent;
+             }
+         }
+    }
+    else dprintf(("Unsupported type %d", type));
+
+    RELEASE_WNDOBJ(window);
+    return hwndAncestor;
 }
 //******************************************************************************
@@ -760 +789 @@
             return 0;
         }
+        fIgnoreKeystrokes = TRUE;
         SendMessageA(lastFocus_W, WM_KILLFOCUS, 0, 0);
-
-        fIgnoreKeystrokes = TRUE;
 
         return lastFocus_W;
@@ -2151 +2179 @@
 }
 //******************************************************************************
+//The GetWindowModuleFileName function retrieves the full path and file name of 
+//the module associated with the specified window handle.
+//******************************************************************************
+UINT WIN32API GetWindowModuleFileNameA(HWND hwnd, LPTSTR lpszFileName, UINT cchFileNameMax)
+{
+    WNDPROC lpfnWindowProc;
+
+    if (!IsWindow(hwnd)) {
+        dprintf(("warning: GetWindowModuleFileName: window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    lpfnWindowProc = (WNDPROC)GetWindowLongA(hwnd, GWL_WNDPROC);
+    return GetProcModuleFileNameA((ULONG)lpfnWindowProc, lpszFileName, cchFileNameMax);
+}
+//******************************************************************************
 //******************************************************************************