Changeset 724 for trunk/src/user32/new/window.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/window.cpp (modified) (4 diffs)

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.16 1999-08-27 16:52:09 sandervl Exp $ */
+/* $Id: window.cpp,v 1.17 1999-08-28 14:09:30 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -568 +568 @@
     }
     dprintf(("SetWindowTextA %x %s", hwnd, lpsz));
-    return window->SetWindowTextA(lpsz);
+    return window->SetWindowText((LPSTR)lpsz);
 }
 //******************************************************************************
@@ -645 +645 @@
 HWND WIN32API FindWindowA(LPCSTR lpszClass, LPCSTR lpszWindow)
 {
+    if(!lpszClass) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
     if(HIWORD(lpszClass)) {
          dprintf(("USER32:  FindWindow %s %s\n", lpszClass, lpszWindow));
     }
     else dprintf(("USER32:  FindWindow %x %s\n", lpszClass, lpszWindow));
-    return O32_FindWindow(lpszClass, lpszWindow);
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API FindWindowExA(HWND hwnd1, HWND hwnd2, LPCSTR lpszClass, LPCSTR lpszWindow)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  FindWindowExA, not completely implemented\n");
-#endif
-    return FindWindowA(lpszClass, lpszWindow);
+
+    return Win32Window::FindWindowEx(OSLIB_HWND_DESKTOP, 0, (LPSTR)lpszClass, (LPSTR)lpszWindow);
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API FindWindowExA(HWND hwndParent, HWND hwndChildAfter, LPCSTR lpszClass, LPCSTR lpszWindow)
+{
+    if(!lpszClass) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(HIWORD(lpszClass)) {
+         dprintf(("USER32:  FindWindowExA (%x,%x) %s %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
+    }
+    else dprintf(("USER32:  FindWindowExA (%x,%x)%x %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
+
+    return Win32Window::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
 }
 /*****************************************************************************
@@ -686 +697 @@
                                LPCWSTR lpszWindow)
 {
-  dprintf(("USER32:FindWindowExW (%08xh,%08xh,%s,%s) not implemented.\n",
-         hwndParent,
-         hwndChildAfter,
-         lpszClass,
-         lpszWindow));
-
-  return (NULL);
+    if(!lpszClass) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    dprintf(("USER32:  FindWindowExW (%x,%x) %x %s\n", hwndParent, hwndChildAfter, lpszClass, lpszWindow));
+
+    return Win32Window::FindWindowEx(hwndParent, hwndChildAfter, (LPSTR)lpszClass, (LPSTR)lpszWindow);
 }
 //******************************************************************************