commit 04da8b8f2812f830ec4d000238e85d49e41831e6
author Dmitry Timoshkov <dmitry@sloboda.ru> Mon Jul 10 12:09:31 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 10 12:09:31 2000 +0000
tree ef14f63dd48510cec823db3e87e5e8b34923b77c
parent d5d8480fa5c3a4b4aa55e9d816fe737bf1b53ef2

Convert WND.text field to Unicode.
Add new key to wine.ini in the section [x11drv] - TextCP, which means
code page used for texts passed to X.
Accordingly fix handlers of WM_SETTEXT/WM_GETTEXT.

controls/icontitle.c

diff --git a/controls/icontitle.c b/controls/icontitle.c
index 9e657b7..1e9fe27 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -15,8 +15,6 @@
 #include "desktop.h"
 #include "heap.h"
 
-static  LPCSTR	emptyTitleText = "<...>";
-
 	BOOL	bMultiLineTitle;
 	HFONT	hIconTitleFont;
 
@@ -66,13 +64,14 @@
  */
 static BOOL ICONTITLE_GetTitlePos( WND* wnd, LPRECT lpRect )
 {
-    LPSTR str;
-    int length = lstrlenA( wnd->owner->text );
+    static WCHAR emptyTitleText[] = {'<','.','.','.','>',0};
+    LPWSTR str;
+    int length = lstrlenW( wnd->owner->text );
 
     if( length )
     {
 	str = HeapAlloc( GetProcessHeap(), 0, length + 1 );
-	lstrcpyA( str, wnd->owner->text );
+	lstrcpyW( str, wnd->owner->text );
 	while( str[length - 1] == ' ' ) /* remove trailing spaces */
 	{ 
 	    str[--length] = '\0';
@@ -85,8 +84,8 @@
     }
     if( !length ) 
     {
-	str = (LPSTR)emptyTitleText;
-	length = lstrlenA( str );
+	str = emptyTitleText;
+	length = lstrlenW( str );
     }
 
     if( str )
@@ -100,7 +99,7 @@
 		       GetSystemMetrics(SM_CXBORDER) * 2,
 		       GetSystemMetrics(SM_CYBORDER) * 2 );
 
-	    DrawTextA( hDC, str, length, lpRect, DT_CALCRECT |
+	    DrawTextW( hDC, str, length, lpRect, DT_CALCRECT |
 			 DT_CENTER | DT_NOPREFIX | DT_WORDBREAK |
 			 (( bMultiLineTitle ) ? 0 : DT_SINGLELINE) );