February 2021 - Wine-Devel - list.winehq.org

[PATCH v2] msvfw32: WS_CHILD is set for window style when parent is not NULL
by David Adam Feb. 22, 2021

Feb. 22, 2021

1 0

[PATCH] iphlpapi: Include <netinet/in.h> in ifenum.c.
by Gerald Pfeifer Feb. 21, 2021

Feb. 21, 2021

commit 2d3b1c1288c8a0df5cdecd3929dbb69da0fee7c4 Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 16 22:56:29 2021 -0700 iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke FreeBSD by removing #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif from iphlpapi/ifenum.c. Alas that is required there to define INADDR_ANY which is still used in that file Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/iphlpapi/ifenum.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 288e04db7b8..2e99ebe03fd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -67,6 +67,10 @@ #include <net/if_types.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> #endif -- 2.30.0

1 0

[PATCH v2] ddraw: HWTRANSFORMANDLIGHT is not set for software devices
by David Adam Feb. 21, 2021

Feb. 21, 2021

This patch is from Michael Muller.

2 1

[PATCH] msvfw32: WS_CHILD is set for window style when parent is not NULL
by David Adam Feb. 21, 2021

Feb. 21, 2021

2 1

[PATCH v2 1/2] ntdll/tests: Correct Thread Termination Error
by David Koolhoven Feb. 21, 2021

Feb. 21, 2021

STATUS_THREAD_IS_TERMINATING is only used from calls to QueueUserAPC(), and should set the error to ERROR_GEN_FAILURE. This prepares the test to accept the corrective patch. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v2: Fix test breakage --- dlls/ntdll/tests/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..d9ef1791848 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -268,7 +268,7 @@ static void run_error_tests(void) cmp2(STATUS_THREAD_WAS_SUSPENDED, ERROR_THREAD_WAS_SUSPENDED); cmp2(STATUS_TOO_MANY_THREADS, ERROR_TOO_MANY_THREADS); cmp2(STATUS_THREAD_NOT_IN_PROCESS, ERROR_THREAD_NOT_IN_PROCESS); - cmp(STATUS_THREAD_IS_TERMINATING, ERROR_ACCESS_DENIED); + cmp(STATUS_THREAD_IS_TERMINATING, ERROR_GEN_FAILURE); cmp(STATUS_PROCESS_IS_TERMINATING, ERROR_ACCESS_DENIED); cmp2(STATUS_SYSTEM_PROCESS_TERMINATED, ERROR_SYSTEM_PROCESS_TERMINATED); cmp(STATUS_INVALID_LOCK_SEQUENCE, ERROR_ACCESS_DENIED); -- 2.19.1

2 2

[PATCH] ntdll: Have QueueUserAPC() set expected error on terminating.
by David Koolhoven Feb. 20, 2021

Feb. 20, 2021

QueueUserAPC() should set GetLastError() to return ERROR_GEN_FAILURE in the unlikely but inevitable circumstance it's called on a thread set to STATUS_THREAD_IS_TERMINATING. It currenly returns ERROR_ACCESS_DENIED which is unexpected behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- dlls/ntdll/error.c | 2 +- dlls/ntdll/make_errors | 2 +- dlls/ntdll/tests/error.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index fb630fa9864..3b6b2ecdebe 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -475,7 +475,7 @@ static const DWORD error_map[1579] = ERROR_INVALID_PARAMETER, /* c0000048 (STATUS_PORT_ALREADY_SET) */ ERROR_INVALID_PARAMETER, /* c0000049 (STATUS_SECTION_NOT_IMAGE) */ ERROR_SIGNAL_REFUSED, /* c000004a (STATUS_SUSPEND_COUNT_EXCEEDED) */ - ERROR_ACCESS_DENIED, /* c000004b (STATUS_THREAD_IS_TERMINATING) */ + ERROR_GEN_FAILURE, /* c000004b (STATUS_THREAD_IS_TERMINATING) */ ERROR_INVALID_PARAMETER, /* c000004c (STATUS_BAD_WORKING_SET_LIMIT) */ ERROR_INVALID_PARAMETER, /* c000004d (STATUS_INCOMPATIBLE_FILE_MAP) */ ERROR_INVALID_PARAMETER, /* c000004e (STATUS_SECTION_PROTECTION) */ diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index bedce57fe7a..b7a2a346e5c 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -307,7 +307,7 @@ my %error_map = qw( STATUS_PORT_ALREADY_SET ERROR_INVALID_PARAMETER STATUS_SECTION_NOT_IMAGE ERROR_INVALID_PARAMETER STATUS_SUSPEND_COUNT_EXCEEDED ERROR_SIGNAL_REFUSED - STATUS_THREAD_IS_TERMINATING ERROR_ACCESS_DENIED + STATUS_THREAD_IS_TERMINATING ERROR_GEN_FAILURE STATUS_BAD_WORKING_SET_LIMIT ERROR_INVALID_PARAMETER STATUS_INCOMPATIBLE_FILE_MAP ERROR_INVALID_PARAMETER STATUS_SECTION_PROTECTION ERROR_INVALID_PARAMETER diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..d9ef1791848 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -268,7 +268,7 @@ static void run_error_tests(void) cmp2(STATUS_THREAD_WAS_SUSPENDED, ERROR_THREAD_WAS_SUSPENDED); cmp2(STATUS_TOO_MANY_THREADS, ERROR_TOO_MANY_THREADS); cmp2(STATUS_THREAD_NOT_IN_PROCESS, ERROR_THREAD_NOT_IN_PROCESS); - cmp(STATUS_THREAD_IS_TERMINATING, ERROR_ACCESS_DENIED); + cmp(STATUS_THREAD_IS_TERMINATING, ERROR_GEN_FAILURE); cmp(STATUS_PROCESS_IS_TERMINATING, ERROR_ACCESS_DENIED); cmp2(STATUS_SYSTEM_PROCESS_TERMINATED, ERROR_SYSTEM_PROCESS_TERMINATED); cmp(STATUS_INVALID_LOCK_SEQUENCE, ERROR_ACCESS_DENIED); -- 2.19.1

2 1

[PATCH] quartz: Use free() to free the "pszFileName" member.
by Zebediah Figura Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cc252c0e0e0..cf5fe457715 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -340,7 +340,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); - CoTaskMemFree(filter->pszFileName); + free(filter->pszFileName); FreeMediaType(&filter->mt); } -- 2.30.1

1 0

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

2 1

[PATCH] vkd3d-shader: Set default case the last one in shader_sm4_read_param().
by Andrey Gusev Feb. 20, 2021

Feb. 20, 2021

In file included from ../include/private/vkd3d_memory.h:27, з ../libs/vkd3d-shader/vkd3d_shader_private.h:50, з ../libs/vkd3d-shader/dxbc.c:20: ../libs/vkd3d-shader/dxbc.c: In function ‘shader_sm4_read_param’: ../include/private/vkd3d_debug.h:71:9: warning: this statement may fall through [-Wimplicit-fallthrough=] 71 | vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../include/private/vkd3d_debug.h:60:9: note: in expansion of macro ‘VKD3D_DBG_PRINTF’ 60 | VKD3D_DBG_PRINTF | ^~~~~~~~~~~~~~~~ ../include/private/vkd3d_debug.h:82:15: note: in expansion of macro ‘VKD3D_DBG_LOG’ 82 | #define FIXME VKD3D_DBG_LOG(FIXME) | ^~~~~~~~~~~~~ ../libs/vkd3d-shader/dxbc.c:1553:17: note: in expansion of macro ‘FIXME’ 1553 | FIXME("Skipping modifier 0x%08x.\n", m); | ^~~~~ ../libs/vkd3d-shader/dxbc.c:1554:13: note: here 1554 | case VKD3D_SM4_REGISTER_MODIFIER_NONE: | ^~~~ Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d-shader/dxbc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..89868bd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1549,11 +1549,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *modifier = VKD3DSPSM_ABSNEG; break; - default: - FIXME("Skipping modifier 0x%08x.\n", m); case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break; + + default: + FIXME("Skipping modifier 0x%08x.\n", m); } } else -- 2.29.2

2 1

[PATCH 2/2] krnl386.exe: Cap GetFreeSpace value to 2GB.
by Akihiro Sagawa Feb. 20, 2021

Feb. 20, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0