March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : virtdisk/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 659f6fe32aa8c6158860ea7e32a45e3d481186e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=659f6fe32aa8c6158860ea7e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:35 2022 +0100 virtdisk/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/Makefile.in | 1 - dlls/virtdisk/tests/virtdisk.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/virtdisk/tests/Makefile.in b/dlls/virtdisk/tests/Makefile.in index 6d573f357e9..3ace1a702d3 100644 --- a/dlls/virtdisk/tests/Makefile.in +++ b/dlls/virtdisk/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = virtdisk.dll C_SRCS = \ diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index 34118e532b1..bbbaf4d45e4 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -40,10 +40,10 @@ static void test_GetStorageDependencyInformation(void) info = heap_alloc(size); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); heap_free(info); CloseHandle(handle); @@ -58,27 +58,27 @@ static void test_OpenVirtualDisk(void) static const WCHAR vdisk[] = L"test.vhd"; ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_3; ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_2; ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_1; ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); } START_TEST(virtdisk)

1 0

Eric Pouech : user32/tests: Use correct integral type.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 0d910e6ad90878957b102a5f5abf53c5c0e9d1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d910e6ad90878957b102a5f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:39 2022 +0100 user32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index c7d3a99b228..e2e27480645 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -816,6 +816,7 @@ static void test_ddeml_server(void) HANDLE client; MSG msg; UINT res; + DWORD exit_code; BOOL ret; HSZ server; HDDEDATA hdata; @@ -839,8 +840,8 @@ static void test_ddeml_server(void) } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess(client, &res); - ok( !res, "client failed with %u error(s)\n", res ); + GetExitCodeProcess(client, &exit_code); + ok( !res, "client failed with %u error(s)\n", exit_code ); CloseHandle(client); }

1 0

Eric Pouech : uxtheme/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: bba6d8ac3996d7867d9e369133889fbc581eb15b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba6d8ac3996d7867d9e3691… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:32 2022 +0100 uxtheme/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 1 - dlls/uxtheme/tests/msg.h | 16 +- dlls/uxtheme/tests/system.c | 404 ++++++++++++++++++++--------------------- dlls/uxtheme/tests/v6util.h | 4 +- 4 files changed, 212 insertions(+), 213 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bba6d8ac3996d7867d9e…

1 0

Eric Pouech : version/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 68b44938f8f2d0238e11856f133a8d980e05d28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b44938f8f2d0238e11856f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:29 2022 +0100 version/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 138 ++++++++++++++++++++--------------------- dlls/version/tests/install.c | 76 +++++++++++------------ 3 files changed, 107 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68b44938f8f2d0238e11…

1 0

Eric Pouech : vulkan-1/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 2fec470ade45ed904c61e315c17510ee8bcefa8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fec470ade45ed904c61e315… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:41 2022 +0100 vulkan-1/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/Makefile.in | 1 - dlls/vulkan-1/tests/vulkan.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in index 6bff576d70f..c9f9f0727c8 100644 --- a/dlls/vulkan-1/tests/Makefile.in +++ b/dlls/vulkan-1/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vulkan-1.dll IMPORTS = vulkan-1 diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 75e48bfc9d1..11d20120d1d 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -209,7 +209,7 @@ static void test_enumerate_physical_device2(void) pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); luid = (const LUID *)id.deviceLUID; - trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", + trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); @@ -584,7 +584,7 @@ static void test_cross_process_resource(VkPhysicalDeviceIDPropertiesKHR *device_ sprintf(buf, "\"%s\" vulkan resource %s %s %s %p", argv[0], driver_uuid, device_uuid, kmt ? "kmt" : "nt", handle); res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0L, NULL, NULL, &si, &info); - ok(res, "CreateProcess failed: %u\n", GetLastError()); + ok(res, "CreateProcess failed: %lu\n", GetLastError()); CloseHandle(info.hThread); wait_child_process(info.hProcess);

1 0

Zebediah Figura : configure: Fix the check for CAPI support.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: b8cb9195d0d029da132a0fe1ed8e132d36bc6ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8cb9195d0d029da132a0fe1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 4 18:22:18 2022 -0600 configure: Fix the check for CAPI support. AC_CHECK_LIB sets the variable to "no", not an empty string. Hence compilation would fail if headers were present but libraries were missing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 990f1f9d610..ad2ef2e7b8d 100755 --- a/configure +++ b/configure @@ -17498,7 +17498,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_capi20_capi20_register" = "x" +if test "x$ac_cv_lib_capi20_capi20_register" != xyes then : case "x$with_capi" in x) as_fn_append wine_notices "|libcapi20 ${notice_platform}development files not found, ISDN won't be supported." ;; diff --git a/configure.ac b/configure.ac index 445d3048198..4245f7efb0f 100644 --- a/configure.ac +++ b/configure.ac @@ -1667,7 +1667,7 @@ then AC_CHECK_LIB(capi20,capi20_register,[:],[CAPI20_LIBS=""],[$CAPI20_LIBS]) fi]) fi -WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" = "x"], +WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" != xyes], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.], [enable_capi2032])

1 0

Brendan Shanks : makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 7b27e60e67d966a6db99dd2611310bc6e02a8e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b27e60e67d966a6db99dd26… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 7 12:59:02 2022 -0800 makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs. Fixes launching 32-bit EXEs from a WOW64 build dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52618 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- tools/winegcc/winegcc.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8cdee2b354a..990f1f9d610 100755 --- a/configure +++ b/configure @@ -10042,7 +10042,7 @@ fi LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib" LIBWINE_LDFLAGS="-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version" diff --git a/configure.ac b/configure.ac index 8fcdb15bbad..445d3048198 100644 --- a/configure.ac +++ b/configure.ac @@ -773,7 +773,7 @@ case $host_os in LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bcec3916843..ab26adb07e8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -416,7 +416,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->unix_lib) { strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@loader_path/%s.so", output_name ) ); + strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); } strarray_addall( &link_args, flags ); return link_args;

1 0

Eric Pouech : kernel32/tests/thread: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 6f35ac32c0efdf4178ef7983fbc9127e8fdef34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f35ac32c0efdf4178ef7983… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:02 2022 +0100 kernel32/tests/thread: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 405 ++++++++++++++++++++++--------------------- 1 file changed, 203 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f35ac32c0efdf4178ef…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: d8937c0719eed4c65805a91a4ff2e5e154319482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8937c0719eed4c65805a91a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Mar 8 09:53:15 2022 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 200 ++++++++++++++++----------------------------------------------- 1 file changed, 51 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8937c0719eed4c65805…

1 0

Eric Pouech : kernel32/tests/sync: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 9e945c8d1cf2287cfc5a9a2bf077e72c635fc7a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e945c8d1cf2287cfc5a9a2b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:29:56 2022 +0100 kernel32/tests/sync: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 463 +++++++++++++++++++++++---------------------- 1 file changed, 232 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e945c8d1cf2287cfc5a…

1 0