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

Timestamp:

Jul 31, 2003, 5:58:58 PM (22 years ago)

Author:

sandervl

Message:

KOMH: DBCS updates/fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.375 2003-06-03 09:51:05 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.376 2003-07-31 15:56:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -86 +86 @@
 //******************************************************************************
 //******************************************************************************
-Win32BaseWindow::Win32BaseWindow() 
+Win32BaseWindow::Win32BaseWindow()
                      : GenericObject(&windows, &critsect), ChildWindow(&critsect)
 {
@@ -126 +126 @@
   windowNameA      = NULL;
   windowNameW      = NULL;
-  windowNameLength = 0;
-  
+  windowNameLengthA = 0;
+  windowNameLengthW = 0;
+
   userWindowBytes  = NULL;;
   nrUserWindowBytes= 0;
@@ -228 +229 @@
     {
         //if we're the last child that's being destroyed and our
-        //parent window was also destroyed, then we 
+        //parent window was also destroyed, then we
         if(getParent()->IsWindowDestroyed())
         {
@@ -236 +237 @@
         }
     }
-    else 
+    else
     {
         Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
@@ -340 +341 @@
             }
             if (window->getExStyle() & WS_EX_TOPMOST)
-                 cs->dwExStyle |= WS_EX_TOPMOST;          
+                 cs->dwExStyle |= WS_EX_TOPMOST;
 
             RELEASE_WNDOBJ(window);
@@ -389 +390 @@
         cs->lpszClass = buffer;
     }
-
     /* Fix the coordinates */
     fXDefault = FALSE;
@@ -446 +446 @@
                  RELEASE_WNDOBJ(wndparent);
             }
-            else owner = NULL;        
+            else owner = NULL;
 
             if(owner == NULL)
@@ -582 +582 @@
         vertScrollInfo->flags  = ESB_ENABLE_BOTH;
     }
-  
+
     // initially allocate the window name fields
     if(HIWORD(cs->lpszName))
@@ -588 +588 @@
         if (!isUnicode)
         {
-            windowNameLength = strlen(cs->lpszName);
-            windowNameA = (LPSTR)_smalloc(windowNameLength+1);
-            memcpy(windowNameA,cs->lpszName,windowNameLength+1);
-            windowNameW = (LPWSTR)_smalloc((windowNameLength+1)*sizeof(WCHAR));
-            lstrcpynAtoW(windowNameW,windowNameA,windowNameLength+1);
-            windowNameA[windowNameLength] = 0;
-            windowNameW[windowNameLength] = 0;
+            windowNameLengthA = strlen(cs->lpszName);
+            windowNameA = (LPSTR)_smalloc(windowNameLengthA+1);
+            strcpy(windowNameA,cs->lpszName);
+
+            windowNameLengthW = lstrlenAtoW( windowNameA, -1 );
+            windowNameW = (LPWSTR)_smalloc(( windowNameLengthW + 1 ) * sizeof( WCHAR ) );
+            lstrcpyAtoW( windowNameW, windowNameA );
         }
         else
         {
             // Wide
-            windowNameLength = lstrlenW((LPWSTR)cs->lpszName);
-            windowNameW = (LPWSTR)_smalloc( (windowNameLength+1)*sizeof(WCHAR) );
-            memcpy(windowNameW,(LPWSTR)cs->lpszName, (windowNameLength+1)*sizeof(WCHAR) );
-          
+            windowNameLengthW = lstrlenW((LPWSTR)cs->lpszName);
+            windowNameW = (LPWSTR)_smalloc((windowNameLengthW+1)*sizeof(WCHAR));
+            strcpyW(windowNameW,(LPWSTR)cs->lpszName);
+
             // windowNameW[lstrlenW((LPWSTR)cs->lpszName)] = 0; // need ?
-          
+
             // Ascii
-            windowNameA = (LPSTR)_smalloc(windowNameLength+1);
-            WideCharToMultiByte(CP_ACP,
-                                0,
-                                windowNameW,
-                                windowNameLength,
-                                windowNameA,
-                                windowNameLength + 1,
-                                0,
-                                NULL);
-            windowNameA[windowNameLength] = 0;
-        }
-      
+            windowNameLengthA = lstrlenWtoA( windowNameW, -1 );
+            windowNameA = (LPSTR)_smalloc( windowNameLengthA + 1 );
+            lstrcpyWtoA( windowNameA, windowNameW );
+        }
+
+        dprintf(("windowNameA 0x%lx to 0x%lx windowNameW : 0x%lx to 0x%lx",
+                windowNameA, windowNameA + windowNameLengthA,
+                windowNameW, windowNameW + windowNameLengthW ));
+
         if(fOS2Look) {
             OSLibWinSetTitleBarText(OS2HwndFrame, windowNameA);
@@ -752 +749 @@
         //@@PF Popup children of inactive windows can thus bring inactive window
         //on top, this is not correct, popup windows can be on top only if their owner
-        //is in foreground, otherwise they are linked after owner. 
+        //is in foreground, otherwise they are linked after owner.
         if (((dwStyle & (WS_CHILD|WS_POPUP)) == WS_POPUP) && getOwner() && (getOwner()->getWindowHandle() != GetForegroundWindow()))
         {
@@ -1066 +1063 @@
 
     dprintf(("MsgButton %d at (%d,%d)", msg->message, msg->pt.x, msg->pt.y));
-    switch(msg->message) 
+    switch(msg->message)
     {
         case WM_LBUTTONDBLCLK:
@@ -1132 +1129 @@
     SendMessageA(getWindowHandle(),WM_SETCURSOR, getWindowHandle(), MAKELONG(lastHitTestVal, msg->message));
 
-    switch(msg->message) 
+    switch(msg->message)
     {
         case WM_LBUTTONDOWN:
@@ -1155 +1152 @@
 }
 //******************************************************************************
-// 
+//
 // Win32BaseWindow::saveAndValidateUpdateRegion
 //
-//   If an application doesn't validate the update region while processing 
+//   If an application doesn't validate the update region while processing
 //   WM_PAINT, then we must remember it for the next time. Also validates
 //   the current update region.
@@ -1192 +1189 @@
 }
 //******************************************************************************
-// 
+//
 // Win32BaseWindow::checkForDirtyUpdateRegion
 //
-//   If an application doesn't validate the update region while processing 
+//   If an application doesn't validate the update region while processing
 //   WM_PAINT, then we must remember it for the next time. If the window has
 //   a dirty update region, then invalidate that region.
@@ -1250 +1247 @@
 ULONG Win32BaseWindow::MsgChar(MSG *msg)
 {
-    return DispatchMsgA(msg);
+    return IsWindowUnicode() ? DispatchMsgW( msg ) : DispatchMsgA( msg );
 }
 //******************************************************************************
@@ -1276 +1273 @@
     //Send WM_PAINTICON here if minimized, because client window will
     //not receive a (valid) WM_PAINT message
-    if (getStyle() & WS_MINIMIZE) 
+    if (getStyle() & WS_MINIMIZE)
     {
         rc = SendMessageA(getWindowHandle(),WM_PAINTICON, 1, 0);
@@ -1347 +1344 @@
 #endif
   //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
-  if(fOS2Look && ((dwStyle & WS_CAPTION) == WS_CAPTION) && !(dwExStyle & WS_EX_TOOLWINDOW)) 
+  if(fOS2Look && ((dwStyle & WS_CAPTION) == WS_CAPTION) && !(dwExStyle & WS_EX_TOOLWINDOW))
   {
       RECT rect = {0};
@@ -1362 +1359 @@
       rect.top    = rect.bottom - rect.top;
       rect.right  = rectWindow.right - rectWindow.left - rect.right;
- 
+
       rectOS2.xLeft   = rect.left;
       rectOS2.xRight  = rect.right;
@@ -1368 +1365 @@
       rectOS2.yTop    = height - rect.bottom;
 
-      //@@PF Disable close button as well when needed by application 
+      //@@PF Disable close button as well when needed by application
       OSLibChangeCloseButtonState(getOS2FrameWindowHandle(), fCloseButton);
       OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2,
                                     dwStyle, dwExStyle, IconForWindow(ICON_SMALL),
-                                    fCloseButton, windowClass->getIcon() != NULL);
+                    fCloseButton, windowClass->getIcon() != NULL);
   }
   return rc;
@@ -1562 +1559 @@
 
     case WM_GETTEXTLENGTH:
-        return windowNameLength;
+        return windowNameLengthA;
 
     case WM_GETTEXT:
-        if (!lParam || !wParam) 
+        if (!lParam || !wParam)
           return 0;
-        if (!windowNameA) 
+        if (!windowNameA)
           ((LPSTR)lParam)[0] = 0;
-        else 
-          memcpy((LPSTR)lParam, windowNameA, min(windowNameLength+1, wParam) );
-        return min(windowNameLength, wParam);
+        else
+          lstrcpynA(( LPSTR )lParam, windowNameA, wParam );
+        return strlen(( LPSTR )lParam );
 
     case WM_SETTEXT:
     {
         LPCSTR lpsz = (LPCSTR)lParam;
-      
+
         // reallocate if new buffer is larger
         if (!lParam)
@@ -1582 +1579 @@
           free(windowNameA);
           free(windowNameW);
-          windowNameLength = 0;
+          windowNameLengthA = 0;
+          windowNameLengthW = 0;
           windowNameA      = NULL;
           windowNameW      = NULL;
@@ -1590 +1588 @@
           // determine length of new text
           int iTextLength = strlen(lpsz);
-          
-          if (windowNameLength < iTextLength)
+
+          if (windowNameLengthA < iTextLength)
           {
             if (windowNameA)
@@ -1598 +1596 @@
               windowNameA = NULL;
             }
-          
+
             if (windowNameW)
             {
@@ -1605 +1603 @@
             }
           }
-      
-          windowNameLength = iTextLength;
+
+          windowNameLengthA = iTextLength;
           if(!windowNameA)
-            windowNameA = (LPSTR)_smalloc(windowNameLength+1);
-          memcpy(windowNameA, lpsz, windowNameLength+1);
+            windowNameA = (LPSTR)_smalloc(windowNameLengthA+1);
+          strcpy(windowNameA, lpsz);
+          windowNameLengthW = lstrlenAtoW( windowNameA, -1 );
           if(!windowNameW)
-            windowNameW = (LPWSTR)_smalloc((windowNameLength+1)*sizeof(WCHAR));
-          lstrcpynAtoW(windowNameW, windowNameA, windowNameLength+1);
-        }
-      
+            windowNameW = (LPWSTR)_smalloc(( windowNameLengthW + 1 )*sizeof(WCHAR));
+          lstrcpyAtoW( windowNameW, windowNameA );
+        }
+
         dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, lParam));
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
@@ -1675 +1674 @@
         dprintf(("DefWndProc: WM_MOUSEACTIVATE for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
         if (::GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)
-        {
-            LONG ret = ::SendMessageW( ::GetParent(hwnd), WM_MOUSEACTIVATE, wParam, lParam );
-            if (ret) return ret;
-        }
-
-        /* Caption clicks are handled by the NC_HandleNCLButtonDown() */
+    {
+        LONG ret = ::SendMessageW( ::GetParent(hwnd), WM_MOUSEACTIVATE, wParam, lParam );
+        if (ret) return ret;
+    }
+
+    /* Caption clicks are handled by the NC_HandleNCLButtonDown() */
         return (LOWORD(lParam) >= HTCLIENT) ? MA_ACTIVATE : MA_NOACTIVATE;
     }
@@ -1754 +1753 @@
         if (::GetWindowLongA( getWindowHandle(), GWL_STYLE ) & WS_CHILD)
             return ::SendMessageA( ::GetParent(getWindowHandle()), WM_MOUSEWHEEL, wParam, lParam );
-        break;
+    break;
 
     case WM_WINDOWPOSCHANGED:
@@ -1789 +1788 @@
       RECT   rect;
       int    rc;
-     
-        if (!windowClass || (!windowClass->getBackgroundBrush() 
+
+        if (!windowClass || (!windowClass->getBackgroundBrush()
                               && !(getStyle() & WS_MINIMIZE))) return 0;
 
@@ -1804 +1803 @@
                 hBrush = GetSysColorBrush(hBrush-1);
         }
-             
+
 
         rc = GetClipBox( (HDC)wParam, &rect );
@@ -1905 +1904 @@
 
     case WM_KEYDOWN:
-        if(wParam == VK_F10) iF10Key = VK_F10;
-        break;
+    if(wParam == VK_F10) iF10Key = VK_F10;
+    break;
 
     case WM_SYSKEYDOWN:
     {
-        if( HIWORD(lParam) & KEYDATA_ALT )
-        {
-            /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */
-              if( wParam == VK_MENU && !iMenuSysKey )
-                iMenuSysKey = 1;
-              else
-                iMenuSysKey = 0;
-            
-            iF10Key = 0;
-
-            if( wParam == VK_F4 )       /* try to close the window */
-            {
+    if( HIWORD(lParam) & KEYDATA_ALT )
+    {
+        /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */
+          if( wParam == VK_MENU && !iMenuSysKey )
+        iMenuSysKey = 1;
+          else
+        iMenuSysKey = 0;
+
+        iF10Key = 0;
+
+        if( wParam == VK_F4 )   /* try to close the window */
+        {
                 HWND top = GetTopParent();
                 if (!(GetClassLongW( top, GCL_STYLE ) & CS_NOCLOSE))
                     PostMessageW( top, WM_SYSCOMMAND, SC_CLOSE, 0 );
-            }
+        }
 
             //Default OS/2 app behaviour for system keys
             if(fOS2Look)
             {
-                    if( wParam == VK_F5 )       /* try to restore the window */
-                    {
-                        HWND top = GetTopParent();
+            if( wParam == VK_F5 )   /* try to restore the window */
+            {
+                    HWND top = GetTopParent();
                         /* No checks needed SC_RESTORE handler does them */
-                        PostMessageW( top, WM_SYSCOMMAND, SC_RESTORE, 0 );
-                    }
-
-                    if( wParam == VK_F7 )       /* size the window */
-                    {
-                        HWND top = GetTopParent();
-                        PostMessageW( top, WM_SYSCOMMAND, SC_MOVE, 0 );
-                    }
-
-                    if( wParam == VK_F8 )       /* move the window */
-                    {
-                        HWND top = GetTopParent();
-                        if ( GetWindowLongA(top, GWL_STYLE) & WS_SIZEBOX)
-                        PostMessageW( top, WM_SYSCOMMAND, SC_SIZE, 0 );
-                    }
-
-                    if( wParam == VK_F9 )       /* try to minimize the window */
-                    {
-                        HWND top = GetTopParent();
-                        if ( GetWindowLongA(top, GWL_STYLE) & WS_MINIMIZEBOX)
-                            PostMessageW( top, WM_SYSCOMMAND, SC_MINIMIZE, 0 );
-                    }
-
-                    if( wParam == VK_F10 )      /* try to maximize the window */
-                    {
-                        HWND top = GetTopParent();
-                        if ( GetWindowLongA(top, GWL_STYLE) & WS_MAXIMIZEBOX)
-                            PostMessageW( top, WM_SYSCOMMAND, SC_MAXIMIZE, 0 );
-                    }
-            }
-
-        } 
-        else if( wParam == VK_F10 )
-                iF10Key = 1;
-             else
-                if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000))
+                    PostMessageW( top, WM_SYSCOMMAND, SC_RESTORE, 0 );
+            }
+
+            if( wParam == VK_F7 )   /* size the window */
+            {
+                    HWND top = GetTopParent();
+                    PostMessageW( top, WM_SYSCOMMAND, SC_MOVE, 0 );
+            }
+
+            if( wParam == VK_F8 )   /* move the window */
+            {
+                    HWND top = GetTopParent();
+                    if ( GetWindowLongA(top, GWL_STYLE) & WS_SIZEBOX)
+                    PostMessageW( top, WM_SYSCOMMAND, SC_SIZE, 0 );
+            }
+
+            if( wParam == VK_F9 )   /* try to minimize the window */
+            {
+                    HWND top = GetTopParent();
+                    if ( GetWindowLongA(top, GWL_STYLE) & WS_MINIMIZEBOX)
+                        PostMessageW( top, WM_SYSCOMMAND, SC_MINIMIZE, 0 );
+            }
+
+            if( wParam == VK_F10 )  /* try to maximize the window */
+            {
+                    HWND top = GetTopParent();
+                    if ( GetWindowLongA(top, GWL_STYLE) & WS_MAXIMIZEBOX)
+                        PostMessageW( top, WM_SYSCOMMAND, SC_MAXIMIZE, 0 );
+            }
+            }
+
+    }
+    else if( wParam == VK_F10 )
+            iF10Key = 1;
+         else
+            if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000))
                     SendMessageW(getWindowHandle(), WM_SYSCOMMAND, SC_KEYMENU, VK_SPACE );
         return 0;
@@ -1979 +1978 @@
         // no break;
     case WM_SYSKEYUP:
-        /* Press and release F10 or ALT */
-        if (((wParam == VK_MENU) && iMenuSysKey) ||
+    /* Press and release F10 or ALT */
+    if (((wParam == VK_MENU) && iMenuSysKey) ||
             ((wParam == VK_F10) && iF10Key))
               ::SendMessageW( GetTopParent(), WM_SYSCOMMAND, SC_KEYMENU, 0L );
-        iMenuSysKey = iF10Key = 0;
+    iMenuSysKey = iF10Key = 0;
         break;
 
@@ -2020 +2019 @@
     case WM_RBUTTONUP:
         {
-            POINT pt;
-            pt.x = SLOWORD(lParam);
-            pt.y = SHIWORD(lParam);
-            ClientToScreen(getWindowHandle(), &pt);
+        POINT pt;
+        pt.x = SLOWORD(lParam);
+        pt.y = SHIWORD(lParam);
+        ClientToScreen(getWindowHandle(), &pt);
             SendMessageA( getWindowHandle(), WM_CONTEXTMENU, getWindowHandle(),MAKELPARAM(pt.x, pt.y) );
         }
@@ -2136 +2135 @@
     {
     case WM_GETTEXTLENGTH:
-        return windowNameLength;
+        return windowNameLengthW;
 
     case WM_GETTEXT:
-        if (!lParam || !wParam) 
+        if (!lParam || !wParam)
           return 0;
         if (!windowNameW)
           ((LPWSTR)lParam)[0] = 0;
-        else 
-          memcpy((LPSTR)lParam, windowNameW, min( sizeof(WCHAR) * (windowNameLength+1), wParam) );
-        return min(windowNameLength, wParam);
+        else
+          lstrcpynW(( LPWSTR )lParam, windowNameW, wParam );
+
+        return strlenW(( LPWSTR )lParam );
 
     case WM_SETTEXT:
     {
         LPWSTR lpsz = (LPWSTR)lParam;
-      
+
         // reallocate if new buffer is larger
         if (!lParam)
@@ -2156 +2156 @@
           free(windowNameA);
           free(windowNameW);
-          windowNameLength = 0;
+          windowNameLengthA = 0;
+          windowNameLengthW = 0;
           windowNameA      = NULL;
           windowNameW      = NULL;
@@ -2164 +2165 @@
           // determine length of new text
           int iTextLength = lstrlenW(lpsz);
-          
-          if (windowNameLength < iTextLength)
+
+          if (windowNameLengthW < iTextLength)
           {
             if (windowNameA)
@@ -2172 +2173 @@
               windowNameA = NULL;
             }
-          
+
             if (windowNameW)
             {
@@ -2179 +2180 @@
             }
           }
-      
-          windowNameLength = iTextLength;
+
+          windowNameLengthW = iTextLength;
           if(!windowNameW)
-            windowNameW = (LPWSTR)_smalloc((windowNameLength+1)*sizeof(WCHAR));
-          memcpy(windowNameW, lpsz, (windowNameLength+1) * sizeof(WCHAR));
+            windowNameW = (LPWSTR)_smalloc((windowNameLengthW+1)*sizeof(WCHAR));
+          strcpyW(windowNameW, lpsz);
+          windowNameLengthA = lstrlenWtoA( windowNameW, -1 );
           if(!windowNameA)
-            windowNameA = (LPSTR)_smalloc(windowNameLength+1);
-          lstrcpynWtoA(windowNameA, windowNameW, windowNameLength+1);
-        }
-
-        dprintf(("WM_SETTEXT of %x\n",Win32Hwnd));
+            windowNameA = (LPSTR)_smalloc( windowNameLengthA + 1 );
+          lstrcpyWtoA( windowNameA, windowNameW );
+        }
+
+        dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, windowNameA));
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
@@ -2259 +2261 @@
         hWndIcon = windowClass->getIcon();
     else
-    if (!(dwStyle & DS_MODALFRAME)) 
+    if (!(dwStyle & DS_MODALFRAME))
     {//SvL: load it as shared or else we'll leak icons
          hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR|LR_SHARED);
@@ -2279 +2281 @@
         hWndIcon = windowClass->getIcon();
     else
-    if (!(dwStyle & DS_MODALFRAME)) 
+    if (!(dwStyle & DS_MODALFRAME))
     {//SvL: load it as shared or else we'll leak icons
          hWndIcon = LoadImageA(0,MAKEINTRESOURCEA(OIC_ODINICON),IMAGE_ICON,0,0,LR_DEFAULTCOLOR|LR_SHARED);
@@ -2310 +2312 @@
         dprintf(("ShowWindow: GetProcessDword(0, GPD_STARTF_SHOWWINDOW) -> %x", nCmdShow));
     }
- 
+
 
     switch(nCmdShow)
@@ -2433 +2435 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, 
+BOOL Win32BaseWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx,
                                    int cy, UINT fuFlags, BOOL fShowWindow)
 {
@@ -2538 +2540 @@
         OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
     }
-    if((dwOldStyle & WS_MINIMIZE) && (getStyle() & WS_MINIMIZE)) 
+    if((dwOldStyle & WS_MINIMIZE) && (getStyle() & WS_MINIMIZE))
     {//don't allow size changes if the window is minimized
      //we will update the restore position at the end of this method
@@ -2589 +2591 @@
     //SvL: Must also deactivate the window when hiding it or else focus won't
     //     change. (NOTE: make sure this doesn't cause regressions (01-02-2003)
-    if((swp.fl & (SWPOS_HIDE|SWPOS_DEACTIVATE)) == (SWPOS_HIDE|SWPOS_DEACTIVATE)) 
+    if((swp.fl & (SWPOS_HIDE|SWPOS_DEACTIVATE)) == (SWPOS_HIDE|SWPOS_DEACTIVATE))
     {
         //we must make sure the owner is not disabled or else the focus will
@@ -2687 +2689 @@
          wpos->y      = rectWindow.top;
     }
-   
+
     WINDOWPOS wpOld = *wpos;
     if(!(wpos->flags & SWP_NOSENDCHANGING))
@@ -2823 +2825 @@
         return FALSE;
     }
-  
+
     if(!(getStyle() & WS_CHILD) && getOwner() == NULL)
     {
@@ -2854 +2856 @@
     }
     dprintf(("DestroyWindow %x -> HIDDEN", hwnd));
-  
+
     // check the handle for the last active popup window
     Win32BaseWindow* owner = getOwner();
@@ -2870 +2872 @@
         //     (MFC created modeless dialog)
         //TODO: This might be the wrong place to do it. EndDialog is called,
-        //      so perhaps it should be done there. (although Wine only 
+        //      so perhaps it should be done there. (although Wine only
         //      enables the owner if the dialog is modal)
         ::EnableWindow(owner->getWindowHandle(), 1);
     }
-  
+
     fDestroyWindowCalled = TRUE;
 
@@ -2929 +2931 @@
   Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
 
-    if(getStyle() & WS_CHILD) 
+    if(getStyle() & WS_CHILD)
     {
         if(wndparent) {
@@ -2938 +2940 @@
         return 0;
     }
-    else 
+    else
     if(getStyle() & WS_POPUP)
          return (getOwner()) ? getOwner()->getWindowHandle() : 0;
@@ -3027 +3029 @@
     // in release build.
     Win32BaseWindow *_parent = getParent();
-    
-    if(_parent) 
+
+    if(_parent)
     {
         if(_parent->getWindowHandle() == hwndParent)
             return TRUE;
-    
+
         return _parent->IsChild(hwndParent);
     }
-    else 
+    else
         return 0;
 }
@@ -3208 +3210 @@
     dprintf(("EnumWindows %x %x", lpfn, lParam));
 
-    for(int i=0;i<MAX_WINDOW_HANDLES;i++) 
+    for(int i=0;i<MAX_WINDOW_HANDLES;i++)
     {
         window = Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -3440 +3442 @@
              if(window->state >= STATE_POST_WMNCCREATE) {
                  hwndRelated = window->getWindowHandle();
-                 RELEASE_WNDOBJ(window); 
+                 RELEASE_WNDOBJ(window);
              }
              else {
                  hwndRelated = window->GetWindow(GW_HWNDNEXT);
-                 RELEASE_WNDOBJ(window); 
+                 RELEASE_WNDOBJ(window);
              }
         }
@@ -3497 +3499 @@
 //******************************************************************************
 PRECT Win32BaseWindow::getWindowRect()
-{ 
-    return &rectWindow; 
+{
+    return &rectWindow;
 }
 //******************************************************************************
@@ -3668 +3670 @@
 {
     //if the destination window is created by this process, send message
-    if(dwProcessId == currentProcessId) 
+    if(dwProcessId == currentProcessId)
     {
         if(fUnicode) {
@@ -3677 +3679 @@
     //else get data directory from window structure
     //TODO: must lock window structure.... (TODO)
-    return windowNameLength;
+    return fUnicode ? windowNameLengthW : windowNameLengthA;
 }
 //******************************************************************************
@@ -3689 +3691 @@
         return SendMessageA(getWindowHandle(),WM_GETTEXT,(WPARAM)cch,(LPARAM)lpsz);
     }
-  
+
     //else get data directory from window structure
     if (!lpsz || !cch) return 0;
     if (!windowNameA) lpsz[0] = 0;
-    else memcpy(lpsz, windowNameA, min(windowNameLength + 1, cch) );
-    return min(windowNameLength, cch);
+    else lstrcpynA( lpsz, windowNameA, cch );
+    return strlen( lpsz );
 }
 //******************************************************************************
@@ -3707 +3709 @@
     }
     //else get data directory from window structure
-    if (!lpsz || !cch) 
+    if (!lpsz || !cch)
         return 0;
-    if (!windowNameW) 
+    if (!windowNameW)
         lpsz[0] = 0;
-    else 
-        memcpy(lpsz, windowNameW, min( sizeof(WCHAR) * (windowNameLength+1), cch));
-           
-    return min(windowNameLength, cch);
+    else
+        lstrcpynW( lpsz, windowNameW, cch );
+
+    return strlenW( lpsz );
 }
 //******************************************************************************
@@ -3751 +3753 @@
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
 
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(),
                                     getStyle(), getExStyle(),ss.styleOld);
 
@@ -3760 +3762 @@
         {
                 STYLESTRUCT ss;
- 
+
                 //SvL: TODO: Can you change minimize or maximize status here too?
 
@@ -3768 +3770 @@
                 }
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x (%x)", getWindowHandle(), dwStyle, value));
-                
+
                 //Changing WS_CHILD style is allowed
                 ss.styleOld = getStyle();
@@ -3776 +3778 @@
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
 
-                 OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
+                 OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(),
                                     getStyle(), getExStyle(),ss.styleOld);
 
@@ -3941 +3943 @@
     switch(index)
     {
-    case GWW_ID:         
-        if(HIWORD(getWindowId()))
+    case GWW_ID:
+        if(HIWORD(getWindowId()))
             dprintf(("WARNING: GWW_ID: discards high bits of 0x%08x!\n", getWindowId()));
         return (WORD)getWindowId();
 
-    case GWW_HWNDPARENT: 
+    case GWW_HWNDPARENT:
         dprintf(("WARNING: GWW_HWNDPARENT: discards high bits of 0x%08x!\n", GetParent()));
-        return (WORD) GetParent();
-
-    case GWW_HINSTANCE:  
-        if (HIWORD(hInstance))
+        return (WORD) GetParent();
+
+    case GWW_HINSTANCE:
+        if (HIWORD(hInstance))
             dprintf(("WARNING: GWW_HINSTANCE: discards high bits of 0x%08x!\n", hInstance));
         return (WORD)hInstance;
@@ -3969 +3971 @@
 //    VISRGN_NOTIFY_PROC lpNotifyProc    - notification handler
 //    DWORD              dwUserData      - caller supplied parameter for handler invocations
-// 
+//
 // Returns:
 //    TRUE              - Success
@@ -3989 +3991 @@
 // Parameters:
 //    BOOL   fDrawingAllowed    - drawing is allowed or not
-// 
+//
 // Returns:
 //    TRUE              - Success
@@ -3995 +3997 @@
 //
 //******************************************************************************
-void Win32BaseWindow::callVisibleRgnNotifyProc(BOOL fDrawingAllowed) 
+void Win32BaseWindow::callVisibleRgnNotifyProc(BOOL fDrawingAllowed)
 {
     if(fDrawingAllowed) {
@@ -4016 +4018 @@
 //    int  chdcWindow   - size of HDC array       (IN)
 //    int *pnrdcs       - number of HDCs returned (OUT)
-// 
+//
 // Returns:
 //    TRUE              - Success
@@ -4050 +4052 @@
 // Parameters:
 //    HDC hdc            - HDC to be added to our list of open DCs
-// 
+//
 // Returns:
 //
@@ -4083 +4085 @@
 // Parameters:
 //    HDC hdc            - HDC to be removed from our list of open DCs
-// 
+//
 // Returns:
 //
@@ -4141 +4143 @@
 {
  DWORD            magic;
- HWND             hwnd; 
+ HWND             hwnd;
 
     if(hwndOS2 == OSLIB_HWND_DESKTOP)
@@ -4157 +4159 @@
 //  dprintf2(("Win32BaseWindow::GetWindowFromOS2Handle: not an Odin os2 window %x", hwndOS2));
 
-    //Now check if it's a fake window 
+    //Now check if it's a fake window
     Win32FakeWindow *window = Win32FakeWindow::GetWindowFromOS2Handle(hwndOS2);
     if(window) {