October 2020 - Wine-commits

Henri Verbeet : vkd3d-compiler: Do not validate the target type if --print-target-types is specified.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: vkd3d Branch: master Commit: e075ec59143b81f48bbb0fab8446acf73a35d9ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e075ec59143b81f48bbb0fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 18:54:42 2020 +0330 vkd3d-compiler: Do not validate the target type if --print-target-types is specified. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8b9d7c2..da09ce3 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -474,6 +474,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (!validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", @@ -482,9 +485,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return false; } - if (options->print_target_types) - return true; - if (optind < argc) options->filename = argv[argc - 1];

1 0

Biswapriyo Nath : include: Add the ID3D12InfoQueue interface.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: vkd3d Branch: master Commit: 1210dac8e122c654f186c5cf0c68f003ac27d80c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1210dac8e122c654f186c5c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Oct 7 18:54:43 2020 +0330 include: Add the ID3D12InfoQueue interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 943 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 943 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1210dac8e122c654f18…

1 0

Biswapriyo Nath : include: Add the D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE enumeration.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: vkd3d Branch: master Commit: 55feaae8153d0c893b0395a527e4e265ffa962d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55feaae8153d0c893b0395a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Oct 7 18:54:44 2020 +0330 include: Add the D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE enumeration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 31187f7..027eeaa 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -890,6 +890,15 @@ typedef enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_D3D12_MESSAGES_END } D3D12_MESSAGE_ID; +typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE +{ + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0x0, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY = 0x1, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION = 0x2, + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION = 0x3, + NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, +} D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category;

1 0

Zebediah Figura : vkd3d-compiler: Use the correct array count in validate_target_type().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: vkd3d Branch: master Commit: 4eadd917c7cdbbcdf802a3475cdbc05aab7eaf77 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4eadd917c7cdbbcdf802a34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 5 19:45:23 2020 -0500 vkd3d-compiler: Use the correct array count in validate_target_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index da09ce3..7a1a5b0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -365,7 +365,7 @@ static bool validate_target_type( const enum vkd3d_shader_target_type *supported_types = vkd3d_shader_get_supported_target_types(source_type, &count); - for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + for (i = 0; i < count; ++i) { if (target_type == supported_types[i]) return true;

1 0

Hans Leidekker : bcrypt: Add support for exporting legacy DSA public keys.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 2a91b0bead7e5c6d08e3a6b79a6feda242e66652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a91b0bead7e5c6d08e3a6b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:13 2020 +0200 bcrypt: Add support for exporting legacy DSA public keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 4 ++ dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/gnutls.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5edc9e6c9c..13d6ba8d6c 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "bcrypt.h" +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) typedef struct @@ -164,9 +165,12 @@ struct key_symmetric ULONG secret_len; }; +#define KEY_FLAG_LEGACY_DSA_V2 0x00000001 + struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ + ULONG flags; UCHAR *pubkey; ULONG pubkey_len; DSSSEED dss_seed; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7f8b08869d..bc6ec69918 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -991,7 +991,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || - !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ed632dfd4c..2d80b74aac 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -804,6 +804,89 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, + UCHAR **pubkey, ULONG *pubkey_len ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *dsskey; + gnutls_datum_t p, q, g, y; + UCHAR *dst, *src; + int i, ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); + + if (bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + p.size + q.size + g.size + y.size ))) + { + pgnutls_perror( ret ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_NO_MEMORY; + } + + hdr->bType = PUBLICKEYBLOB; + hdr->bVersion = 2; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_DSS_SIGN; + + dsskey = (DSSPUBKEY *)(hdr + 1); + dsskey->magic = MAGIC_DSS1; + dsskey->bitlen = bitlen; + + dst = (UCHAR *)(dsskey + 1); + if (p.size % 2) + { + src = p.data + 1; + p.size--; + } + else src = p.data; + for (i = 0; i < p.size; i++) dst[i] = src[p.size - i - 1]; + + dst += p.size; + if (q.size % 2) + { + src = q.data + 1; + q.size--; + } + else src = q.data; + for (i = 0; i < q.size; i++) dst[i] = src[q.size - i - 1]; + + dst += q.size; + if (g.size % 2) + { + src = g.data + 1; + g.size--; + } + else src = g.data; + for (i = 0; i < g.size; i++) dst[i] = src[g.size - i - 1]; + + dst += g.size; + if (y.size % 2) + { + src = y.data + 1; + y.size--; + } + else src = y.data; + for (i = 0; i < y.size; i++) dst[i] = src[y.size - i - 1]; + + dst += y.size; + memcpy( dst, seed, sizeof(*seed) ); + + *pubkey = (UCHAR *)hdr; + *pubkey_len = size + p.size + q.size + g.size + y.size; + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + static NTSTATUS CDECL key_asymmetric_generate( struct key *key ) { gnutls_pk_algorithm_t pk_alg; @@ -1069,6 +1152,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le unsigned char dummy[128]; unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; int i, ret, size; + NTSTATUS status; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1118,9 +1202,18 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } + if ((status = export_gnutls_pubkey_dsa_capi( handle, &key->u.a.dss_seed, key->u.a.bitlen, &key->u.a.pubkey, + &key->u.a.pubkey_len ))) + { + pgnutls_privkey_deinit( handle ); + return status; + } + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; key_data(key)->privkey = handle; + return STATUS_SUCCESS; }

1 0

Hans Leidekker : bcrypt: Add support for importing legacy DSA public keys.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: f79ca651aeff14a7f4e3443410a89441569ea080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f79ca651aeff14a7f4e34434… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:14 2020 +0200 bcrypt: Add support for importing legacy DSA public keys. This is not supported on native but it will be useful to implement public key import in dssenh. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++++ dlls/bcrypt/gnutls.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bc6ec69918..a91f31e9f0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1329,6 +1329,34 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } + else if (!wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + { + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + ULONG size; + + if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + + if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; + } + + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; + + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if (input_len < size) return STATUS_INVALID_PARAMETER; + + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2d80b74aac..94e375cc8c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1336,6 +1336,54 @@ static NTSTATUS import_gnutls_pubkey_dsa( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + gnutls_datum_t p, q, g, y; + unsigned char *data, p_data[128], q_data[20], g_data[128], y_data[128]; + int i, ret, size; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + hdr = (BLOBHEADER *)key->u.a.pubkey; + pubkey = (DSSPUBKEY *)(hdr + 1); + size = pubkey->bitlen / 8; + data = (unsigned char *)(pubkey + 1); + + p.data = p_data; + p.size = size; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; + g.size = size; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + y.data = y_data; + y.size = sizeof(y_data); + for (i = 0; i < y.size; i++) y.data[i] = data[y.size - i - 1]; + + if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key ) { switch (key->alg_id) @@ -1349,7 +1397,10 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k return import_gnutls_pubkey_rsa( key, gnutls_key ); case ALG_ID_DSA: - return import_gnutls_pubkey_dsa( key, gnutls_key ); + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return import_gnutls_pubkey_dsa_capi( key, gnutls_key ); + else + return import_gnutls_pubkey_dsa( key, gnutls_key ); default: FIXME("algorithm %u not yet supported\n", key->alg_id );

1 0

Nikolay Sivov : evr/presenter: Return default flags for GetRenderingPrefs().
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 9b1bd73188ca47b718a46718ae8f269f9d0e212d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1bd73188ca47b718a46718… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:57 2020 +0300 evr/presenter: Return default flags for GetRenderingPrefs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 14 ++++++++++++-- dlls/evr/tests/evr.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index eceabfd381..8c455778d7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -61,6 +61,7 @@ struct video_presenter HWND video_window; MFVideoNormalizedRect src_rect; RECT dst_rect; + DWORD rendering_prefs; unsigned int state; CRITICAL_SECTION cs; }; @@ -658,9 +659,18 @@ static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayC static HRESULT WINAPI video_presenter_control_GetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (!flags) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *flags = presenter->rendering_prefs; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetFullscreen(IMFVideoDisplayControl *iface, BOOL fullscreen) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9546a945..85eedbe664 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -979,6 +979,7 @@ static void test_default_presenter(void) HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; + DWORD flags; float rate; HRESULT hr; GUID iid; @@ -1016,6 +1017,15 @@ static void test_default_presenter(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + flags = 123; + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected rendering flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm);

1 0

Nikolay Sivov : evr/presenter: Check for null argument in GetVideoWindow().
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: c01a9bae61618eca9a551108994b374b05e865ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01a9bae61618eca9a551108… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:58 2020 +0300 evr/presenter: Check for null argument in GetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 5 +++++ dlls/evr/tests/evr.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8c455778d7..9acbead728 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -616,7 +616,12 @@ static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayCont TRACE("%p, %p.\n", iface, window); + if (!window) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); *window = presenter->video_window; + LeaveCriticalSection(&presenter->cs); return S_OK; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 85eedbe664..53f1b02724 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1065,6 +1065,9 @@ static void test_default_presenter(void) hwnd = create_window(); ok(!!hwnd, "Failed to create a test window.\n"); + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hwnd2 = hwnd; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Validate passed handle on SetVideoWindow().
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: adc4dd674a28b71586511d466ac505aea86680fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc4dd674a28b71586511d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:48:59 2020 +0300 evr/presenter: Validate passed handle on SetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 3 +++ dlls/evr/tests/evr.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9acbead728..15ebcd80ac 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -603,6 +603,9 @@ static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayCont TRACE("%p, %p.\n", iface, window); + if (!IsWindow(window)) + return E_INVALIDARG; + EnterCriticalSection(&presenter->cs); presenter->video_window = window; LeaveCriticalSection(&presenter->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 53f1b02724..79020e1ec4 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1073,6 +1073,12 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, (HWND)0x1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Keep per-stream output rectangles.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 0b8b00216fa269657f06a54803c731966e173829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b8b00216fa269657f06a548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 14:49:00 2020 +0300 evr/mixer: Keep per-stream output rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 83 +++++++++++++++++++--------- dlls/evr/tests/evr.c | 150 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 190 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b8b00216fa269657f06…

1 0