November 2022 - Wine-commits

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e41dd49f36548a174b8fa637a18efa356985e110 URL: https://gitlab.winehq.org/wine/wine/-/commit/e41dd49f36548a174b8fa637a18efa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Aug 14 17:34:30 2022 +0300 readme: Update Finnish translation. (cherry picked from commit 41274a09737f59b8c4e471c915e50510db7bebf8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fi | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index e459bbc779a..00af959c033 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -146,6 +146,8 @@ Kysymyksiä: Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. +Gitlab: Winen kehitykseen voi osallistua sivustolla https://gitlab.winehq.org + Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, sivulla https://www.winehq.org/forums kerrotaan niistä lisää. @@ -157,14 +159,6 @@ Virheet: IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.libera.chat. -Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla https://www.winehq.org/git kerrotaan tästä lisää. - - -Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi -(mieluiten komennon git-format-patch avulla) listalle wine-devel(a)winehq.org, -jotta se voidaan lisätä Winen seuraavaan versioon. - -- Alkuperäisen version tekstistä on kirjoittanut Alexandre Julliard

1 0

Alexandre Julliard : kernel32/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a2b7d799dfb7b8c4adff64a8d347729421846616 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2b7d799dfb7b8c4adff64a8d34772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:53:50 2022 +0200 kernel32/tests: Fix affinity test when there are too many CPUs. (cherry picked from commit 5314fac5b77ef7d6b157e975b90ec094d4353db8) Conflicts: dlls/kernel32/tests/thread.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/thread.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e9fd90b1889..bbff60ab596 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -954,12 +954,15 @@ static VOID test_thread_processor(void) affinity_new.Mask, affinity.Mask); /* show that the "all processors" flag is not supported for SetThreadGroupAffinity */ - affinity_new.Group = 0; - affinity_new.Mask = ~0u; - SetLastError(0xdeadbeef); - ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (sysInfo.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + affinity_new.Group = 0; + affinity_new.Mask = ~(DWORD_PTR)0; + SetLastError(0xdeadbeef); + ok(!pSetThreadGroupAffinity(curthread, &affinity_new, NULL), "SetThreadGroupAffinity succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } affinity_new.Group = 1; /* assumes that you have less than 64 logical processors */ affinity_new.Mask = 0x1;

1 0

Alexandre Julliard : ntdll/tests: Fix affinity test when there are too many CPUs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a79b0d4bcccdd9570195133239be6b95657c9d69 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79b0d4bcccdd9570195133239be6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:54:24 2022 +0200 ntdll/tests: Fix affinity test when there are too many CPUs. (cherry picked from commit 3c9c1ffdba637f11681cda26b8205db9d6316134) Conflicts: dlls/ntdll/tests/info.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/info.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5bcccd8a322..1fc3b38f00b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2947,11 +2947,13 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = pbi.AffinityMask; ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); - proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + } proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, @@ -2960,10 +2962,13 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); - thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; - status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + if (si.dwNumberOfProcessors < 8 * sizeof(DWORD_PTR)) + { + thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + } thread_affinity = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER,

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: fbeb7b006ca2ee86aad2a2c896bf3ee4fa4b620b URL: https://gitlab.winehq.org/wine/wine/-/commit/fbeb7b006ca2ee86aad2a2c896bf3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:41:38 2022 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02eae36ec861a4133d66035b623dfd81242990c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7cb3871193c..cea5dad06ff 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -566,7 +566,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Alexandre Julliard : urlmon/tests: Run tests against the gitlab server to avoid redirects.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: c0e76838dc6dc8fb3e40c8b656682c4f9fcfbf68 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0e76838dc6dc8fb3e40c8b656682c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:18:26 2022 +0200 urlmon/tests: Run tests against the gitlab server to avoid redirects. (cherry picked from commit 81e91afb36f014956db75d29f0dad334bf0f9e75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 2f2667cea2d..d465a9e8a7a 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -158,8 +158,8 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -#define WINEHQ_IP "4.4.81.124" -static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +#define WINEHQ_IP "4.4.81.126" +static const WCHAR wszWineHQSite[] = L"gitlab.winehq.org"; static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0};

1 0

Alexandre Julliard : webservices/tests: Mark tests that fail on 64-bit as todo.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: ae008aec4690353ab2ab9ec8df7122078d2bffcf URL: https://gitlab.winehq.org/wine/wine/-/commit/ae008aec4690353ab2ab9ec8df7122… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:28:46 2022 +0200 webservices/tests: Mark tests that fail on 64-bit as todo. (cherry picked from commit c0c93d80173c1540accbf9638ba9d0826ada932e) Conflicts: dlls/webservices/tests/writer.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/tests/writer.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 1d769189014..0bf0a92dd0b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2222,12 +2222,14 @@ static void test_text_types(void) static void test_double(void) { + static const BOOL is_win64 = sizeof(void*) > sizeof(int); WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; unsigned int fpword, fpword_orig; static const struct { double val; const char *result; + BOOL todo64; } tests[] = { @@ -2240,12 +2242,12 @@ static void test_double(void) {1.0000000000000004, "<t>1.0000000000000004</t>"}, {100000000000000, "<t>100000000000000</t>"}, {1000000000000000, "<t>1E+15</t>"}, - {0.1, "<t>0.1</t>"}, - {0.01, "<t>1E-2</t>"}, - {-0.1, "<t>-0.1</t>"}, - {-0.01, "<t>-1E-2</t>"}, - {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>"}, - {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>"}, + {0.1, "<t>0.1</t>", TRUE}, + {0.01, "<t>1E-2</t>", TRUE}, + {-0.1, "<t>-0.1</t>", TRUE}, + {-0.01, "<t>-1E-2</t>", TRUE}, + {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>", TRUE}, + {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>", TRUE}, }; HRESULT hr; WS_XML_WRITER *writer; @@ -2268,8 +2270,23 @@ static void test_double(void) ok( hr == S_OK, "%u: got %08x\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); - check_output( writer, tests[i].result, __LINE__ ); + ok( hr == S_OK, "%u: got %#x\n", i, hr ); + if (tests[i].todo64 && is_win64) + { + WS_BYTES bytes; + ULONG size = sizeof(bytes); + int len = strlen( tests[i].result ); + HRESULT hr; + + memset( &bytes, 0, sizeof(bytes) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + ok( hr == S_OK, "%u: got %#x\n", i, hr ); + todo_wine + ok( bytes.length == len && !memcmp( bytes.bytes, tests[i].result, len ), + "%u: got %u %s expected %d %s\n", i, bytes.length, + debugstr_bytes(bytes.bytes, bytes.length), len, tests[i].result ); + } + else check_output( writer, tests[i].result, __LINE__ ); } hr = set_output( writer );

1 0

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

08 Nov '22

Module: wine Branch: stable Commit: d267a658c62152b3bead5842f317d9f4e5e5d313 URL: https://gitlab.winehq.org/wine/wine/-/commit/d267a658c62152b3bead5842f317d9… 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> (cherry picked from commit b8cb9195d0d029da132a0fe1ed8e132d36bc6ea9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 82870da724d..56fa0974d31 100755 --- a/configure +++ b/configure @@ -17609,7 +17609,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 b9903b04671..aeeaa8bfcf7 100644 --- a/configure.ac +++ b/configure.ac @@ -1648,7 +1648,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

Eric Pouech : include/msvcrt: Redefine towlower* & towupper* with wint_t types.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 2e474fa5ff9d6fed43797909a8f7592ee5535cff URL: https://gitlab.winehq.org/wine/wine/-/commit/2e474fa5ff9d6fed43797909a8f759… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 16:10:42 2022 +0200 include/msvcrt: Redefine towlower* & towupper* with wint_t types. It conflicts in C++ compilation with MINGW builtin definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 69ab9568b28b594160ffae3ce5fef9439fe74ae3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 8 ++++---- include/msvcrt/wctype.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..9661ab5e596 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #ifdef __cplusplus } diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 2cf4636a88b..27a6adcd922 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -64,8 +64,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #endif /* _WCTYPE_DEFINED */ typedef wchar_t wctrans_t;

1 0

Alexandre Julliard : makefiles: Disable printf format warnings for non-PE msvcrt modules.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a07278e571257b166498c843ab0fee1a43dc1609 URL: https://gitlab.winehq.org/wine/wine/-/commit/a07278e571257b166498c843ab0fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 18:47:25 2022 +0100 makefiles: Disable printf format warnings for non-PE msvcrt modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26a3472b340f01288b3fa4b98a4e8f363b62b135) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 3 ++- tools/makedep.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 56fa0974d31..dfded3d83c9 100755 --- a/configure +++ b/configure @@ -19470,6 +19470,34 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +printf %s "checking whether the compiler supports -Wno-format... " >&6; } +if test ${ac_cv_cflags__Wno_format+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wno_format=yes +else $as_nop + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +printf "%s\n" "$ac_cv_cflags__Wno_format" >&6; } +if test "x$ac_cv_cflags__Wno_format" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format" fi ;; esac diff --git a/configure.ac b/configure.ac index aeeaa8bfcf7..4b15e79d5d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1882,7 +1882,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) - WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) + WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac case $host_cpu in diff --git a/tools/makedep.c b/tools/makedep.c index e69dc3ce0a4..3c25a7f7064 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2986,6 +2986,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); + output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -2997,7 +2998,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" ); output( "\n" );

1 0

Gerald Pfeifer : iphlpapi: Zero-init prefix_len to avoid a compiler warning.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: f321a29a902aa5890457fbe4aaae9d4cfcfcdb09 URL: https://gitlab.winehq.org/wine/wine/-/commit/f321a29a902aa5890457fbe4aaae9d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 28 08:53:30 2022 +0000 iphlpapi: Zero-init prefix_len to avoid a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 56b26e1d66ad9491bd7357a60c31e5df35cdd15c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..387589cc03d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1057,6 +1057,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); + prefix_len = 0; if (family == AF_INET) { if (!key4->next_hop.s_addr)

1 0