wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Francois Gouget : testbot/SetWinLocale: Fix the usage, GetThreadLocale() is set by --system.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: tools Branch: master Commit: abdb6b72f779ea787646139128e190170cce99f0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=abdb6b72f779ea787646139… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 24 20:55:37 2022 +0100 testbot/SetWinLocale: Fix the usage, GetThreadLocale() is set by --system. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0f624e8..fcc816d 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -459,13 +459,13 @@ if (defined $Usage) print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; - print " . APIs: GetSystemDefaultLCID().\n"; + print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n";

1 0

Alexandre Julliard : wrc: Add a workaround for older bison versions.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: c09a5da157585d171ad896e9862db00d505e4363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c09a5da157585d171ad896e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 23:30:59 2022 +0100 wrc: Add a workaround for older bison versions. Bison < 3.6 doesn't apply api.prefix to YYEMPTY. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 3 +-- tools/wrc/parser.y | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e16e30e98a9..b708faff6a6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -483,8 +483,7 @@ typedecl: cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } ; -import_start: tIMPORT aSTRING ';' { assert(yychar == PARSER_EMPTY); - $$ = xmalloc(sizeof(struct _import_t)); +import_start: tIMPORT aSTRING ';' { $$ = xmalloc(sizeof(struct _import_t)); $$->name = $2; $$->import_performed = do_import($2); if (!$$->import_performed) yychar = aEOF; diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 944cffd0064..cc5dc2935a9 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -199,6 +199,9 @@ static resource_t *build_fontdirs(resource_t *tail); static resource_t *build_fontdir(resource_t **fnt, int nfnt); static int rsrcid_to_token(int lookahead); +/* bison >= 3.6 applies api.prefix also to YYEMPTY */ +#define YYEMPTY (-2) + %} %define api.prefix {parser_} @@ -490,11 +493,11 @@ resource * want_id because we already have a lookahead that * cannot be undone. */ - if(yychar != PARSER_EMPTY && yychar != tNL) + if(yychar != YYEMPTY && yychar != tNL) dont_want_id = 1; if(yychar == tNL) - yychar = PARSER_EMPTY; /* Could use 'yyclearin', but we already need the*/ + yychar = YYEMPTY; /* Could use 'yyclearin', but we already need the*/ /* direct access to yychar in rule 'usrcvt' below. */ else if(yychar == tIDENT) parser_warning("LANGUAGE statement not delimited with newline; next identifier might be wrong\n"); @@ -2725,7 +2728,7 @@ static int rsrcid_to_token(int lookahead) int token; /* Get a token if we don't have one yet */ - if(lookahead == PARSER_EMPTY) + if(lookahead == YYEMPTY) lookahead = yylex(); /* Only numbers are possibly interesting */

1 0

Tim Clem : winemac.drv: Use -setMouseConfinementRect: for cursor clipping by default.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 599ecd97a8fded8c00aa261535880a4d8b5d2693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599ecd97a8fded8c00aa2615… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Jan 19 11:40:28 2022 -0800 winemac.drv: Use -setMouseConfinementRect: for cursor clipping by default. On macOS 10.13+, use this private NSWindow method for ClipCursor calls. The old behavior can be restored by setting the per-app Mac Driver registry key UseConfinementCursorClipping to N. 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 ++++++-- dlls/winemac.drv/cocoa_cursorclipping.m | 4 ++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b0dd36f4abc..b5a3059382e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1211,8 +1211,12 @@ static NSString* WineLocalizedString(unsigned int stringID) - (BOOL) startClippingCursor:(CGRect)rect { - if (!clipCursorHandler) - clipCursorHandler = [[WineEventTapClipCursorHandler alloc] init]; + if (!clipCursorHandler) { + if (use_confinement_cursor_clipping && [WineConfinementClipCursorHandler isAvailable]) + clipCursorHandler = [[WineConfinementClipCursorHandler alloc] init]; + else + clipCursorHandler = [[WineEventTapClipCursorHandler alloc] init]; + } if (self.clippingCursor && CGRectEqualToRect(rect, clipCursorHandler.cursorClipRect)) return TRUE; diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index bbaa896099b..81b53c2703c 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -34,6 +34,10 @@ * -[NSWindow setMouseConfinementRect:]. It comes with its own drawbacks, * but is generally far simpler. It is described and implemented in * the WineConfinementClipCursorHandler class. + * + * On macOS 10.13+, WineConfinementClipCursorHandler is the default. + * The Mac driver registry key UseConfinementCursorClipping can be set + * to "n" to use the event tap implementation. */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 5c19b4f4e81..94f9fbcfa17 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -162,6 +162,7 @@ extern int right_option_is_alt DECLSPEC_HIDDEN; extern int left_command_is_ctrl DECLSPEC_HIDDEN; extern int right_command_is_ctrl DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; +extern int use_confinement_cursor_clipping DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN; extern int gl_surface_mode DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 63c6a8199e0..a6a7f73e040 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -57,6 +57,7 @@ int right_command_is_ctrl = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; +int use_confinement_cursor_clipping = TRUE; int cursor_clipping_locks_windows = TRUE; int use_precise_scrolling = TRUE; int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; @@ -194,6 +195,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowImmovableWindows", buffer, sizeof(buffer))) allow_immovable_windows = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "UseConfinementCursorClipping", buffer, sizeof(buffer))) + use_confinement_cursor_clipping = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "CursorClippingLocksWindows", buffer, sizeof(buffer))) cursor_clipping_locks_windows = IS_OPTION_TRUE(buffer[0]);

1 0

Tim Clem : winemac.drv: Add a cursor clipping implementation using -setMouseConfinementRect:.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 648fcd1882831a8c2e009916b25588b2cb2c5017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=648fcd1882831a8c2e009916… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Jan 19 11:40:27 2022 -0800 winemac.drv: Add a cursor clipping implementation using -setMouseConfinementRect:. This 10.13+ API is far simpler than the CGEventTap approach, and does not require Accessibility permissions. It is not currently not enabled. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_cursorclipping.h | 16 ++++ dlls/winemac.drv/cocoa_cursorclipping.m | 141 ++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) diff --git a/dlls/winemac.drv/cocoa_cursorclipping.h b/dlls/winemac.drv/cocoa_cursorclipping.h index 7ce0529a157..bec7b384d87 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.h +++ b/dlls/winemac.drv/cocoa_cursorclipping.h @@ -55,3 +55,19 @@ } @end + + +@interface WineConfinementClipCursorHandler : NSObject <WineClipCursorHandler> +{ + BOOL clippingCursor; + CGRect cursorClipRect; + /* The number of the window that "owns" the clipping (i.e., the one with a + * mouseConfinementRect set). Using this rather than a WineWindow* to avoid + * tricky retain situations. */ + NSInteger clippingWindowNumber; +} + + /* Returns true if the API in use by this handler is available. */ + + (BOOL) isAvailable; + +@end diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index eaa243ae1a5..bbaa896099b 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -21,9 +21,24 @@ #import "cocoa_app.h" #import "cocoa_cursorclipping.h" +#import "cocoa_window.h" /* Neither Quartz nor Cocoa has an exact analog for Win32 cursor clipping. + * + * Historically, we've used a CGEventTap and the + * CGAssociateMouseAndMouseCursorPosition function, as implemented in + * the WineEventTapClipCursorHandler class. + * + * As of macOS 10.13, there is an undocumented alternative, + * -[NSWindow setMouseConfinementRect:]. It comes with its own drawbacks, + * but is generally far simpler. It is described and implemented in + * the WineConfinementClipCursorHandler class. + */ + + +/* Clipping via CGEventTap and CGAssociateMouseAndMouseCursorPosition: + * * For one simple case, clipping to a 1x1 rectangle, Quartz does have an * equivalent: CGAssociateMouseAndMouseCursorPosition(false). For the * general case, we leverage that. We disassociate mouse movements from @@ -363,3 +378,129 @@ static void scale_rect_for_retina_mode(int mode, CGRect *cursorClipRect) } @end + + +/* Clipping via mouse confinement rects: + * + * The undocumented -[NSWindow setMouseConfinementRect:] method is almost + * perfect for our needs. It has two main drawbacks compared to the CGEventTap + * approach: + * 1. It requires macOS 10.13+ + * 2. A mouse confinement rect is tied to a region of a particular window. If + * an app calls ClipCursor with a rect that is outside the bounds of a + * window, the best we can do is intersect that rect with the window's bounds + * and clip to the result. If no windows are visible in the app, we can't do + * any clipping. Switching between windows in the same app while clipping is + * active is likewise impossible. + * + * But it has two major benefits: + * 1. The code is far simpler. + * 2. CGEventTap started requiring Accessibility permissions from macOS in + * Catalina. It's a hassle to enable, and if it's triggered while an app is + * fullscreen (which is often the case with clipping), it's easy to miss. + */ + + +@interface NSWindow (UndocumentedMouseConfinement) + /* Confines the system's mouse location to the provided window-relative rect + * while the app is frontmost and the window is key or a child of the key + * window. Confinement rects will be unioned among the key window and its + * children. The app should invoke this any time internal window geometry + * changes to keep the region up to date. Set NSZeroRect to remove mouse + * location confinement. + * + * These have been available since 10.13. + */ + - (NSRect) mouseConfinementRect; + - (void) setMouseConfinementRect:(NSRect)mouseConfinementRect; +@end + + +@implementation WineConfinementClipCursorHandler + +@synthesize clippingCursor, cursorClipRect; + + + (BOOL) isAvailable + { + if ([NSProcessInfo instancesRespondToSelector:@selector(isOperatingSystemAtLeastVersion:)]) + { + NSOperatingSystemVersion requiredVersion = { 10, 13, 0 }; + return [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:requiredVersion] && + [NSWindow instancesRespondToSelector:@selector(setMouseConfinementRect:)]; + } + + return FALSE; + } + + /* Returns the region of the given rect that intersects with the given + * window. The rect should be in screen coordinates. The result will be in + * window-relative coordinates. + * + * Returns NSZeroRect if the rect lies entirely outside the window. + */ + + (NSRect) rectForScreenRect:(CGRect)rect inWindow:(NSWindow*)window + { + NSRect flippedRect = NSRectFromCGRect(rect); + [[WineApplicationController sharedController] flipRect:&flippedRect]; + + NSRect intersection = NSIntersectionRect([window frame], flippedRect); + + if (NSIsEmptyRect(intersection)) + return NSZeroRect; + + return [window convertRectFromScreen:intersection]; + } + + - (BOOL) startClippingCursor:(CGRect)rect + { + if (clippingCursor && ![self stopClippingCursor]) + return FALSE; + + WineWindow *ownerWindow = [[WineApplicationController sharedController] frontWineWindow]; + if (!ownerWindow) + { + /* There's nothing we can do here in this case, since confinement + * rects must be tied to a window. */ + return FALSE; + } + + NSRect clipRectInWindowCoords = [WineConfinementClipCursorHandler rectForScreenRect:rect + inWindow:ownerWindow]; + + if (NSIsEmptyRect(clipRectInWindowCoords)) + { + /* If the clip region is entirely outside of the bounds of the + * window, there's again nothing we can do. */ + return FALSE; + } + + [ownerWindow setMouseConfinementRect:clipRectInWindowCoords]; + + clippingWindowNumber = ownerWindow.windowNumber; + cursorClipRect = rect; + clippingCursor = TRUE; + + return TRUE; + } + + - (BOOL) stopClippingCursor + { + NSWindow *ownerWindow = [NSApp windowWithWindowNumber:clippingWindowNumber]; + [ownerWindow setMouseConfinementRect:NSZeroRect]; + + clippingCursor = FALSE; + + return TRUE; + } + + - (void) clipCursorLocation:(CGPoint*)location + { + clip_cursor_location(cursorClipRect, location); + } + + - (void) setRetinaMode:(int)mode + { + scale_rect_for_retina_mode(mode, &cursorClipRect); + } + +@end

1 0

Tim Clem : winemac.drv: Factor common cursor clipping methods into functions.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 7bd72959a3d686d1f586eacf563adeaaa1a2f3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bd72959a3d686d1f586eacf… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Jan 19 11:40:26 2022 -0800 winemac.drv: Factor common cursor clipping methods into functions. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_cursorclipping.m | 46 +++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index 7c0b53e47d9..eaa243ae1a5 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -67,6 +67,29 @@ @end; +static void clip_cursor_location(CGRect cursorClipRect, CGPoint *location) +{ + if (location->x < CGRectGetMinX(cursorClipRect)) + location->x = CGRectGetMinX(cursorClipRect); + if (location->y < CGRectGetMinY(cursorClipRect)) + location->y = CGRectGetMinY(cursorClipRect); + if (location->x > CGRectGetMaxX(cursorClipRect) - 1) + location->x = CGRectGetMaxX(cursorClipRect) - 1; + if (location->y > CGRectGetMaxY(cursorClipRect) - 1) + location->y = CGRectGetMaxY(cursorClipRect) - 1; +} + + +static void scale_rect_for_retina_mode(int mode, CGRect *cursorClipRect) +{ + double scale = mode ? 0.5 : 2.0; + cursorClipRect->origin.x *= scale; + cursorClipRect->origin.y *= scale; + cursorClipRect->size.width *= scale; + cursorClipRect->size.height *= scale; +} + + @implementation WineEventTapClipCursorHandler @synthesize clippingCursor, cursorClipRect; @@ -88,18 +111,6 @@ [super dealloc]; } - - (void) clipCursorLocation:(CGPoint*)location - { - if (location->x < CGRectGetMinX(cursorClipRect)) - location->x = CGRectGetMinX(cursorClipRect); - if (location->y < CGRectGetMinY(cursorClipRect)) - location->y = CGRectGetMinY(cursorClipRect); - if (location->x > CGRectGetMaxX(cursorClipRect) - 1) - location->x = CGRectGetMaxX(cursorClipRect) - 1; - if (location->y > CGRectGetMaxY(cursorClipRect) - 1) - location->y = CGRectGetMaxY(cursorClipRect) - 1; - } - - (BOOL) warpCursorTo:(CGPoint*)newLocation from:(const CGPoint*)currentLocation { CGPoint oldLocation; @@ -341,13 +352,14 @@ return TRUE; } + - (void) clipCursorLocation:(CGPoint*)location + { + clip_cursor_location(cursorClipRect, location); + } + - (void) setRetinaMode:(int)mode { - double scale = mode ? 0.5 : 2.0; - cursorClipRect.origin.x *= scale; - cursorClipRect.origin.y *= scale; - cursorClipRect.size.width *= scale; - cursorClipRect.size.height *= scale; + scale_rect_for_retina_mode(mode, &cursorClipRect); } @end

1 0

Tim Clem : winemac.drv: Create a protocol to represent a cursor clipping handler.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 2e25ba489a182f0d530a2d29bfd7bb76ae036941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e25ba489a182f0d530a2d29… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Jan 19 11:40:25 2022 -0800 winemac.drv: Create a protocol to represent a cursor clipping handler. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 4 ++-- dlls/winemac.drv/cocoa_app.m | 5 ++++- dlls/winemac.drv/cocoa_cursorclipping.h | 29 ++++++++++++++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index cf01844dd84..e5caad00a87 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -67,8 +67,8 @@ enum { @class WineEventQueue; -@class WineEventTapClipCursorHandler; @class WineWindow; +@protocol WineClipCursorHandler; @interface WineApplicationController : NSObject <NSApplicationDelegate> @@ -121,7 +121,7 @@ enum { NSTimeInterval lastSetCursorPositionTime; - WineEventTapClipCursorHandler* clipCursorHandler; + id<WineClipCursorHandler> clipCursorHandler; NSImage* applicationIcon; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5443893b835..b0dd36f4abc 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1148,10 +1148,13 @@ static NSString* WineLocalizedString(unsigned int stringID) if ([windowsBeingDragged count]) ret = FALSE; - else if (self.clippingCursor) + else if (self.clippingCursor && [clipCursorHandler respondsToSelector:@selector(setCursorPosition:)]) ret = [clipCursorHandler setCursorPosition:pos]; else { + if (self.clippingCursor) + [clipCursorHandler clipCursorLocation:&pos]; + // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates // the mouse from the cursor position for 0.25 seconds. This means // that mouse movement during that interval doesn't move the cursor diff --git a/dlls/winemac.drv/cocoa_cursorclipping.h b/dlls/winemac.drv/cocoa_cursorclipping.h index 132527e1039..7ce0529a157 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.h +++ b/dlls/winemac.drv/cocoa_cursorclipping.h @@ -21,15 +21,8 @@ #import <AppKit/AppKit.h> -@interface WineEventTapClipCursorHandler : NSObject -{ - BOOL clippingCursor; - CGRect cursorClipRect; - CFMachPortRef cursorClippingEventTap; - NSMutableArray* warpRecords; - CGPoint synthesizedLocation; - NSTimeInterval lastEventTapEventTime; -} + +@protocol WineClipCursorHandler <NSObject> @property (readonly, nonatomic) BOOL clippingCursor; @property (readonly, nonatomic) CGRect cursorClipRect; @@ -41,6 +34,24 @@ - (void) setRetinaMode:(int)mode; + @optional + /* If provided, should reposition the cursor as needed given the current + * clipping rect. If not provided, the location will be clipped by + * -clipCursorLocation, and the cursor will be warped normally. + */ - (BOOL) setCursorPosition:(CGPoint)pos; @end + + +@interface WineEventTapClipCursorHandler : NSObject <WineClipCursorHandler> +{ + BOOL clippingCursor; + CGRect cursorClipRect; + CFMachPortRef cursorClippingEventTap; + NSMutableArray* warpRecords; + CGPoint synthesizedLocation; + NSTimeInterval lastEventTapEventTime; +} + +@end

1 0

Tim Clem : winemac.drv: Factor out cursor clipping code to its own class.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 1c80eb5e5baab766d571d9e8695981acbe88b7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c80eb5e5baab766d571d9e8… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Jan 19 11:40:24 2022 -0800 winemac.drv: Factor out cursor clipping code to its own class. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 11 +- dlls/winemac.drv/cocoa_app.m | 326 +++-------------------------- dlls/winemac.drv/cocoa_cursorclipping.h | 46 +++++ dlls/winemac.drv/cocoa_cursorclipping.m | 353 ++++++++++++++++++++++++++++++++ 5 files changed, 430 insertions(+), 307 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c80eb5e5baab766d571…

1 0

Michael Stefaniuc : dmsynth: Implement SetMasterClock() for the sink.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: bdea89242cc3fb1833b29de4cc0f812bb1767204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdea89242cc3fb1833b29de4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 21 18:41:10 2022 +0100 dmsynth: Implement SetMasterClock() for the sink. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 7 +++---- dlls/dmsynth/synthsink.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 22d020992b8..2a2e88c8e88 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -72,13 +72,12 @@ struct IDirectMusicSynth8Impl { * IDirectMusicSynthSinkImpl implementation structure */ struct IDirectMusicSynthSinkImpl { - /* IUnknown fields */ IDirectMusicSynthSink IDirectMusicSynthSink_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynthSinkImpl fields */ - IReferenceClock* latency_clock; + IReferenceClock *latency_clock; + IReferenceClock *master_clock; + BOOL active; }; /********************************************************************** diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 46011eae27a..72fd671a415 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -81,6 +81,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa if (!ref) { if (This->latency_clock) IReferenceClock_Release(This->latency_clock); + if (This->master_clock) + IReferenceClock_Release(This->master_clock); HeapFree(GetProcessHeap(), 0, This); DMSYNTH_UnlockModule(); } @@ -104,7 +106,15 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynth { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); + + if (!clock) + return E_POINTER; + if (This->active) + return E_FAIL; + + IReferenceClock_AddRef(clock); + This->master_clock = clock; return S_OK; }

1 0

Michael Stefaniuc : dmusic: The synth port needs to get the latency clock from the synth.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 98ecff2760c4c79eeee6dd824e070138475c5912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98ecff2760c4c79eeee6dd82… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 21 18:41:09 2022 +0100 dmusic: The synth port needs to get the latency clock from the synth. And not reimplement it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index fb807e7871a..31b3b764e02 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -35,7 +35,6 @@ struct synth_port { IDirectMusic8Impl *parent; IDirectSound *dsound; IDirectSoundBuffer *dsbuffer; - IReferenceClock *pLatencyClock; IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; BOOL active; @@ -200,7 +199,6 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); IDirectMusicSynthSink_Release(This->synth_sink); - IReferenceClock_Release(This->pLatencyClock); if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); if (This->dsound) @@ -372,10 +370,7 @@ static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IRefer TRACE("(%p/%p)->(%p)\n", iface, This, clock); - *clock = This->pLatencyClock; - IReferenceClock_AddRef(*clock); - - return S_OK; + return IDirectMusicSynth8_GetLatencyClock(This->synth, clock); } static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_SYNTHSTATS *stats) @@ -840,15 +835,8 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->params = *port_params; obj->caps = *port_caps; - hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); - if (hr != S_OK) - { - HeapFree(GetProcessHeap(), 0, obj); - return hr; - } - - if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void**)&obj->synth); + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, + (void **)&obj->synth); if (SUCCEEDED(hr)) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); @@ -898,8 +886,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param IDirectMusicSynth_Release(obj->synth); if (obj->synth_sink) IDirectMusicSynthSink_Release(obj->synth_sink); - if (obj->pLatencyClock) - IReferenceClock_Release(obj->pLatencyClock); HeapFree(GetProcessHeap(), 0, obj); return hr;

1 0

Michael Stefaniuc : dmusic: Send the master clock to the synth and not a latency clock.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: ccb216e477155dd402b9fbdcef12c73cb78d96ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb216e477155dd402b9fbdc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 21 18:41:08 2022 +0100 dmusic: Send the master clock to the synth and not a latency clock. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index a17e399ee17..fb807e7871a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -857,7 +857,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->parent->master_clock); if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
73
Older →

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 January 2022