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

Timestamp:

Feb 26, 2002, 12:12:26 PM (23 years ago)

Author:

sandervl

Message:

GetWindowThreadProcessId changes

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.120 2002-02-12 18:07:21 sandervl Exp $ */
+/* $Id: window.cpp,v 1.121 2002-02-26 11:12:26 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1634 +1634 @@
                     return hwnd;
                 }
+                hwnd = GetWindow(hwnd, GW_HWNDNEXT);
+#if 0
                 //try siblings
                 HWND hwndSibling;
@@ -1651 +1653 @@
                 }
                 hwnd = hwndParent;
+#endif
         }
     }
@@ -1871 +1874 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API GetWindowThreadProcessId(HWND hwnd,  PDWORD lpdwProcessId)
-{
-    DWORD dwThreadId;
-
-    dwThreadId = O32_GetWindowThreadProcessId(Win32ToOS2Handle(hwnd), lpdwProcessId);
-    if(dwThreadId == 0) {
-        dprintf(("!WARNING! GetWindowThreadProcessId %x failed!!", hwnd));
-    }
+DWORD WIN32API GetWindowThreadProcessId(HWND hwnd, PDWORD lpdwProcessId)
+{
+  Win32BaseWindow *window;
+  DWORD dwThreadId;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetWindowThreadProcessId, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dwThreadId = window->getThreadId();
+    if(lpdwProcessId) {
+        *lpdwProcessId = window->getProcessId();
+    }
+    RELEASE_WNDOBJ(window);
+    
     return dwThreadId;
 }