Changeset 2269 for trunk/src/user32/win32wbase.cpp

Timestamp:

Dec 30, 1999, 7:33:00 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.128 1999-12-30 11:21:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.129 1999-12-30 18:32:59 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2875 +2875 @@
 BOOL Win32BaseWindow::hasWindowName(LPSTR wndname, BOOL fUnicode)
 {
-    if(wndname == NULL)
-      return FALSE;
-
-    if(fUnicode) {
-            return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);
-    }
-    else    return (strcmp(windowNameA, wndname) == 0);
+    INT len = GetWindowTextLength();
+    BOOL res;
+
+    if (wndname == NULL)
+      return (len == 0);
+
+    len++;
+    if (fUnicode)
+    {
+      WCHAR *text = (WCHAR*)malloc(len*sizeof(WCHAR));
+
+      GetWindowTextW(text,len);
+      res = (lstrcmpW(text,(LPWSTR)wndname) == 0);
+      free(text);
+    } else
+    {
+      CHAR *text = (CHAR*)malloc(len*sizeof(CHAR));
+
+      GetWindowTextA(text,len);
+      res = (strcmp(text,wndname) == 0);
+      free(text);
+    }
+
+    return res;
 }
 //******************************************************************************