August 2023 - Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add IPackageStatics interface definition.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: fe877fdf8a130e4d3721dc63e6c12ca8bb1787a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe877fdf8a130e4d3721dc63e6c12c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 6 19:11:20 2023 -0500 include: Add IPackageStatics interface definition. --- include/windows.applicationmodel.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index cea2c9423d8..9514c06a60e 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -93,6 +93,16 @@ namespace Windows.ApplicationModel { [propget] HRESULT Author([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.Package), + uuid(4e534bdf-2960-4878-97a4-9624deb72f2d) + ] + interface IPackageStatics : IInspectable + { + [propget] HRESULT Current([out, retval] Windows.ApplicationModel.Package **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -102,6 +112,14 @@ namespace Windows.ApplicationModel { runtimeclass Package { [default] interface Windows.ApplicationModel.IPackage; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage3; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackageWithMetadata; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.ApplicationModel.IPackage4; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackage5; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.ApplicationModel.IPackage6; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.ApplicationModel.IPackage7; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.ApplicationModel.IPackage8; } [

1 0

Alex Henrie : cmd: Introduce an option_equals helper for WCMD_parse_forf_options.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: c27f8f72d15195abd4caccd83a2c96a87e7954a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c27f8f72d15195abd4caccd83a2c96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 20:37:35 2023 -0600 cmd: Introduce an option_equals helper for WCMD_parse_forf_options. --- programs/cmd/builtins.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index badf41c17f6..397eb567277 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1631,6 +1631,19 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, return; } +static BOOL option_equals(WCHAR **haystack, const WCHAR *needle) +{ + int len = wcslen(needle); + + if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + *haystack, len, needle, len) == CSTR_EQUAL) { + *haystack += len; + return TRUE; + } + + return FALSE; +} + /***************************************************************************** * WCMD_parse_forf_options * @@ -1653,11 +1666,6 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, WCHAR *pos = options; int len = lstrlenW(pos); - const int eol_len = lstrlenW(L"eol="); - const int skip_len = lstrlenW(L"skip="); - const int tokens_len = lstrlenW(L"tokens="); - const int delims_len = lstrlenW(L"delims="); - const int usebackq_len = lstrlenW(L"usebackq"); /* Initialize to defaults */ lstrcpyW(delims, L" \t"); @@ -1678,36 +1686,28 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, pos++; /* Save End of line character (Ignore line if first token (based on delims) starts with it) */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, eol_len, L"eol=", eol_len) == CSTR_EQUAL) { - *eol = *(pos + eol_len); - pos = pos + eol_len + 1; + } else if (option_equals(&pos, L"eol=")) { + *eol = *pos++; WINE_TRACE("Found eol as %c(%x)\n", *eol, *eol); /* Save number of lines to skip (Can be in base 10, hex (0x...) or octal (0xx) */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, skip_len, L"skip=", skip_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"skip=")) { WCHAR *nextchar = NULL; - pos = pos + skip_len; *skip = wcstoul(pos, &nextchar, 0); WINE_TRACE("Found skip as %d lines\n", *skip); pos = nextchar; /* Save if usebackq semantics are in effect */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, pos, - usebackq_len, L"usebackq", usebackq_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"usebackq")) { *usebackq = TRUE; - pos = pos + usebackq_len; WINE_TRACE("Found usebackq\n"); /* Save the supplied delims. Slightly odd as space can be a delimiter but only if you finish the optionsroot string with delims= otherwise the space is just a token delimiter! */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, delims_len, L"delims=", delims_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"delims=")) { int i=0; - pos = pos + delims_len; while (*pos && *pos != ' ') { delims[i++] = *pos; pos++; @@ -1717,11 +1717,9 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, WINE_TRACE("Found delims as '%s'\n", wine_dbgstr_w(delims)); /* Save the tokens being requested */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, tokens_len, L"tokens=", tokens_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"tokens=")) { int i=0; - pos = pos + tokens_len; while (*pos && *pos != ' ') { tokens[i++] = *pos; pos++;

1 0

Alex Henrie : odbccp32: Use CRT allocation functions.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 79e78218ec0a1fc13b67b136f19edce1e4d53ccc URL: https://gitlab.winehq.org/wine/wine/-/commit/79e78218ec0a1fc13b67b136f19edc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:49:52 2023 -0600 odbccp32: Use CRT allocation functions. --- dlls/odbccp32/odbccp32.c | 107 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 54 deletions(-)

1 0

Alex Henrie : adsldp: Use CRT allocation functions.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 64d9d63fecb87c9dcfe14539c68bcf9b999c1072 URL: https://gitlab.winehq.org/wine/wine/-/commit/64d9d63fecb87c9dcfe14539c68bcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:04:49 2023 -0600 adsldp: Use CRT allocation functions. --- dlls/adsldp/adsldp_private.h | 4 +--- dlls/adsldp/schema.c | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 5d8b8177a7b..73bf8f379fd 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -19,8 +19,6 @@ #ifndef _ADSLDP_PRIVATE_H #define _ADSLDP_PRIVATE_H -#include "wine/heap.h" - static inline LPWSTR strnUtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) { LPWSTR ret = NULL; @@ -28,7 +26,7 @@ static inline LPWSTR strnUtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = MultiByteToWideChar( CP_UTF8, 0, str, inlen, NULL, 0 ); - if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_UTF8, 0, str, inlen, ret, len ); ret[len] = 0; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 7a530cc57e3..d8d0d7e9cde 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -116,9 +116,9 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, static void free_attribute_type(struct attribute_type *at) { - heap_free(at->oid); - heap_free(at->name); - heap_free(at->syntax); + free(at->oid); + free(at->name); + free(at->syntax); } void free_attribute_types(struct attribute_type *at, ULONG count) @@ -128,7 +128,7 @@ void free_attribute_types(struct attribute_type *at, ULONG count) for (i = 0; i < count; i++) free_attribute_type(&at[i]); - heap_free(at); + free(at); } static BOOL is_space(WCHAR c) @@ -156,7 +156,7 @@ static WCHAR *parse_oid(WCHAR **str) } count = end - p; - oid = heap_alloc((count + 1) * sizeof(WCHAR)); + oid = malloc((count + 1) * sizeof(WCHAR)); if (!oid) return NULL; memcpy(oid, p, count * sizeof(WCHAR)); @@ -202,17 +202,14 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) count = wcslen(tmp_name); - if (!name) - new_name = heap_alloc((count + 1) * sizeof(WCHAR)); - else - new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + new_name = realloc(name, (total_count + count + 1) * sizeof(WCHAR)); if (!new_name) break; memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); name = new_name; - heap_free(tmp_name); + free(tmp_name); total_count += count + 1; *name_count += 1; @@ -221,7 +218,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) *str = *p ? p + 1 : p; - heap_free(name); + free(name); return NULL; } @@ -236,7 +233,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) if (!end) return NULL; count = end - p; - name = heap_alloc((count + 1) * sizeof(WCHAR)); + name = malloc((count + 1) * sizeof(WCHAR)); if (!name) return NULL; memcpy(name, p, count * sizeof(WCHAR)); @@ -400,7 +397,7 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_single_count, ULONG *at_m { ULONG i, total = ldap_count_valuesW(types); - at = heap_alloc(total * sizeof(*at)); + at = malloc(total * sizeof(*at)); if (!at) goto exit; for (i = 0; i < total; i++)

1 0

Alex Henrie : inetcpl: Use CRT allocation functions.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 81a5a8f46b378b0868dd6be4b97ee5d1abfcd75f URL: https://gitlab.winehq.org/wine/wine/-/commit/81a5a8f46b378b0868dd6be4b97ee5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:46:14 2023 -0600 inetcpl: Use CRT allocation functions. --- dlls/inetcpl.cpl/connections.c | 11 +++++------ dlls/inetcpl.cpl/security.c | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index a6591051771..842f154bd8c 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -27,7 +27,6 @@ #include "inetcpl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -83,7 +82,7 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se pac_url_len = 0; size += sizeof(DWORD)*10; - *ret = heap_alloc_zero(size); + *ret = calloc(1, size); if(!*ret) return 0; (*ret)->version = CONNECTION_SETTINGS_VERSION; @@ -152,11 +151,11 @@ static void connections_on_initdialog(HWND hwnd) while((res = RegQueryValueExW(con, L"DefaultConnectionSettings", NULL, &type, (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) { - connection_settings *new_settings = heap_realloc(settings, size); + connection_settings *new_settings = realloc(settings, size); if(!new_settings) { RegCloseKey(con); - heap_free(settings); + free(settings); return; } settings = new_settings; @@ -170,7 +169,7 @@ static void connections_on_initdialog(HWND hwnd) else if(settings->flags & CONNECTION_SETTINGS_WPAD) CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED); } - heap_free(settings); + free(settings); } TRACE("ProxyEnable = %lx\n", enabled); @@ -332,7 +331,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) res = RegSetValueExW(con, L"DefaultConnectionSettings", 0, REG_BINARY, (BYTE*)default_connection, size); - heap_free(default_connection); + free(default_connection); RegCloseKey(con); return !res; } diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index a6e8c03d505..05c6502043c 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,7 +37,6 @@ #include "inetcpl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -273,8 +272,8 @@ static INT_PTR security_on_destroy(secdlg_data * sd) { TRACE("(%p)\n", sd); - heap_free(sd->zone_attr); - heap_free(sd->zones); + free(sd->zone_attr); + free(sd->zones); if (sd->himages) { SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(sd->himages); @@ -282,7 +281,7 @@ static INT_PTR security_on_destroy(secdlg_data * sd) security_cleanup_zones(sd); SetWindowLongPtrW(sd->hsec, DWLP_USER, 0); - heap_free(sd); + free(sd); return TRUE; } @@ -300,7 +299,7 @@ static INT_PTR security_on_initdialog(HWND hsec) DWORD lv_index = 0; DWORD i; - sd = heap_alloc_zero(sizeof(secdlg_data)); + sd = calloc(1, sizeof(secdlg_data)); SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); if (!sd) { return FALSE; @@ -338,14 +337,14 @@ static INT_PTR security_on_initdialog(HWND hsec) TRACE("found %ld zones\n", sd->num_zones); /* remember ZONEATTRIBUTES for a listview entry */ - sd->zone_attr = heap_alloc(sizeof(ZONEATTRIBUTES) * sd->num_zones); + sd->zone_attr = calloc(sd->num_zones, sizeof(ZONEATTRIBUTES)); if (!sd->zone_attr) { security_on_destroy(sd); return FALSE; } /* remember zone number and current security level for a listview entry */ - sd->zones = heap_alloc((sizeof(DWORD) + sizeof(DWORD)) * sd->num_zones); + sd->zones = calloc(sd->num_zones, sizeof(DWORD) + sizeof(DWORD)); if (!sd->zones) { security_on_destroy(sd); return FALSE;

1 0

Alex Henrie : advapi32: Use CRT allocation functions.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 7abcc31298567fbf7a1fb10047b8c625cd1d52bc URL: https://gitlab.winehq.org/wine/wine/-/commit/7abcc31298567fbf7a1fb10047b8c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:22:54 2023 -0600 advapi32: Use CRT allocation functions. --- dlls/advapi32/advapi.c | 6 +-- dlls/advapi32/advapi32_misc.h | 3 +- dlls/advapi32/cred.c | 110 +++++++++++++++++++++--------------------- dlls/advapi32/eventlog.c | 18 +++---- dlls/advapi32/lsa.c | 60 +++++++++++------------ dlls/advapi32/security.c | 96 ++++++++++++++++++------------------ dlls/advapi32/service.c | 32 ++++++------ 7 files changed, 162 insertions(+), 163 deletions(-)

1 0

Tim Clem : winemac.drv: Support cooperative app activation in macOS 14 Sonoma.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: fd67d678503ec2e57cbefef0bdfda48938153d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/fd67d678503ec2e57cbefef0bdfda4… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Aug 15 11:38:43 2023 -0700 winemac.drv: Support cooperative app activation in macOS 14 Sonoma. Starting in Sonoma, apps can no longer force themselves to the foreground with -activateIgnoringOtherApps:. winemac currently does that in a few places - when an app creates its first window, and in the implementation of APIs like SetFocus. There's nothing we can do to work around the new behavior in the general case. This patch makes Wine apps running in the same prefix yield to one another, so that windows from multiple EXEs can at least behave as intended. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 121 +++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 7 ++- 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 52c91c0621f..c4c8bbd16f2 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -142,6 +142,7 @@ enum { + (WineApplicationController*) sharedController; - (void) transformProcessToForeground:(BOOL)activateIfTransformed; + - (void) tryToActivateIgnoringOtherApps:(BOOL)ignore; - (BOOL) registerEventQueue:(WineEventQueue*)queue; - (void) unregisterEventQueue:(WineEventQueue*)queue; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 6a16d1ba832..5a6a3e01005 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -34,6 +34,12 @@ static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponse static NSString* const NSWindowWillStartDraggingNotification = @"NSWindowWillStartDraggingNotification"; static NSString* const NSWindowDidEndDraggingNotification = @"NSWindowDidEndDraggingNotification"; +// Internal distributed notification to handle cooperative app activation in Sonoma. +static NSString* const WineAppWillActivateNotification = @"WineAppWillActivateNotification"; +static NSString* const WineActivatingAppPIDKey = @"ActivatingAppPID"; +static NSString* const WineActivatingAppPrefixKey = @"ActivatingAppPrefix"; +static NSString* const WineActivatingAppConfigDirKey = @"ActivatingAppConfigDir"; + int macdrv_err_on; @@ -47,6 +53,24 @@ int macdrv_err_on; #endif +#if !defined(MAC_OS_VERSION_14_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_14_0 +(a)interface NSApplication (CooperativeActivationSelectorsForOldSDKs) + + - (void)activate; + - (void)yieldActivationToApplication:(NSRunningApplication *)application; + - (void)yieldActivationToApplicationWithBundleIdentifier:(NSString *)bundleIdentifier; + +(a)end + +(a)interface NSRunningApplication (CooperativeActivationSelectorsForOldSDKs) + + - (BOOL)activateFromApplication:(NSRunningApplication *)application + options:(NSApplicationActivationOptions)options; + +(a)end +#endif + + /*********************************************************************** * WineLocalizedString * @@ -227,7 +251,7 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; if (activateIfTransformed) - [NSApp activateIgnoringOtherApps:YES]; + [self tryToActivateIgnoringOtherApps:YES]; #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 if (!enable_app_nap && [NSProcessInfo instancesRespondToSelector:@selector(beginActivityWithOptions:reason:)]) @@ -1939,8 +1963,103 @@ static NSString* WineLocalizedString(unsigned int stringID) selector:@selector(enabledKeyboardInputSourcesChanged) name:(NSString*)kTISNotifyEnabledKeyboardInputSourcesChanged object:nil]; + + if ([NSApplication instancesRespondToSelector:@selector(yieldActivationToApplication:)]) + { + /* App activation cooperation, starting in macOS 14 Sonoma. */ + [dnc addObserver:self + selector:@selector(otherWineAppWillActivate:) + name:WineAppWillActivateNotification + object:nil + suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately]; + } + } + + - (void) otherWineAppWillActivate:(NSNotification *)note + { + NSProcessInfo *ourProcess; + pid_t otherPID; + NSString *ourConfigDir, *otherConfigDir, *ourPrefix, *otherPrefix; + NSRunningApplication *otherApp; + + /* No point in yielding if we're not the foreground app. */ + if (![NSApp isActive]) return; + + /* Ignore requests from ourself, dead processes, and other prefixes. */ + ourProcess = [NSProcessInfo processInfo]; + otherPID = [note.userInfo[WineActivatingAppPIDKey] integerValue]; + if (otherPID == ourProcess.processIdentifier) return; + + otherApp = [NSRunningApplication runningApplicationWithProcessIdentifier:otherPID]; + if (!otherApp) return; + + ourConfigDir = ourProcess.environment[@"WINECONFIGDIR"]; + otherConfigDir = note.userInfo[WineActivatingAppConfigDirKey]; + if (ourConfigDir.length && otherConfigDir.length && + ![ourConfigDir isEqualToString:otherConfigDir]) + { + return; + } + + ourPrefix = ourProcess.environment[@"WINEPREFIX"]; + otherPrefix = note.userInfo[WineActivatingAppPrefixKey]; + if (ourPrefix.length && otherPrefix.length && + ![ourPrefix isEqualToString:otherPrefix]) + { + return; + } + + /* There's a race condition here. The requesting app sends out + WineAppWillActivateNotification and then activates itself, but since + distributed notifications are asynchronous, we may not have yielded + in time. So we call activateFromApplication: on the other app here, + which will work around that race if it happened. If we didn't hit the + race, the activateFromApplication: call will be a no-op. */ + + /* We only add this observer if NSApplication responds to the yield + methods, so they're safe to call without checking here. */ + [NSApp yieldActivationToApplication:otherApp]; + [otherApp activateFromApplication:[NSRunningApplication currentApplication] + options:0]; } + - (void) tryToActivateIgnoringOtherApps:(BOOL)ignore + { + NSProcessInfo *processInfo; + NSString *configDir, *prefix; + NSDictionary *userInfo; + + if ([NSApp isActive]) return; /* Nothing to do. */ + + if (!ignore || + ![NSApplication instancesRespondToSelector:@selector(yieldActivationToApplication:)]) + { + /* Either we don't need to force activation, or the OS is old enough + that this is our only option. */ + [NSApp activateIgnoringOtherApps:ignore]; + return; + } + + /* Ask other Wine apps to yield activation to us. */ + processInfo = [NSProcessInfo processInfo]; + configDir = processInfo.environment[@"WINECONFIGDIR"]; + prefix = processInfo.environment[@"WINEPREFIX"]; + userInfo = @{ + WineActivatingAppPIDKey: @(processInfo.processIdentifier), + WineActivatingAppPrefixKey: prefix ? prefix : @"", + WineActivatingAppConfigDirKey: configDir ? configDir : @"" + }; + + [[NSDistributedNotificationCenter defaultCenter] + postNotificationName:WineAppWillActivateNotification + object:nil + userInfo:userInfo + deliverImmediately:YES]; + + /* This is racy. See the note in otherWineAppWillActivate:. */ + [NSApp activate]; + } + - (BOOL) inputSourceIsInputMethod { if (!inputSourceIsInputMethodValid) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ac4cc214239..cc9a9e13c2b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1720,7 +1720,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi wasVisible = [self isVisible]; if (activate) - [NSApp activateIgnoringOtherApps:YES]; + [controller tryToActivateIgnoringOtherApps:YES]; NSDisableScreenUpdates(); @@ -2084,8 +2084,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if (activate) { - [[WineApplicationController sharedController] transformProcessToForeground:YES]; - [NSApp activateIgnoringOtherApps:YES]; + WineApplicationController *controller = [WineApplicationController sharedController]; + [controller transformProcessToForeground:YES]; + [controller tryToActivateIgnoringOtherApps:YES]; } causing_becomeKeyWindow = self;

1 0

Jacek Caban : cscript: Build as CUI application.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: a1d429dabde73689c66a5434d6f92284503b8f7a URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d429dabde73689c66a5434d6f922… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 16 16:08:12 2023 +0200 cscript: Build as CUI application. --- programs/cscript/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index d87a28fcc54..7d3e74768f3 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript -EXTRADLLFLAGS = -mwindows -municode +EXTRADLLFLAGS = -mconsole -municode C_SRCS = \ arguments.c \

1 0

Ziqing Hui : winegstreamer: Implement GetStreamSinkById for media sink.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: a7594900ea9d0ee1fae864175848e23673c7881a URL: https://gitlab.winehq.org/wine/wine/-/commit/a7594900ea9d0ee1fae864175848e2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 11 11:41:34 2023 +0800 winegstreamer: Implement GetStreamSinkById for media sink. --- dlls/winegstreamer/media_sink.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 4418a82096c..fcea67eb8f1 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -671,9 +671,27 @@ static HRESULT WINAPI media_sink_GetStreamSinkByIndex(IMFFinalizableMediaSink *i static HRESULT WINAPI media_sink_GetStreamSinkById(IMFFinalizableMediaSink *iface, DWORD stream_sink_id, IMFStreamSink **stream) { - FIXME("iface %p, stream_sink_id %#lx, stream %p stub!\n", iface, stream_sink_id, stream); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + struct stream_sink *stream_sink; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stream_sink_id %#lx, stream %p.\n", iface, stream_sink_id, stream); + + if (!stream) + return E_POINTER; + + EnterCriticalSection(&media_sink->cs); + + hr = MF_E_INVALIDSTREAMNUMBER; + if ((stream_sink = media_sink_get_stream_sink_by_id(media_sink, stream_sink_id))) + { + IMFStreamSink_AddRef((*stream = &stream_sink->IMFStreamSink_iface)); + hr = S_OK; + } + + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI media_sink_SetPresentationClock(IMFFinalizableMediaSink *iface, IMFPresentationClock *clock)

1 0

Ziqing Hui : winegstreamer: Implement GetStreamSinkByIndex for media sink.
by Alexandre Julliard Aug. 16, 2023

Aug. 16, 2023

Module: wine Branch: master Commit: 59adbf66708e61553881da32b35334de6e50fc2e URL: https://gitlab.winehq.org/wine/wine/-/commit/59adbf66708e61553881da32b35334… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 11 11:33:27 2023 +0800 winegstreamer: Implement GetStreamSinkByIndex for media sink. --- dlls/winegstreamer/media_sink.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 54a1c839758..4418a82096c 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -641,9 +641,31 @@ static HRESULT WINAPI media_sink_GetStreamSinkCount(IMFFinalizableMediaSink *ifa static HRESULT WINAPI media_sink_GetStreamSinkByIndex(IMFFinalizableMediaSink *iface, DWORD index, IMFStreamSink **stream) { - FIXME("iface %p, index %lu, stream %p stub!\n", iface, index, stream); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + struct stream_sink *stream_sink; + HRESULT hr = MF_E_INVALIDINDEX; + DWORD entry_index = 0; - return E_NOTIMPL; + TRACE("iface %p, index %lu, stream %p stub!\n", iface, index, stream); + + if (!stream) + return E_POINTER; + + EnterCriticalSection(&media_sink->cs); + + LIST_FOR_EACH_ENTRY(stream_sink, &media_sink->stream_sinks, struct stream_sink, entry) + { + if (entry_index++ == index) + { + IMFStreamSink_AddRef((*stream = &stream_sink->IMFStreamSink_iface)); + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI media_sink_GetStreamSinkById(IMFFinalizableMediaSink *iface, DWORD stream_sink_id,

1 0