June 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9/tests: Add tests for updating boolean matrices on CommitChanges.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 8bc783ef3011de1404f5fcc418cdcd54deae8dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc783ef3011de1404f5fcc41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:11 2017 +0300 d3dx9/tests: Add tests for updating boolean matrices on CommitChanges. 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> --- dlls/d3dx9_36/tests/effect.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 966f1bd..6ec07a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5128,6 +5128,17 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"arr2", {0x60000000, 0x00000000}}, {"ts3", {0x00000fc0, 0x00000000}}, }; + static const struct + { + const char *param_name; + const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_bconsts) + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; + } + check_bconsts_parameters[] = + { + {"mb2x3row", {0x0000001f}}, + {"mb2x3column", {0x00000060}}, + }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; @@ -5139,6 +5150,8 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; + unsigned char buffer[256]; + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), NULL, NULL, 0, NULL, &effect, NULL); @@ -5180,8 +5193,6 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) for (i = 0; i < ARRAY_SIZE(check_vconsts_parameters); ++i) { - unsigned char buffer[256]; - test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, check_vconsts_parameters[i].param_name); ok(!!param, "GetParameterByName failed.\n"); @@ -5196,6 +5207,22 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) check_vconsts_parameters[i].param_name); } + for (i = 0; i < ARRAY_SIZE(check_bconsts_parameters); ++i) + { + test_effect_preshader_clear_pbool_consts(device); + param = effect->lpVtbl->GetParameterByName(effect, NULL, check_bconsts_parameters[i].param_name); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->GetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_pbool_consts(device, check_bconsts_parameters[i].const_updated_mask, + check_bconsts_parameters[i].param_name); + } + test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Selector"); ok(!!param, "GetParameterByName failed.\n");

1 0

Paul Gofman : d3dx9: Remove redundant FIXME in set_constants().
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 68e6691a5b1b6b08f7fc8e92ad2ee17e7147e847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e6691a5b1b6b08f7fc8e92a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:12 2017 +0300 d3dx9: Remove redundant FIXME in set_constants(). 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> --- dlls/d3dx9_36/preshader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index cc103f5..a6320f9 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1072,12 +1072,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) - { - if (table != PRES_REGTAB_OBCONST) - FIXME("Output offset exceeds regiser count, name %s, component %u.\n", - debugstr_a(param->name), i); break; - } offset += start_offset; if (info.transpose) param_offset = i + j * info.major;

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to a FIXME() message.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: aacf28d701b08d8dae75af0d5fbcd6e791038bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacf28d701b08d8dae75af0d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:23 2017 +0200 d3dx9_36: Add a trailing '\n' to a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a6320f9..522d484 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -868,7 +868,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } if (reg_idx >= pres->regs.table_sizes[table]) { - FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.", + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", i, j, table, reg_idx); return D3DXERR_INVALIDDATA; }

1 0

Sebastian Lackner : ntdll: Do not cast unaligned pointer to M128A in set_context_reg.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d2ec61105d47543ae5bddf393d384b5165795ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ec61105d47543ae5bddf393… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:50:48 2017 +0200 ntdll: Do not cast unaligned pointer to M128A in set_context_reg. GCC 7.x will assume 'val' is properly aligned when using a cast. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 61bb2dd..86034c0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) case 14: context->R14 = *(ULONG64 *)val; break; case 15: context->R15 = *(ULONG64 *)val; break; case 16: context->Rip = *(ULONG64 *)val; break; - case 17: context->u.s.Xmm0 = *(M128A *)val; break; - case 18: context->u.s.Xmm1 = *(M128A *)val; break; - case 19: context->u.s.Xmm2 = *(M128A *)val; break; - case 20: context->u.s.Xmm3 = *(M128A *)val; break; - case 21: context->u.s.Xmm4 = *(M128A *)val; break; - case 22: context->u.s.Xmm5 = *(M128A *)val; break; - case 23: context->u.s.Xmm6 = *(M128A *)val; break; - case 24: context->u.s.Xmm7 = *(M128A *)val; break; - case 25: context->u.s.Xmm8 = *(M128A *)val; break; - case 26: context->u.s.Xmm9 = *(M128A *)val; break; - case 27: context->u.s.Xmm10 = *(M128A *)val; break; - case 28: context->u.s.Xmm11 = *(M128A *)val; break; - case 29: context->u.s.Xmm12 = *(M128A *)val; break; - case 30: context->u.s.Xmm13 = *(M128A *)val; break; - case 31: context->u.s.Xmm14 = *(M128A *)val; break; - case 32: context->u.s.Xmm15 = *(M128A *)val; break; - case 33: context->u.s.Legacy[0] = *(M128A *)val; break; - case 34: context->u.s.Legacy[1] = *(M128A *)val; break; - case 35: context->u.s.Legacy[2] = *(M128A *)val; break; - case 36: context->u.s.Legacy[3] = *(M128A *)val; break; - case 37: context->u.s.Legacy[4] = *(M128A *)val; break; - case 38: context->u.s.Legacy[5] = *(M128A *)val; break; - case 39: context->u.s.Legacy[6] = *(M128A *)val; break; - case 40: context->u.s.Legacy[7] = *(M128A *)val; break; + case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break; + case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break; + case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break; + case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break; + case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break; + case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break; + case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break; + case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break; + case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break; + case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break; + case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break; + case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break; + case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break; + case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break; + case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break; + case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break; + case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break; + case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break; + case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break; + case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break; + case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break; + case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break; + case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break; + case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break; } }

1 0

Huw Davies : riched20: The background colour is set using \highlight.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 17b7cde00ee4fb8750fd21500b2ede69af167fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b7cde00ee4fb8750fd21500… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 14:18:40 2017 +0100 riched20: The background colour is set using \highlight. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 2 +- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++-- dlls/riched20/writer.c | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index a05b7fc..0310109 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1377,7 +1377,7 @@ static RTFKey rtfKey[] = { rtfCharAttr, rtfSuperScrShrink, "super", 0 }, { rtfCharAttr, rtfInvisible, "v", 0 }, { rtfCharAttr, rtfForeColor, "cf", 0 }, - { rtfCharAttr, rtfBackColor, "cb", 0 }, + { rtfCharAttr, rtfBackColor, "highlight", 0 }, { rtfCharAttr, rtfRTLChar, "rtlch", 0 }, { rtfCharAttr, rtfLTRChar, "ltrch", 0 }, { rtfCharAttr, rtfCharStyleNum, "cs", 0 }, diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ef53c56..20189c6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8537,19 +8537,23 @@ static void test_WM_GETTEXTLENGTH(void) DestroyWindow(hwndRichEdit); } -static void test_rtf_specials(void) +static void test_rtf(void) { const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, 0x201d,0x200e,0x200f,0x200d,0x200c}; const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; + const char *highlight = "{\\rtf1{\\colortbl;\\red0\\green0\\blue0;\\red128\\green128\\blue128;\\red192\\green192\\blue192;}\\cf2\\highlight3 foo\\par}"; + HWND edit = new_richeditW( NULL ); EDITSTREAM es; WCHAR buf[80]; LRESULT result; PARAFORMAT2 fmt; + CHARFORMAT2W cf; + /* Test rtf specials */ es.dwCookie = (DWORD_PTR)&specials; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; @@ -8580,6 +8584,18 @@ static void test_rtf_specials(void) ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + /* Test \highlight */ + es.dwCookie = (DWORD_PTR)&highlight; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 3, "got %ld\n", result ); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + memset( &cf, 0, sizeof(cf) ); + cf.cbSize = sizeof(cf); + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( (cf.dwEffects & (CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)) == 0, "got %08x\n", cf.dwEffects ); + ok( cf.crTextColor == RGB(128,128,128), "got %08x\n", cf.crTextColor ); + ok( cf.crBackColor == RGB(192,192,192), "got %08x\n", cf.crBackColor ); + DestroyWindow( edit ); } @@ -8769,7 +8785,7 @@ START_TEST( editor ) test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); - test_rtf_specials(); + test_rtf(); test_background(); test_eop_char_fmt(); test_para_numbering(); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 1cd293c..5494afe 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -775,7 +775,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0; else find_color_in_colortbl( pStream, fmt->crBackColor, &i ); - sprintf(props + strlen(props), "\\cb%u", i); + sprintf(props + strlen(props), "\\highlight%u", i); } if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR || (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor))

1 0

Huw Davies : user32: Allow button-down events on the system menu to continue tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 77026e244cb70cc3131be45c4c2fb9931b3d3a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77026e244cb70cc3131be45c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:11 2017 +0100 user32: Allow button-down events on the system menu to continue tracking. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a65f01e..d198ddf 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2583,7 +2583,7 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) { UINT pos; POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - enum hittest ht = ht_nowhere; + enum hittest ht = ht_item; if( IS_SYSTEM_MENU(ptmenu) ) pos = 0;

1 0

Huw Davies : user32: A second button-up on the system menu should end the tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 580915040edfdd6308aad7b98ccfa675a912e0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=580915040edfdd6308aad7b98… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:12 2017 +0100 user32: A second button-up on the system menu should end the tracking. This isn't quite how Windows behaves. Windows doesn't follow the tracking between the menu-bar and the system menu, while Wine does. Since the system menu of top-level windows is likely to be hidden by Wine's graphics driver, this seems like useful behaviour to keep and thus this patch makes things behave sensibly. Even without Wine's special tracking behaviour, this patch is an improvement. The tracking state has no reason to be stored in the menu structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index d198ddf..95e4ef6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -94,7 +94,6 @@ typedef struct { MENUITEM *items; /* Array of menu items */ UINT FocusedItem; /* Currently focused item */ HWND hwndOwner; /* window receiving the messages for ownerdraw */ - BOOL bTimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ BOOL bScrolling; /* Scroll arrows are active */ UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ @@ -114,6 +113,7 @@ typedef struct { #define TF_ENDMENU 0x10000 #define TF_SUSPENDPOPUP 0x20000 #define TF_SKIPREMOVE 0x40000 +#define TF_RCVD_BTN_UP 0x80000 typedef struct { @@ -2643,11 +2643,11 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ - if((pmt->hTopMenu == hPtMenu) && ptmenu->bTimeToHide) + if(((pmt->hTopMenu == hPtMenu) || IS_SYSTEM_MENU(ptmenu)) && (pmt->trackFlags & TF_RCVD_BTN_UP)) return 0; } - if( GetMenu(ptmenu->hWnd) == hPtMenu ) - ptmenu->bTimeToHide = TRUE; + if( GetMenu(ptmenu->hWnd) == hPtMenu || IS_SYSTEM_MENU(ptmenu) ) + pmt->trackFlags |= TF_RCVD_BTN_UP; } return -1; } @@ -3303,9 +3303,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, MENU_SelectItem( mt.hOwnerWnd, mt.hTopMenu, NO_SELECTED_ITEM, FALSE, 0 ); SendMessageW( mt.hOwnerWnd, WM_MENUSELECT, MAKEWPARAM(0,0xffff), 0 ); } - - /* Reset the variable for hiding menu */ - if( menu ) menu->bTimeToHide = FALSE; } SetLastError( ERROR_SUCCESS ); @@ -4073,7 +4070,6 @@ HMENU WINAPI CreatePopupMenu(void) if (!(hmenu = CreateMenu())) return 0; menu = MENU_GetMenu( hmenu ); menu->wFlags |= MF_POPUP; - menu->bTimeToHide = FALSE; return hmenu; } @@ -4122,7 +4118,6 @@ HMENU WINAPI CreateMenu(void) if (!(menu = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; - menu->bTimeToHide = FALSE; if (!(hMenu = alloc_user_handle( &menu->obj, USER_MENU ))) HeapFree( GetProcessHeap(), 0, menu );

1 0

Huw Davies : user32: A button-up in the menu-bar, but not on an item, should stop the tracking.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e60bc27dd2b15c9dbd09712219fc7259e6c2e595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60bc27dd2b15c9dbd0971221… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:13 2017 +0100 user32: A button-up in the menu-bar, but not on an item, should stop the tracking. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 95e4ef6..00abcc9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2647,7 +2647,10 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) return 0; } if( GetMenu(ptmenu->hWnd) == hPtMenu || IS_SYSTEM_MENU(ptmenu) ) + { + if (pos == NO_SELECTED_ITEM) return 0; pmt->trackFlags |= TF_RCVD_BTN_UP; + } } return -1; }

1 0

Huw Davies : user32: Use the original message' s wparam during the double-click comparison.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 8d10b5ceccf074390a8f267a774b7ed615dc0284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d10b5ceccf074390a8f267a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:14 2017 +0100 user32: Use the original message's wparam during the double-click comparison. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 5 +++- dlls/user32/tests/win.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d13a9b0..61a1543 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2490,6 +2490,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H GUITHREADINFO info; MOUSEHOOKSTRUCTEX hook; BOOL eatMsg; + WPARAM wparam; /* find the window to dispatch this mouse message to */ @@ -2523,13 +2524,14 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H pt = msg->pt; message = msg->message; + wparam = msg->wParam; /* Note: windows has no concept of a non-client wheel message */ if (message != WM_MOUSEWHEEL) { if (hittest != HTCLIENT) { message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; - msg->wParam = hittest; + wparam = hittest; } else { @@ -2581,6 +2583,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { if (message < first || message > last) return FALSE; } + msg->wParam = wparam; /* message is accepted now (but may still get dropped) */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 460ae93..2399228 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3759,7 +3759,7 @@ static void test_mouse_input(HWND hwnd) RECT rc; POINT pt; int x, y; - HWND popup; + HWND popup, child = NULL; MSG msg; BOOL ret; LRESULT res; @@ -3948,10 +3948,72 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); + ShowWindow(popup, SW_HIDE); + + /* Test sending double click to the non-client area, while capturing the window after + the first click has been processed. Use a child window to ensure that Wine's graphics + driver isn't managing the non-client area. */ + + GetWindowRect(hwnd, &rc); + child = CreateWindowExA(0, "MainWindowClass", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_VISIBLE, + rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, + hwnd, 0, 0, NULL); + GetWindowRect(child, &rc); + + UpdateWindow(child); + SetCursorPos( rc.left + 5, rc.top + 5 ); + flush_events( TRUE ); + + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); +todo_wine + ok(msg.hwnd == child && msg.message == WM_NCMOUSEMOVE, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + if (msg.message == WM_NCMOUSEMOVE) + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_NCLBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + ok(msg.wParam == HTSYSMENU, "wparam %ld\n", msg.wParam); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_NCLBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + SetCapture( child ); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + ok(msg.wParam == MK_LBUTTON, "wparam %ld\n", msg.wParam); + + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); +todo_wine + ok(msg.hwnd == child && (msg.message == WM_NCMOUSELEAVE || broken(msg.message == WM_LBUTTONUP)), + "hwnd %p/%p message %04x\n", msg.hwnd, child, msg.message); + + if (msg.message == WM_NCMOUSELEAVE) + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + ok(msg.hwnd == child && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, child, msg.message); + + ret = peek_message(&msg); + ok(!ret, "message %04x available\n", msg.message); + done: - /* Clear any messages left behind by WM_MOUSEACTIVATE tests */ flush_events( TRUE ); + if (child) DestroyWindow(child); DestroyWindow(popup); }

1 0

Huw Davies : user32: End the tracking on a system menu double-click.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 022e4b824396a869512df39e93247b8a8847e512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e4b824396a869512df39e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 5 13:05:15 2017 +0100 user32: End the tracking on a system menu double-click. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 00abcc9..5866383 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2575,7 +2575,7 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id, UINT wFl * * Return TRUE if we can go on with menu tracking. */ -static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) +static BOOL MENU_ButtonDown( MTRACKER* pmt, UINT message, HMENU hPtMenu, UINT wFlags ) { TRACE("%p hPtMenu=%p\n", pmt, hPtMenu); @@ -2586,7 +2586,10 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) enum hittest ht = ht_item; if( IS_SYSTEM_MENU(ptmenu) ) + { + if (message == WM_LBUTTONDBLCLK) return FALSE; pos = 0; + } else ht = MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ); @@ -3045,7 +3048,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TPM_BUTTONDOWN) { /* Get the result in order to start the tracking or not */ - fRemove = MENU_ButtonDown( &mt, hmenu, wFlags ); + fRemove = MENU_ButtonDown( &mt, WM_LBUTTONDOWN, hmenu, wFlags ); fEndMenu = !fRemove; } @@ -3131,7 +3134,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, case WM_LBUTTONDOWN: /* If the message belongs to the menu, removes it from the queue */ /* Else, end menu tracking */ - fRemove = MENU_ButtonDown( &mt, hmenu, wFlags ); + fRemove = MENU_ButtonDown( &mt, msg.message, hmenu, wFlags ); fEndMenu = !fRemove; break;

1 0