March 2019 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Adjust video memory when resizing swapchain buffers.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 9e20eda421a961e765ef4de17532477f14428101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e20eda421a961e765ef4de1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 25 11:11:58 2019 +0300 wined3d: Adjust video memory when resizing swapchain buffers. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 55c9543..9494920 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1531,6 +1531,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; + const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; DWORD valid_location = 0; @@ -1541,6 +1542,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); device = texture->resource.device; + d3d = device->wined3d; gl_info = &device->adapter->gl_info; d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); @@ -1608,6 +1610,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.multisample_quality = multisample_quality; texture->resource.width = width; texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); texture->resource.size = texture->slice_pitch; sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED;

1 0

Jacek Caban : mshtml: Introduce new CSSStyle type as a base for different style object implementations.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 66e918fc0769505ef4289e64653e5b720b960fb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e918fc0769505ef4289e64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:12:04 2019 +0100 mshtml: Introduce new CSSStyle type as a base for different style object implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 40 ++++++++++++++++++++-------------------- dlls/mshtml/htmlstyle.h | 6 +++++- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 76fbe11..ccaadcc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -986,7 +986,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const } if(!*iter) { WARN("invalid value %s\n", debugstr_w(value)); - set_nsstyle_property(style->nsstyle, sid, emptyW); + set_nsstyle_property(style->css_style.nsstyle, sid, emptyW); return E_INVALIDARG; } } @@ -997,7 +997,7 @@ static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const val = fix_url_value(value); } - hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + hres = set_nsstyle_property(style->css_style.nsstyle, sid, val ? val : value); heap_free(val); return hres; } @@ -1147,12 +1147,12 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { - return get_nsstyle_property(This->nsstyle, sid, dispex_compat_mode(&This->dispex), p); + return get_nsstyle_property(This->css_style.nsstyle, sid, dispex_compat_mode(&This->dispex), p); } static inline HRESULT get_style_property_var(HTMLStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->nsstyle, sid, dispex_compat_mode(&This->dispex), v); + return get_nsstyle_property_var(This->css_style.nsstyle, sid, dispex_compat_mode(&This->dispex), v); } static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR exval, VARIANT_BOOL *p) @@ -1162,7 +1162,7 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex nsAString_Init(&str_value, NULL); - get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); *p = variant_bool(!strcmpW(value, exval)); @@ -1204,7 +1204,7 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) nsAString_Init(&str_value, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); if(hres == S_OK) { WCHAR *ptr; @@ -1240,7 +1240,7 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) nsAString_Init(&str_value, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, sid, &str_value); if(hres == S_OK) { WCHAR *ptr = NULL; const PRUnichar *value; @@ -1332,8 +1332,8 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) if(!ref) { assert(!This->elem); - if(This->nsstyle) - nsIDOMCSSStyleDeclaration_Release(This->nsstyle); + if(This->css_style.nsstyle) + nsIDOMCSSStyleDeclaration_Release(This->css_style.nsstyle); release_dispex(&This->dispex); heap_free(This); } @@ -1622,7 +1622,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *posy; DWORD posy_len; @@ -1668,7 +1668,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *space; @@ -1715,7 +1715,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *space; DWORD posx_len; @@ -1764,7 +1764,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&pos_str, NULL); - hres = get_nsstyle_attr_nsval(This->nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); + hres = get_nsstyle_attr_nsval(This->css_style.nsstyle, STYLEID_BACKGROUND_POSITION, &pos_str); if(SUCCEEDED(hres)) { const PRUnichar *pos, *posy; @@ -3093,7 +3093,7 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) nsAString_InitDepend(&val_str, val); nsAString_InitDepend(&empty_str, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &val_str, &empty_str); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->css_style.nsstyle, &name_str, &val_str, &empty_str); if(NS_FAILED(nsres)) ERR("SetProperty failed: %08x\n", nsres); @@ -3356,7 +3356,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri nsAString_InitDepend(&name_str, style_entry->name); nsAString_Init(&ret_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->css_style.nsstyle, &name_str, &ret_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *ret; nsAString_GetData(&ret_str, &ret); @@ -5189,7 +5189,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclar style_entry = lookup_style_tbl(bstrPropertyName); nsAString_InitDepend(&name_str, style_entry ? style_entry->name : bstrPropertyName); nsAString_Init(&ret_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->css_style.nsstyle, &name_str, &ret_str); nsAString_Finish(&name_str); return return_nsstr(nsres, &ret_str, pbstrPropertyValue); } @@ -5223,7 +5223,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); nsAString_InitDepend(&value_str, val); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->css_style.nsstyle, &name_str, &value_str, &priority_str); nsAString_Finish(&name_str); nsAString_Finish(&value_str); nsAString_Finish(&priority_str); @@ -6231,7 +6231,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_cssText(IHTMLCSSStyleDeclarati TRACE("(%p)->(%s)\n", This, debugstr_w(v)); nsAString_InitDepend(&text_str, v); - nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); + nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->css_style.nsstyle, &text_str); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { FIXME("SetCssStyle failed: %08x\n", nsres); @@ -6251,7 +6251,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssText(IHTMLCSSStyleDeclarati /* NOTE: Quicks mode should use different formatting (uppercase, no ';' at the end of rule). */ nsAString_Init(&text_str, NULL); - nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); + nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->css_style.nsstyle, &text_str); return return_nsstr(nsres, &text_str, p); } @@ -10205,7 +10205,7 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) style->IHTMLCSSStyleDeclaration2_iface.lpVtbl = &HTMLCSSStyleDeclaration2Vtbl; style->ref = 1; - style->nsstyle = nsstyle; + style->css_style.nsstyle = nsstyle; style->elem = elem; nsIDOMCSSStyleDeclaration_AddRef(nsstyle); diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9908fc9..08c75ca 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -16,8 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +typedef struct { + nsIDOMCSSStyleDeclaration *nsstyle; +} CSSStyle; + struct HTMLStyle { DispatchEx dispex; + CSSStyle css_style; IHTMLStyle IHTMLStyle_iface; IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; @@ -29,7 +34,6 @@ struct HTMLStyle { LONG ref; - nsIDOMCSSStyleDeclaration *nsstyle; HTMLElement *elem; };

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to set_style_property_var.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: bff44d514ccb5c2336abb6937d40c1e9eca2d84e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff44d514ccb5c2336abb693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:49 2019 +0100 mshtml: Pass style as CSSStyle to set_style_property_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 156 ++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff44d514ccb5c2336ab…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to get_style_property.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 4709d9c553172394bb81b504c1f8f1fb2e334b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4709d9c553172394bb81b504… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:56 2019 +0100 mshtml: Pass style as CSSStyle to get_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 202 ++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4709d9c553172394bb81…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to get_style_property_var.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 153f666b64487044768d425f8e78a1ef281246b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=153f666b64487044768d425f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:13 2019 +0100 mshtml: Pass style as CSSStyle to get_style_property_var. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 146 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=153f666b64487044768d…

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: f4cceb1fb041fdccd236e52ac195cdfc260d0157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cceb1fb041fdccd236e52a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:15:10 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 494 ++++++++++++++++++++++++------------------------ dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 248 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4cceb1fb041fdccd236…

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to set_style_property.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 989df1851dc7f23a706ab5442bf39d914b253c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=989df1851dc7f23a706ab544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:13:39 2019 +0100 mshtml: Pass style as CSSStyle to set_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 226 ++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=989df1851dc7f23a706a…

1 0

Zebediah Figura : wined3d: Clean up lights in wined3d_stateblock_cleanup() .
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: cc5c9e8dff4840769a6cddda890cbfdd666bf830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5c9e8dff4840769a6cddda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 24 11:32:43 2019 -0500 wined3d: Clean up lights in wined3d_stateblock_cleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46829 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ee552c1..38f124c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -523,6 +523,7 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { + struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -570,6 +571,15 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_texture_decref(texture); } } + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &state->light_state.light_map[i], struct wined3d_light_info, entry) + { + list_remove(&light->entry); + heap_free(light); + } + } } void state_cleanup(struct wined3d_state *state)

1 0

Nikolay Sivov : mfplat: Use existing helper for BeginWrite() too.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 493b375f0064e7f06d2cf6e17223791118a421ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=493b375f0064e7f06d2cf6e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:43:02 2019 +0300 mfplat: Use existing helper for BeginWrite() too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 385eb25..57bed4a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2339,33 +2339,10 @@ static HRESULT WINAPI bytestream_BeginWrite(IMFByteStream *iface, const BYTE *da IMFAsyncCallback *callback, IUnknown *state) { struct bytestream *stream = impl_from_IMFByteStream(iface); - struct async_stream_op *op; - IMFAsyncResult *request; - HRESULT hr; TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); - op = heap_alloc(sizeof(*op)); - if (!op) - return E_OUTOFMEMORY; - - op->IUnknown_iface.lpVtbl = &async_stream_op_vtbl; - op->refcount = 1; - op->u.src = data; - op->requested_length = size; - op->type = ASYNC_STREAM_OP_WRITE; - if (FAILED(hr = MFCreateAsyncResult((IUnknown *)iface, callback, state, &op->caller))) - goto failed; - - if (FAILED(hr = MFCreateAsyncResult(&op->IUnknown_iface, &stream->write_callback, NULL, &request))) - goto failed; - - MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, request); - IMFAsyncResult_Release(request); - -failed: - IUnknown_Release(&op->IUnknown_iface); - return hr; + return bytestream_create_io_request(stream, ASYNC_STREAM_OP_WRITE, data, size, callback, state); } static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written)

1 0

Nikolay Sivov : mfreadwrite: Use single helper for source reader creation functions.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 0319a2dd3f2b38636858bc0f536251abeb573425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0319a2dd3f2b38636858bc0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:45:16 2019 +0300 mfreadwrite: Use single helper for source reader creation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 65 +++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 516b592..3936b5b 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -838,6 +838,35 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) +{ + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + + if (source) + { + UINT32 disconnect = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); + hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); + } + else if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; +} + /*********************************************************************** * MFCreateSourceReaderFromByteStream (mfreadwrite.@) */ @@ -846,23 +875,18 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr { TRACE("%p, %p, %p.\n", stream, attributes, reader); - return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)stream, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) */ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) + IMFSourceReader **reader) { - UINT32 disconnect = 0; - TRACE("%p, %p, %p.\n", source, attributes, reader); - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - - return create_source_reader_from_source(source, attributes, !disconnect, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)source, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** @@ -924,30 +948,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) { - IMFMediaSource *source = NULL; - IMFByteStream *stream = NULL; - - hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); - if (FAILED(hr)) - hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); - - if (stream) - hr = create_source_reader_from_stream(stream, attributes, riid, out); - else if (source) - { - UINT32 disconnect = 0; - - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); - } - - if (source) - IMFMediaSource_Release(source); - if (stream) - IMFByteStream_Release(stream); - - return hr; + return create_source_reader_from_object(unk, attributes, riid, out); } else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) {

1 0