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

Timestamp:

Apr 12, 2001, 4:04:54 PM (24 years ago)

Author:

sandervl

Message:

Sofiya: DBCS fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.249 2001-04-02 17:30:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.250 2001-04-12 14:04:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -109 +109 @@
   windowNameA      = NULL;
   windowNameW      = NULL;
-  wndNameLength    = 0;
 
   userWindowBytes  = NULL;;
@@ -545 +544 @@
         if (!isUnicode)
         {
-            wndNameLength = strlen(cs->lpszName);
+            int wndNameLength = strlen(cs->lpszName);
             windowNameA = (LPSTR)_smalloc(wndNameLength+1);
             strcpy(windowNameA,cs->lpszName);
@@ -555 +554 @@
         else
         {
-            wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
-            windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-            lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
+            // Wide
+            int wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
             windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
             lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
-            windowNameA[wndNameLength] = 0;
-            windowNameW[wndNameLength] = 0;
+            windowNameW[lstrlenW((LPWSTR)cs->lpszName)] = 0; // need ?
+            // Ascii
+            LPSTR tmp = HEAP_strdupWtoA(GetProcessHeap(), 0, (LPWSTR)cs->lpszName);
+            if(tmp) {
+                long tmpLength = strlen( tmp );
+                windowNameA = (LPSTR)_smalloc(tmpLength+1);
+                strcpy(windowNameA,tmp);
+                windowNameA[tmpLength] = 0; // need ?
+                HEAP_free(tmp);
+            } else {
+                windowNameA = (LPSTR)_smalloc(1);
+                windowNameA[0] = 0;
+            }
         }
     }
@@ -1380 +1389 @@
 
     case WM_GETTEXTLENGTH:
-        return wndNameLength;
+        if(windowNameA) {
+          return strlen(windowNameA);
+        }
+        else {
+          return 0;
+        }
 
     case WM_GETTEXT:
@@ -1386 +1400 @@
         if (!windowNameA) ((LPSTR)lParam)[0] = 0;
         else lstrcpynA((LPSTR)lParam, windowNameA, wParam);
-        return min(wndNameLength, wParam);
+        return min((windowNameA ? strlen(windowNameA) : 0), wParam);
 
     case WM_SETTEXT:
@@ -1396 +1410 @@
         if (lParam)
         {
-            wndNameLength = strlen(lpsz);
+            int wndNameLength = strlen(lpsz);
             windowNameA = (LPSTR)_smalloc(wndNameLength+1);
             strcpy(windowNameA, lpsz);
@@ -1406 +1420 @@
             windowNameA = NULL;
             windowNameW = NULL;
-            wndNameLength = 0;
         }
         dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, lParam));
@@ -1689 +1702 @@
         sibling = GetWindow (GW_HWNDFIRST);
         while (sibling != 0) {
-          siblingWindow = GetWindowFromHandle (sibling);
-          nameLength = siblingWindow->GetWindowTextA (nameBuffer, 40);
-
-          // find the siblings mnemonic
-          mnemonic = '\0';
-          for (int i=0 ; i<nameLength ; i++) {
-            if (nameBuffer [i] == '&') {
-              mnemonic = nameBuffer [i+1];
-              if ((mnemonic >= 'a') && (mnemonic <= 'z'))
-                mnemonic -= 32; // make it uppercase
-              break;  // stop searching
+            siblingWindow = GetWindowFromHandle (sibling);
+            nameLength = siblingWindow->GetWindowTextA (nameBuffer, 40);
+
+            // find the siblings mnemonic
+            mnemonic = '\0';
+            for (int i=0 ; i<nameLength ; i++) {
+                if (IsDBCSLeadByte(nameBuffer[i])) {
+                    // Skip DBCS
+                    continue;
+                }
+                if (nameBuffer [i] == '&') {
+                    mnemonic = nameBuffer [i+1];
+                    if ((mnemonic >= 'a') && (mnemonic <= 'z'))
+                        mnemonic -= 32; // make it uppercase
+                    break;  // stop searching
+                }
             }
-          }
-
-          // key matches siblings mnemonic, send mouseclick
-          if (mnemonic == (char) wParam) {
-            siblingWindow->SendInternalMessageA (BM_CLICK, 0, 0);
-          }
-
-          sibling = siblingWindow->GetNextWindow (GW_HWNDNEXT);
+
+            // key matches siblings mnemonic, send mouseclick
+            if (mnemonic == (char) wParam) {
+                siblingWindow->SendInternalMessageA (BM_CLICK, 0, 0);
+            }
+
+            sibling = siblingWindow->GetNextWindow (GW_HWNDNEXT);
         }
 
@@ -1845 +1862 @@
     {
     case WM_GETTEXTLENGTH:
-        return wndNameLength;
+        if(windowNameW) {
+             return lstrlenW(windowNameW);
+        }
+        else return 0;
 
     case WM_GETTEXT:
@@ -1851 +1871 @@
         if (!windowNameW) ((LPWSTR)lParam)[0] = 0;
         else lstrcpynW((LPWSTR)lParam,windowNameW,wParam);
-        return min(wndNameLength,wParam);
+        return min((windowNameW ? lstrlenW(windowNameW) : 0),wParam);
 
     case WM_SETTEXT:
@@ -1861 +1881 @@
         if (lParam)
         {
-          wndNameLength = lstrlenW(lpsz);
-          windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-          lstrcpyWtoA(windowNameA,lpsz);
-          windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-          lstrcpyW(windowNameW,lpsz);
+            // Wide
+            int wndNameLength = lstrlenW(lpsz);
+            windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+            lstrcpyW(windowNameW,lpsz);
+            // Ascii
+            LPSTR tmp = HEAP_strdupWtoA(GetProcessHeap(), 0, lpsz);
+            if(tmp) {
+                long tmpLength = strlen( tmp );
+                windowNameA = (LPSTR)_smalloc(tmpLength+1);
+                strcpy(windowNameA,tmp);
+                windowNameA[tmpLength] = 0; // need ?
+                HEAP_free(tmp);
+            }
+            else {
+                windowNameA = (LPSTR)_smalloc(1);
+                windowNameA[0] = 0;
+            }
         }
         else
         {
-          windowNameA = NULL;
-          windowNameW = NULL;
-          wndNameLength = 0;
+            windowNameA = NULL;
+            windowNameW = NULL;
         }
         dprintf(("WM_SETTEXT of %x\n",Win32Hwnd));
@@ -2298 +2329 @@
 //testestest
     //temporary workaround for file dialogs with template dialog child
-    //they don't redraw when switching directories 
+    //they don't redraw when switching directories
     //For some reason the new child's (syslistview32) update rectangle stays
     //empty after its parent is made visible with ShowWindow
@@ -3238 +3269 @@
 BOOL Win32BaseWindow::hasWindowName(LPSTR wndname, BOOL fUnicode)
 {
-    INT len = GetWindowTextLength();
+    INT len = GetWindowTextLength(fUnicode);
     BOOL res;
 
     if (wndname == NULL)
-      return (len == 0);
+        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);
+        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);
     }
 
@@ -3267 +3299 @@
 CHAR *Win32BaseWindow::getWindowNamePtrA()
 {
-    INT len = GetWindowTextLength();
+    INT len = GetWindowTextLength(FALSE);
     CHAR *text;
 
@@ -3281 +3313 @@
 WCHAR *Win32BaseWindow::getWindowNamePtrW()
 {
-    INT len = GetWindowTextLength();
+    INT len = GetWindowTextLength(TRUE);
     WCHAR *text;
 
@@ -3301 +3333 @@
 //does NOT send WM_GETTEXTLENGTH.
 //******************************************************************************
-int Win32BaseWindow::GetWindowTextLength()
+int Win32BaseWindow::GetWindowTextLength(BOOL fUnicode)
 {
     //if the destination window is created by this process, send message
     if(dwProcessId == currentProcessId) {
-        return SendInternalMessageA(WM_GETTEXTLENGTH,0,0);
+        if(fUnicode) {
+             return SendInternalMessageW(WM_GETTEXTLENGTH,0,0);
+        }
+        else return SendInternalMessageA(WM_GETTEXTLENGTH,0,0);
     }
     //else get data directory from window structure
-    return wndNameLength;
+    //TODO: must lock window structure.... (TODO)
+    if(fUnicode) {
+        if(windowNameW) {
+             return strlenW(windowNameW);
+        }
+        else return 0;
+    }
+    else {
+        if(windowNameA) {
+             return strlen(windowNameA);
+        }
+        else return 0;
+    }
 }
 //******************************************************************************
@@ -3324 +3371 @@
     if (!windowNameA) lpsz[0] = 0;
     else lstrcpynA(lpsz, windowNameA, cch);
-    return min(wndNameLength, cch);
+    return min((windowNameA ? strlen(windowNameA) : 0), cch);
 }
 //******************************************************************************
@@ -3340 +3387 @@
     if (!windowNameW) lpsz[0] = 0;
     else lstrcpynW(lpsz, windowNameW, cch);
-    return min(wndNameLength, cch);
+    return min((windowNameW ? strlenW(windowNameW) : 0), cch);
 }
 //******************************************************************************