Author: akhaldi
Date: Fri Nov 27 22:46:41 2015
New Revision: 70166
URL:
http://svn.reactos.org/svn/reactos?rev=70166&view=rev
Log:
[USER32] Sync icontitle.c with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/media/doc/README.WINE
trunk/reactos/win32ss/user/user32/controls/icontitle.c
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Nov 27 22:46:41 2015
@@ -296,7 +296,7 @@
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
Modified: trunk/reactos/win32ss/user/user32/controls/icontitle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro…
==============================================================================
--- trunk/reactos/win32ss/user/user32/controls/icontitle.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/controls/icontitle.c [iso-8859-1] Fri Nov 27
22:46:41 2015
@@ -126,7 +126,7 @@
{
RECT rect;
HFONT hPrevFont;
- HBRUSH hBrush = 0;
+ HBRUSH hBrush;
COLORREF textColor = 0;
if( bActive )
@@ -213,7 +213,7 @@
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 )