Changeset 8126 for trunk/src

Timestamp:

Mar 27, 2002, 11:56:25 AM (23 years ago)

Author:

sandervl

Message:

move process id setup to OSLibWinQueryWindowProcess

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.116 2002-03-18 13:03:53 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.117 2002-03-27 10:56:24 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -22 +22 @@
 #include <winconst.h>
 #include <winuser32.h>
+#include <wprocess.h>
 #include "oslibwin.h"
 #include "oslibutil.h"
@@ -805 +806 @@
 BOOL OSLibWinQueryWindowProcess(HWND hwnd, ULONG *pid, ULONG *tid)
 {
-   return WinQueryWindowProcess(hwnd, pid, tid);
+   BOOL ret;
+
+   ret = WinQueryWindowProcess(hwnd, pid, tid);
+   *tid = MAKE_THREADID(*pid, *tid);
+   return ret;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.319 2002-03-22 11:02:04 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.320 2002-03-27 10:56:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2976 +2976 @@
     {
         OSLibWinQueryWindowProcess(child->getOS2WindowHandle(), &pid, &tid);
-        ULONG wtid = MAKE_THREADID( pid, tid);
-
-        if(dwThreadId == wtid) {
+
+        if(dwThreadId == tid) {
             dprintf2(("EnumThreadWindows: Found Window %x", child->getWindowHandle()));
             if((rc = lpfn(child->getWindowHandle(), lParam)) == FALSE) {