January 2022 - Wine-Devel - list.winehq.org

[PATCH 1/5] uxtheme: Allow EnableThemeDialogTexture() to set flags in multiple steps.
by Zhiyi Zhang Jan. 24, 2022

Jan. 24, 2022

For example, set ETDT_USETABTEXTURE first and then set ETDT_ENABLE to activate dialog theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 28 +++++++++++++++++++++++----- dlls/uxtheme/tests/system.c | 8 ++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index b6e5f0230e5..4aac46f3fed 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -52,14 +52,32 @@ extern ATOM atDialogThemeEnabled; /*********************************************************************** * EnableThemeDialogTexture (UXTHEME.@) */ -HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) +HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag) { + DWORD old_flag = 0; BOOL res; - TRACE("(%p,0x%08x\n", hwnd, dwFlags); - res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), - UlongToHandle(dwFlags|0x80000000)); - /* 0x80000000 serves as a "flags set" flag */ + TRACE("(%p,%#x\n", hwnd, new_flag); + + new_flag &= ETDT_VALIDBITS; + + if (new_flag == 0) + return S_OK; + + if (new_flag & ETDT_DISABLE) + { + new_flag = ETDT_DISABLE; + old_flag = 0; + } + + if (new_flag & ~ETDT_DISABLE) + { + old_flag = HandleToUlong(GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled))); + old_flag &= ~ETDT_DISABLE; + } + + new_flag = new_flag | old_flag; + res = SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), UlongToHandle(new_flag)); return res ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 93994fa8364..4a5a6d291fc 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1645,16 +1645,15 @@ static void test_EnableThemeDialogTexture(void) { DWORD flag; BOOL enabled; - BOOL todo; } invalid_flag_tests[] = { - {0, FALSE, TRUE}, + {0, FALSE}, {ETDT_DISABLE | ETDT_ENABLE, FALSE}, {ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB, TRUE}, {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE}, {ETDT_VALIDBITS, FALSE}, - {~ETDT_VALIDBITS, FALSE, TRUE}, + {~ETDT_VALIDBITS, FALSE}, {~ETDT_VALIDBITS | ETDT_DISABLE, FALSE} }; @@ -1989,7 +1988,6 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, invalid_flag_tests[i].flag); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ret = IsThemeDialogTextureEnabled(dialog); - todo_wine_if(invalid_flag_tests[i].todo) ok(ret == invalid_flag_tests[i].enabled, "Wrong dialog texture status.\n"); EndDialog(dialog, 0); @@ -2020,7 +2018,6 @@ static void test_EnableThemeDialogTexture(void) "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ - todo_wine_if(flags[i] == 0) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); child = GetDlgItem(dialog, 100); @@ -2045,7 +2042,6 @@ static void test_EnableThemeDialogTexture(void) if (flags[j]) ok(ret == !(flags[j] & ETDT_DISABLE), "Wrong dialog texture status.\n"); else - todo_wine_if(!flags[i] || flags[i] == ETDT_DISABLE || flags[i] == (ETDT_DISABLE | ETDT_ENABLE)) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); ok(lr != 0, "WM_ERASEBKGND failed.\n"); -- 2.32.0

1 0

[PATCH v2] kernelbase: Improve stub for ResolveLocaleName.
by Louis Lenders Jan. 23, 2022

Jan. 23, 2022

v2: Remove some unnecessary initialization code (leftovers) from test, as this minimal test now only tests for returnvalues of ResolveLocaleName Fixes https://bugs.winehq.org/show_bug.cgi?id=52407 The current stub assumes a failing call to ResolveLocaleName returns 0, but tests show it returns 1 (and empty string). It actually never seems to returns 0. Added test is minimal to keep patch small, a few other traces of what the function returns can be seen on testbot here https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report#k206 and https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report&f207=… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/tests/locale.c | 19 +++++++++++++++++++ dlls/kernelbase/locale.c | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..daa70f13580 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -99,6 +99,7 @@ static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetThreadPreferredUILanguages)(DWORD,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetUserPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR,LPWSTR,INT); static void InitFunctionPointers(void) { @@ -139,6 +140,7 @@ static void InitFunctionPointers(void) X(GetNLSVersion); X(GetNLSVersionEx); X(IsValidNLSVersion); + X(ResolveLocaleName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -7142,6 +7144,22 @@ static void test_EnumCalendarInfoExW(void) } } +static void test_ResolveLocaleName(void) +{ + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + INT i; + + /* querying for 'eo' returns empty string '' on <=win8 and 'eo-001' on win10 */ + i = pResolveLocaleName( L"eo", name, LOCALE_NAME_MAX_LENGTH ); + ok( i, "ResolveLocaleName returned unexpected %d\n", i ); + + i = pResolveLocaleName( L"wi-NEHQ", name, LOCALE_NAME_MAX_LENGTH ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); + + i = pResolveLocaleName( L"wi-NEHQ", NULL, 0 ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -7198,4 +7216,5 @@ START_TEST(locale) test_EnumCalendarInfoW(); test_EnumCalendarInfoExA(); test_EnumCalendarInfoExW(); + test_ResolveLocaleName(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 667d1a4dc65..79e60913182 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5621,8 +5621,10 @@ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT { FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (buffer) + buffer[0] = 0; + + return 1; } -- 2.34.1

2 1

[PATCH v9 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang Jan. 23, 2022

Jan. 23, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v3 -> v4: - iatgas.h - LLVM(Clang), ARM, ARM64 support - Use __ASM_NAME macro - Don't fail test on MSVC - Don't end asm macros with "\n\t" v4 -> v5: - iatgas.h - mark idata sections as RO - loader.c - test for forward export itself v5 -> v6: - loader.c - Fix compilation warning in format string v6 -> v7: - forward4.c - fix building without MinGW v7 -> v8: - Also do GetProcAddress for forwarded ordinal exports - forward[1-3].c - Call DisableThreadLibraryCalls in DllMain - forward4.c: removed - iatgas.h: removed - sforward.c: new file - loader.c - test static forwarded import using shlwapi -> userenv forward v8 -> v9: - Test with iprop (documented as an ole32 forwarder in MSDN [1]) [1] https://docs.microsoft.com/en-us/windows/win32/api/coml2api/nf-coml2api-stg… dlls/iprop/Makefile.in | 1 + dlls/kernel32/tests/Makefile.in | 14 ++- dlls/kernel32/tests/forward1.c | 19 ++++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 9 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 9 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/loader.c | 182 ++++++++++++++++++++++++++++++ dlls/kernel32/tests/sforward.c | 16 +++ dlls/kernel32/tests/sforward.spec | 1 + 11 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/sforward.c create mode 100644 dlls/kernel32/tests/sforward.spec diff --git a/dlls/iprop/Makefile.in b/dlls/iprop/Makefile.in index e402cd0d4a9..709aebafe14 100644 --- a/dlls/iprop/Makefile.in +++ b/dlls/iprop/Makefile.in @@ -1 +1,2 @@ MODULE = iprop.dll +IMPORTLIB = iprop diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..b453269273f 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernel32.dll -IMPORTS = user32 advapi32 + +# iprop is for testing export forwarding (to ole32) +IMPORTS = user32 advapi32 iprop SOURCES = \ actctx.c \ @@ -37,4 +39,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + sforward.c \ + sforward.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..6419d95eaea --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,19 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..527f9f5157b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1642,6 +1642,185 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH], sforward_path[MAX_PATH]; + HMODULE ole32, iprop, sforward; + FARPROC test_func_stub; + + if (GetModuleHandleA( "ole32.dll" )) + { + skip("cannot test since ole32.dll is already loaded\n"); + return; + } + if (GetModuleHandleA( "iprop.dll" )) + { + skip("cannot test since iprop.dll is already loaded\n"); + return; + } + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( sforward_path, MAX_PATH, "%s\\sforward.dll", dir_path ); + extract_resource( "sforward.dll", "TESTDLL", sforward_path ); + + ole32 = LoadLibraryA( "ole32.dll" ); + ok( !!ole32, "couldn't find ole32.dll: %u\n", GetLastError() ); + iprop = LoadLibraryA( "iprop.dll" ); + ok( !!iprop, "couldn't find iprop.dll: %u\n", GetLastError() ); + sforward = LoadLibraryA( sforward_path ); + ok( !!sforward, "couldn't find %s: %u\n", sforward_path, GetLastError() ); + + test_func_stub = GetProcAddress( sforward, "test_func_stub" ); + ok( !!test_func_stub, "sforward!test_func_stub not found\n" ); + + FreeLibrary( ole32 ); + FreeLibrary( iprop ); + + todo_wine + ok( !!GetModuleHandleA( "ole32.dll" ), "ole32.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "iprop.dll" ), "iprop.dll unexpectedly unloaded\n" ); + + FreeLibrary( sforward ); + + ok( !GetModuleHandleA( "ole32.dll" ), "ole32.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "iprop.dll" ), "iprop.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "sforward.dll" ), "sforward.dll unexpectedly kept open\n" ); + + DeleteFileA( sforward_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3, oproc1, oproc2, oproc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + oproc1 = GetProcAddress(forward1, (LPSTR)2); + ok( !!oproc1, "cannot resolve forward1!#2 (forward_test_func2)\n"); + oproc2 = GetProcAddress(forward2, (LPSTR)2); + ok( !!oproc2, "cannot resolve forward2!#2 (forward_test_func2)\n"); + oproc3 = GetProcAddress(forward3, (LPSTR)2); + ok( !!oproc3, "cannot resolve forward3!#2 (forward_test_func2)\n"); + ok( oproc1 == oproc3, "forward1!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + ok( oproc2 == oproc3, "forward2!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4119,9 +4298,12 @@ START_TEST(loader) return; } + test_static_forwarded_import_refs(); /* Must be first; other tests may load ole32.dll */ test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); diff --git a/dlls/kernel32/tests/sforward.c b/dlls/kernel32/tests/sforward.c new file mode 100644 index 00000000000..91865b4834c --- /dev/null +++ b/dlls/kernel32/tests/sforward.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <ole2.h> +#include <propidl.h> + +void test_func_stub(void) +{ + StgOpenPropStg(NULL, NULL, 0, 0, NULL); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/sforward.spec b/dlls/kernel32/tests/sforward.spec new file mode 100644 index 00000000000..cb6d4add796 --- /dev/null +++ b/dlls/kernel32/tests/sforward.spec @@ -0,0 +1 @@ +@ cdecl test_func_stub() -- 2.31.1

2 3

[PATCH v2] Re-enabled Wide Character Case insensitive import handling
by Ben Shefte Jan. 23, 2022

Jan. 23, 2022

From: Benjamin Shefte <support(a)neuwon.com> Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..ec1fc556250 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -627,8 +627,14 @@ static WCHAR *append_dll_ext( const WCHAR *name ) static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + WCHAR buffer[16]; + DWORD len = strlen(name); + + if (len * sizeof(WCHAR) >= sizeof(buffer)) + return; + ascii_to_unicode( buffer, name, len + 1 ); + + return !wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH] Re-enabled Wide Character Case insensitive import handling
by Ben Shefte Jan. 23, 2022

Jan. 23, 2022

From: Benjamin Shefte <support(a)neuwon.com> Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..ec1fc556250 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -627,8 +627,14 @@ static WCHAR *append_dll_ext( const WCHAR *name ) static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + WCHAR buffer[16]; + DWORD len = strlen(name); + + if (len * sizeof(WCHAR) >= sizeof(buffer)) + continue; + ascii_to_unicode( buffer, name, len + 1 ); + + return !wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH 1/4] ntdll/unix: Zero-extend IP_TOS byte to INT.
by Jinoh Kang Jan. 23, 2022

Jan. 23, 2022

The IP_TOS control data is 1 byte on Unix, but 4 bytes on Windows. Properly zero-extend the value instead of copying 3 bytes of garbage. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..71dfcdd1114 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -429,8 +429,9 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) #if defined(IP_TOS) case IP_TOS: { + INT tos = *(unsigned char *)CMSG_DATA(cmsg_unix); ptr = fill_control_message( WS_IPPROTO_IP, WS_IP_TOS, ptr, &ctlsize, - CMSG_DATA(cmsg_unix), sizeof(INT) ); + &tos, sizeof(INT) ); if (!ptr) goto error; break; } -- 2.31.1

3 14

version wine for android publish google play store
by Виртуалины MER user MER Jan. 22, 2022

Jan. 22, 2022

Google play store in there appbundle

1 0

[PATCH] kernelbase: Improve stub for ResolveLocaleName.
by Louis Lenders Jan. 22, 2022

Jan. 22, 2022

Fixes https://bugs.winehq.org/show_bug.cgi?id=52407 The current stub assumes a failing call to ResolveLocaleName returns 0, but tests show it returns 1 (and empty string). It actually never seems to returns 0. Added test is minimal to keep patch small, a few other traces of what the function returns can be seen on testbot here https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report#k206 and https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report&f207=… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ dlls/kernelbase/locale.c | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..d02d5c63ae7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -99,6 +99,7 @@ static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetThreadPreferredUILanguages)(DWORD,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetUserPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR,LPWSTR,INT); static void InitFunctionPointers(void) { @@ -139,6 +140,7 @@ static void InitFunctionPointers(void) X(GetNLSVersion); X(GetNLSVersionEx); X(IsValidNLSVersion); + X(ResolveLocaleName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -7142,6 +7144,24 @@ static void test_EnumCalendarInfoExW(void) } } +static void test_ResolveLocaleName(void) +{ + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + INT i; + + name[0] = 0; /* querying for 'eo' returns empty string '' on <=win8 and 'eo-001' on win10 */ + i = pResolveLocaleName( L"eo", name, LOCALE_NAME_MAX_LENGTH ); + ok( i, "ResolveLocaleName returned unexpected %d\n", i ); + + name[0] = 0; + i = pResolveLocaleName( L"wi-NEHQ", name, LOCALE_NAME_MAX_LENGTH ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); + + name[0] = 0; + i = pResolveLocaleName( L"wi-NEHQ", NULL, 0 ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -7198,4 +7218,5 @@ START_TEST(locale) test_EnumCalendarInfoW(); test_EnumCalendarInfoExA(); test_EnumCalendarInfoExW(); + test_ResolveLocaleName(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 667d1a4dc65..79e60913182 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5621,8 +5621,10 @@ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT { FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (buffer) + buffer[0] = 0; + + return 1; } -- 2.34.1

1 0

[PATCH resend] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Bastien Orivel Jan. 22, 2022

Jan. 22, 2022

According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe7e4fb3464..e43d6c5d671 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2900,8 +2900,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 054e597b719..042c743f95e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,59 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.1

3 2

[PATCH v6 1/4] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang Jan. 22, 2022

Jan. 22, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v5 -> v6: - Replace ULONG/ULONGLONG with ULONG_PTR for cross-architecture consistency. - Use machine-specific machine constraint ("c") for i386 and x86-64. - Merge i386 and x86-64 code. - "Prevent" taking address of __fastfail (just like MSVC exclusive intrinsic). - Remove erroneous preprocessor directive comments. - Don't repeat function declaration and epilogue. include/winnt.h | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..34406853469 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,108 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +/* __fastfail is intentionally not declared static, so that taking the address + * of this function will fail on link due to unresolved symbol (just like MSVC). + */ +#ifdef __GNUC_GNU_INLINE__ +extern /* don't emit definition of this inline function */ +#endif +FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ +#if defined(__x86_64__) || defined(__i386__) + __asm__ __volatile__( "int $0x29" :: "c" ((ULONG_PTR)code) : "memory" ); +#elif defined(__aarch64__) + register ULONG_PTR val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#elif defined(__arm__) + register ULONG_PTR val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#else +#error __fastfail not defined for this architecture +#endif +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) + __builtin_unreachable(); +#endif +} +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.31.1

1 3