June 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: fc9e0a26bab8f0fc07b5e4074682a6f9b4b533cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9e0a26bab8f0fc07b5e4074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 17:36:13 2016 +0300 user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d91fce444fab9dc408f1e3834b2b0738843ec41) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/scroll.c | 2 +- dlls/user32/tests/scroll.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index be205ef..e844122 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2040,7 +2040,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnableScrollBar( HWND hwnd, UINT nBar, UINT flags nBar = SB_HORZ; } else - bFineWithMe = TRUE; + bFineWithMe = nBar != SB_CTL; if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return FALSE; if (bFineWithMe && infoPtr->flags == flags) return FALSE; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 691855b..1c454fb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,6 +114,15 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + /* disable window, try to reenable */ + ret = EnableWindow( hScroll, FALSE ); + ok( !ret, "got %d\n", ret ); + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "got %d\n", ret ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } @@ -539,7 +548,7 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -551,9 +560,10 @@ static void test_SetScrollInfo(void) memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 100; + si.nMin = 10; si.nPos = 0; si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); @@ -564,6 +574,18 @@ static void test_SetScrollInfo(void) ret = GetScrollInfo(hScroll, SB_CTL, &si); ok(ret, "got %d\n", ret); + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 10; + si.nMin = 100; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(ret, "scroll bar disabled\n"); + DestroyWindow(hScroll); DestroyWindow(mainwnd); }

1 0

Paul Gofman : d3dx9: D3DXVec3Transform should support input and output parameter overlap.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 5907604e9a82cc535ce35e2b3964b8dfae2f87d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5907604e9a82cc535ce35e2b3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Apr 12 13:09:17 2016 +0300 d3dx9: D3DXVec3Transform should support input and output parameter overlap. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ba9cfb5c33f71cd1e1a2ba832b843ca4219a38f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/math.c | 11 +++++++---- dlls/d3dx9_36/tests/math.c | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5e8d51a..84898dc 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1900,12 +1900,15 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3* out, UINT outstride, const D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ac4475d..04378d7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1356,8 +1356,12 @@ static void D3DXVector3Test(void) /*_______________D3DXVec3Transform_______________________*/ expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; - D3DXVec3Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + D3DXVec3Transform(&gottrans, &u, &mat); + expect_vec4(expectedtrans, gottrans); + + gottrans.x = u.x; gottrans.y = u.y; gottrans.z = u.z; + D3DXVec3Transform(&gottrans, (D3DXVECTOR3 *)&gottrans, &mat); + expect_vec4(expectedtrans, gottrans); /*_______________D3DXVec3TransformCoord_______________________*/ expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f;

1 0

Michael Müller : winex11: Add 320x240 as supported resolution in desktop mode.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: cf500d36f4fa857fc89e1a19f2e2ecb6d0606ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf500d36f4fa857fc89e1a19f… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 07:47:49 2016 +0200 winex11: Add 320x240 as supported resolution in desktop mode. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b49601b5cef28a14f1bf5f5dbb56ae3bfa79f1d0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2d8c039..8db1ed0 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Alexander Lakhin : user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 3cf5d768a060b42c51e4ba2479cd7eb85ec1b99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf5d768a060b42c51e4ba247… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:14:49 2016 +0200 user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35ab5f4499185f8df0504b95a99613fa4e30440a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9c52147..efd74f9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -389,13 +389,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); GetClientRect(hWnd, &client); rc = client;

1 0

Austin English : oleaut32: Add OleLoadPictureFile stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 21d3ec418d072e2e02a506085ff437aaa1b6f63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d3ec418d072e2e02a506085… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 14:06:45 2016 -0500 oleaut32: Add OleLoadPictureFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5989664e0f23327fe788c3b44991e70b29e07619) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/olepicture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index f5ad0ef..97aec54 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -390,7 +390,7 @@ 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) -422 stub OleLoadPictureFile +422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 44157de..b67563d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2316,6 +2316,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } /*********************************************************************** + * OleLoadPictureFile (OLEAUT32.422) + */ +HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) +{ + FIXME("(%s %p): stub\n", wine_dbgstr_variant(&file), picture); + return E_NOTIMPL; +} + +/*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename)

1 0

Sebastian Lackner : user32: Set %ecx to address of rect in EnumDisplayMonitors callback.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: f7c6a288ce8a73c2fdfb55d3a0174480e3d235e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c6a288ce8a73c2fdfb55d3a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 05:51:41 2016 +0200 user32: Set %ecx to address of rect in EnumDisplayMonitors callback. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11f6df13eb23260331d9ca8412b9323dbe942885) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 6b1b5ed..7c53ab2 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -471,6 +471,7 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) #ifdef __i386__ /* Some apps pass a non-stdcall callback to EnumDisplayMonitors, * so we need a small assembly wrapper to call it. + * MJ's Help Diagnostic expects that %ecx contains the address to the rect. */ struct enumdisplaymonitors_lparam { @@ -491,6 +492,7 @@ __ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" + "movl 16(%ebp),%ecx\n\t" "call *(%eax)\n\t" /* call orig->proc */ "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t")

1 0

Piotr Caban : msvcp71: Add basic_istream<char>::operator>> export.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 8de4c8cab874ff1ca441aabdbddb3e8254f56ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de4c8cab874ff1ca441aabdb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 19:57:15 2016 +0200 msvcp71: Add basic_istream<char>::operator>> export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62d4e5e6fa0a220a037e0a1764a7a1deb4e939da) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 48f1add..0f8e2d2 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 46e5213..bd38c88 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch

1 0

Sebastian Lackner : user32: Do not block sending/ posting WM_NOTIFY messages.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 1354e84c6d0984f2c26b86251befcb38012c5468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354e84c6d0984f2c26b86251… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 18:28:59 2016 +0200 user32: Do not block sending/posting WM_NOTIFY messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4ac51effaa19b3ddf64f89b23894254608b6294) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 3 +-- dlls/user32/tests/msg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3e419ee..c538161 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -310,8 +310,7 @@ static const unsigned int message_pointer_flags[] = SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c214ecd..c51cb68 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10911,6 +10911,70 @@ static void test_quit_message(void) ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } +static const struct message WmNotifySeq[] = { + { WM_NOTIFY, sent|wparam|lparam, 0x1234, 0xdeadbeef }, + { 0 } +}; + +static void test_notify_message(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); + ok(hwnd != 0, "Failed to create window\n"); + flush_events(); + flush_sequence(); + + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + DestroyWindow(hwnd); +} + static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ { WM_MOUSEACTIVATE, sent|optional }, @@ -15118,6 +15182,7 @@ START_TEST(msg) test_SendMessageTimeout(); test_edit_messages(); test_quit_message(); + test_notify_message(); test_SetActiveWindow(); if (!pTrackMouseEvent)

1 0

Alexander Lakhin : user32: Send WM_CTLCOLOR* message only for visible buttons.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 3512282bafcfe46309f1996ec9c14e267f816bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3512282bafcfe46309f1996ec… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:15:24 2016 +0200 user32: Send WM_CTLCOLOR* message only for visible buttons. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc3f40e21a4beaaabd2d865838bef99a3d12f908) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 53 ++++++++++++++++++++++++++----------------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index efd74f9..13fc746 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -385,31 +385,34 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); - HBRUSH hbrush; - RECT client, rc; - HWND parent = GetParent(hWnd); - UINT message = (btn_type == BS_PUSHBUTTON || - btn_type == BS_DEFPUSHBUTTON || - btn_type == BS_USERBUTTON || - btn_type == BS_OWNERDRAW) ? - WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; - - if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - - GetClientRect(hWnd, &client); - rc = client; - BUTTON_CalcLabelRect(hWnd, hdc, &rc); - /* Clip by client rect bounds */ - if (rc.right > client.right) rc.right = client.right; - if (rc.bottom > client.bottom) rc.bottom = client.bottom; - FillRect(hdc, &rc, hbrush); - ReleaseDC(hWnd, hdc); + if (IsWindowVisible(hWnd)) + { + HDC hdc = GetDC(hWnd); + HBRUSH hbrush; + RECT client, rc; + HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + if (!parent) parent = hWnd; + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + if (!hbrush) /* did the app forget to call DefWindowProc ? */ + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + + GetClientRect(hWnd, &client); + rc = client; + BUTTON_CalcLabelRect(hWnd, hdc, &rc); + /* Clip by client rect bounds */ + if (rc.right > client.right) rc.right = client.right; + if (rc.bottom > client.bottom) rc.bottom = client.bottom; + FillRect(hdc, &rc, hbrush); + ReleaseDC(hWnd, hdc); + } if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 12b0855..c214ecd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5770,7 +5770,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(hwnd, SW_SHOW); ShowWindow(parent, SW_HIDE); @@ -5779,7 +5779,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(parent, SW_SHOW); flush_events();

1 0

Sebastian Lackner : user32/tests: Add tests for button WM_CTLCOLOR* messages.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: b1ad817b574269363e9c3bdd16b17137746fa411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ad817b574269363e9c3bdd1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 22:15:05 2016 +0200 user32/tests: Add tests for button WM_CTLCOLOR* messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c180741e154a73a502c3aff1a15f9e990c2aac4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 58e1437..12b0855 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5372,6 +5372,35 @@ static const struct message WmSetFontStaticSeq[] = { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; +static const struct message WmSetTextButtonSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|parent|optional }, + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; +static const struct message WmSetTextStaticSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetTextGroupSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { 0 } +}; +static const struct message WmSetTextInvisibleSeq[] = +{ + { WM_SETTEXT, sent }, + { 0 } +}; static const struct message WmSetStyleButtonSeq[] = { { BM_SETSTYLE, sent }, @@ -5541,51 +5570,63 @@ static void test_button_messages(void) const struct message *lbuttondown; const struct message *lbuttonup; const struct message *setfont; + const struct message *settext; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextGroupSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5719,6 +5760,30 @@ static void test_button_messages(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(button[i].setcheck, "BM_SETCHECK on a button", FALSE); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 1"); + sprintf(desc, "button[%i]: WM_SETTEXT on a visible button", i); + ok_sequence(button[i].settext, desc, FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(hwnd, SW_SHOW); + ShowWindow(parent, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(parent, SW_SHOW); + flush_events(); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON ||

1 0