May 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/effect: Add a helper to append shader objects to the context.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 5317f869e09a84d5f4f9ee3d743c446e0f3cced4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5317f869e09a84d5f4f9ee3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 25 10:29:13 2022 +0300 d2d1/effect: Add a helper to append shader objects to the context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index ff808475a78..79d704dd949 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -37,18 +37,35 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) { - unsigned int i; + size_t i; for (i = 0; i < effect_context->shader_count; ++i) - { - if (effect_context->shaders[i].shader) - IUnknown_Release(effect_context->shaders[i].shader); - } + IUnknown_Release(effect_context->shaders[i].shader); heap_free(effect_context->shaders); ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface); } +static HRESULT d2d_effect_context_add_shader(struct d2d_effect_context *effect_context, + REFGUID shader_id, void *shader) +{ + struct d2d_shader *entry; + + if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, + effect_context->shader_count + 1, sizeof(*effect_context->shaders))) + { + WARN("Failed to resize shaders array.\n"); + return E_OUTOFMEMORY; + } + + entry = &effect_context->shaders[effect_context->shader_count++]; + entry->id = *shader_id; + entry->shader = shader; + IUnknown_AddRef(entry->shader); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -189,7 +206,6 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); ID3D11VertexShader *vertex_shader; - struct d2d_shader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", @@ -205,22 +221,10 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect return hr; } - if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, - effect_context->shader_count + 1, sizeof(*effect_context->shaders))) - { - ERR("Failed to resize shaders array.\n"); - ID3D11VertexShader_Release(vertex_shader); - return E_OUTOFMEMORY; - } - memset(effect_context->shaders + effect_context->shader_count, 0, - sizeof(*effect_context->shaders) * (effect_context->shaders_size - effect_context->shader_count)); + hr = d2d_effect_context_add_shader(effect_context, shader_id, vertex_shader); + ID3D11VertexShader_Release(vertex_shader); - effect_context->shader_count++; - shader = &effect_context->shaders[effect_context->shader_count - 1]; - shader->id = *shader_id; - shader->shader = (IUnknown *)vertex_shader; - - return S_OK; + return hr; } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface,

1 0

Rémi Bernon : widl: Remove set but unused variable.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: d81589371d424502bdf90b3135d22e7ed8df78bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81589371d424502bdf90b31… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 10:06:05 2022 +0200 widl: Remove set but unused variable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index abeb37f34a4..457b20df259 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1056,7 +1056,7 @@ static int encode_var( var, type, type->name ? type->name : "NULL"); if (is_array(type) && !type_array_is_decl_as_ptr(type)) { - int num_dims, elements = 1, arrayoffset; + int num_dims, arrayoffset; type_t *atype; int *arraydata; @@ -1083,7 +1083,6 @@ static int encode_var( arraydata[0] = type_array_get_dim(atype); arraydata[1] = 0; arraydata += 2; - elements *= type_array_get_dim(atype); } typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0);

1 0

Zhiyi Zhang : uxtheme: Support parsing menu class.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 7e48747bd67f8dcd47a0f5754d73b4b231fa723c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e48747bd67f8dcd47a0f575… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:28 2022 +0800 uxtheme: Support parsing menu class. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index afeda659a36..07fafbe0bde 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -485,6 +485,59 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classMenu[] = { + {MENU_MENUITEM_TMSCHEMA, 0, L"MENUITEM"}, + {MENU_MENUDROPDOWN_TMSCHEMA, 0, L"MENUDROPDOWN"}, + {MENU_MENUBARITEM_TMSCHEMA, 0, L"MENUBARITEM"}, + {MENU_MENUBARDROPDOWN_TMSCHEMA, 0, L"MENUBARDROPDOWN"}, + {MENU_CHEVRON_TMSCHEMA, 0, L"CHEVRON"}, + {MENU_SEPARATOR_TMSCHEMA, 0, L"SEPARATOR"}, + {MENU_BARBACKGROUND, 0, L"BARBACKGROUND"}, + {MENU_BARBACKGROUND, MB_ACTIVE, L"ACTIVE"}, + {MENU_BARBACKGROUND, MB_INACTIVE, L"INACTIVE"}, + {MENU_BARITEM, 0, L"BARITEM"}, + {MENU_BARITEM, MBI_NORMAL, L"NORMAL"}, + {MENU_BARITEM, MBI_HOT, L"HOT"}, + {MENU_BARITEM, MBI_PUSHED, L"PUSHED"}, + {MENU_BARITEM, MBI_DISABLED, L"DISABLED"}, + {MENU_BARITEM, MBI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_BARITEM, MBI_DISABLEDPUSHED, L"DISABLEDPUSHED"}, + {MENU_POPUPBACKGROUND, 0, L"POPUPBACKGROUND"}, + {MENU_POPUPBORDERS, 0, L"POPUPBORDERS"}, + {MENU_POPUPCHECK, 0, L"POPUPCHECK"}, + {MENU_POPUPCHECK, MC_CHECKMARKNORMAL, L"CHECKMARKNORMAL"}, + {MENU_POPUPCHECK, MC_CHECKMARKDISABLED, L"CHECKMARKDISABLED"}, + {MENU_POPUPCHECK, MC_BULLETNORMAL, L"BULLETNORMAL"}, + {MENU_POPUPCHECK, MC_BULLETDISABLED, L"BULLETDISABLED"}, + {MENU_POPUPCHECKBACKGROUND, 0, L"POPUPCHECKBACKGROUND"}, + {MENU_POPUPCHECKBACKGROUND, MCB_DISABLED, L"DISABLED"}, + {MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, L"NORMAL"}, + {MENU_POPUPCHECKBACKGROUND, MCB_BITMAP, L"BITMAP"}, + {MENU_POPUPGUTTER, 0, L"POPUPGUTTER"}, + {MENU_POPUPITEM, 0, L"POPUPITEM"}, + {MENU_POPUPITEM, MPI_NORMAL, L"NORMAL"}, + {MENU_POPUPITEM, MPI_HOT, L"HOT"}, + {MENU_POPUPITEM, MPI_DISABLED, L"DISABLED"}, + {MENU_POPUPITEM, MPI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_POPUPSEPARATOR, 0, L"POPUPSEPARATOR"}, + {MENU_POPUPSUBMENU, 0, L"POPUPSUBMENU"}, + {MENU_POPUPSUBMENU, MSM_NORMAL, L"NORMAL"}, + {MENU_POPUPSUBMENU, MSM_DISABLED, L"DISABLED"}, + {MENU_SYSTEMCLOSE, 0, L"SYSTEMCLOSE"}, + {MENU_SYSTEMCLOSE, MSYSC_NORMAL, L"NORMAL"}, + {MENU_SYSTEMCLOSE, MSYSC_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMAXIMIZE, 0, L"SYSTEMMAXIMIZE"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMINIMIZE, 0, L"SYSTEMMINIMIZE"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_DISABLED, L"DISABLED"}, + {MENU_SYSTEMRESTORE, 0, L"SYSTEMRESTORE"}, + {MENU_SYSTEMRESTORE, MSYSR_NORMAL, L"NORMAL"}, + {MENU_SYSTEMRESTORE, MSYSR_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1020,6 +1073,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, + {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"},

1 0

Zhiyi Zhang : light.msstyles: Add Menu parts.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: b90662e695c512de1d4476d7ff15004e4f1e2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90662e695c512de1d4476d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:37 2022 +0800 light.msstyles: Add Menu parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++ dlls/light.msstyles/blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes dlls/light.msstyles/blue_menu_popup_check_16px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes dlls/light.msstyles/blue_menu_popup_check_18px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_menu_popup_separator.svg | 5 + dlls/light.msstyles/blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes dlls/light.msstyles/blue_menu_popup_submenu.svg | 9 ++ dlls/light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_close.svg | 5 + dlls/light.msstyles/blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_maximize.svg | 5 + dlls/light.msstyles/blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_minimize.svg | 5 + dlls/light.msstyles/blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 +++++++++++++++++++++ 18 files changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b90662e695c512de1d44…

1 0

Brendan Shanks : win32u: Fix typo in NtUserGetIconInfo.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: b88ba537ea879772dc86fc8b811523744795b22d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88ba537ea879772dc86fc8b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 24 12:38:32 2022 -0700 win32u: Fix typo in NtUserGetIconInfo. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/win32u/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 032110b26d0..e51feb87115 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -600,7 +600,7 @@ BOOL WINAPI NtUserGetIconInfo( HICON icon, ICONINFO *info, UNICODE_STRING *modul { size_t size = min( res_name->MaximumLength, lstrlenW( obj->resname) * sizeof(WCHAR) ); if (size) memcpy( res_name->Buffer, obj->resname, size ); - module->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ + res_name->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ } } }

1 0

Rémi Bernon : qasf/tests: Add more ASF Reader filter tests.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 031747a5aaa7614a3982cda14a1714fc9b54d2f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031747a5aaa7614a3982cda1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 18:02:38 2022 +0100 qasf/tests: Add more ASF Reader filter tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/tests/Makefile.in | 2 + dlls/qasf/tests/asfreader.c | 234 +++++++++++++++++++++++++++++++++++++++++++- dlls/qasf/tests/resource.rc | 25 +++++ dlls/qasf/tests/test.wmv | Bin 0 -> 45663 bytes 4 files changed, 257 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=031747a5aaa7614a3982…

1 0

Rémi Bernon : qasf: Constify filter_ops.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 71b136384b208e85be362d523cc4cc7be9aff202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b136384b208e85be362d52… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:46:55 2022 +0200 qasf: Constify filter_ops. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index a037728079f..ba782f19ad9 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -66,7 +66,7 @@ static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID return E_NOINTERFACE; } -static struct strmbase_filter_ops filter_ops = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = asf_reader_get_pin, .filter_destroy = asf_reader_destroy,

1 0

Rémi Bernon : qasf: Rename variables and functions.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: bee6d2049e2f2c3b87ab5bcc5458ff900ec42850 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee6d2049e2f2c3b87ab5bcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 17 16:15:53 2022 +0200 qasf: Rename variables and functions. * filesourcefilter_ prefix to file_source_. * type to media_type. * filename to file_name. * impl_reader_from_strmbase_filter to impl_from_strmbase_filter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index ba782f19ad9..a657b719456 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,11 +27,11 @@ struct asf_reader struct strmbase_filter filter; IFileSourceFilter IFileSourceFilter_iface; - AM_MEDIA_TYPE type; - WCHAR *filename; + AM_MEDIA_TYPE media_type; + WCHAR *file_name; }; -static inline struct asf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) +static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); } @@ -43,10 +43,10 @@ static struct strmbase_pin *asf_reader_get_pin(struct strmbase_filter *iface, un static void asf_reader_destroy(struct strmbase_filter *iface) { - struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + struct asf_reader *filter = impl_from_strmbase_filter(iface); - free(filter->filename); - FreeMediaType(&filter->type); + free(filter->file_name); + FreeMediaType(&filter->media_type); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -54,7 +54,7 @@ static void asf_reader_destroy(struct strmbase_filter *iface) static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) { - struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + struct asf_reader *filter = impl_from_strmbase_filter(iface); if (IsEqualGUID(iid, &IID_IFileSourceFilter)) { @@ -78,84 +78,84 @@ static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter * return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); } -static HRESULT WINAPI filesourcefilter_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) +static HRESULT WINAPI file_source_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, iid, out); } -static ULONG WINAPI filesourcefilter_AddRef(IFileSourceFilter *iface) +static ULONG WINAPI file_source_AddRef(IFileSourceFilter *iface) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_AddRef(&filter->filter.IBaseFilter_iface); } -static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) +static ULONG WINAPI file_source_Release(IFileSourceFilter *iface) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_Release(&filter->filter.IBaseFilter_iface); } -static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter *iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) +static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_name, const AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); - TRACE("filter %p, filename %s, type %p.\n", filter, debugstr_w(filename), type); - strmbase_dump_media_type(type); + TRACE("filter %p, file_name %s, media_type %p.\n", filter, debugstr_w(file_name), media_type); + strmbase_dump_media_type(media_type); - if (!filename) + if (!file_name) return E_POINTER; - if (filter->filename) + if (filter->file_name) return E_FAIL; - if (!(filter->filename = wcsdup(filename))) + if (!(filter->file_name = wcsdup(file_name))) return E_OUTOFMEMORY; - if (type) - CopyMediaType(&filter->type, type); + if (media_type) + CopyMediaType(&filter->media_type, media_type); return S_OK; } -static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) +static HRESULT WINAPI file_source_GetCurFile(IFileSourceFilter *iface, LPOLESTR *file_name, AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); - TRACE("filter %p, filename %p, type %p.\n", filter, filename, type); + TRACE("filter %p, file_name %p, media_type %p.\n", filter, file_name, media_type); - if (!filename) + if (!file_name) return E_POINTER; - *filename = NULL; + *file_name = NULL; - if (type) + if (media_type) { - type->majortype = filter->type.majortype; - type->subtype = filter->type.subtype; - type->lSampleSize = filter->type.lSampleSize; - type->pUnk = filter->type.pUnk; - type->cbFormat = filter->type.cbFormat; + media_type->majortype = filter->media_type.majortype; + media_type->subtype = filter->media_type.subtype; + media_type->lSampleSize = filter->media_type.lSampleSize; + media_type->pUnk = filter->media_type.pUnk; + media_type->cbFormat = filter->media_type.cbFormat; } - if (filter->filename) + if (filter->file_name) { - *filename = CoTaskMemAlloc((wcslen(filter->filename) + 1) * sizeof(WCHAR)); - wcscpy(*filename, filter->filename); + *file_name = CoTaskMemAlloc((wcslen(filter->file_name) + 1) * sizeof(WCHAR)); + wcscpy(*file_name, filter->file_name); } return S_OK; } -static const IFileSourceFilterVtbl filesourcefilter_vtbl = +static const IFileSourceFilterVtbl file_source_vtbl = { - filesourcefilter_QueryInterface, - filesourcefilter_AddRef, - filesourcefilter_Release, - filesourcefilter_Load, - filesourcefilter_GetCurFile, + file_source_QueryInterface, + file_source_AddRef, + file_source_Release, + file_source_Load, + file_source_GetCurFile, }; HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) @@ -166,7 +166,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); - object->IFileSourceFilter_iface.lpVtbl = &filesourcefilter_vtbl; + object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl; TRACE("Created WM ASF reader %p.\n", object); *out = &object->filter.IUnknown_inner;

1 0

Rémi Bernon : qasf: Create and open a WMReader in the ASF Reader filter.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: e8bf5dcdf8cdbb365e9ca8703debdc2ae5f98279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8bf5dcdf8cdbb365e9ca870… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:48:59 2022 +0200 qasf: Create and open a WMReader in the ASF Reader filter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/Makefile.in | 2 +- dlls/qasf/asfreader.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index ee8fd0451e1..05c947b6255 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,5 +1,5 @@ MODULE = qasf.dll -IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 +IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 wmvcore C_SRCS = \ asfreader.c \ diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index a657b719456..b65529ec3bf 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -20,6 +20,11 @@ #include "qasf_private.h" +#include "mediaobj.h" +#include "propsys.h" +#include "initguid.h" +#include "wmsdkidl.h" + WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct asf_reader @@ -29,6 +34,9 @@ struct asf_reader AM_MEDIA_TYPE media_type; WCHAR *file_name; + + IWMReaderCallback *callback; + IWMReader *reader; }; static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -47,6 +55,8 @@ static void asf_reader_destroy(struct strmbase_filter *iface) free(filter->file_name); FreeMediaType(&filter->media_type); + IWMReaderCallback_Release(filter->callback); + IWMReader_Release(filter->reader); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -102,6 +112,7 @@ static ULONG WINAPI file_source_Release(IFileSourceFilter *iface) static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_name, const AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + HRESULT hr; TRACE("filter %p, file_name %s, media_type %p.\n", filter, debugstr_w(file_name), media_type); strmbase_dump_media_type(media_type); @@ -118,6 +129,9 @@ static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_ if (media_type) CopyMediaType(&filter->media_type, media_type); + if (FAILED(hr = IWMReader_Open(filter->reader, filter->file_name, filter->callback, NULL))) + WARN("Failed to open WM reader, hr %#lx.\n", hr); + return S_OK; } @@ -158,13 +172,123 @@ static const IFileSourceFilterVtbl file_source_vtbl = file_source_GetCurFile, }; +struct asf_callback +{ + IWMReaderCallback IWMReaderCallback_iface; + LONG ref; + + struct asf_reader *filter; +}; + +static inline struct asf_callback *impl_from_IWMReaderCallback(IWMReaderCallback *iface) +{ + return CONTAINING_RECORD(iface, struct asf_callback, IWMReaderCallback_iface); +} + +static HRESULT WINAPI reader_callback_QueryInterface(IWMReaderCallback *iface, const IID *iid, void **out) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IWMStatusCallback) + || IsEqualGUID(iid, &IID_IWMReaderCallback)) + *out = &callback->IWMReaderCallback_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI reader_callback_AddRef(IWMReaderCallback *iface) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + ULONG ref = InterlockedIncrement(&callback->ref); + + TRACE("%p increasing ref to %lu.\n", callback, ref); + + return ref; +} + +static ULONG WINAPI reader_callback_Release(IWMReaderCallback *iface) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + ULONG ref = InterlockedDecrement(&callback->ref); + + TRACE("%p decreasing ref to %lu.\n", callback, ref); + + if (!ref) + free(callback); + + return ref; +} + +static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, HRESULT hr, + WMT_ATTR_DATATYPE type, BYTE *value, void *context) +{ + FIXME("iface %p, status %d, hr %#lx, type %d, value %p, context %p stub!\n", + iface, status, hr, type, value, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, + QWORD duration, DWORD flags, INSSBuffer *sample, void *context) +{ + FIXME("iface %p, output %lu, time %I64u, duration %I64u, flags %#lx, sample %p, context %p stub!\n", + iface, output, time, duration, flags, sample, context); + return E_NOTIMPL; +} + +static const IWMReaderCallbackVtbl reader_callback_vtbl = +{ + reader_callback_QueryInterface, + reader_callback_AddRef, + reader_callback_Release, + reader_callback_OnStatus, + reader_callback_OnSample, +}; + +static HRESULT asf_callback_create(struct asf_reader *filter, IWMReaderCallback **out) +{ + struct asf_callback *callback; + + if (!(callback = calloc(1, sizeof(*callback)))) + return E_OUTOFMEMORY; + + callback->IWMReaderCallback_iface.lpVtbl = &reader_callback_vtbl; + callback->filter = filter; + callback->ref = 1; + + *out = &callback->IWMReaderCallback_iface; + return S_OK; +} + HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) { struct asf_reader *object; + HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + if (FAILED(hr = WMCreateReader(NULL, 0, &object->reader))) + { + free(object); + return hr; + } + if (FAILED(hr = asf_callback_create(object, &object->callback))) + { + IWMReader_Release(object->reader); + free(object); + return hr; + } + strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl;

1 0

Rémi Bernon : qasf: Implement ASF Reader filter stream stubs.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: c39dbe1f31435e715cd10bdf83be864e00346699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39dbe1f31435e715cd10bdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 13:20:51 2022 +0200 qasf: Implement ASF Reader filter stream stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 92 +++++++++++++++++++++++++++++++++++++++++++-- dlls/qasf/tests/asfreader.c | 6 --- 2 files changed, 89 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index b65529ec3bf..13b6e2d7bbe 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,6 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +struct asf_stream +{ + struct strmbase_source source; + DWORD index; +}; + struct asf_reader { struct strmbase_filter filter; @@ -37,6 +43,9 @@ struct asf_reader IWMReaderCallback *callback; IWMReader *reader; + + UINT stream_count; + struct asf_stream streams[16]; }; static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -46,12 +55,31 @@ static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filte static struct strmbase_pin *asf_reader_get_pin(struct strmbase_filter *iface, unsigned int index) { - return NULL; + struct asf_reader *filter = impl_from_strmbase_filter(iface); + struct strmbase_pin *pin = NULL; + + TRACE("iface %p, index %u.\n", iface, index); + + EnterCriticalSection(&filter->filter.filter_cs); + if (index < filter->stream_count) + pin = &filter->streams[index].source.pin; + LeaveCriticalSection(&filter->filter.filter_cs); + + return pin; } static void asf_reader_destroy(struct strmbase_filter *iface) { struct asf_reader *filter = impl_from_strmbase_filter(iface); + struct strmbase_source *source; + + while (filter->stream_count--) + { + source = &filter->streams[filter->stream_count].source; + if (source->pin.peer) IPin_Disconnect(source->pin.peer); + IPin_Disconnect(&source->pin.IPin_iface); + strmbase_source_cleanup(source); + } free(filter->file_name); FreeMediaType(&filter->media_type); @@ -83,6 +111,20 @@ static const struct strmbase_filter_ops filter_ops = .filter_query_interface = asf_reader_query_interface, }; +static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) +{ + FIXME("iface %p, allocator %p, req_props %p stub!\n", iface, allocator, req_props); + return E_NOTIMPL; +} + +static const struct strmbase_source_ops source_ops = +{ + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = asf_reader_DecideBufferSize, +}; + static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); @@ -232,9 +274,51 @@ static ULONG WINAPI reader_callback_Release(IWMReaderCallback *iface) static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, HRESULT hr, WMT_ATTR_DATATYPE type, BYTE *value, void *context) { - FIXME("iface %p, status %d, hr %#lx, type %d, value %p, context %p stub!\n", + struct asf_reader *filter = impl_from_IWMReaderCallback(iface)->filter; + DWORD i, stream_count; + WCHAR name[MAX_PATH]; + + TRACE("iface %p, status %d, hr %#lx, type %d, value %p, context %p.\n", iface, status, hr, type, value, context); - return E_NOTIMPL; + + switch (status) + { + case WMT_OPENED: + if (FAILED(hr)) + { + ERR("Failed to open WMReader, hr %#lx.\n", hr); + break; + } + if (FAILED(hr = IWMReader_GetOutputCount(filter->reader, &stream_count))) + { + ERR("Failed to get WMReader output count, hr %#lx.\n", hr); + break; + } + if (stream_count > ARRAY_SIZE(filter->streams)) + { + FIXME("Found %lu streams, not supported!\n", stream_count); + stream_count = ARRAY_SIZE(filter->streams); + } + + EnterCriticalSection(&filter->filter.filter_cs); + for (i = 0; i < stream_count; ++i) + { + struct asf_stream *stream = filter->streams + i; + swprintf(name, ARRAY_SIZE(name), L"Raw Stream %u", stream->index); + strmbase_source_init(&stream->source, &filter->filter, name, &source_ops); + } + filter->stream_count = stream_count; + LeaveCriticalSection(&filter->filter.filter_cs); + + BaseFilterImpl_IncrementPinVersion(&filter->filter); + break; + + default: + WARN("Ignoring status %#x.\n", status); + break; + } + + return S_OK; } static HRESULT WINAPI reader_callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, @@ -273,6 +357,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) { struct asf_reader *object; HRESULT hr; + int i; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -289,6 +374,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return hr; } + for (i = 0; i < ARRAY_SIZE(object->streams); ++i) object->streams[i].index = i; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl; diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index 54c38263464..494d0384ac8 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -242,9 +242,7 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec CoTaskMemFree(id); hr = IPin_EnumMediaTypes(pin, &enum_mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) goto skip_enum_mt; for (i = 0; (hr = IEnumMediaTypes_Next(enum_mt, 1, &mt, NULL)) == S_OK; i++) { if (i < expect_mt_count) @@ -260,7 +258,6 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enum_mt); -skip_enum_mt: check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IUnknown, TRUE); todo_wine @@ -499,9 +496,7 @@ static void test_filesourcefilter(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enumpins, 1, pins, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) goto skip_pins; check_pin(pins[0], filter, PINDIR_OUTPUT, L"Raw Video 0", L"Raw Video 0", video_mt, ARRAY_SIZE(video_mt)); IPin_Release(pins[0]); @@ -511,7 +506,6 @@ static void test_filesourcefilter(void) IPin_Release(pins[0]); hr = IEnumPins_Next(enumpins, 1, pins, NULL); -skip_pins: ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumPins_Release(enumpins);

1 0