Changeset 934 for trunk/src

Timestamp:

Sep 14, 1999, 10:46:40 PM (26 years ago)

Author:

sandervl

Message:

Implemented Enum(Thread/Child)Windows

Location:

trunk/src/user32/new

Files:

• makefile (modified) (3 diffs)
• oslibwin.cpp (modified) (3 diffs)
• oslibwin.h (modified) (3 diffs)
• user32.cpp (modified) (3 diffs)
• usrcall.cpp (deleted)
• usrcall.h (deleted)
• window.cpp (modified) (3 diffs)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.50 1999-09-13 16:13:46 dengert Exp $
+# $Id: makefile,v 1.51 1999-09-14 20:46:39 sandervl Exp $
 
 #
@@ -25 +25 @@
         dde.obj heapshared.obj win32wndhandle.obj \
         icon.obj hook.obj hooks.obj winmenu.obj \
-        usrcall.obj defwndproc.obj syscolor.obj char.obj initterm.obj \
+        defwndproc.obj syscolor.obj char.obj initterm.obj \
         uitools.obj unknown.obj spy.obj wndmsg.obj \
         pmwindow.obj win32class.obj win32wnd.obj win32dlg.obj \
@@ -68 +68 @@
 winmenu.obj: winmenu.cpp user32.h $(PDWIN32_INCLUDE)\winres.h $(PDWIN32_INCLUDE)\winresmenu.h win32wbase.h
 syscolor.obj: syscolor.cpp syscolor.h
-usrcall.obj: usrcall.cpp usrcall.h
 dde.obj: dde.cpp
 hook.obj: hook.cpp hooks.h

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.26 1999-08-28 14:09:29 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.27 1999-09-14 20:46:39 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -678 +678 @@
 {
    if(hwnd == OSLIB_HWND_DESKTOP)       hwnd = HWND_DESKTOP;
+   else
+   if(hwnd == OSLIB_HWND_OBJECT)        hwnd = HWND_OBJECT;
 
    return WinBeginEnumWindows(hwnd);
@@ -706 +708 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinQueryWindowProcess(HWND hwnd, ULONG *pid, ULONG *tid)
+{
+   return WinQueryWindowProcess(hwnd, pid, tid);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/new/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.24 1999-09-05 15:53:09 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.25 1999-09-14 20:46:39 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -31 +31 @@
 
 #define OSLIB_HWND_DESKTOP      0
+#define OSLIB_HWND_OBJECT       1
+
 BOOL  OSLibWinSetParent(HWND hwnd, HWND hwndParent, ULONG fRedraw = TRUE);
 
@@ -235 +237 @@
 HWND  OSLibWinQueryClientWindow(HWND hwndFrame);
 BOOL  OSLibWinEndEnumWindows(HWND hwndEnum);
+BOOL  OSLibWinQueryWindowProcess(HWND hwnd, ULONG *pid, ULONG *tid);
 
 #endif //__OSLIBWIN_H__

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.20 1999-09-10 19:00:11 dengert Exp $ */
+/* $Id: user32.cpp,v 1.21 1999-09-14 20:46:40 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include "user32.h"
 #include <winicon.h>
-#include "usrcall.h"
 #include "syscolor.h"
 
@@ -830 +829 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API EnumChildWindows(HWND hwnd, WNDENUMPROC lpfn, LPARAM lParam)
-{
- BOOL                rc;
- EnumWindowCallback *callback = new EnumWindowCallback(lpfn, lParam);
-
-#ifdef DEBUG
-  WriteLog("USER32:  EnumChildWindows\n");
-#endif
-  rc = O32_EnumChildWindows(hwnd, callback->GetOS2Callback(), (LPARAM)callback);
-  if(callback)
-    delete callback;
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API EnumWindows(WNDENUMPROC lpfn, LPARAM lParam)
-{
- BOOL                rc;
- EnumWindowCallback *callback = new EnumWindowCallback(lpfn, lParam);
-
-#ifdef DEBUG
-  WriteLog("USER32:  EnumWindows\n");
-#endif
-  rc = O32_EnumWindows(callback->GetOS2Callback(), (LPARAM)callback);
-  if(callback)
-        delete callback;
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
 INT WIN32API ExcludeUpdateRgn( HDC arg1, HWND  arg2)
 {

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.24 1999-09-10 19:00:11 dengert Exp $ */
+/* $Id: window.cpp,v 1.25 1999-09-14 20:46:40 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -24 +24 @@
 #include "user32.h"
 #include "winicon.h"
-#include "usrcall.h"
 
 //******************************************************************************
@@ -983 +982 @@
 BOOL WIN32API EnumThreadWindows(DWORD dwThreadId, WNDENUMPROC lpfn, LPARAM lParam)
 {
- BOOL                rc;
- EnumWindowCallback *callback = new EnumWindowCallback(lpfn, lParam);
-
-  dprintf(("USER32:  EnumThreadWindows\n"));
-  //CB: replace
-  rc = O32_EnumThreadWindows(dwThreadId, callback->GetOS2Callback(), (LPARAM)callback);
-  if(callback)
-    delete callback;
-  return(rc);
+ Win32BaseWindow *window;
+ BOOL   rc;
+ ULONG  henum;
+ HWND   hwndNext;
+ ULONG  tid;
+ ULONG  pid, curpid;
+
+  dprintf(("EnumThreadWindows\n"));
+
+  curpid = GetCurrentProcessId();
+
+  henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);          
+  while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
+  {
+        OSLibWinQueryWindowProcess(hwndNext, &pid, &tid);
+        if(!(curpid == pid && dwThreadId == tid))
+                continue;
+
+        window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
+        if(window == NULL) {
+                //OS/2 window or non-frame window, so skip it
+                continue;
+        }
+        if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE)
+                break;
+  }
+  OSLibWinEndEnumWindows (henum);
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API EnumChildWindows(HWND hwnd, WNDENUMPROC lpfn, LPARAM lParam)
+{
+ Win32BaseWindow *window, *parentwindow;
+ BOOL   rc = TRUE;
+ ULONG  henum;
+ HWND   hwndNext;
+
+  dprintf(("EnumChildWindows %x %x\n", hwnd, lParam));
+
+  parentwindow = Win32BaseWindow::GetWindowFromHandle(hwnd);
+  if(!parentwindow) {
+        dprintf(("EnumChildWindows, window %x not found", hwnd));
+        return FALSE;
+  }
+
+  henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);          
+  while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
+  {
+        window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
+        if(window == NULL) {
+                //OS/2 window or non-frame window, so skip it
+                continue;
+        }
+        if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE)
+        {
+                rc = FALSE;
+                break;
+        }
+  }
+  OSLibWinEndEnumWindows(henum);
+  return rc;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API EnumWindows(WNDENUMPROC lpfn, LPARAM lParam)
+{
+ Win32BaseWindow *window;
+ BOOL   rc;
+ ULONG  henum;
+ HWND   hwndNext, hwndParent = OSLIB_HWND_DESKTOP;
+
+  dprintf(("EnumThreadWindows\n"));
+
+  do {
+        henum = OSLibWinBeginEnumWindows(hwndParent);          
+        while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
+        {
+                window = Win32BaseWindow::GetWindowFromHandle(hwndNext);
+                if(window == NULL) {
+                        //OS/2 window or non-frame window, so skip it
+                        continue;
+                }
+                if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE) {
+                        goto Abort;
+                }
+        }
+        if(hwndParent == OSLIB_HWND_OBJECT)
+                break;
+        hwndParent = OSLIB_HWND_OBJECT;
+        OSLibWinEndEnumWindows(henum);
+  }
+  while(TRUE);
+
+Abort:
+  OSLibWinEndEnumWindows(henum);
+  return TRUE;
 }
 //******************************************************************************