wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Alexandre Julliard : winex11: Ignore EnterNotify events that are older than the last mouse wrap.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 49e1ba7d4ba31f2a16fa4527e8028fb876a7b026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e1ba7d4ba31f2a16fa4527e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:42:38 2015 +0900 winex11: Ignore EnterNotify events that are older than the last mouse wrap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 356343d..63d202c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1621,6 +1621,11 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; + if (is_old_motion_event( event->serial )) + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; + } send_mouse_input( hwnd, event->window, event->state, &input ); }

1 0

Alexandre Julliard : winex11: Add a helper function to check a motion event against the serial number.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 9d237f97fc94f7dcd8afe0763951c601be6449b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d237f97fc94f7dcd8afe0763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:42:01 2015 +0900 winex11: Add a helper function to check a motion event against the serial number. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e462b55..356343d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -520,6 +520,21 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) return grab_clipping_window( &rect ); } + +/*********************************************************************** + * is_old_motion_event + */ +static BOOL is_old_motion_event( unsigned long serial ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (!thread_data->warp_serial) return FALSE; + if ((long)(serial - thread_data->warp_serial) < 0) return TRUE; + thread_data->warp_serial = 0; /* we caught up now */ + return FALSE; +} + + /*********************************************************************** * send_mouse_input * @@ -1576,20 +1591,11 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - if (!hwnd) + if (!hwnd && is_old_motion_event( event->serial )) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial) - { - if ((long)(event->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ - } + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; } - send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1677,14 +1683,10 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (broken_rawevents && thread_data->warp_serial) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - if ((long)(xev->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + return; } TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );

1 0

Nikolay Sivov : oledlg: Replace existing menu item in case of empty object too.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 93ff3fde8a7f04f7a363c4ee71d020ff2a51e911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ff3fde8a7f04f7a363c4ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 04:13:38 2015 +0300 oledlg: Replace existing menu item in case of empty object too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/oledlg_main.c | 1 + dlls/oledlg/tests/main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 87df968..8ba9f17 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -184,6 +184,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); /* no object, or object without enumeration support */ if (!object || !enumverbs) { + RemoveMenu(hMenu, uPos, MF_BYPOSITION); InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING|MF_GRAYED, idmin, resstrW); return FALSE; } diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 9c5e4bd..5d452f1 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -303,6 +303,7 @@ static IOleObject oleobject = { &oleobjectvtbl }; static void test_OleUIAddVerbMenu(void) { + static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0}; HMENU hMenu, verbmenu; MENUITEMINFOW info; WCHAR buffW[50]; @@ -418,6 +419,72 @@ static void test_OleUIAddVerbMenu(void) ok(count == 5, "got %d\n", count); DestroyMenu(hMenu); + + /* try to add verb menu repeatedly, with same id */ + hMenu = CreatePopupMenu(); + + count = GetMenuItemCount(hMenu); + ok(count == 0, "got %d\n", count); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + /* same position, different id */ + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 6, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + /* change added item string and state */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING|MIIM_STATE; + info.fState = MFS_ENABLED; + info.dwTypeData = buffW; + lstrcpyW(buffW, cadabraW); + ret = SetMenuItemInfoW(hMenu, 0, TRUE, &info); + ok(ret, "got %d\n", ret); + + buffW[0] = 0; + GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING|MIIM_STATE; + buffW[0] = 0; + info.dwTypeData = buffW; + info.cch = sizeof(buffW)/sizeof(WCHAR); + ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); + ok(ret, "got %d\n", ret); + ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + DestroyMenu(hMenu); } START_TEST(main)

1 0

Ken Thomases : winemac: Don' t post a WINDOW_BROUGHT_FORWARD event for a click on a window which is already frontmost in its level.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 5c992f965335ccb02a90ebcb10a881649cbab859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c992f965335ccb02a90ebcb1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 30 20:10:32 2015 -0600 winemac: Don't post a WINDOW_BROUGHT_FORWARD event for a click on a window which is already frontmost in its level. Commit 793ab7d45 fixed a bug where WINDOW_BROUGHT_FORWARD events weren't being posted when they should, but it caused a regression in Scribblenauts Unlimited. Every click caused a window ordering operation that generated messages and Scribblenauts would move the mouse cursor to the upper-left corner of the window in response. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3a80f1d..fb9edc2 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1745,7 +1745,23 @@ static NSString* WineLocalizedString(unsigned int stringID) if (windowBroughtForward) { - [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; + WineWindow* ancestor = [windowBroughtForward ancestorWineWindow]; + NSInteger ancestorNumber = [ancestor windowNumber]; + NSInteger ancestorLevel = [ancestor level]; + + for (NSNumber* windowNumberObject in [NSWindow windowNumbersWithOptions:0]) + { + NSInteger windowNumber = [windowNumberObject integerValue]; + if (windowNumber == ancestorNumber) + break; + WineWindow* otherWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowNumber]; + if ([otherWindow isKindOfClass:[WineWindow class]] && [otherWindow screen] && + [otherWindow level] <= ancestorLevel && otherWindow == [otherWindow ancestorWineWindow]) + { + [ancestor postBroughtForwardEvent]; + break; + } + } if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) [self windowGotFocus:windowBroughtForward]; }

1 0

Ken Thomases : winemac: Remove a window from the NSWorkspace notification center when it' s deallocated.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: ebcf8aadc54a12aa9359da109ea89608e417210c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcf8aadc54a12aa9359da109… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 30 14:34:59 2015 -0600 winemac: Remove a window from the NSWorkspace notification center when it's deallocated. It was added as an observer in commit 3beec95a0. Failing to remove it caused the notification center to have a dangling pointer and caused crashes and hangs. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 75f5605..bcc1cf5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -777,6 +777,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) dealloc { + [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self]; [queue release]; [latentChildWindows release];

1 0

Nikolay Sivov : oleaut32/tests: Some tests for SafeArrayDestroyData().
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: b07ebe6815acbd14afc1dcf9b1335689667fc529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07ebe6815acbd14afc1dcf9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 23:28:44 2015 +0300 oleaut32/tests: Some tests for SafeArrayDestroyData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 75 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 12e1f54..f57b886 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1965,40 +1965,99 @@ static void test_SafeArrayChangeTypeEx(void) static void test_SafeArrayDestroyData (void) { - SAFEARRAYBOUND sab; + SAFEARRAYBOUND sab[2]; SAFEARRAY *sa; HRESULT hres; int value = 0xdeadbeef; LONG index[1]; void *temp_pvData; + USHORT features; - sab.lLbound = 0; - sab.cElements = 10; - sa = SafeArrayCreate(VT_INT, 1, &sab); + sab[0].lLbound = 0; + sab[0].cElements = 10; + sa = SafeArrayCreate(VT_INT, 1, sab); ok(sa != NULL, "Create() failed.\n"); - if (!sa) - return; + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + index[0] = 1; SafeArrayPutElement (sa, index, &value); /* SafeArrayDestroyData shouldn't free pvData if FADF_STATIC is set. */ - sa->fFeatures |= FADF_STATIC; + features = (sa->fFeatures |= FADF_STATIC); temp_pvData = sa->pvData; hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == temp_pvData, "SADData FADF_STATIC: pvData=%p, expected %p (fFeatures = %d).\n", sa->pvData, temp_pvData, sa->fFeatures); SafeArrayGetElement (sa, index, &value); ok(value == 0, "Data not cleared after SADData\n"); /* Clear FADF_STATIC, now really destroy the data. */ - sa->fFeatures ^= FADF_STATIC; + features = (sa->fFeatures ^= FADF_STATIC); hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData !FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == NULL, "SADData !FADF_STATIC: pvData=%p, expected NULL.\n", sa->pvData); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "SAD failed, error code %x.\n", hres); + + /* two dimensions */ + sab[0].lLbound = 0; + sab[0].cElements = 10; + sab[1].lLbound = 0; + sab[1].cElements = 10; + + sa = SafeArrayCreate(VT_INT, 2, sab); + ok(sa != NULL, "Create() failed.\n"); + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + + features = sa->fFeatures; + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); + + SafeArrayDestroy(sa); + + /* try to destroy data from descriptor */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = SafeArrayAllocDescriptor(2, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* vector case */ + sa = SafeArrayCreateVector(VT_I4, 0, 10); + ok(sa != NULL, "got %p\n", sa); + ok(sa->fFeatures == (FADF_CREATEVECTOR|FADF_HAVEVARTYPE), "got 0x%x\n", sa->fFeatures); + + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + /* There seems to be a bug on windows, especially visible on 64bit systems, + probably double-free of similar issue. */ + sa->pvData = NULL; + SafeArrayDestroy(sa); } static void test_safearray_layout(void)

1 0

Bruno Jesus : msacm32/tests: Add more acmStreamPrepareHeader tests.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 395b9c321b6788463d2e2f03b603600f8bb78454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395b9c321b6788463d2e2f03b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Nov 27 21:10:04 2015 +0800 msacm32/tests: Add more acmStreamPrepareHeader tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index bb4ccc5..812a1bb 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -586,6 +586,33 @@ static void test_prepareheader(void) memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); hdr.pbSrc = input; + hdr.cbSrcLength = 0; /* invalid source length */ + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + + mr = acmStreamPrepareHeader(has, &hdr, 0); +todo_wine + ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); + + hdr.cbSrcLength = src->wfx.nBlockAlign - 1; /* less than block align */ + mr = acmStreamPrepareHeader(has, &hdr, 0); +todo_wine + ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + + hdr.cbSrcLength = src->wfx.nBlockAlign; + mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ +todo_wine + ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr); + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; hdr.cbSrcLength = sizeof(input); hdr.pbDst = pcm; hdr.cbDstLength = sizeof(pcm); @@ -638,7 +665,8 @@ todo_wine ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); } else - ok(mr == MMSYSERR_INVALPARAM, "expected 11, got %d\n", mr); +todo_wine + ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2015