- Wine-Commits - list.winehq.org

Alexandre Julliard : wmvcore/tests: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 9974960f0cbc942e410485661b81afbd9eeabc77 URL: https://gitlab.winehq.org/wine/wine/-/commit/9974960f0cbc942e410485661b81af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:14:31 2023 +0200 wmvcore/tests: Avoid sizeof() in traces. --- dlls/wmvcore/tests/wmvcore.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6071ac25ad7..f40ae37c0ce 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1481,8 +1481,7 @@ static void test_stream_media_props(IWMStreamConfig *config, hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", debugstr_guid(majortype), debugstr_guid(&mt->majortype)); todo_wine_if(todo_subtype) @@ -1687,8 +1686,7 @@ static void test_sync_reader_types(void) hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -3587,8 +3585,7 @@ static void test_async_reader_types(void) hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype));

1 0

Alexandre Julliard : wtsapi32/tests: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 4aac5089f3c423fe7afb8e4ef152b36bf55505f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aac5089f3c423fe7afb8e4ef152b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:15:03 2023 +0200 wtsapi32/tests: Avoid sizeof() in traces. --- dlls/wtsapi32/tests/wtsapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 396a3f4b1e7..6e8de7b232d 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -224,7 +224,7 @@ static void test_WTSQuerySessionInformation(void) GetUserNameW(usernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); - ok(count == tempsize * sizeof(WCHAR), "expected %Iu, got %lu\n", tempsize * sizeof(WCHAR), count); + ok(count == tempsize * sizeof(WCHAR), "got %lu\n", count); WTSFreeMemory(buf1); count = 0; @@ -237,7 +237,7 @@ static void test_WTSQuerySessionInformation(void) GetComputerNameW(computernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); - ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (tempsize + 1) * sizeof(WCHAR), count); + ok(count == (tempsize + 1) * sizeof(WCHAR), "got %lu\n", count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : kernel32/tests: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: ef6055c164ad28eceba08f98de27380187209148 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef6055c164ad28eceba08f98de2738… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:13:20 2023 +0200 kernel32/tests: Avoid sizeof() in traces. --- dlls/kernel32/tests/volume.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 5d2d971232f..baf055c08b0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1565,8 +1565,7 @@ static void test_GetVolumeInformationByHandle(void) attr_info->MaximumComponentNameLength, filename_len); ok(!wcscmp( fsname, attr_info->FileSystemName ), "expected fsname %s, got %s\n", debugstr_w( attr_info->FileSystemName ), debugstr_w( fsname )); - ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), - "expected fsname length %Iu, got %Iu\n", attr_info->FileSystemNameLength / sizeof(WCHAR), wcslen( fsname )); + ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), "got %Iu\n", wcslen( fsname )); SetLastError(0xdeadbeef); ret = pGetVolumeInformationByHandleW( file, NULL, 0, NULL, &filename_len, &flags, fsname, 2 ); @@ -1580,8 +1579,7 @@ static void test_GetVolumeInformationByHandle(void) volume_info->VolumeSerialNumber, serial); ok(!wcscmp( label, volume_info->VolumeLabel ), "expected label %s, got %s\n", debugstr_w( volume_info->VolumeLabel ), debugstr_w( label )); - ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), - "expected label length %Iu, got %Iu\n", volume_info->VolumeLabelLength / sizeof(WCHAR), wcslen( label )); + ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), "got %Iu\n", wcslen( label )); CloseHandle( file ); @@ -1606,8 +1604,7 @@ static void test_GetVolumeInformationByHandle(void) volume_info->VolumeSerialNumber, serial); ok(!wcscmp( label, volume_info->VolumeLabel ), "expected label %s, got %s\n", debugstr_w( volume_info->VolumeLabel ), debugstr_w( label )); - ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), - "expected label length %Iu, got %Iu\n", volume_info->VolumeLabelLength / sizeof(WCHAR), wcslen( label )); + ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), "got %Iu\n", wcslen( label )); memset(buffer, 0, sizeof(buffer)); status = NtQueryVolumeInformationFile( file, &io, buffer, sizeof(buffer), FileFsAttributeInformation ); @@ -1618,8 +1615,7 @@ static void test_GetVolumeInformationByHandle(void) attr_info->MaximumComponentNameLength, filename_len); ok(!wcscmp( fsname, attr_info->FileSystemName ), "expected fsname %s, got %s\n", debugstr_w( attr_info->FileSystemName ), debugstr_w( fsname )); - ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), - "expected fsname length %Iu, got %Iu\n", attr_info->FileSystemNameLength / sizeof(WCHAR), wcslen( fsname )); + ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), "got %Iu\n", wcslen( fsname )); CloseHandle( file ); }

1 0

Alexandre Julliard : ntoskrnl.exe/tests: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 08cfcb71bdd755814de2c0986b85a154822ebc4e URL: https://gitlab.winehq.org/wine/wine/-/commit/08cfcb71bdd755814de2c0986b85a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:13:51 2023 +0200 ntoskrnl.exe/tests: Avoid sizeof() in traces. --- dlls/ntoskrnl.exe/tests/driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a80bef78fab..bd388a6ec9e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1241,8 +1241,7 @@ static void test_lookaside_list(void) ok(list.L.Type == (NonPagedPool|POOL_NX_ALLOCATION), "Expected NonPagedPool|POOL_NX_ALLOCATION got %u\n", list.L.Type); ok(list.L.Tag == tag, "Expected %lx got %lx\n", tag, list.L.Tag); - ok(list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, - "Expected %Iu got %lu\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, list.L.Size); + ok(list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, "got %lu\n", list.L.Size); ok(list.L.LastTotalAllocates == 0,"Expected 0 got %lu\n", list.L.LastTotalAllocates); ok(list.L.LastAllocateMisses == 0,"Expected 0 got %lu\n", list.L.LastAllocateMisses); ExDeleteNPagedLookasideList(&list); @@ -1264,8 +1263,7 @@ static void test_lookaside_list(void) ok(paged_list.L.Type == (PagedPool|POOL_NX_ALLOCATION), "Expected PagedPool|POOL_NX_ALLOCATION got %u\n", paged_list.L.Type); ok(paged_list.L.Tag == tag, "Expected %lx got %lx\n", tag, paged_list.L.Tag); - ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, - "Expected %Iu got %lu\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, paged_list.L.Size); + ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, "got %lu\n", paged_list.L.Size); ok(paged_list.L.LastTotalAllocates == 0,"Expected 0 got %lu\n", paged_list.L.LastTotalAllocates); ok(paged_list.L.LastAllocateMisses == 0,"Expected 0 got %lu\n", paged_list.L.LastAllocateMisses); ExDeletePagedLookasideList(&paged_list);

1 0

Alexandre Julliard : configure: Don't try to use a non-compliant cross-compiler.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: abe79e3b52db97cd955574de4c10b22435b2c22f URL: https://gitlab.winehq.org/wine/wine/-/commit/abe79e3b52db97cd955574de4c10b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:27:36 2023 +0200 configure: Don't try to use a non-compliant cross-compiler. --- configure | 11 ++++++++--- configure.ac | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 262222bfed4..73b29c92241 100755 --- a/configure +++ b/configure @@ -10690,7 +10690,6 @@ fi LDFLAGS=$saved_LDFLAGS continue fi - as_fn_append PE_ARCHS " $wine_arch" as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh` @@ -10726,17 +10725,23 @@ fi fi eval res=\$$as_wine_cv_crosscc_c99 + case "x$res" in x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } ;; xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; +printf "%s\n" "unsupported" >&6; } + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 printf "%s\n" "$res" >&6; } as_fn_append ${wine_arch}_CC " $res" ;; esac - + as_fn_append PE_ARCHS " $wine_arch" { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-strict-aliasing" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5 printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index d43dc662eb3..63dc4f65980 100644 --- a/configure.ac +++ b/configure.ac @@ -902,7 +902,6 @@ do LDFLAGS=$saved_LDFLAGS continue fi - AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AC_MSG_CHECKING([for $CC option to enable C99 features]) @@ -918,14 +917,20 @@ do AS_VAR_IF([wine_cv_crosscc_c99],[no],[],[break]) done]) AS_VAR_COPY([res],[wine_cv_crosscc_c99]) + AS_VAR_POPDEF([wine_cv_crosscc_c99]) case "x$res" in x) AC_MSG_RESULT([none needed]) ;; - xno) AC_MSG_RESULT([unsupported]) ;; + xno) AC_MSG_RESULT([unsupported]) + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) AC_MSG_RESULT([$res]) AS_VAR_APPEND([${wine_arch}_CC],[" $res"]) ;; esac - AS_VAR_POPDEF([wine_cv_crosscc_c99]) + AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) WINE_TRY_PE_CFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_PE_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])

1 0

Alexandre Julliard : advapi32/tests: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: c8c22e13486f3a48293bad08f7cb38c338593cc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8c22e13486f3a48293bad08f7cb38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:12:16 2023 +0200 advapi32/tests: Avoid sizeof() in traces. --- dlls/advapi32/tests/registry.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9e051056eed..8bffefe8628 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4187,9 +4187,7 @@ static void test_performance_keys(void) ok(file_time.l >= systime1.QuadPart - 10000 && file_time.l <= systime2.QuadPart, "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, file_time.l, systime2.QuadPart); - ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), - "expected name len %Iu, got %lu\n", - (sysname_len + 1) * sizeof(WCHAR), data->SystemNameLength); + ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "got %lu\n", data->SystemNameLength); ok(data->SystemNameOffset == sizeof(PERF_DATA_BLOCK), "got name offset %lu\n", data->SystemNameOffset); ok(!wcscmp(sysname, (const WCHAR *)(data + 1)), "expected name %s, got %s\n",

1 0

Alexandre Julliard : dmstyle: Avoid sizeof() in traces.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: d0c6486f5191ca04923d58e519adb7d970dfb0c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0c6486f5191ca04923d58e519adb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:12:48 2023 +0200 dmstyle: Avoid sizeof() in traces. --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index ae939f8b738..23e32a75fd0 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -508,7 +508,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, cnt, dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -524,7 +524,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, cnt, dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL;

1 0

Alexandre Julliard : configure: Define __STDC__ to work around clang breakage in MSVC mode.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 8f27e8f601af5e591d7f91367290f9d5140860de URL: https://gitlab.winehq.org/wine/wine/-/commit/8f27e8f601af5e591d7f91367290f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:42:56 2023 +0200 configure: Define __STDC__ to work around clang breakage in MSVC mode. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a6736d138c6..262222bfed4 100755 --- a/configure +++ b/configure @@ -10701,7 +10701,7 @@ then : printf %s "(cached) " >&6 else $as_nop eval "$as_wine_cv_crosscc_c99=no" - for arg in '' '-std=gnu99' + for arg in '' '-std=gnu99' '-D__STDC__' do test -z "$arg" || CC="$CC $arg" cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 6b75edc254e..d43dc662eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -908,7 +908,7 @@ do AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_CACHE_VAL([wine_cv_crosscc_c99], [AS_VAR_SET([wine_cv_crosscc_c99],[no]) - for arg in '' '-std=gnu99' + for arg in '' '-std=gnu99' '-D__STDC__' do test -z "$arg" || CC="$CC $arg" AC_COMPILE_IFELSE([AC_LANG_SOURCE([$ac_c_conftest_c99_program])],

1 0

Alex Henrie : vbscript: Use correct pointer type in add_match (scan-build).
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 449bdc33b50d2af412b1dda9912568c8dad556c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/449bdc33b50d2af412b1dda9912568… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:13:01 2023 -0600 vbscript: Use correct pointer type in add_match (scan-build). --- dlls/vbscript/vbregexp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 641798f97dd..4a56875ef14 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1024,12 +1024,12 @@ static HRESULT add_match(IMatchCollection2 *iface, IMatch2 *add) TRACE("(%p)->(%p)\n", This, add); if(!This->size) { - This->matches = malloc(8*sizeof(IMatch*)); + This->matches = malloc(8 * sizeof(*This->matches)); if(!This->matches) return E_OUTOFMEMORY; This->size = 8; }else if(This->size == This->count) { - IMatch2 **new_matches = realloc(This->matches, 2*This->size*sizeof(IMatch*)); + IMatch2 **new_matches = realloc(This->matches, 2 * This->size * sizeof(*This->matches)); if(!new_matches) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : configure: Allow using clang as cross-compiler for multiple archs.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: a09019b7e99ab364b9e9ad4d7f3d18daee072ce9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a09019b7e99ab364b9e9ad4d7f3d18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:27:07 2023 +0200 configure: Allow using clang as cross-compiler for multiple archs. --- configure | 7 +++---- configure.ac | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 1e05d87431c..a6736d138c6 100755 --- a/configure +++ b/configure @@ -10354,15 +10354,14 @@ else $as_nop if test "x$with_mingw" != xno then test $HOST_ARCH = unknown || cross_archs=$HOST_ARCH - case "x$with_mingw" in - x|xyes) ;; - *) eval "${cross_archs}_CC=\$with_mingw" ;; - esac fi fi for wine_arch in $cross_archs do + case "x$with_mingw" in + xclang|x*/clang) eval "${wine_arch}_CC=\$with_mingw" ;; + esac if eval \${${wine_arch}_CC:+false} : then : case $wine_arch in diff --git a/configure.ac b/configure.ac index 6e1b8250cc1..6b75edc254e 100644 --- a/configure.ac +++ b/configure.ac @@ -818,14 +818,13 @@ AS_VAR_SET_IF([enable_archs], [if test "x$with_mingw" != xno then test $HOST_ARCH = unknown || cross_archs=$HOST_ARCH - case "x$with_mingw" in - x|xyes) ;; - *) AS_VAR_SET(${cross_archs}_CC,$with_mingw) ;; - esac fi]) for wine_arch in $cross_archs do + case "x$with_mingw" in + xclang|x*/clang) AS_VAR_SET(${wine_arch}_CC,$with_mingw) ;; + esac AS_VAR_IF([${wine_arch}_CC],[], [case $wine_arch in aarch64)

1 0