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

Timestamp:

Oct 6, 2003, 11:49:38 AM (22 years ago)

Author:

sandervl

Message:

KOM: Fixed heap corruption when changing windows text (DBCS)

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.377 2003-08-08 13:30:20 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.378 2003-10-06 09:49:38 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1586 +1586 @@
         else
         {
-          // determine length of new text
-          int iTextLength = strlen(lpsz);
-
-          if (windowNameLengthA < iTextLength)
-          {
             if (windowNameA)
             {
@@ -1602 +1597 @@
               windowNameW = NULL;
             }
-          }
-
-          windowNameLengthA = iTextLength;
-          if(!windowNameA)
-            windowNameA = (LPSTR)_smalloc(windowNameLengthA+1);
+
+          windowNameLengthA = strlen( lpsz );
+          windowNameA = (LPSTR)_smalloc(windowNameLengthA+1);
           strcpy(windowNameA, lpsz);
-          windowNameLengthW = lstrlenAtoW( windowNameA, -1 );
-          if(!windowNameW)
-            windowNameW = (LPWSTR)_smalloc(( windowNameLengthW + 1 )*sizeof(WCHAR));
+          windowNameLengthW = lstrlenAtoW( lpsz, -1 );
+          windowNameW = (LPWSTR)_smalloc(( windowNameLengthW + 1 )*sizeof(WCHAR));
           lstrcpyAtoW( windowNameW, windowNameA );
         }
@@ -2124 +2116 @@
 
     case WM_IME_CHAR:
-        if( wParam & 0xFF00 ) // DBCS ? 
-            SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam >> 8 ), lParam ); 
+        if( wParam & 0xFF00 ) // DBCS ?
+            SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam >> 8 ), lParam );
         SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam & 0xFF ), lParam );
         break;
@@ -2169 +2161 @@
         else
         {
-          // determine length of new text
-          int iTextLength = lstrlenW(lpsz);
-
-          if (windowNameLengthW < iTextLength)
-          {
             if (windowNameA)
             {
@@ -2185 +2172 @@
               windowNameW = NULL;
             }
-          }
-
-          windowNameLengthW = iTextLength;
-          if(!windowNameW)
-            windowNameW = (LPWSTR)_smalloc((windowNameLengthW+1)*sizeof(WCHAR));
+
+          windowNameLengthW = lstrlenW( lpsz );
+          windowNameW = (LPWSTR)_smalloc((windowNameLengthW+1)*sizeof(WCHAR));
           strcpyW(windowNameW, lpsz);
-          windowNameLengthA = lstrlenWtoA( windowNameW, -1 );
-          if(!windowNameA)
-            windowNameA = (LPSTR)_smalloc( windowNameLengthA + 1 );
+          windowNameLengthA = lstrlenWtoA( lpsz, -1 );
+          windowNameA = (LPSTR)_smalloc( windowNameLengthA + 1 );
           lstrcpyWtoA( windowNameA, windowNameW );
         }