From f77b7935358986a217c9ab73835d0949d3470b6f Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 27 Nov 2015 22:46:41 +0000 Subject: [PATCH 1/1] [USER32] Sync icontitle.c with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=70166 --- reactos/media/doc/README.WINE | 2 +- reactos/win32ss/user/user32/controls/icontitle.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 8a4bc63a101..95804277e5d 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -296,7 +296,7 @@ User32 - reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 diff --git a/reactos/win32ss/user/user32/controls/icontitle.c b/reactos/win32ss/user/user32/controls/icontitle.c index d8c9d9e9c85..4948b8268ca 100644 --- a/reactos/win32ss/user/user32/controls/icontitle.c +++ b/reactos/win32ss/user/user32/controls/icontitle.c @@ -126,7 +126,7 @@ static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive ) { RECT rect; HFONT hPrevFont; - HBRUSH hBrush = 0; + HBRUSH hBrush; COLORREF textColor = 0; if( bActive ) @@ -213,7 +213,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, case WM_CLOSE: return 0; case WM_SHOWWINDOW: - if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); + if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: if( GetWindowLongPtrW( owner, GWL_STYLE ) & WS_CHILD ) -- 2.17.1