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

Nikolay Sivov : mfsrcsnk/wave: Add a sink stub.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: ed7762c1fa5ccb5096570e03a6a1734242262e20 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed7762c1fa5ccb5096570e03a6a173… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 16:02:00 2022 +0300 mfsrcsnk/wave: Add a sink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/mfsrcsnk/Makefile.in | 1 + dlls/mfsrcsnk/tests/Makefile.in | 5 + dlls/mfsrcsnk/tests/mfsrcsnk.c | 163 ++++++++++++ dlls/mfsrcsnk/wave.c | 539 +++++++++++++++++++++++++++++++++++++++- 6 files changed, 707 insertions(+), 3 deletions(-)

1 0

Hans Leidekker : hnetcfg: Add INetFwRule stub.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 99c5f7d7e807bafefb090fc63a34d307b9b7a0a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/99c5f7d7e807bafefb090fc63a34d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 12 16:50:13 2022 +0200 hnetcfg: Add INetFwRule stub. --- dlls/hnetcfg/hnetcfg.c | 6 +- dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/policy.c | 554 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 561 insertions(+), 1 deletion(-)

1 0

Santino Mazza : bcrypt: Move symmetric flags check to symmetric section.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 5c1b0e5df50d5e1586b5b51790bcfcbca5594907 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c1b0e5df50d5e1586b5b51790bcfc… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Sun Aug 14 10:27:32 2022 -0300 bcrypt: Move symmetric flags check to symmetric section. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 37 +++++++++++++++++++++++-------------- dlls/bcrypt/tests/bcrypt.c | 3 ++- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 081a35bb416..5a3fefd2b51 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1928,34 +1928,43 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key_asymmetric_decrypt_params params; + NTSTATUS ret; struct key *key = handle; TRACE( "%p, %p, %lu, %p, %p, %lu, %p, %lu, %p, %#lx\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (flags & ~BCRYPT_BLOCK_PADDING) - { - FIXME( "flags %#lx not supported\n", flags ); - return STATUS_NOT_IMPLEMENTED; - } if (key_is_symmetric( key )) { - NTSTATUS ret; + if (flags & ~BCRYPT_BLOCK_PADDING) + { + FIXME( "flags %#lx not supported\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + EnterCriticalSection( &key->u.s.cs ); ret = key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); LeaveCriticalSection( &key->u.s.cs ); - return ret; + } + else + { + if (flags & BCRYPT_PAD_NONE || flags & BCRYPT_PAD_OAEP) + { + FIXME( "flags %#lx not implemented\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + params.key = key; + params.input = input; + params.input_len = input_len; + params.output = output; + params.output_len = output_len; + params.ret_len = ret_len; + ret = UNIX_CALL(key_asymmetric_decrypt, &params); } - params.key = key; - params.input = input; - params.input_len = input_len; - params.output = output; - params.output_len = output_len; - params.ret_len = ret_len; - return UNIX_CALL( key_asymmetric_decrypt, &params ); + return ret; } NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 04b3be53ae6..a72849fb4e9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2258,13 +2258,14 @@ static void test_rsa_encrypt(void) ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); - todo_wine { BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_PKCS1); + ok(decrypted_size == sizeof(input), "got size of %ld\n", decrypted_size); decrypted = malloc(decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_PKCS1); ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); free(decrypted); + todo_wine { encrypted_size = 60; /* OAEP Padding */ ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, NULL, 0, &encrypted_size, BCRYPT_PAD_OAEP);

1 0

Piotr Caban : msvcp60: Use 'MultiByteToWideChar' in __Fiopen implementation.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: fb54c4e0a4d1f3d19c34ebcd44db61fe42f5e285 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb54c4e0a4d1f3d19c34ebcd44db61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 9 19:29:17 2022 +0200 msvcp60: Use 'MultiByteToWideChar' in __Fiopen implementation. Based on a patch by Yeshun Ye. --- dlls/msvcp60/ios.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 1fef80f8a43..3da714375f4 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -26,6 +26,7 @@ #include "msvcp.h" #include "windef.h" #include "winbase.h" +#include "windows.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); @@ -2128,7 +2129,7 @@ FILE* __cdecl ___Fiopen(const char *name, int mode) TRACE("(%p %d)\n", name, mode); - if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + if(!MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, FILENAME_MAX-1)) return NULL; return _Fiopen_wchar(nameW, mode, _SH_DENYNO); }

1 0

Nikolay Sivov : mfsrcsnk/wave: Store media format structure.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 762356404848adbc75d39e469fab4b6d059d22f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/762356404848adbc75d39e469fab4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 20:39:01 2022 +0300 mfsrcsnk/wave: Store media format structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfsrcsnk/Makefile.in | 2 +- dlls/mfsrcsnk/wave.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mfsrcsnk/Makefile.in b/dlls/mfsrcsnk/Makefile.in index 8482d8f3556..a63ebaf60eb 100644 --- a/dlls/mfsrcsnk/Makefile.in +++ b/dlls/mfsrcsnk/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfsrcsnk.dll IMPORTLIB = mfsrcsnk -IMPORTS = mfplat mfuuid uuid +IMPORTS = ole32 mfplat mfuuid uuid EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mfsrcsnk/wave.c b/dlls/mfsrcsnk/wave.c index b9951b3e2b6..583eefb98b0 100644 --- a/dlls/mfsrcsnk/wave.c +++ b/dlls/mfsrcsnk/wave.c @@ -64,6 +64,7 @@ struct wave_sink IMFMediaEventQueue *stream_event_queue; IMFPresentationClock *clock; + WAVEFORMATEX *fmt; IMFByteStream *bytestream; unsigned int flags; @@ -144,6 +145,7 @@ static ULONG WINAPI wave_sink_Release(IMFFinalizableMediaSink *iface) if (sink->stream_event_queue) IMFMediaEventQueue_Release(sink->stream_event_queue); IMFByteStream_Release(sink->bytestream); + CoTaskMemFree(sink->fmt); DeleteCriticalSection(&sink->cs); free(sink); } @@ -679,6 +681,7 @@ HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *me { struct wave_sink *object; DWORD flags = 0; + UINT32 size; HRESULT hr; TRACE("%p, %p, %p.\n", bytestream, media_type, sink); @@ -689,11 +692,17 @@ HRESULT WINAPI MFCreateWAVEMediaSink(IMFByteStream *bytestream, IMFMediaType *me if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &flags))) return hr; if (!(flags & MFBYTESTREAM_IS_WRITABLE)) return E_INVALIDARG; - /* FIXME: do basic media type validation */ - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + /* FIXME: do basic media type validation */ + + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(media_type, &object->fmt, &size, 0))) + { + WARN("Failed to produce WAVEFORMATEX representation, hr %#lx.\n", hr); + goto failed; + } + object->IMFFinalizableMediaSink_iface.lpVtbl = &wave_sink_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &wave_sink_events_vtbl; object->IMFStreamSink_iface.lpVtbl = &wave_stream_sink_vtbl;

1 0

Martin Storsjö : vkd3d: Fix the signature of vkd3d_spirv_build_op_type_image.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 7ee17a15e0945d238848e767204010e5cacbf77c URL: https://gitlab.winehq.org/wine/wine/-/commit/7ee17a15e0945d238848e767204010… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Aug 11 14:32:52 2022 +0300 vkd3d: Fix the signature of vkd3d_spirv_build_op_type_image. Don't assume that enums and uint32_t parameters are identical. Clang 16 changes the diagonstic for incompatible function pointer types from a warning into an error by default. This fixes the following error, when built (for aarch64, but probably also for other architectures) in MSVC mode: ../src/libs/vkd3d/libs/vkd3d-shader/spirv.c:1083:13: error: incompatible function pointer types passing 'uint32_t (struct vkd3d_spirv_builder *, uint32_t, SpvDim, uint32_t, uint32_t, uint32_t, uint32_t, SpvImageFormat)' (aka 'unsigned int (struct vkd3d_spirv_builder *, unsigned int, enum SpvDim_, unsigned int, unsigned int, unsigned int, unsigned int, enum SpvImageFormat_)') to parameter of type 'vkd3d_spirv_build7_pfn' (aka 'unsigned int (*)(struct vkd3d_spirv_builder *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int)') [-Wincompatible-function-pointer-types] vkd3d_spirv_build_op_type_image); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/libs/vkd3d/libs/vkd3d-shader/spirv.c:612:68: note: passing argument to parameter 'build_pfn' here SpvOp op, const uint32_t *operands, vkd3d_spirv_build7_pfn build_pfn) ^ --- libs/vkd3d/libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/libs/vkd3d-shader/spirv.c b/libs/vkd3d/libs/vkd3d-shader/spirv.c index 99d247653bf..0168641c90c 100644 --- a/libs/vkd3d/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d/libs/vkd3d-shader/spirv.c @@ -1066,8 +1066,8 @@ static uint32_t vkd3d_spirv_get_op_type_sampler(struct vkd3d_spirv_builder *buil /* Access qualifiers are not supported. */ static uint32_t vkd3d_spirv_build_op_type_image(struct vkd3d_spirv_builder *builder, - uint32_t sampled_type_id, SpvDim dim, uint32_t depth, uint32_t arrayed, - uint32_t ms, uint32_t sampled, SpvImageFormat format) + uint32_t sampled_type_id, uint32_t dim, uint32_t depth, uint32_t arrayed, + uint32_t ms, uint32_t sampled, uint32_t format) { uint32_t operands[] = {sampled_type_id, dim, depth, arrayed, ms, sampled, format}; return vkd3d_spirv_build_op_rv(builder, &builder->global_stream,

1 0

Hans Leidekker : hnetcfg: Return success from netfw_rules_Add() and netfw_rules_Remove().
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: dc1fa72d1d58c10285b744e7939fa34ef64d5dd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc1fa72d1d58c10285b744e7939fa3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 12 16:51:28 2022 +0200 hnetcfg: Return success from netfw_rules_Add() and netfw_rules_Remove(). --- dlls/hnetcfg/policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index e603e1a1626..5031fdcdd92 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -759,7 +759,7 @@ static HRESULT WINAPI netfw_rules_Add( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %p\n", This, rule); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI netfw_rules_Remove( @@ -769,7 +769,7 @@ static HRESULT WINAPI netfw_rules_Remove( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %s\n", This, debugstr_w(name)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI netfw_rules_Item(

1 0

Martin Storsjö : configure: Downgrade -Wincompatible-function-pointer-types to a warning on ARM.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 59b5b79c0c9ca6589f02f707328d849b08c89a73 URL: https://gitlab.winehq.org/wine/wine/-/commit/59b5b79c0c9ca6589f02f707328d84… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Aug 11 14:26:31 2022 +0300 configure: Downgrade -Wincompatible-function-pointer-types to a warning on ARM. Clang 16 is defaulting -Wincompatible-function-pointer-types to an error instead of a warning. This isn't an issue for most of Wine, but the error shows up in a lot of cases if doing a non-PE build for ARM (32 bit, 64 has no such issues), in particular around the integration of libxml2 and faudio. The root cause of the issue is that some functions are specified with e.g. __attribute__((pcs("aapcs-vfp"))) - which is equal to the default calling convention when compiling with -mfloat-abi=hard - but Clang's warning doesn't treat such function pointers as equal. (This could maybe be considered a bug or limitation in Clang though.) There's also some smaller amount of cases where our attributes actually do conflict, where we mix __attribute__((pcs("aapcs"))), i.e. arm softfloat calling convention, with the default calling convention (which is set to hardfloat), but they drown in the noise from the other ones. Therefore, on arm, try to downgrade this diagnostic back to a warning, not an error - while keeping the warnings visible. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure | 29 +++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 31 insertions(+) diff --git a/configure b/configure index 51946122dae..9a426b619bb 100755 --- a/configure +++ b/configure @@ -19413,6 +19413,35 @@ printf "%s\n" "$ac_cv_mabi_ms" >&6; } fi MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; esac ;; + arm*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wincompatible-function-pointer-types" >&5 +printf %s "checking whether the compiler supports -Wincompatible-function-pointer-types... " >&6; } +if test ${ac_cv_cflags__Wincompatible_function_pointer_types+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wincompatible-function-pointer-types" +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__Wincompatible_function_pointer_types=yes +else $as_nop + ac_cv_cflags__Wincompatible_function_pointer_types=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__Wincompatible_function_pointer_types" >&5 +printf "%s\n" "$ac_cv_cflags__Wincompatible_function_pointer_types" >&6; } +if test "x$ac_cv_cflags__Wincompatible_function_pointer_types" = xyes +then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-error=incompatible-function-pointer-types" +fi ;; esac CFLAGS=$saved_CFLAGS diff --git a/configure.ac b/configure.ac index dd4abd39e32..560d66c46de 100644 --- a/configure.ac +++ b/configure.ac @@ -1931,6 +1931,8 @@ int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }] fi MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; esac ;; + arm*) + WINE_TRY_CFLAGS([-Wincompatible-function-pointer-types],[EXTRACFLAGS="$EXTRACFLAGS -Wno-error=incompatible-function-pointer-types"]) ;; esac CFLAGS=$saved_CFLAGS

1 0

Zebediah Figura : d3d9/tests: Expand tests for valid pools in UpdateTexture().
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 5a8075c945749987d854490ff52982144bd94616 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a8075c945749987d854490ff52982… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 16:41:06 2022 -0500 d3d9/tests: Expand tests for valid pools in UpdateTexture(). --- dlls/d3d9/tests/device.c | 229 +++++++++++++++++++++++++++++++---------------- 1 file changed, 153 insertions(+), 76 deletions(-)

1 0

Zebediah Figura : d3d9/tests: Add more tests for dirty rect handling.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: a0eaae85a403344cb81e43d8d182d4c8250720ae URL: https://gitlab.winehq.org/wine/wine/-/commit/a0eaae85a403344cb81e43d8d182d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 16:45:41 2022 -0500 d3d9/tests: Add more tests for dirty rect handling. --- dlls/d3d9/tests/visual.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 665702f3206..8be60d5e2fb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19624,6 +19624,15 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + fill_surface(surface_src_green, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); + + /* So does drawing directly from the sysmem texture. */ + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_src_green); + ok(hr == S_OK, "Failed to set texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + /* Tests with managed textures. */ fill_surface(surface_managed0, 0x00ff0000, 0); fill_surface(surface_managed1, 0x00ff0000, 0);

1 0