February 2023 - Wine-Commits

Alexandre Julliard : makedep: Remove support for building shared libraries.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 5c98858a9b65ff4c83d6c306983158c6f3d1b418 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98858a9b65ff4c83d6c306983158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:01:23 2023 +0100 makedep: Remove support for building shared libraries. --- tools/makedep.c | 80 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index b94a221854d..d9ca4a1a7b6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -193,7 +193,6 @@ struct makefile const char *module; const char *testdll; const char *extlib; - const char *sharedlib; const char *staticlib; const char *importlib; const char *unixlib; @@ -2316,39 +2315,6 @@ static const char *get_include_install_path( const char *name ) } -/******************************************************************* - * get_shared_library_name - * - * Determine possible names for a shared library with a version number. - */ -static struct strarray get_shared_lib_names( const char *libname ) -{ - struct strarray ret = empty_strarray; - const char *ext, *p; - char *name, *first, *second; - size_t len = 0; - - strarray_add( &ret, libname ); - - for (p = libname; (p = strchr( p, '.' )); p++) - if ((len = strspn( p + 1, "0123456789." ))) break; - - if (!len) return ret; - ext = p + 1 + len; - if (*ext && ext[-1] == '.') ext--; - - /* keep only the first group of digits */ - name = xstrdup( libname ); - first = name + (p - libname); - if ((second = strchr( first + 1, '.' ))) - { - strcpy( second, ext ); - strarray_add( &ret, xstrdup( name )); - } - return ret; -} - - /******************************************************************* * get_source_defines */ @@ -3169,7 +3135,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); if (!arch) { - if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) + if (source->file->flags & FLAG_C_UNIX) { output_filenames( unix_dllflags ); } @@ -3464,48 +3430,6 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) } -/******************************************************************* - * output_shared_lib - */ -static void output_shared_lib( struct makefile *make ) -{ - unsigned int i; - char *basename, *p; - struct strarray names = get_shared_lib_names( make->sharedlib ); - struct strarray all_libs = empty_strarray; - struct strarray dep_libs = empty_strarray; - unsigned int arch = 0; /* shared libs are always native */ - - basename = xstrdup( make->sharedlib ); - if ((p = strchr( basename, '.' ))) *p = 0; - - strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); - strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &all_libs, libs ); - - output( "%s:", obj_dir_path( make, make->sharedlib )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( dep_libs ); - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); - add_install_rule( make, make->sharedlib, arch, make->sharedlib, - strmake( "p%s%s", arch_install_dirs[arch], make->sharedlib )); - for (i = 1; i < names.count; i++) - { - output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], arch, names.str[i-1], - strmake( "y%s%s", arch_install_dirs[arch], names.str[i] )); - } - strarray_addall( &make->all_targets[arch], names ); -} - - /******************************************************************* * output_test_module */ @@ -3831,7 +3755,6 @@ static void output_sources( struct makefile *make ) for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_test_module( make, arch ); } - else if (make->sharedlib) output_shared_lib( make ); else if (make->programs.count) output_programs( make ); for (i = 0; i < make->scripts.count; i++) @@ -4233,7 +4156,6 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); - make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->extlib = get_expanded_make_variable( make, "EXTLIB" );

1 0

Francois Gouget : kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: b66f9af10657a0c468cd3858074fb61d3d317095 URL: https://gitlab.winehq.org/wine/wine/-/commit/b66f9af10657a0c468cd3858074fb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:27:36 2023 +0100 kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11. Windows 11 uses a narrow non-breaking space instead of a plain one when formatting numbers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54583 --- dlls/kernel32/tests/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f8d4ab14d38..5c99e644f15 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,12 @@ static void test_GetNumberFormatEx(void) /* Test French formatting */ if (pIsValidLocaleName(frW)) { + const WCHAR *expected; ret = pGetNumberFormatEx(frW, NUO, L"-12345", NULL, buffer, ARRAY_SIZE(buffer)); - expect_wstr(ret, buffer, L"-12\xa0\x33\x34\x35,00"); /* Non breaking space */ + expected = (ret && wcschr(buffer, 0x202f)) ? + L"-12\x202f\x33\x34\x35,00" : /* Same but narrow (win11) */ + L"-12\xa0\x33\x34\x35,00"; /* Non breaking space */ + expect_wstr(ret, buffer, expected); } }

1 0

Francois Gouget : kernel32/tests: Fix the NLSVersion test on Windows 10 22H2.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: ad5c8fb6ffacd965312aee36b182ca99d5ccb162 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad5c8fb6ffacd965312aee36b182ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 19:32:11 2023 +0100 kernel32/tests: Fix the NLSVersion test on Windows 10 22H2. Microsoft backported support for the 60403 NLS version from Windows 11 21H2 to Windows 10 22H2 to ensure better compatibility between the two systems. This is similar to when they preserved support for NLS version 6020f when switching Windows 10 2004 to 60305. So use larger version changes to check that IsValidNLSVersion() does reject invalid versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54582 --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b2c581dc518..a4c97286dc5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7865,13 +7865,13 @@ static void test_NLSVersion(void) ok( ret, "IsValidNLSVersion failed err %lu\n", GetLastError() ); ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion += 0x100; + info.dwNLSVersion += 0x700; /* much higher ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" ); ok( GetLastError() == 0, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion -= 0x800; + info.dwNLSVersion -= 2 * 0x700; /* much lower ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" );

1 0

Gijs Vermeulen : shell32: Add Shell_GetCachedImageIndexA/W exports.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: a4e51c6beceb60c4d67e90559ce115cb60274432 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4e51c6beceb60c4d67e90559ce115… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Feb 25 18:43:53 2023 +0100 shell32: Add Shell_GetCachedImageIndexA/W exports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54581 --- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 3f3741540d0..d75daa3fa8d 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -737,7 +737,7 @@ HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf * Shell_GetCachedImageIndex [SHELL32.72] * */ -static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) { INT ret, len; LPWSTR szTemp; @@ -755,7 +755,7 @@ static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD return ret; } -static INT Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) { WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc); diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 59285c89c57..4a64b80ddd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -453,6 +453,8 @@ @ stdcall ShellExecuteExW (long) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) +@ stdcall Shell_GetCachedImageIndexA(str long long) +@ stdcall Shell_GetCachedImageIndexW(wstr long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA @ stdcall Shell_NotifyIconA(long ptr) @ stdcall Shell_NotifyIconW(long ptr)

1 0

Francois Gouget : kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 705d35edfa94e2bd9a025045c745a388d8119663 URL: https://gitlab.winehq.org/wine/wine/-/commit/705d35edfa94e2bd9a025045c745a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:52:39 2023 +0100 kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11. NtGetNlsSectionPtr() supports an unknown section 14 which presumably takes no id parameter such that the call succeeds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54584 --- dlls/kernel32/tests/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a4c97286dc5..f8d4ab14d38 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4974,6 +4974,11 @@ static void test_GetCPInfo(void) case 12: /* normalization */ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%u: failed %lx\n", i, status ); break; + case 14: /* unknown */ + ok( status == STATUS_INVALID_PARAMETER_1 || + status == STATUS_SUCCESS, /* win11 */ + "%u: failed %lx\n", i, status ); + break; default: ok( status == STATUS_INVALID_PARAMETER_1, "%u: failed %lx\n", i, status ); break;

1 0

Sven Baars : bcrypt: Remove unused fields from struct key_asymmetric32.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 533454111c88bef008cef0296f61da4dcf9e1ebc URL: https://gitlab.winehq.org/wine/wine/-/commit/533454111c88bef008cef0296f61da… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Feb 25 11:17:58 2023 +0100 bcrypt: Remove unused fields from struct key_asymmetric32. --- dlls/bcrypt/gnutls.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 3c64a3643ef..c54ebc471a9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2285,8 +2285,6 @@ struct key_asymmetric32 { ULONG bitlen; /* ignored for ECC keys */ ULONG flags; - PTR32 pubkey; - ULONG pubkey_len; DSSSEED dss_seed; };

1 0

Torge Matthies : kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 2db94ca8f98c9e760e0236fc36cf84af6cfc6984 URL: https://gitlab.winehq.org/wine/wine/-/commit/2db94ca8f98c9e760e0236fc36cf84… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:27 2023 +0100 kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 80cc163468c..e3a0ad257f2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1734,7 +1734,7 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) ntdll.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork

1 0

Torge Matthies : kernel32: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 78ce8e0018c8a5c806c596b10158343f705f4bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ce8e0018c8a5c806c596b1015834… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:15 2023 +0100 kernel32: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8068e45e5e5..d6b0eb62a69 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ @ stdcall -import WaitForMultipleObjectsEx(long ptr long long long) @ stdcall -import WaitForSingleObject(long long) @ stdcall -import WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) NTDLL.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) NTDLL.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) NTDLL.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) NTDLL.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) NTDLL.TpWaitForWork

1 0

Giovanni Mascellani : vkd3d-shader: Do not pass client-given strings as printf()-style format strings.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: vkd3d Branch: master Commit: a1c6bb85ade1da5cae3ba2f9717f882b0c9bf611 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1c6bb85ade1da5cae3ba2f9717f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 23 16:21:55 2023 +0100 vkd3d-shader: Do not pass client-given strings as printf()-style format strings. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0cfee47..beee1548 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1767,7 +1767,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, "%s", entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder)

1 0

Francois Gouget : mscoree/tests: Trace the error when a Windows API fails.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: c898503e949ea3b2c478bfb4ccbf6a1d9400b08f URL: https://gitlab.winehq.org/wine/wine/-/commit/c898503e949ea3b2c478bfb4ccbf6a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 03:07:09 2023 +0100 mscoree/tests: Trace the error when a Windows API fails. --- dlls/mscoree/tests/comtest.c | 2 +- dlls/mscoree/tests/mscoree.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index db6acac1e9e..2881fdb8943 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -102,7 +102,7 @@ static BOOL compile_cs_to_dll(char *source_path, char *dest_path) ok(ret, "Compilation failed\n"); ret = MoveFileA(path_temp, dest_path); - ok(ret, "Moving temporary file failed\n"); + ok(ret, "Could not move %s to %s: %lu\n", path_temp, dest_path, GetLastError()); return ret; } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 7da40d92887..bb6545b8a21 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -148,7 +148,7 @@ static BOOL runtime_is_usable(void) si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcessA failed\n"); + ok(ret, "Could not create process: %lu\n", GetLastError()); if (!ret) return FALSE; @@ -159,7 +159,7 @@ static BOOL runtime_is_usable(void) ret = GetExitCodeProcess(pi.hProcess, &exitcode); CloseHandle(pi.hProcess); - ok(ret, "GetExitCodeProcess failed\n"); + ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); if (!ret || exitcode != 0) { @@ -424,7 +424,7 @@ static void create_xml_file(LPCWSTR filename) DWORD dwNumberOfBytesWritten; HANDLE hfile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hfile != INVALID_HANDLE_VALUE, "File creation failed\n"); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open %s for writing: %lu\n", wine_dbgstr_w(filename), GetLastError()); WriteFile(hfile, xmldata, sizeof(xmldata) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hfile); }

1 0