ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Store style bits provided with WM_CREATE.

This commit is contained in:
Nikolay Sivov 2012-01-07 21:36:12 +03:00 committed by Alexandre Julliard
parent 54b6c76720
commit 9188b58e4c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/comctl32/tests/toolbar.c
View File

@ -1658,7 +1658,6 @@ static void test_get_set_style(void)
style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0);
style2 = GetWindowLongA(hToolbar, GWL_STYLE); style2 = GetWindowLongA(hToolbar, GWL_STYLE);
todo_wine
ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2);
/* try to alter common window bits */ /* try to alter common window bits */

5
dlls/comctl32/toolbar.c
View File

@ -5151,12 +5151,11 @@ static LRESULT
TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
{ {
TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0); TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0);
DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
LOGFONTW logFont; LOGFONTW logFont;
TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style);
infoPtr->dwStyle = dwStyle; infoPtr->dwStyle = lpcs->style;
GetClientRect(hwnd, &infoPtr->client_rect); GetClientRect(hwnd, &infoPtr->client_rect);
infoPtr->bUnicode = infoPtr->hwndNotify && infoPtr->bUnicode = infoPtr->hwndNotify &&
(NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY)); (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY));
@ -5167,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
OpenThemeData (hwnd, themeClass); OpenThemeData (hwnd, themeClass);
TOOLBAR_CheckStyle (infoPtr, dwStyle); TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle);
return 0; return 0;
} }