From 51d20d699d26e751af4b886c2112025c2ed865ff Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 17 Jan 2009 21:45:00 +0000 Subject: [PATCH] user32: sync icontitle.c with Wine 1.1.13 Alexandre Julliard user32: Store the builtin class names in Unicode. Rob Shearman user32: Fix incorrect character count passed to GetWindowTextW in ICONTITLE_Paint. svn path=/trunk/; revision=38856 --- reactos/dll/win32/user32/controls/icontitle.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/user32/controls/icontitle.c b/reactos/dll/win32/user32/controls/icontitle.c index 12af0b161b9..a884c01e34d 100644 --- a/reactos/dll/win32/user32/controls/icontitle.c +++ b/reactos/dll/win32/user32/controls/icontitle.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include @@ -37,7 +37,7 @@ static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPAR */ const struct builtin_class_descr ICONTITLE_builtin_class = { - ICONTITLE_CLASS_ATOM, /* name */ + (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ IconTitleWndProc, /* procW */ @@ -60,11 +60,11 @@ HWND ICONTITLE_Create( HWND owner ) if (!IsWindowEnabled(owner)) style |= WS_DISABLED; if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, + hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL, style | WS_CHILD, 0, 0, 1, 1, GetParent(owner), 0, instance, NULL ); else - hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, + hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL, style, 0, 0, 1, 1, owner, 0, instance, NULL ); WIN_SetOwner( hWnd, owner ); /* MDI depends on this */ @@ -175,7 +175,7 @@ static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive ) { WCHAR buffer[80]; - INT length = GetWindowTextW( owner, buffer, sizeof(buffer) ); + INT length = GetWindowTextW( owner, buffer, sizeof(buffer)/sizeof(buffer[0]) ); SetTextColor( hDC, textColor ); SetBkMode( hDC, TRANSPARENT ); @@ -222,8 +222,8 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: - if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 ); + if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) + lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 ); else lParam = (owner == GetActiveWindow()); if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) )