wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

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

15 Aug '22

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

Piotr Caban : msvcp90: Use 'MultiByteToWideChar' in _Fiopen implementation.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: 8c46e2a85b588273fc6c6123b3b542e5b25d8d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/8c46e2a85b588273fc6c6123b3b542… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 9 19:30:00 2022 +0200 msvcp90: Use 'MultiByteToWideChar' in _Fiopen implementation. Based on a patch by Yeshun Ye. --- dlls/msvcp90/ios.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ef2c122f17f..a8014a3dfcf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3262,8 +3262,13 @@ FILE* __cdecl _Fiopen(const char *name, int mode, int prot) TRACE("(%s %d %d)\n", name, mode, prot); +#if _MSVCP_VER >= 71 && _MSVCP_VER <= 90 if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) return NULL; +#else + if(!MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, FILENAME_MAX-1)) + return NULL; +#endif return _Fiopen_wchar(nameW, mode, prot); }

1 0

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

15 Aug '22

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

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

15 Aug '22

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

Hans Leidekker : hnetcfg: Add INetFwRule stub.
by Alexandre Julliard 15 Aug '22

15 Aug '22

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

Robert Wilhelm : wshom: Use signed type for property ExitCode in IWshExec.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: e7dada5f9050fb265d314c841f8ce4b45415141a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7dada5f9050fb265d314c841f8ce4… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Aug 14 11:26:12 2022 +0200 wshom: Use signed type for property ExitCode in IWshExec. Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5ac04e60e88..034f6583d54 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -277,7 +277,7 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) return S_OK; } -static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) +static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, int *code) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index ee9578f5ae3..cdd674460f6 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate(); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c2984afc227..54de529a7a3 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate();

1 0

Robert Wilhelm : wshom: Use signed type for property ProcessID in IWshExec.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: cfdbebd80cba33c3b201071bc195940a831368e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfdbebd80cba33c3b201071bc19594… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Aug 14 11:18:04 2022 +0200 wshom: Use signed type for property ProcessID in IWshExec. Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 41913dcadd5..5ac04e60e88 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -264,7 +264,7 @@ static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) return S_OK; } -static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) +static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index a0175bb1604..ee9578f5ae3 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c69362d6fac..c2984afc227 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code);

1 0

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

15 Aug '22

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

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

15 Aug '22

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

Zebediah Figura : d3d8/tests: Add more tests for dirty rect handling.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: ddfd9ea5ab0676472e68cf5ee74a8a758d879f8b URL: https://gitlab.winehq.org/wine/wine/-/commit/ddfd9ea5ab0676472e68cf5ee74a8a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 16:45:34 2022 -0500 d3d8/tests: Add more tests for dirty rect handling. --- dlls/d3d8/tests/visual.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cb2f944b14a..068a29f3847 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5428,6 +5428,7 @@ static void add_dirty_rect_test(void) *tex_managed, *tex_dynamic; IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed0, *surface_managed1, *surface_dynamic; + struct surface_readback rb; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; unsigned int color, i; @@ -5704,6 +5705,29 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_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 = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)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); + + /* Blitting to the sysmem texture adds a dirty rect. */ + fill_surface(surface_src_red, 0x00000000, D3DLOCK_NO_DIRTY_UPDATE); + fill_surface(surface_src_green, 0x00ff00ff, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst1); + ok(hr == S_OK, "Failed to set texture, hr %#lx.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, surface_src_green, NULL, 0, surface_src_red, NULL); + ok(hr == S_OK, "Failed to update surface, hr %#lx.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst1); + ok(hr == S_OK, "Failed to update texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ff00ff, 1), "Got unexpected color 0x%08x.\n", color); + /* Tests with managed textures. */ fill_surface(surface_managed0, 0x00ff0000, 0); fill_surface(surface_managed1, 0x00ff0000, 0); @@ -5801,6 +5825,24 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Failed to present, hr %#lx.\n", hr); + /* Test blitting to a managed texture. */ + fill_surface(surface_managed0, 0x000000ff, 0); + /* Draw so that both the CPU and GPU copies are blue. */ + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_managed); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000000ff, 0), "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_CopyRects(device, surface_dst2, NULL, 0, surface_managed0, NULL); + ok(hr == D3D_OK, "Failed to update surface, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 0), "Got unexpected colour 0x%08x.\n", color); + get_surface_readback(surface_managed0, &rb); + color = get_readback_color(&rb, 320, 240) & 0x00ffffff; + ok(color_match(color, 0x0000ff00, 0), "Got unexpected colour 0x%08x.\n", color); + release_surface_readback(&rb); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dynamic);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
60
Older →

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