wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Martin Storsjö : winebuild: Fix building for arm with older versions of binutils.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 5de4766475ac606ad917f27ec86154b1406ea9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de4766475ac606ad917f27e… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 12:47:21 2021 +0300 winebuild: Fix building for arm with older versions of binutils. Use an explicit "movw" instead of a plain "mov", as the immediates might not fit in a narrow thumb mov instruction. Newer versions of binutils deduces this implicitly. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 02029056b30..d944f8179af 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -312,7 +312,7 @@ static void output_relay_debug( DLLSPEC *spec ) if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); - output( "\tmov r1,#%u\n", i - spec->base ); + output( "\tmovw r1,#%u\n", i - spec->base ); output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset ); if (UsePIC) {

1 0

Nikolay Sivov : wininet: Adjust IsHostInProxyBypassList() prototype.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 8a016805f0b15ba72c38ebf303eb611324f7788b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a016805f0b15ba72c38ebf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 3 12:06:17 2021 +0300 wininet: Adjust IsHostInProxyBypassList() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 11 ++++------- include/winineti.h | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eedb210cd23..e9363208471 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6314,13 +6314,10 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index) /*********************************************************************** - * IsHostInProxyBypassList (@) - * - * Undocumented - * + * IsHostInProxyBypassList (WININET.@) */ -BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME scheme, LPCSTR szHost, DWORD length) { - FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); - return FALSE; + FIXME("STUB: scheme=%d host=%s length=%d\n", scheme, szHost, length); + return FALSE; } diff --git a/include/winineti.h b/include/winineti.h index 812ff793317..5dc3088a881 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -128,6 +128,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD, #define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo) BOOL WINAPI IncrementUrlCacheHeaderData(DWORD,LPDWORD); BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME,LPCSTR,DWORD); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired)

1 0

Zebediah Figura : ieproxy: Remove incorrect comments.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 760a9d1daab032ba5c87a810d922afd2f1d90547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=760a9d1daab032ba5c87a810… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 14:55:15 2021 -0500 ieproxy: Remove incorrect comments. The PSFactoryBuffer CLSID does not match the IInternetExplorerManager IID. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/ieproxy_ieautomation.idl | 2 +- dlls/ieproxy/ieproxy_perhist.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieproxy/ieproxy_ieautomation.idl b/dlls/ieproxy/ieproxy_ieautomation.idl index 9ffe91b7956..f97f176a764 100644 --- a/dlls/ieproxy/ieproxy_ieautomation.idl +++ b/dlls/ieproxy/ieproxy_ieautomation.idl @@ -26,6 +26,6 @@ [ threading(both), - uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) ] coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ieproxy/ieproxy_perhist.idl b/dlls/ieproxy/ieproxy_perhist.idl index 12268f55c80..eee7b2ccd27 100644 --- a/dlls/ieproxy/ieproxy_perhist.idl +++ b/dlls/ieproxy/ieproxy_perhist.idl @@ -25,6 +25,6 @@ [ threading(both), - uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) ] coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Zebediah Figura : ieframe: Remove manual IInternetExplorerManager proxy registration.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: f6ef640e0a4d5fd7191d2e2f679541e916113601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ef640e0a4d5fd7191d2e2f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 14:55:14 2021 -0500 ieframe: Remove manual IInternetExplorerManager proxy registration. This is handled automatically when registering ieproxy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.rgs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index 0b48600321e..f99e6b63523 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -42,13 +42,6 @@ HKCR Control } } - NoRemove Interface - { - '{acc84351-04ff-44f9-b23f-655ed168c6d5}' - { - ProxyStubClsid32 = s '{a4a1a128-768f-41e0-bf75-e4fddd701cba}' - } - } 'InternetShortcut' { val 'EditFlags' = s '2'

1 0

Alexandre Julliard : msvcrt: Remove leftover __wine_init_unix_lib() call.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 08e5080089220d6bcce0c0a33cf49e8c95ed711f URL: https://source.winehq.org/git/wine.git/?a=commit;h=08e5080089220d6bcce0c0a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 16:40:06 2021 +0200 msvcrt: Remove leftover __wine_init_unix_lib() call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 124cdf80098..05eacbb36fb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -66,8 +66,6 @@ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; BOOL sse2_supported; static BOOL sse2_enabled; -static const struct unix_funcs *unix_funcs; - void msvcrt_init_math( void *module ) { sse2_supported = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE ); @@ -76,7 +74,6 @@ void msvcrt_init_math( void *module ) #else sse2_enabled = sse2_supported; #endif - __wine_init_unix_lib( module, DLL_PROCESS_ATTACH, NULL, &unix_funcs ); } /* Copied from musl: src/internal/libm.h */

1 0

Alexandre Julliard : ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: e5339ecbc66f20193a0a6b1dfdce98d42d2ad926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5339ecbc66f20193a0a6b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 13:31:15 2021 +0200 ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 29 +++++++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 29 +++++++++++++---------------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ dlls/ntdll/unixlib.h | 3 +-- dlls/wow64/virtual.c | 3 +++ include/winternl.h | 3 +++ 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1139a228c2c..c8ea2452e66 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1338,6 +1338,31 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } } + +/************************************************************************* + * init_builtin_dll + */ +static void init_builtin_dll( HMODULE module ) +{ + void *buffer[16]; + void (**funcs)(int, char **, char **) = (void *)buffer; + SIZE_T i, size; + NTSTATUS status; + + status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, + buffer, sizeof(buffer), &size ); + if (status == STATUS_BUFFER_TOO_SMALL) + { + if (!(funcs = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return; + status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, + funcs, size, &size ); + } + if (!status) for (i = 0; i < size / sizeof(*funcs); i++) funcs[i]( 0, NULL, NULL ); + + if ((void *)funcs != (void *)buffer) RtlFreeHeap( GetProcessHeap(), 0, funcs ); +} + + /************************************************************************* * MODULE_InitDLL */ @@ -1354,7 +1379,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -3914,7 +3939,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bf5f8048124..c2f79bc2c44 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1700,26 +1700,21 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase) #endif /************************************************************************* - * init_builtin_dll + * get_builtin_init_funcs */ -static void CDECL init_builtin_dll( void *module ) +NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) { #ifdef HAVE_DLINFO - void *handle = NULL; struct link_map *map; - void (*init_func)(int, char **, char **) = NULL; - void (**init_array)(int, char **, char **) = NULL; - ULONG_PTR i, init_arraysz = 0; + void *init_func = NULL, **init_array = NULL; + ULONG_PTR i, count, init_arraysz = 0; #ifdef _WIN64 const Elf64_Dyn *dyn; #else const Elf32_Dyn *dyn; #endif - if (!(handle = get_builtin_so_handle( module ))) return; - if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) map = NULL; - release_builtin_module( module ); - if (!map) return; + if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) return STATUS_INVALID_IMAGE_FORMAT; for (dyn = map->l_ld; dyn->d_tag; dyn++) { @@ -1738,13 +1733,16 @@ static void CDECL init_builtin_dll( void *module ) } } - TRACE( "%p: got init_func %p init_array %p %lu\n", module, init_func, init_array, init_arraysz ); + TRACE( "%p: got init_func %p init_array %p %lu\n", handle, init_func, init_array, init_arraysz ); - if (init_func) init_func( main_argc, main_argv, main_envp ); + count = init_arraysz / sizeof(*init_array); + if (init_func) count++; + if (retlen) *retlen = count * sizeof(*funcs); - if (init_array) - for (i = 0; i < init_arraysz / sizeof(*init_array); i++) - init_array[i]( main_argc, main_argv, main_envp ); + if (count > len / sizeof(*funcs)) return STATUS_BUFFER_TOO_SMALL; + if (init_func) *funcs++ = init_func; + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; + return STATUS_SUCCESS; #endif } @@ -1896,7 +1894,6 @@ static struct unix_funcs unix_funcs = ntdll_sqrt, ntdll_tan, load_so_dll, - init_builtin_dll, init_unix_lib, unwind_builtin_dll, }; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d65807b8057..a51b04fb3c8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -158,6 +158,7 @@ extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPE extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) DECLSPEC_HIDDEN; extern NTSTATUS load_start_exe( WCHAR **image, void **module ) DECLSPEC_HIDDEN; +extern NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6d6d52e7208..f055be94238 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4281,6 +4281,21 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryMappedFilenameInformation: return get_memory_section_name( process, addr, buffer, len, res_len ); + case MemoryWineImageInitFuncs: + if (process == GetCurrentProcess()) + { + void *module = (void *)addr; + void *handle = get_builtin_so_handle( module ); + + if (handle) + { + NTSTATUS status = get_builtin_init_funcs( handle, buffer, len, res_len ); + release_builtin_module( module ); + return status; + } + } + return STATUS_INVALID_HANDLE; + default: FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", process, addr, info_class, buffer, len, res_len); diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 8747ec5039f..f22e0c12d22 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 124 +#define NTDLL_UNIXLIB_VERSION 125 struct unix_funcs { @@ -71,7 +71,6 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); - void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 2c60718d516..e1acd0c9609 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -363,6 +363,9 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) break; } + case MemoryWineImageInitFuncs: + return STATUS_INVALID_INFO_CLASS; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS; diff --git a/include/winternl.h b/include/winternl.h index ae86040d6f0..9dff3a98bed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1918,6 +1918,9 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryEnclaveImageInformation, MemoryBasicInformationCapped, MemoryPhysicalContiguityInformation, +#ifdef __WINESRC__ + MemoryWineImageInitFuncs = 1000 +#endif } MEMORY_INFORMATION_CLASS; typedef struct _MEMORY_SECTION_NAME

1 0

Alexandre Julliard : ntdll: Update the MEMORY_INFORMATION_CLASS enumeration.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: c6373abc10100f7b1c564afe3c6148a904732220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6373abc10100f7b1c564afe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 13:09:35 2021 +0200 ntdll: Update the MEMORY_INFORMATION_CLASS enumeration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/kernelbase/debug.c | 6 ++++-- dlls/ntdll/tests/info.c | 18 +++++++++--------- dlls/ntdll/unix/virtual.c | 11 +++-------- dlls/psapi/tests/psapi_main.c | 2 +- dlls/wow64/virtual.c | 2 +- include/winternl.h | 15 +++++++++++---- 7 files changed, 30 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6373abc10100f7b1c56…

1 0

Alexandre Julliard : ntdll: Add a magic parameter to NtFreeVirtualMemory() for releasing address space.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 669d1cce03a42ea978faf9a4608552b2d11ef5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=669d1cce03a42ea978faf9a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 12:02:51 2021 +0200 ntdll: Add a magic parameter to NtFreeVirtualMemory() for releasing address space. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 2 -- dlls/ntdll/unix/virtual.c | 66 +++++++++++++++++++++--------------------- dlls/ntdll/unixlib.h | 5 +--- 5 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2b840a864a6..1139a228c2c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3775,6 +3775,17 @@ static void init_wow64( CONTEXT *context ) #endif +/* release some address space once dlls are loaded*/ +static void release_address_space(void) +{ +#ifndef _WIN64 + void *addr = (void *)1; + SIZE_T size = 0; + + NtFreeVirtualMemory( GetCurrentProcess(), &addr, &size, MEM_RELEASE ); +#endif +} + /****************************************************************** * LdrInitializeThunk (NTDLL.@) * @@ -3901,7 +3912,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtTerminateProcess( GetCurrentProcess(), status ); } } - unix_funcs->virtual_release_address_space(); + release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e580cd7556..bf5f8048124 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1895,7 +1895,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - virtual_release_address_space, load_so_dll, init_builtin_dll, init_unix_lib, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3bb763a5eda..d65807b8057 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -109,8 +109,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; - extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fbdbf79d9d5..cd677cd2c69 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -580,6 +580,20 @@ static void mmap_init( const struct preload_info *preload_info ) #endif } + +/*********************************************************************** + * get_wow_user_space_limit + */ +static void *get_wow_user_space_limit(void) +{ +#ifdef _WIN64 + if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) return (void *)0xc0000000; + return (void *)0x7fff0000; +#endif + return user_space_limit; +} + + /*********************************************************************** * add_builtin_module */ @@ -2703,17 +2717,8 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) info->LowestUserAddress = (void *)0x10000; info->ActiveProcessorsAffinityMask = get_system_affinity_mask(); info->NumberOfProcessors = peb->NumberOfProcessors; -#ifdef _WIN64 - if (wow64) - { - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) - info->HighestUserAddress = (char *)0xc0000000 - 1; - else - info->HighestUserAddress = (char *)0x7fff0000 - 1; - return; - } -#endif - info->HighestUserAddress = (char *)user_space_limit - 1; + if (wow64) info->HighestUserAddress = (char *)get_wow_user_space_limit() - 1; + else info->HighestUserAddress = (char *)user_space_limit - 1; } @@ -3639,38 +3644,29 @@ static int CDECL free_reserved_memory( void *base, SIZE_T size, void *arg ) * * Release some address space once we have loaded and initialized the app. */ -void CDECL virtual_release_address_space(void) +static void virtual_release_address_space(void) { struct free_range range; - sigset_t sigset; - - if (is_win64) return; - - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); range.base = (char *)0x82000000; - range.limit = user_space_limit; + range.limit = get_wow_user_space_limit(); + + if (range.limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ if (range.limit > range.base) { while (mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; #ifdef __APPLE__ /* On macOS, we still want to free some of low memory, for OpenGL resources */ - range.base = (char *)0x40000000; + range.base = (char *)0x40000000; #else - range.base = NULL; + return; #endif } - else - range.base = (char *)0x20000000; + else range.base = (char *)0x20000000; - if (range.base) - { - range.limit = (char *)0x7f000000; - while (mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; - } - - server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + range.limit = (char *)0x7f000000; + while (mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; } @@ -3884,12 +3880,16 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); - /* avoid freeing the DOS area when a broken app passes a NULL pointer */ - if (!base) return STATUS_INVALID_PARAMETER; - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - if (!(view = find_view( base, size )) || !is_view_valloc( view )) + /* avoid freeing the DOS area when a broken app passes a NULL pointer */ + if (!base) + { + /* address 1 is magic to mean release reserved space */ + if (addr == (void *)1 && !*size_ptr && type == MEM_RELEASE) virtual_release_address_space(); + else status = STATUS_INVALID_PARAMETER; + } + else if (!(view = find_view( base, size )) || !is_view_valloc( view )) { status = STATUS_INVALID_PARAMETER; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ba37297a324..8747ec5039f 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 123 +#define NTDLL_UNIXLIB_VERSION 124 struct unix_funcs { @@ -69,9 +69,6 @@ struct unix_funcs double (CDECL *sqrt)( double d ); double (CDECL *tan)( double d ); - /* virtual memory functions */ - void (CDECL *virtual_release_address_space)(void); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module );

1 0

Martin Storsjö : mailmap: Add a mailmap entry for myself with the proper spelling.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: c44218ba501e7bafc3dadc5486f4340a183d5f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44218ba501e7bafc3dadc54… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Aug 2 12:03:09 2021 +0300 mailmap: Add a mailmap entry for myself with the proper spelling. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 81ca6946268..c545fa05d81 100644 --- a/.mailmap +++ b/.mailmap @@ -90,6 +90,7 @@ Luis Carlos Busquets Pérez <luiscar2001(a)yahoo.es> Mariusz Pluciński <vshader(a)gmail.com> Mark G. Adams <mark(a)transgaming.com> Markus Gömmel <m.goemmel(a)compulab.de> +Martin Storsjö <martin(a)martin.st> Matej Špindler <matej.spindler(a)gmail.com> Matej Špindler <spindler.matej(a)gmail.com> Matthew Finnicum <mattfinn(a)gmail.com>

1 0

Alex Henrie : include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC).
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 14e205ff502ec7275d2c4cf59b1446ac0a294416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e205ff502ec7275d2c4cf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 22:13:38 2021 -0600 include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msi.h b/include/msi.h index 604331a9e5f..c1ca99771a4 100644 --- a/include/msi.h +++ b/include/msi.h @@ -470,8 +470,8 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) -UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR*, MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR*, MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR[39], MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); #define MsiEnumClientsEx WINELIB_NAME_AW(MsiEnumClientsEx) UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021