September 2021 - Wine-Commits

Jacek Caban : gdi32: Directly use ntgdi functions in painting.c.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 9f88685f5460da2bf6e39f24191a6b65be7baec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f88685f5460da2bf6e39f24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 14 21:52:55 2021 +0200 gdi32: Directly use ntgdi functions in painting.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index a7f06ea7df3..dba91daf788 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -40,13 +40,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) { + DC *dc = get_physdev_dc( dev ); INT x1 = GDI_ROUND( x + cos( start * M_PI / 180 ) * radius ); INT y1 = GDI_ROUND( y - sin( start * M_PI / 180 ) * radius ); INT x2 = GDI_ROUND( x + cos( (start + sweep) * M_PI / 180) * radius ); INT y2 = GDI_ROUND( y - sin( (start + sweep) * M_PI / 180) * radius ); - INT arcdir = SetArcDirection( dev->hdc, sweep >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE ); - BOOL ret = ArcTo( dev->hdc, x - radius, y - radius, x + radius, y + radius, x1, y1, x2, y2 ); - SetArcDirection( dev->hdc, arcdir ); + INT arcdir = dc->attr->arc_direction; + BOOL ret; + dc->attr->arc_direction = sweep >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE; + ret = NtGdiArcInternal( NtGdiArcTo, dev->hdc, x - radius, y - radius, x + radius, y + radius, + x1, y1, x2, y2 ); + dc->attr->arc_direction = arcdir; return ret; } @@ -64,9 +68,10 @@ BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if (!height || !width) return FALSE; /* draw a line from the current position to the starting point of the arc, then draw the arc */ angle = atan2( (ystart - ycenter) / height, (xstart - xcenter) / width ); - LineTo( dev->hdc, GDI_ROUND( xcenter + cos(angle) * xradius ), - GDI_ROUND( ycenter + sin(angle) * yradius )); - return Arc( dev->hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + NtGdiLineTo( dev->hdc, GDI_ROUND( xcenter + cos(angle) * xradius ), + GDI_ROUND( ycenter + sin(angle) * yradius )); + return NtGdiArcInternal( NtGdiArc, dev->hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); } BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) @@ -99,9 +104,12 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) { - INT prev_rop = SetROP2( dev->hdc, R2_NOT ); - BOOL ret = NtGdiFillRgn( dev->hdc, rgn, get_stock_object(BLACK_BRUSH) ); - SetROP2( dev->hdc, prev_rop ); + DC *dc = get_physdev_dc( dev ); + INT prev_rop = dc->attr->rop_mode; + BOOL ret; + dc->attr->rop_mode = R2_NOT; + ret = NtGdiFillRgn( dev->hdc, rgn, get_stock_object(BLACK_BRUSH) ); + dc->attr->rop_mode = prev_rop; return ret; }

1 0

Nikolay Sivov : gdi32: Fix a typo in failure path (Coverity).
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 2b99a4ebb9ceeb3e4d9ac6a6cdabb7817ffc6ef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b99a4ebb9ceeb3e4d9ac6a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 15:16:26 2021 +0300 gdi32: Fix a typo in failure path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1c304f008a7..ec1699533c7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -125,7 +125,7 @@ DC *alloc_dc_ptr( DWORD magic ) if (!(dc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc) ))) return NULL; if (!(dc->attr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc->attr)))) { - HeapFree( GetProcessHeap(), 0, dc->attr ); + HeapFree( GetProcessHeap(), 0, dc ); return NULL; }

1 0

Nikolay Sivov : secur32: Fix allocation size (Coverity).
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 37bc7518b8402706537b7854516a409a435bebac URL: https://source.winehq.org/git/wine.git/?a=commit;h=37bc7518b8402706537b7854… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 13:31:03 2021 +0300 secur32: Fix allocation size (Coverity). Fixes copy-paste issue from fbd30fff038645bf2f7967ff63d4178309a14138. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 08bac24686a..a20469a3ff3 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -365,7 +365,7 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, if (!providerTable) { - if (!(providerTable = malloc(sizeof(*ret)))) + if (!(providerTable = malloc(sizeof(*providerTable)))) { LeaveCriticalSection(&cs); return NULL;

1 0

Alexandre Julliard : shell32: Use the standard shell folder implementation for Unix folders.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

1 0

Nikolay Sivov : dwrite/tests: Add a linebreaking test regarding LB30 rule changes in Unicode 13.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 8ca898ed36c1e00e22022056217e9cb9da45724e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca898ed36c1e00e22022056… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 10:58:56 2021 +0300 dwrite/tests: Add a linebreaking test regarding LB30 rule changes in Unicode 13. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 358e3e4780d..dd3207c7933 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1083,7 +1083,8 @@ struct linebreaks_test { DWRITE_LINE_BREAKPOINT bp[BREAKPOINT_COUNT]; }; -static struct linebreaks_test linebreaks_tests[] = { +static const struct linebreaks_test linebreaks_tests[] = +{ { {'A','-','B',' ','C',0x58a,'D',0x2010,'E',0x2012,'F',0x2013,'\t',0xc,0xb,0x2028,0x2029,0x200b,0}, { { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, @@ -1124,6 +1125,14 @@ static struct linebreaks_test linebreaks_tests[] = { { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, } }, + /* LB30 changes in Unicode 13 regarding East Asian parentheses */ + { {0x5f35,'G',0x300c,0}, + { + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK }, + } + }, { { 0 } } };

1 0

Tim Clem : winemac.drv: Use window drag notifications when available.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: bb28d54d08023f6cea7be2c2c52545ab7f61e30b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb28d54d08023f6cea7be2c2… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Sep 14 13:22:45 2021 -0700 winemac.drv: Use window drag notifications when available. When running on macOS 10.12+, there are private notification center messages we can use to reliably detect when a window is being dragged by its titlebar. These are less finicky than the current combination of an undocumented event subtype and a left mouse up. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 93 +++++++++++++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 28 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 7abea0990e9..0b70a2fd55b 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -131,6 +131,7 @@ enum { BOOL beenActive; NSMutableSet* windowsBeingDragged; + BOOL useDragNotifications; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e296d4b4af0..fe10ee8c41d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -27,6 +27,12 @@ static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode"; +// Private notifications that are reliably dispatched when a window is moved by dragging its titlebar. +// The object of the notification is the window being dragged. +// Available in macOS 10.12+ +static NSString* const NSWindowWillStartDraggingNotification = @"NSWindowWillStartDraggingNotification"; +static NSString* const NSWindowDidEndDraggingNotification = @"NSWindowDidEndDraggingNotification"; + int macdrv_err_on; @@ -181,6 +187,15 @@ static NSString* WineLocalizedString(unsigned int stringID) windowsBeingDragged = [[NSMutableSet alloc] init]; + // On macOS 10.12+, use notifications to more reliably detect when windows are being dragged. + if ([NSProcessInfo instancesRespondToSelector:@selector(isOperatingSystemAtLeastVersion:)]) + { + NSOperatingSystemVersion requiredVersion = { 10, 12, 0 }; + useDragNotifications = [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:requiredVersion]; + } + else + useDragNotifications = NO; + if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { @@ -1554,32 +1569,28 @@ static NSString* WineLocalizedString(unsigned int stringID) } } - - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin + - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin { - WineWindow* window = (WineWindow*)[anEvent window]; - if ([window isKindOfClass:[WineWindow class]]) - { - macdrv_event* event; - int eventType; - - if (begin) - { - [windowsBeingDragged addObject:window]; - eventType = WINDOW_DRAG_BEGIN; - } - else - { - [windowsBeingDragged removeObject:window]; - eventType = WINDOW_DRAG_END; - } - [self updateCursorClippingState]; + macdrv_event* event; + int eventType; - event = macdrv_create_event(eventType, window); - if (eventType == WINDOW_DRAG_BEGIN) - event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; - [window.queue postEvent:event]; - macdrv_release_event(event); + if (begin) + { + [windowsBeingDragged addObject:window]; + eventType = WINDOW_DRAG_BEGIN; } + else + { + [windowsBeingDragged removeObject:window]; + eventType = WINDOW_DRAG_END; + } + [self updateCursorClippingState]; + + event = macdrv_create_event(eventType, window); + if (eventType == WINDOW_DRAG_BEGIN) + event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; + [window.queue postEvent:event]; + macdrv_release_event(event); } - (void) handleMouseMove:(NSEvent*)anEvent @@ -1736,8 +1747,13 @@ static NSString* WineLocalizedString(unsigned int stringID) WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (type == NSEventTypeLeftMouseUp && [windowsBeingDragged count]) - [self handleWindowDrag:theEvent begin:NO]; + if (!useDragNotifications && + type == NSEventTypeLeftMouseUp && + [windowsBeingDragged count] && + [window isKindOfClass:[WineWindow class]]) + { + [self handleWindowDrag:window begin:NO]; + } if ([window isKindOfClass:[WineWindow class]] && type == NSEventTypeLeftMouseDown && @@ -2085,15 +2101,16 @@ static NSString* WineLocalizedString(unsigned int stringID) [window postKeyEvent:anEvent]; } } - else if (type == NSEventTypeAppKitDefined) + else if (!useDragNotifications && type == NSEventTypeAppKitDefined) { + WineWindow *window = (WineWindow *)[anEvent window]; short subtype = [anEvent subtype]; // These subtypes are not documented but they appear to mean // "a window is being dragged" and "a window is no longer being // dragged", respectively. - if (subtype == 20 || subtype == 21) - [self handleWindowDrag:anEvent begin:(subtype == 20)]; + if ((subtype == 20 || subtype == 21) && [window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:window begin:(subtype == 20)]; } return ret; @@ -2155,6 +2172,26 @@ static NSString* WineLocalizedString(unsigned int stringID) [self updateCursorClippingState]; }]; + if (useDragNotifications) { + [nc addObserverForName:NSWindowWillStartDraggingNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:(WineWindow *)window begin:YES]; + }]; + + [nc addObserverForName:NSWindowDidEndDraggingNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:(WineWindow *)window begin:NO]; + }]; + } + [nc addObserver:self selector:@selector(keyboardSelectionDidChange) name:NSTextInputContextKeyboardSelectionDidChangeNotification

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetCapabilities tests.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 8325c5331ecddfeb3913fda43db94d64b137509b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8325c5331ecddfeb3913fda4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:53 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetCapabilities tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c2221c475d8..69e85830be5 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3330,6 +3330,15 @@ static void test_simple_joystick(void) { .InputReportByteLength = 4, }; + static const DIDEVCAPS expect_caps = + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwAxes = 2, + .dwPOVs = 1, + .dwButtons = 2, + }; const DIDEVICEINSTANCEW expect_devinst = { @@ -3347,6 +3356,7 @@ static void test_simple_joystick(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; IDirectInputDevice8W *device; + DIDEVCAPS caps = {0}; IDirectInput8W *di; HRESULT hr; ULONG ref; @@ -3426,6 +3436,27 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsagePage ); check_member( devinst, expect_devinst, "%04x", wUsage ); + hr = IDirectInputDevice8_GetCapabilities( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + caps.dwSize = sizeof(DIDEVCAPS); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + check_member( caps, expect_caps, "%d", dwSize ); + check_member( caps, expect_caps, "%#x", dwFlags ); + todo_wine + check_member( caps, expect_caps, "%#x", dwDevType ); + check_member( caps, expect_caps, "%d", dwAxes ); + check_member( caps, expect_caps, "%d", dwButtons ); + check_member( caps, expect_caps, "%d", dwPOVs ); + check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); + check_member( caps, expect_caps, "%d", dwFFMinTimeResolution ); + check_member( caps, expect_caps, "%d", dwFirmwareRevision ); + check_member( caps, expect_caps, "%d", dwHardwareRevision ); + check_member( caps, expect_caps, "%d", dwFFDriverVersion ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceInfo tests.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 52377b3dec4eef0f1f5b515d4c1ded17657d1498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52377b3dec4eef0f1f5b515d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:29:52 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceInfo tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 1dc42909c7f..c2221c475d8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3389,6 +3389,43 @@ static void test_simple_joystick(void) hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW) + 1; + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + + devinst.dwSize = sizeof(DIDEVICEINSTANCE_DX3W); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#x", dwDevType ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszProductName ); + + memset( &devinst, 0, sizeof(devinst) ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + check_member( devinst, expect_devinst, "%d", dwSize ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#x", dwDevType ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + todo_wine + check_member_wstr( devinst, expect_devinst, tszProductName ); + check_member_guid( devinst, expect_devinst, guidFFDriver ); + check_member( devinst, expect_devinst, "%04x", wUsagePage ); + check_member( devinst, expect_devinst, "%04x", wUsage ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Tim Clem : winemac.drv: Remove now-unnecessary drag stop event on mouse up.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: a45bb014e884a59a2109fa4602e8b22a7a8e7e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45bb014e884a59a2109fa46… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Sep 14 13:22:46 2021 -0700 winemac.drv: Remove now-unnecessary drag stop event on mouse up. This approach was added by 5cf64084fb6 to work around changes to event behavior in macOS Catalina, 10.15. However, more reliable notification center messages for dragging are available on 10.12+, making this path unnecessary. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fe10ee8c41d..2d18da7f99a 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1747,14 +1747,6 @@ static NSString* WineLocalizedString(unsigned int stringID) WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (!useDragNotifications && - type == NSEventTypeLeftMouseUp && - [windowsBeingDragged count] && - [window isKindOfClass:[WineWindow class]]) - { - [self handleWindowDrag:window begin:NO]; - } - if ([window isKindOfClass:[WineWindow class]] && type == NSEventTypeLeftMouseDown && ![theEvent wine_commandKeyDown])

1 0

Charles Davis : ntdll: Use posix_fallocate() instead of fallocate().
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: dd882794d2b226c59a306d1b39b9529ac431479c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd882794d2b226c59a306d1b… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 14 16:57:41 2021 -0500 ntdll: Use posix_fallocate() instead of fallocate(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 35 +---------------------------------- configure.ac | 10 +--------- dlls/ntdll/unix/file.c | 11 ++++++----- include/config.h.in | 6 +++--- 4 files changed, 11 insertions(+), 51 deletions(-) diff --git a/configure b/configure index 1adbf1789f3..4306ea70100 100755 --- a/configure +++ b/configure @@ -18008,6 +18008,7 @@ for ac_func in \ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ @@ -18600,40 +18601,6 @@ $as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5 -$as_echo_n "checking for fallocate... " >&6; } -if ${wine_cv_have_fallocate+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <fcntl.h> -int -main () -{ -fallocate(-1, 0, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_fallocate=yes -else - wine_cv_have_fallocate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_fallocate" >&5 -$as_echo "$wine_cv_have_fallocate" >&6; } -if test "$wine_cv_have_fallocate" = "yes" -then - -$as_echo "#define HAVE_FALLOCATE 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } diff --git a/configure.ac b/configure.ac index eb970972936..6ca4eb5c923 100644 --- a/configure.ac +++ b/configure.ac @@ -2182,6 +2182,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ @@ -2273,15 +2274,6 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi -AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#define _GNU_SOURCE -#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) -if test "$wine_cv_have_fallocate" = "yes" -then - AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) -fi - dnl **** Check for types **** AC_C_INLINE diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcd74c9d6aa..e6f813966a5 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4494,14 +4494,15 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) +#ifdef HAVE_POSIX_FALLOCATE + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } #else - FIXME( "setting valid data length not supported\n" ); + WARN( "setting valid data length not supported\n" ); #endif } if (needs_close) close( fd ); diff --git a/include/config.h.in b/include/config.h.in index 9f8e7f34ada..f66444fd715 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -83,9 +83,6 @@ /* Define to 1 if you have the `F3DAudioInitialize8' function. */ #undef HAVE_F3DAUDIOINITIALIZE8 -/* Define to 1 if you have the `fallocate' function. */ -#undef HAVE_FALLOCATE - /* Define to 1 if you have the `FAudioCreateReverb9WithCustomAllocatorEXT' function. */ #undef HAVE_FAUDIOCREATEREVERB9WITHCUSTOMALLOCATOREXT @@ -507,6 +504,9 @@ /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE +/* Define to 1 if you have the `posix_fallocate' function. */ +#undef HAVE_POSIX_FALLOCATE + /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL

1 0