Changeset 724 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Aug 28, 1999, 4:09:58 PM (26 years ago)

Author:

sandervl

Message:

Use shared memory for class & window objects

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (14 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.31 1999-08-27 17:50:56 dengert Exp $ */
+/* $Id: win32wnd.cpp,v 1.32 1999-08-28 14:09:30 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -11 +11 @@
  * Copyright 1993, 1994 Alexandre Julliard
  *
+ * TODO: Not thread/process safe
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -23 +24 @@
 #include <misc.h>
 #include <handlemanager.h>
+#include <heapstring.h>
 #include <win32wnd.h>
 #include <spy.h>
@@ -71 +73 @@
   fFirstShow       = TRUE;
 
-  memset(windowNameA, 0, MAX_WINDOW_NAMELENGTH);
-  memset(windowNameW, 0, MAX_WINDOW_NAMELENGTH*sizeof(WCHAR));
+  windowNameA      = NULL;
+  windowNameW      = NULL;
   wndNameLength    = 0;
 
@@ -125 +127 @@
   if(userWindowLong)
         free(userWindowLong);
+  if(windowNameA) {
+        free(windowNameA);
+        windowNameA = NULL;
+  }
+  if(windowNameW) {
+        free(windowNameW);
+        windowNameW = NULL;
+  }
 }
 //******************************************************************************
@@ -249 +259 @@
   nrUserWindowLong = windowClass->getExtraWndWords();
   if(nrUserWindowLong) {
-        userWindowLong = (ULONG *)malloc(nrUserWindowLong);
+        userWindowLong = (ULONG *)_smalloc(nrUserWindowLong);
         memset(userWindowLong, 0, nrUserWindowLong);
   }
@@ -371 +381 @@
 #endif
 
+  if(cs->lpszName)
+        SetWindowText((LPSTR)cs->lpszName);
+
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 dwOSWinStyle, dwOSFrameStyle, (char *)cs->lpszName,
+                                 dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
                                  (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
@@ -985 +998 @@
 {
     if(isUnicode) {
-        SendInternalMessageW(WM_GETTEXT, MAX_WINDOW_NAMELENGTH, (LPARAM)windowNameW);
+        SendInternalMessageW(WM_GETTEXT, wndNameLength, (LPARAM)windowNameW);
     }
     else {
-        SendInternalMessageA(WM_GETTEXT, MAX_WINDOW_NAMELENGTH, (LPARAM)windowNameA);
+        SendInternalMessageA(WM_GETTEXT, wndNameLength, (LPARAM)windowNameA);
     }
     return windowNameA;
@@ -1656 +1669 @@
 }
 //******************************************************************************
-//TODO: not complete nor correct (distinction between top-level, top-most & child windows)
+//TODO:
+//We assume (for now) that if hwndParent or hwndChildAfter are real window handles, that
+//the current process owns them.
+//******************************************************************************
+HWND Win32Window::FindWindowEx(HWND hwndParent, HWND hwndChildAfter, LPSTR lpszClass, LPSTR lpszWindow,
+                               BOOL fUnicode)
+{
+ Win32Window *parent = GetWindowFromHandle(hwndParent);
+ Win32Window *child  = GetWindowFromHandle(hwndChildAfter);
+
+    if((hwndParent != OSLIB_HWND_DESKTOP && !parent) ||
+       (hwndChildAfter != 0 && !child) ||
+       (hwndParent == OSLIB_HWND_DESKTOP && hwndChildAfter != 0))
+    {
+        dprintf(("Win32Window::FindWindowEx: parent or child not found %x %x", hwndParent, hwndChildAfter));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    if(hwndParent != OSLIB_HWND_DESKTOP)
+    {//if the current process owns the window, just do a quick search
+        child = (Win32Window *)parent->GetFirstChild();
+        if(hwndChildAfter != 0)
+        {
+            while(child)
+            {
+                if(child->getWindowHandle() == hwndChildAfter)
+                {
+                    child = (Win32Window *)child->GetNextChild();
+                    break;
+                }
+                child = (Win32Window *)child->GetNextChild();
+            }
+        }
+        while(child)
+        {
+            if(child->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
+               (!lpszWindow || child->hasWindowName(lpszWindow, fUnicode)))
+            {
+                dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
+                return child->getWindowHandle();
+            }
+            child = (Win32Window *)child->GetNextChild();
+        }
+    }
+    else {
+        Win32Window *wnd;
+        HWND henum, hwnd;
+
+        henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);
+        hwnd = OSLibWinGetNextWindow(henum);
+
+        while(hwnd)
+        {
+            HWND hwndClient;
+
+            wnd = GetWindowFromOS2Handle(hwnd);
+            if(wnd == NULL) {
+                hwndClient = OSLibWinQueryClientWindow(hwnd);
+                if(hwndClient)  wnd = GetWindowFromOS2Handle(hwndClient);
+            }
+
+            if(wnd && wnd->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
+               (!lpszWindow || wnd->hasWindowName(lpszWindow, fUnicode)))
+            {
+                OSLibWinEndEnumWindows(henum);
+                dprintf(("FindWindowEx: Found window %x", wnd->getWindowHandle()));
+                return wnd->getWindowHandle();
+            }
+            hwnd = OSLibWinGetNextWindow(henum);
+        }
+        OSLibWinEndEnumWindows(henum);
+    }
+    SetLastError(ERROR_CANNOT_FIND_WND_CLASS); //TODO: not always correct
+    return 0;
+}
+//******************************************************************************
+//TODO: not complete nor correct (distinction be    tween top-level, top-most & child windows)
 //******************************************************************************
 HWND Win32Window::GetWindow(UINT uCmd)
@@ -1770 +1859 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32Window::hasWindowName(LPSTR wndname, BOOL fUnicode)
+{
+    if(fUnicode) {
+            return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);
+    }
+    else    return (strcmp(windowNameA, wndname) == 0);
+}
+//******************************************************************************
+//******************************************************************************
 int Win32Window::GetWindowTextLengthA()
 {
@@ -1782 +1880 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32Window::SetWindowTextA(LPCSTR lpsz)
-{
-  return OSLibWinSetWindowText(OS2Hwnd, (LPSTR)lpsz);
+BOOL Win32Window::SetWindowText(LPSTR lpsz)
+{
+    if(lpsz == NULL)
+        return FALSE;
+
+    if(isUnicode == FALSE) {
+        windowNameA = (LPSTR)_smalloc(strlen(lpsz)+1);
+        strcpy(windowNameA, lpsz);
+        windowNameW = (LPWSTR)_smalloc((strlen(lpsz)+1)*sizeof(WCHAR));
+        lstrcpyAtoW(windowNameW, windowNameA);
+    }
+    else {
+        windowNameW = (LPWSTR)_smalloc((lstrlenW((LPWSTR)lpsz)+1)*sizeof(WCHAR));
+        lstrcpyW(windowNameW, (LPWSTR)lpsz);
+        windowNameA = (LPSTR)_smalloc(lstrlenW((LPWSTR)lpsz)+1);
+        lstrcpyWtoA(windowNameA, windowNameW);
+    }
+    wndNameLength = strlen(windowNameA)+1; //including 0 terminator
+
+    if(OS2Hwnd)
+        return OSLibWinSetWindowText(OS2Hwnd, (LPSTR)windowNameA);
+
+    return TRUE;
 }
 //******************************************************************************
@@ -1810 +1928 @@
                 return oldval;
         case GWL_HWNDPARENT:
-        return SetParent((HWND)value);
+                return SetParent((HWND)value);
 
         case GWL_ID:
@@ -1895 +2013 @@
 
    if(HIWORD(hwnd) != 0x6800) {
-    return NULL;
+        return NULL;
    }
 
    if(HMHandleTranslateToOS2(LOWORD(hwnd), (PULONG)&window) == NO_ERROR) {
-    return window;
+        return window;
    }
    else return NULL;
@@ -1914 +2032 @@
 
   if(win32wnd && CheckMagicDword(magic)) {
-    return win32wnd;
+        return win32wnd;
   }
   return 0;