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

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

16 Aug '23

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 : ieframe/tests: Use less strict checks in session count tests.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 3f276c836b43a720256559870b059399fb3f4663 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f276c836b43a720256559870b0593… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 16 10:15:55 2023 +0200 ieframe/tests: Use less strict checks in session count tests. --- dlls/ieframe/tests/webbrowser.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 15ce0272654..402014a8c07 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4434,22 +4434,22 @@ static void test_SetAdvise(void) static void test_SetQueryNetSessionCount(void) { - LONG count, init_count; + LONG count, init_count, inc_count, dec_count; init_count = pSetQueryNetSessionCount(SESSION_QUERY); trace("init_count %ld\n", init_count); - count = pSetQueryNetSessionCount(SESSION_INCREMENT); - ok(count == init_count + 1, "count = %ld\n", count); + inc_count = pSetQueryNetSessionCount(SESSION_INCREMENT); + ok(inc_count > init_count, "count = %ld\n", inc_count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == init_count + 1, "count = %ld\n", count); + ok(count == inc_count, "count = %ld\n", count); - count = pSetQueryNetSessionCount(SESSION_DECREMENT); - ok(count == init_count, "count = %ld\n", count); + dec_count = pSetQueryNetSessionCount(SESSION_DECREMENT); + ok(dec_count < inc_count, "count = %ld\n", dec_count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == init_count, "count = %ld\n", count); + ok(count == dec_count, "count = %ld\n", count); } static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)

1 0

Ilia Docin : sane.ds: Fix pixel type setting.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 161e34bd86cfca052ddeb7f9996ffec9f76abb74 URL: https://gitlab.winehq.org/wine/wine/-/commit/161e34bd86cfca052ddeb7f9996ffe… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Wed Aug 16 12:59:32 2023 +0300 sane.ds: Fix pixel type setting. Remove extra memory access operator. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55375 --- dlls/sane.ds/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index fabbb554744..1d39844a770 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -103,7 +103,7 @@ TW_UINT16 sane_option_set_str(const char *option_name, char *val, BOOL *needs_re struct option_descriptor opt; TW_UINT16 rc = sane_find_option(option_name, TYPE_STRING, &opt); - if (rc == TWCC_SUCCESS) rc = sane_option_set_value( opt.optno, &val, needs_reload ); + if (rc == TWCC_SUCCESS) rc = sane_option_set_value( opt.optno, val, needs_reload ); return rc; }

1 0

Vitaly Lipatov : advapi32: Print name for POLICY_INFORMATION_CLASS argument.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: d5a983ebecfee5cb88f8eca02f476c5d325ab8b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5a983ebecfee5cb88f8eca02f476c… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Nov 15 10:37:20 2019 +0300 advapi32: Print name for POLICY_INFORMATION_CLASS argument. --- dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index b63519c0299..a14025a9458 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -62,6 +62,33 @@ static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa) } } +static const char *debugstr_InformationClass( POLICY_INFORMATION_CLASS class ) +{ + static const char * const names[] = + { + NULL, + "PolicyAuditLogInformation", + "PolicyAuditEventsInformation", + "PolicyPrimaryDomainInformation", + "PolicyPdAccountInformation", + "PolicyAccountDomainInformation", + "PolicyLsaServerRoleInformation", + "PolicyReplicaSourceInformation", + "PolicyDefaultQuotaInformation", + "PolicyModificationInformation", + "PolicyAuditFullSetInformation", + "PolicyAuditFullQueryInformation", + "PolicyDnsDomainInformation", + "PolicyDnsDomainInformationInt", + "PolicyLocalAccountDomainInformation", + "PolicyMachineAccountInformation", + "PolicyMachineAccountInformation2", + }; + + if (class < ARRAY_SIZE(names) && names[class]) return names[class]; + return wine_dbg_sprintf( "%u", class ); +} + static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) { HKEY key; @@ -779,7 +806,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( IN POLICY_INFORMATION_CLASS InformationClass, OUT PVOID *Buffer) { - TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + TRACE("(%p,%s,%p)\n", PolicyHandle, debugstr_InformationClass(InformationClass), Buffer); if(!Buffer) return STATUS_INVALID_PARAMETER; switch (InformationClass) @@ -1016,7 +1043,7 @@ NTSTATUS WINAPI LsaSetInformationPolicy( IN POLICY_INFORMATION_CLASS InformationClass, IN PVOID Buffer) { - FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + FIXME("(%p,%s,%p) stub\n", PolicyHandle, debugstr_InformationClass(InformationClass), Buffer); return STATUS_UNSUCCESSFUL; }

1 0

Vitaly Lipatov : secur32: Print name for EXTENDED_NAME_FORMAT argument.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 5f1b91e5688a85502c4bf6f19672b06f0d8d0337 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f1b91e5688a85502c4bf6f19672b0… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Nov 17 12:42:56 2019 +0300 secur32: Print name for EXTENDED_NAME_FORMAT argument. --- dlls/secur32/secur32.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index bb723e90004..f757ea6d34f 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -816,6 +816,33 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG pcPackages, return ret; } + +static const char *debugstr_NameFormat( EXTENDED_NAME_FORMAT format ) +{ + static const char * const names[] = + { + "NameUnknown", + "NameFullyQualifiedDN", + "NameSamCompatible", + "NameDisplay", + NULL, + NULL, + "NameUniqueId", + "NameCanonical", + "NameUserPrincipal", + "NameCanonicalEx", + "NameServicePrincipal", + NULL, + "NameDnsDomain", + "NameGivenName", + "NameSurname" + }; + + if (format < ARRAY_SIZE(names) && names[format]) return names[format]; + return wine_dbg_sprintf( "%u", format ); +} + + /*********************************************************************** * GetComputerObjectNameA (SECUR32.@) * @@ -847,7 +874,7 @@ BOOLEAN WINAPI GetComputerObjectNameA( LPWSTR bufferW = NULL; ULONG sizeW = *nSize; - TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + TRACE("(%s %p %p)\n", debugstr_NameFormat(NameFormat), lpNameBuffer, nSize); if (lpNameBuffer) { if (!(bufferW = malloc(sizeW * sizeof(WCHAR)))) { @@ -879,7 +906,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( NTSTATUS ntStatus; BOOLEAN status; - TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + TRACE("(%s %p %p)\n", debugstr_NameFormat(NameFormat), lpNameBuffer, nSize); if (NameFormat == NameUnknown) { @@ -1066,7 +1093,7 @@ BOOLEAN WINAPI GetUserNameExA( BOOLEAN rc; LPWSTR bufferW = NULL; ULONG sizeW = *nSize; - TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + TRACE("(%s %p %p)\n", debugstr_NameFormat(NameFormat), lpNameBuffer, nSize); if (lpNameBuffer) { bufferW = malloc(sizeW * sizeof(WCHAR)); if (bufferW == NULL) { @@ -1098,7 +1125,7 @@ BOOLEAN WINAPI GetUserNameExA( BOOLEAN WINAPI GetUserNameExW( EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) { - TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + TRACE("(%s %p %p)\n", debugstr_NameFormat(NameFormat), lpNameBuffer, nSize); switch (NameFormat) { @@ -1155,8 +1182,8 @@ BOOLEAN WINAPI TranslateNameA( EXTENDED_NAME_FORMAT DesiredNameFormat, LPSTR lpTranslatedName, PULONG nSize) { - FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat, - DesiredNameFormat, lpTranslatedName, nSize); + FIXME("%p %s %s %p %p\n", lpAccountName, debugstr_NameFormat(AccountNameFormat), + debugstr_NameFormat(DesiredNameFormat), lpTranslatedName, nSize); return FALSE; } @@ -1165,8 +1192,8 @@ BOOLEAN WINAPI TranslateNameW( EXTENDED_NAME_FORMAT DesiredNameFormat, LPWSTR lpTranslatedName, PULONG nSize) { - FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat, - DesiredNameFormat, lpTranslatedName, nSize); + FIXME("%p %s %s %p %p\n", lpAccountName, debugstr_NameFormat(AccountNameFormat), + debugstr_NameFormat(DesiredNameFormat), lpTranslatedName, nSize); return FALSE; }

1 0

Alexandre Julliard : ntdll: Set Wow64 user space limit based on LARGE_ADDRESS_AWARE.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 3ac808e46e4795e14c5b999aa39fd9cd15f95279 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ac808e46e4795e14c5b999aa39fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 16 13:48:43 2023 +0200 ntdll: Set Wow64 user space limit based on LARGE_ADDRESS_AWARE. Based on a patch by Billy Laws. --- dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 7 +++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 8aa41aba183..9cd71e4b020 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1864,6 +1864,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); + user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d312ed6a066..0c433fef4c2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1201,7 +1201,7 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE teb->DeallocationStack = stack.DeallocationStack; /* 32-bit stack */ - if (!limit || limit >= limit_2g) limit = limit_2g - 1; + if (!limit || limit > user_space_wow_limit) limit = user_space_wow_limit; if ((status = virtual_alloc_thread_stack( &stack, 0, limit, reserve_size, commit_size, TRUE ))) return status; wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6862d74b863..701ff58b066 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -63,6 +63,7 @@ static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiB #endif extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; +extern ULONG_PTR user_space_wow_limit DECLSPEC_HIDDEN; static inline WOW_TEB *get_wow_teb( TEB *teb ) { @@ -516,7 +517,7 @@ static inline NTSTATUS map_section( HANDLE mapping, void **ptr, SIZE_T *size, UL { *ptr = NULL; *size = 0; - return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, is_win64 && wow_peb ? limit_2g - 1 : 0, + return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, user_space_wow_limit, 0, NULL, size, ViewShare, 0, protect ); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 62fc1c9dd1f..897c92b6349 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -181,6 +181,7 @@ static void *working_set_limit = (void *)0x7fff0000; static struct file_view *arm64ec_view; +ULONG_PTR user_space_wow_limit = 0; struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; /* TEB allocation blocks */ @@ -568,8 +569,7 @@ static void mmap_init( const struct preload_info *preload_info ) static void *get_wow_user_space_limit(void) { #ifdef _WIN64 - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) return (void *)0xffff0000; - return (void *)0x7fff0000; + return (void *)(user_space_wow_limit & ~granularity_mask); #endif return user_space_limit; } @@ -3422,8 +3422,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, - is_win64 && is_wow64() ? limit_2g - 1 : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, user_space_wow_limit, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Vitaly Lipatov : include: Include ncrypt.h in wincrypt.h.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: aa4d0dd8188fc8541d36f8926f67d6b6360bdcf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa4d0dd8188fc8541d36f8926f67d6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:17:38 2023 +0300 include: Include ncrypt.h in wincrypt.h. --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 81ae7d040da..0da94a31f73 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -26,7 +26,7 @@ extern "C" { #endif #include <bcrypt.h> -/* FIXME: #include <ncrypt.h> */ +#include <ncrypt.h> #ifndef WINADVAPI #ifdef _ADVAPI32_

1 0

Vitaly Lipatov : include: Add missing PCWCHAR to winnt.h.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: 7377b53681cd2a96fb087b9b7790ca74121704e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7377b53681cd2a96fb087b9b7790ca… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:18:02 2023 +0300 include: Add missing PCWCHAR to winnt.h. --- include/winnt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index c04f25b29bd..2e1aac0f477 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -536,7 +536,8 @@ typedef CHAR *PZZSTR; typedef const CHAR *PCZZSTR; /* Unicode string types */ -typedef const WCHAR *PCWCHAR, *LPCUWCHAR, *PCUWCHAR; +typedef const WCHAR *PCWCHAR, *LPCWCHAR; +typedef const WCHAR *PCUWCHAR, *LPCUWCHAR; typedef WCHAR *PWCH, *LPWCH; typedef const WCHAR *PCWCH, *LPCWCH; typedef WCHAR *PNZWCH, *PUNZWCH;

1 0

Vitaly Lipatov : include: Add initial activeds.h.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: de354e8d45506f25d7b04bfb3c7eba0badf9d3ce URL: https://gitlab.winehq.org/wine/wine/-/commit/de354e8d45506f25d7b04bfb3c7eba… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:21:07 2023 +0300 include: Add initial activeds.h. --- include/Makefile.in | 1 + include/activeds.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c5ba156f50e..afc043ca671 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -6,6 +6,7 @@ SOURCES = \ activation.idl \ activaut.idl \ activdbg.idl \ + activeds.h \ activscp.idl \ adserr.h \ adshlp.h \ diff --git a/include/activeds.h b/include/activeds.h new file mode 100644 index 00000000000..4b3039e95d7 --- /dev/null +++ b/include/activeds.h @@ -0,0 +1,21 @@ +/* + * Copyright 2023 Vitaly Lipatov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <iads.h> +#include <adshlp.h> +#include <adserr.h>

1 0

Vitaly Lipatov : include: Add standalone LSA_OBJECT_ATTRIBUTES prototype if ntdef.h is not included.
by Alexandre Julliard 16 Aug '23

16 Aug '23

Module: wine Branch: master Commit: d173bc6a534c03fac60920b67d136d11cdee96e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d173bc6a534c03fac60920b67d136d… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Jul 16 17:23:13 2023 +0300 include: Add standalone LSA_OBJECT_ATTRIBUTES prototype if ntdef.h is not included. --- include/ntsecapi.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 849e72ef33e..d01c04c6867 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -188,7 +188,21 @@ typedef struct _SecHandle typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; + +#ifdef _NTDEF_ typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; +#else +typedef struct _LSA_OBJECT_ATTRIBUTES +{ + ULONG Length; + HANDLE RootDirectory; + PLSA_UNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; + PVOID SecurityQualityOfService; +} LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; +#endif + typedef PVOID LSA_HANDLE, *PLSA_HANDLE; typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE;

1 0