- Wine-Commits - list.winehq.org

Rémi Bernon : widl: Use warning_at when reporting duplicate attributes.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: bf9d15e3b1a29f73fedda0c34547a9b29d5e2789 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9d15e3b1a29f73fedda0c34547a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use warning_at when reporting duplicate attributes. --- tools/widl/attribute.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index bceca3da46a..92c6f1a44fa 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -260,16 +260,13 @@ attr_list_t *append_attr( attr_list_t *list, attr_t *attr ) if (!allowed_attr[attr->type].multiple) { LIST_FOR_EACH_ENTRY( attr_existing, list, attr_t, entry ) - if (attr_existing->type == attr->type) - { - char buffer[1024]; - snprintf( buffer, sizeof(buffer), "duplicate attribute %s\n", - get_attr_display_name( attr->type ) ); - parser_warning( NULL, buffer ); - /* use the last attribute, like MIDL does */ - list_remove( &attr_existing->entry ); - break; - } + { + if (attr_existing->type != attr->type) continue; + warning_at( &attr->where, "duplicate attribute %s\n", get_attr_display_name( attr->type ) ); + /* use the last attribute, like MIDL does */ + list_remove( &attr_existing->entry ); + break; + } } list_add_tail( list, &attr->entry ); return list;

1 0

Rémi Bernon : widl: Remove custom attribute creation helper.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: a10740f3196c4d7546b999f13f446bddfee68c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10740f3196c4d7546b999f13f446b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 24 14:56:58 2023 +0100 widl: Remove custom attribute creation helper. --- tools/widl/attribute.c | 11 ----------- tools/widl/parser.y | 5 ++++- tools/widl/widl.h | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index 46fb05d09e0..1234f0a1e40 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -40,17 +40,6 @@ attr_t *attr_ptr( enum attr_type attr_type, void *val ) return a; } -attr_t *make_custom_attr( struct uuid *id, expr_t *pval ) -{ - attr_t *a = xmalloc( sizeof(attr_t) ); - attr_custdata_t *cstdata = xmalloc( sizeof(attr_custdata_t) ); - a->type = ATTR_CUSTOM; - cstdata->id = *id; - cstdata->pval = pval; - a->u.pval = cstdata; - return a; -} - int is_attr( const attr_list_t *list, enum attr_type attr_type ) { const attr_t *attr; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 86a07b175f4..77e9fadff6f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -625,7 +625,10 @@ attribute | tCONTRACT '(' contract_req ')' { $$ = attr_ptr( ATTR_CONTRACT, $3 ); } | tCONTRACTVERSION '(' contract_ver ')' { $$ = attr_int( ATTR_CONTRACTVERSION, $3 ); } | tCONTROL { $$ = attr_int( ATTR_CONTROL, 0 ); } - | tCUSTOM '(' aUUID ',' expr_const ')' { $$ = make_custom_attr( $3, $5 ); } + | tCUSTOM '(' aUUID ',' expr_const ')' { attr_custdata_t *data = xmalloc( sizeof(*data) ); + data->id = *$3; data->pval = $5; + $$ = attr_ptr( ATTR_CUSTOM, data ); + } | tDECODE { $$ = attr_int( ATTR_DECODE, 0 ); } | tDEFAULT { $$ = attr_int( ATTR_DEFAULT, 0 ); } | tDEFAULTBIND { $$ = attr_int( ATTR_DEFAULTBIND, 0 ); } diff --git a/tools/widl/widl.h b/tools/widl/widl.h index c22f619349e..b8f1eb8d4c0 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -99,7 +99,6 @@ extern void end_cplusplus_guard(FILE *fp); extern attr_t *attr_int( enum attr_type attr_type, unsigned int val ); extern attr_t *attr_ptr( enum attr_type attr_type, void *val ); -extern attr_t *make_custom_attr( struct uuid *id, expr_t *pval ); extern int is_attr( const attr_list_t *list, enum attr_type attr_type ); extern int is_ptrchain_attr( const var_t *var, enum attr_type attr_type );

1 0

Rémi Bernon : widl: Use spaces to indent attribute rules more consistently.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: f79ae4a95c16a6795321251bb469860dc30b9d40 URL: https://gitlab.winehq.org/wine/wine/-/commit/f79ae4a95c16a6795321251bb46986… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 24 14:35:12 2023 +0100 widl: Use spaces to indent attribute rules more consistently. --- tools/widl/parser.y | 273 ++++++++++++++++++++++++++-------------------------- 1 file changed, 138 insertions(+), 135 deletions(-)

1 0

Rémi Bernon : widl: Add source location information to attributes.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 3d79c1f56da935f6a323ab23bdb4d307698eaacf URL: https://gitlab.winehq.org/wine/wine/-/commit/3d79c1f56da935f6a323ab23bdb4d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Add source location information to attributes. --- tools/widl/attribute.c | 70 ++++++------- tools/widl/parser.y | 264 ++++++++++++++++++++++++------------------------- tools/widl/typetree.c | 2 +- tools/widl/widl.h | 4 +- tools/widl/widltypes.h | 1 + 5 files changed, 172 insertions(+), 169 deletions(-)

1 0

Rémi Bernon : widl: Move attribute related functions to attribute.c.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: f36fbb37886622dee098b776e591cc396684173f URL: https://gitlab.winehq.org/wine/wine/-/commit/f36fbb37886622dee098b776e591cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Move attribute related functions to attribute.c. --- tools/widl/Makefile.in | 1 + tools/widl/attribute.c | 556 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/header.c | 57 ----- tools/widl/header.h | 4 - tools/widl/parser.y | 481 ------------------------------------------ tools/widl/typegen.c | 13 -- tools/widl/typetree.h | 15 +- tools/widl/widl.h | 38 ++++ 8 files changed, 600 insertions(+), 565 deletions(-)

1 0

Ziqing Hui : winegstreamer: Create wg_transform for WMV decoder.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: e23f9e4dfd7eb8df3b64acb136f9da1742647d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/e23f9e4dfd7eb8df3b64acb136f9da… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Feb 3 18:05:01 2023 +0800 winegstreamer: Create wg_transform for WMV decoder. --- dlls/mf/tests/transform.c | 8 +++- dlls/winegstreamer/wg_transform.c | 4 +- dlls/winegstreamer/wmv_decoder.c | 94 ++++++++++++++++++++++++++++++++------- 3 files changed, 87 insertions(+), 19 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 17b59c46b97..914789db84a 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5243,8 +5243,12 @@ static void test_wmv_decoder_media_object(void) hr = CoInitialize(NULL); ok(hr == S_OK, "CoInitialize failed, hr %#lx.\n", hr); - hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&media_object); - ok(hr == S_OK, "CoCreateInstance returned %#lx.\n", hr); + if (FAILED(hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&media_object))) + { + CoUninitialize(); + winetest_pop_context(); + return; + } /* Test GetStreamCount. */ in_count = out_count = 0xdeadbeef; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 65a34511284..ccdd90361fc 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -428,6 +428,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_INDEO: + case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) || !transform_append_element(transform, element, &first, &last)) { @@ -440,7 +441,6 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO: break; case WG_MAJOR_TYPE_UNKNOWN: - case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", input_format.major_type); gst_caps_unref(raw_caps); goto out; @@ -469,6 +469,7 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = create_element("videoconvert", "base")) || !transform_append_element(transform, element, &first, &last)) goto out; @@ -482,7 +483,6 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_UNKNOWN: - case WG_MAJOR_TYPE_VIDEO_WMV: case WG_MAJOR_TYPE_VIDEO_INDEO: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index ed61ee0e2e3..9011d2cf182 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -28,6 +28,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +WINE_DECLARE_DEBUG_CHANNEL(winediag); extern const GUID MEDIASUBTYPE_VC1S; @@ -83,6 +84,9 @@ struct wmv_decoder struct wg_format input_format; struct wg_format output_format; GUID output_subtype; + + struct wg_transform *wg_transform; + struct wg_sample_queue *wg_sample_queue; }; static bool wg_format_is_set(struct wg_format *format) @@ -140,7 +144,12 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) + { + if (impl->wg_transform) + wg_transform_destroy(impl->wg_transform); + wg_sample_queue_destroy(impl->wg_sample_queue); free(impl); + } return refcount; } @@ -489,6 +498,11 @@ static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index if (flags & DMO_SET_TYPEF_CLEAR) { memset(&decoder->input_format, 0, sizeof(decoder->input_format)); + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = NULL; + } return S_OK; } return DMO_E_TYPE_NOT_ACCEPTED; @@ -509,8 +523,15 @@ static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index wg_format.u.video_wmv.fps_n = 0; wg_format.u.video_wmv.fps_d = 0; - if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) - decoder->input_format = wg_format; + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return S_OK; + + decoder->input_format = wg_format; + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = NULL; + } return S_OK; } @@ -532,6 +553,11 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde if (flags & DMO_SET_TYPEF_CLEAR) { memset(&decoder->output_format, 0, sizeof(decoder->output_format)); + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = NULL; + } return S_OK; } return E_POINTER; @@ -555,11 +581,20 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde wg_format.u.video.fps_n = 0; wg_format.u.video.fps_d = 0; - if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) + if (flags & DMO_SET_TYPEF_TEST_ONLY) + return S_OK; + + decoder->output_subtype = type->subtype; + decoder->output_format = wg_format; + + /* Set up wg_transform. */ + if (decoder->wg_transform) { - decoder->output_subtype = type->subtype; - decoder->output_format = wg_format; + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = NULL; } + if (!(decoder->wg_transform = wg_transform_create(&decoder->input_format, &decoder->output_format))) + return E_FAIL; return S_OK; } @@ -804,22 +839,51 @@ static const IPropertyStoreVtbl property_store_vtbl = HRESULT wmv_decoder_create(IUnknown *outer, IUnknown **out) { - struct wmv_decoder *impl; + static const struct wg_format input_format = + { + .major_type = WG_MAJOR_TYPE_VIDEO_WMV, + .u.video_wmv.format = WG_WMV_VIDEO_FORMAT_WMV3, + }; + static const struct wg_format output_format = + { + .major_type = WG_MAJOR_TYPE_VIDEO, + .u.video = + { + .format = WG_VIDEO_FORMAT_NV12, + .width = 1920, + .height = 1080, + }, + }; + struct wg_transform *transform; + struct wmv_decoder *decoder; + HRESULT hr; TRACE("outer %p, out %p.\n", outer, out); - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + ERR_(winediag)("GStreamer doesn't support WMV decoding, please install appropriate plugins.\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; + if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) + { + free(decoder); + return hr; + } - impl->IUnknown_inner.lpVtbl = &unknown_vtbl; - impl->IMFTransform_iface.lpVtbl = &transform_vtbl; - impl->IMediaObject_iface.lpVtbl = &media_object_vtbl; - impl->IPropertyBag_iface.lpVtbl = &property_bag_vtbl; - impl->IPropertyStore_iface.lpVtbl = &property_store_vtbl; - impl->refcount = 1; - impl->outer = outer ? outer : &impl->IUnknown_inner; + decoder->IUnknown_inner.lpVtbl = &unknown_vtbl; + decoder->IMFTransform_iface.lpVtbl = &transform_vtbl; + decoder->IMediaObject_iface.lpVtbl = &media_object_vtbl; + decoder->IPropertyBag_iface.lpVtbl = &property_bag_vtbl; + decoder->IPropertyStore_iface.lpVtbl = &property_store_vtbl; + decoder->refcount = 1; + decoder->outer = outer ? outer : &decoder->IUnknown_inner; - *out = &impl->IUnknown_inner; + *out = &decoder->IUnknown_inner; TRACE("Created %p\n", *out); return S_OK; }

1 0

Ziqing Hui : winegstreamer: Implement ProcessInput and ProcessOutput for WMV decoder DMO.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: c91ab8c99a7a0bf10df811421e5df5a9f85244b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c91ab8c99a7a0bf10df811421e5df5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Feb 3 18:17:11 2023 +0800 winegstreamer: Implement ProcessInput and ProcessOutput for WMV decoder DMO. --- dlls/mf/tests/transform.c | 14 +---- dlls/winegstreamer/gst_private.h | 4 ++ dlls/winegstreamer/wg_sample.c | 131 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wmv_decoder.c | 29 +++++++-- 4 files changed, 161 insertions(+), 17 deletions(-)

1 0

Paul Gofman : crypt32: Refactor read_trusted_roots_from_known_locations().
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 463bd7c3e012c98592e530bb0e16d23d083aac03 URL: https://gitlab.winehq.org/wine/wine/-/commit/463bd7c3e012c98592e530bb0e16d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 23 15:18:28 2023 -0600 crypt32: Refactor read_trusted_roots_from_known_locations(). --- dlls/crypt32/rootstore.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index fb90c5bde7c..85efe5354bd 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -614,29 +614,30 @@ static void add_ms_root_certs(HCERTSTORE to) */ static void read_trusted_roots_from_known_locations(HCERTSTORE store) { - HCERTSTORE from = CertOpenStore(CERT_STORE_PROV_MEMORY, - X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + HCERTSTORE new; DWORD needed; struct enum_root_certs_params params = { NULL, 2048, &needed }; - if (from) + new = CertOpenStore( CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL ); + if (!new) return; + + params.buffer = CryptMemAlloc( params.size ); + while (!CRYPT32_CALL( enum_root_certs, &params )) { - params.buffer = CryptMemAlloc( params.size ); - while (!CRYPT32_CALL( enum_root_certs, &params )) + if (needed > params.size) { - if (needed > params.size) - { - CryptMemFree( params.buffer ); - params.buffer = CryptMemAlloc( needed ); - params.size = needed; - } - else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, params.buffer, needed, - CERT_STORE_ADD_NEW, NULL ); + CryptMemFree( params.buffer ); + params.buffer = CryptMemAlloc( needed ); + params.size = needed; + continue; } - CryptMemFree( params.buffer ); - check_and_store_certs(from, store); + CertAddEncodedCertificateToStore( new, X509_ASN_ENCODING, params.buffer, needed, + CERT_STORE_ADD_NEW, NULL ); } - CertCloseStore(from, 0); + CryptMemFree( params.buffer ); + check_and_store_certs( new, store ); + + CertCloseStore( new, 0 ); } static HCERTSTORE create_root_store(void)

1 0

Rémi Bernon : imm32: Fix ImmEscape(A|W) with NULL data.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 8f6eda8649b6b214181aa604361b29867372706a URL: https://gitlab.winehq.org/wine/wine/-/commit/8f6eda8649b6b214181aa604361b29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 23 12:03:51 2023 +0100 imm32: Fix ImmEscape(A|W) with NULL data. --- dlls/imm32/imm.c | 4 ++-- dlls/imm32/tests/imm32.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c22c1fb9e64..f202c4cf1e7 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1006,7 +1006,7 @@ LRESULT WINAPI ImmEscapeA( HKL hkl, HIMC himc, UINT code, void *data ) if (!(ime = ime_acquire( hkl ))) return 0; - if (!EscapeRequiresWA( code ) || !ime_is_unicode( ime )) + if (!EscapeRequiresWA( code ) || !ime_is_unicode( ime ) || !data) ret = ime->pImeEscape( himc, code, data ); else { @@ -1039,7 +1039,7 @@ LRESULT WINAPI ImmEscapeW( HKL hkl, HIMC himc, UINT code, void *data ) if (!(ime = ime_acquire( hkl ))) return 0; - if (!EscapeRequiresWA( code ) || ime_is_unicode( ime )) + if (!EscapeRequiresWA( code ) || ime_is_unicode( ime ) || !data) ret = ime->pImeEscape( himc, code, data ); else { diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 93185402441..7088f663535 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2574,15 +2574,9 @@ static LRESULT WINAPI ime_ImeEscape( HIMC himc, UINT escape, void *data ) case IME_ESC_SET_EUDC_DICTIONARY: if (!data) return 4; if (ime_info.fdwProperty & IME_PROP_UNICODE) - { - todo_wine_if(*(WCHAR *)data != 'E') ok_wcs( L"EscapeIme", data ); - } else - { - todo_wine_if(*(char *)data != 'E') ok_str( "EscapeIme", data ); - } /* fallthrough */ case IME_ESC_QUERY_SUPPORT: case IME_ESC_SEQUENCE_TO_INTERNAL:

1 0

Ziqing Hui : winegstreamer: Ignore framerate of media type for WMV decoder DMO.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 5bb46c052d164fd4d2697d3163f803c7fe829f14 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bb46c052d164fd4d2697d3163f803… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Feb 3 17:54:31 2023 +0800 winegstreamer: Ignore framerate of media type for WMV decoder DMO. --- dlls/winegstreamer/wmv_decoder.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 473fabab867..ed61ee0e2e3 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -505,6 +505,9 @@ static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index if (!amt_to_wg_format((const AM_MEDIA_TYPE *)type, &wg_format)) return DMO_E_TYPE_NOT_ACCEPTED; + assert(wg_format.major_type == WG_MAJOR_TYPE_VIDEO_WMV); + wg_format.u.video_wmv.fps_n = 0; + wg_format.u.video_wmv.fps_d = 0; if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) decoder->input_format = wg_format; @@ -548,6 +551,9 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde if (!amt_to_wg_format((const AM_MEDIA_TYPE *)type, &wg_format)) return DMO_E_TYPE_NOT_ACCEPTED; + assert(wg_format.major_type == WG_MAJOR_TYPE_VIDEO); + wg_format.u.video.fps_n = 0; + wg_format.u.video.fps_d = 0; if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) {

1 0