wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : user32/tests: Use correct integral type.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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 08 Mar '22

08 Mar '22

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 : userenv/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: f0c165ed5cc37217e985bf5e64bdbaab4e0967ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c165ed5cc37217e985bf5e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:27 2022 +0100 userenv/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/userenv/tests/Makefile.in | 1 - dlls/userenv/tests/userenv.c | 46 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in index 4eca08ed851..c4aa8d0db4a 100644 --- a/dlls/userenv/tests/Makefile.in +++ b/dlls/userenv/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = userenv.dll IMPORTS = userenv advapi32 diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index c7a6791e2be..3f2b3442832 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -33,7 +33,7 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) -#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %d\n", (EXPECTED), GetLastError()) +#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %ld\n", (EXPECTED), GetLastError()) static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -115,13 +115,13 @@ static void test_create_env(void) expect(TRUE, r); r = GetEnvironmentVariableA("SystemRoot", systemroot, sizeof(systemroot)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("ProgramData", "overwrite"); expect(TRUE, r); @@ -250,7 +250,7 @@ static void test_get_profiles_dir(void) char *profiles_dir, *buf, small_buf[1]; l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); - ok(!l, "RegOpenKeyExA failed: %d\n", GetLastError()); + ok(!l, "RegOpenKeyExA failed: %ld\n", GetLastError()); l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); if (l) @@ -282,7 +282,7 @@ static void test_get_profiles_dir(void) /* MSDN claims the returned character count includes the NULL terminator * when the buffer is too small, but that's not in fact what gets returned. */ - ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); + ok(cch == profiles_len - 1, "expected %ld, got %ld\n", profiles_len - 1, cch); /* Allocate one more character than the return value to prevent a buffer * overrun. */ @@ -291,7 +291,7 @@ static void test_get_profiles_dir(void) /* Rather than a BOOL, the return value is also the number of characters * stored in the buffer. */ - expect(profiles_len - 1, r); + ok(profiles_len - 1 == r, "expected %ld, got %d\n", profiles_len - 1, r); ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); HeapFree(GetProcessHeap(), 0, buf); @@ -330,26 +330,26 @@ static void test_get_user_profile_dir(void) } ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirA = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirA ); len = 0; @@ -357,8 +357,8 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); - ok(!len, "expected 0, got %u\n", len); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); + ok(!len, "expected 0, got %lu\n", len); len = 0; dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); @@ -374,34 +374,34 @@ static void test_get_user_profile_dir(void) dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenA( dirA ), len ); trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); } else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirW = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirW ); len = 0; @@ -409,15 +409,15 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryW( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", error); ok(len, "expected len > 0\n"); dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR) ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); + ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); len2 = 0; @@ -428,10 +428,10 @@ static void test_get_user_profile_dir(void) ok(!ret, "expected failure\n"); HeapFree( GetProcessHeap(), 0, dirW ); if (error == ERROR_INSUFFICIENT_BUFFER) - ok(len2 == len, "expected %d, got %d\n", len, len2); + ok(len2 == len, "expected %ld, got %ld\n", len, len2); else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); CloseHandle( token ); }

1 0

Eric Pouech : kernel32/tests/volume: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 0f430425431408faa681746bcaa48225be18b3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f430425431408faa681746b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:14 2022 +0100 kernel32/tests/volume: 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/volume.c | 423 ++++++++++++++++++++++--------------------- 1 file changed, 212 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f430425431408faa681…

1 0

Eric Pouech : kernel32/tests/virtual: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: d87cc188897a03bb8f1729548ead47c9744f58f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87cc188897a03bb8f172954… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:08 2022 +0100 kernel32/tests/virtual: 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/virtual.c | 1839 +++++++++++++++++++++-------------------- 1 file changed, 920 insertions(+), 919 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87cc188897a03bb8f17…

1 0

Eric Pouech : kernel32/tests/thread: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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

Eric Pouech : kernel32/tests/sync: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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

Zebediah Figura : configure: Fix the check for CAPI support.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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 08 Mar '22

08 Mar '22

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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

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 March 2022