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

Jacek Caban : mshtml: Move child window list to inner window and detach children when detaching parent.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 521888958ca141129d116f5c8a97dbe7b9ede360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=521888958ca141129d116f5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:23:13 2019 +0100 mshtml: Move child window list to inner window and detach children when detaching parent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 32 +++++++++++++++----------------- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ffd4424..0ab81f1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -66,19 +66,6 @@ static inline BOOL is_outer_window(HTMLWindow *window) return &window->outer_window->base == window; } -static void release_children(HTMLOuterWindow *This) -{ - HTMLOuterWindow *child; - - while(!list_empty(&This->children)) { - child = LIST_ENTRY(list_tail(&This->children), HTMLOuterWindow, sibling_entry); - - list_remove(&child->sibling_entry); - child->parent = NULL; - IHTMLWindow2_Release(&child->base.IHTMLWindow2_iface); - } -} - static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { if(This->location) { @@ -99,7 +86,7 @@ void get_top_window(HTMLOuterWindow *window, HTMLOuterWindow **ret) { HTMLOuterWindow *iter; - for(iter = window; iter->parent; iter = iter->parent); + for(iter = window; iter->parent && iter->parent; iter = iter->parent); *ret = iter; } @@ -128,6 +115,18 @@ static void detach_inner_window(HTMLInnerWindow *window) HTMLOuterWindow *outer_window = window->base.outer_window; HTMLDocumentNode *doc = window->doc; + while(!list_empty(&window->children)) { + HTMLOuterWindow *child = LIST_ENTRY(list_tail(&window->children), HTMLOuterWindow, sibling_entry); + + list_remove(&child->sibling_entry); + child->parent = NULL; + + if(child->base.inner_window) + detach_inner_window(child->base.inner_window); + + IHTMLWindow2_Release(&child->base.IHTMLWindow2_iface); + } + if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; @@ -228,7 +227,6 @@ static void release_outer_window(HTMLOuterWindow *This) set_current_uri(This, NULL); if(This->base.inner_window) detach_inner_window(This->base.inner_window); - release_children(This); if(This->secmgr) IInternetSecurityManager_Release(This->secmgr); @@ -3515,6 +3513,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, if(!window) return E_OUTOFMEMORY; + list_init(&window->children); list_init(&window->script_hosts); list_init(&window->bindings); list_init(&window->script_queue); @@ -3565,7 +3564,6 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, window->readystate = READYSTATE_UNINITIALIZED; window->task_magic = get_task_target_magic(); - list_init(&window->children); wine_rb_put(&window_map, window->window_proxy, &window->entry); hres = create_pending_window(window, NULL); @@ -3586,7 +3584,7 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); window->parent = parent; - list_add_tail(&parent->children, &window->sibling_entry); + list_add_tail(&parent->base.inner_window->children, &window->sibling_entry); } TRACE("%p inner_window %p\n", window, window->base.inner_window); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cef745e..03a3f3d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -501,7 +501,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - struct list children; struct list sibling_entry; struct wine_rb_entry entry; }; @@ -512,6 +511,7 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; + struct list children; struct list script_hosts; IHTMLEventObj *event;

1 0

Jacek Caban : mshtml: Detach more document objects in detach_inner_window.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: bf9dc5b3ed2aa9f905e57835abff3cd29431de94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf9dc5b3ed2aa9f905e57835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:22:44 2019 +0100 mshtml: Detach more document objects in detach_inner_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 38 +++++++++++++++++++++++--------------- dlls/mshtml/htmlwindow.c | 8 +++----- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 722f26c..100dc97 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4885,31 +4885,39 @@ static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) +void detach_document_node(HTMLDocumentNode *doc) { - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); unsigned i; - for(i=0; i < This->elem_vars_cnt; i++) - heap_free(This->elem_vars[i]); - heap_free(This->elem_vars); + while(!list_empty(&doc->plugin_hosts)) + detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); - detach_events(This); - if(This->catmgr) - ICatInformation_Release(This->catmgr); + detach_events(doc); + detach_selection(doc); + detach_ranges(doc); - detach_selection(This); - detach_ranges(This); + for(i=0; i < doc->elem_vars_cnt; i++) + heap_free(doc->elem_vars[i]); + heap_free(doc->elem_vars); + doc->elem_vars_cnt = 0; - while(!list_empty(&This->plugin_hosts)) - detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(doc->catmgr) { + ICatInformation_Release(doc->catmgr); + doc->catmgr = NULL; + } - if(!This->nsdoc && This->window) { + if(!doc->nsdoc && doc->window) { /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); - This->window = NULL; + IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); + doc->window = NULL; } +} + +static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + detach_document_node(This); heap_free(This->event_vector); ConnectionPointContainer_Destroy(&This->basedoc.cp_container); } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 41df57f..ffd4424 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -126,15 +126,13 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN static void detach_inner_window(HTMLInnerWindow *window) { HTMLOuterWindow *outer_window = window->base.outer_window; + HTMLDocumentNode *doc = window->doc; if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; - if(window->doc) { - detach_events(window->doc); - while(!list_empty(&window->doc->plugin_hosts)) - detach_plugin_host(LIST_ENTRY(list_head(&window->doc->plugin_hosts), PluginHost, entry)); - } + if(doc) + detach_document_node(doc); abort_window_bindings(window); remove_target_tasks(window->task_magic); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0b3fea..cef745e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -975,6 +975,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECL IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplat: Implement async method of creating objects from bytestreams.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: d34d43bdf4909ec4a031d899ebb2678059d8f491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34d43bdf4909ec4a031d899… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:10 2019 +0300 mfplat: Implement async method of creating objects from bytestreams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 193 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 166 insertions(+), 27 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0e62052..06be27d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1919,6 +1919,19 @@ struct resolver_queued_result enum resolved_object_origin origin; }; +struct resolver_cancel_object +{ + IUnknown IUnknown_iface; + LONG refcount; + union + { + IUnknown *handler; + IMFByteStreamHandler *stream_handler; + } u; + IUnknown *cancel_cookie; + enum resolved_object_origin origin; +}; + typedef struct source_resolver { IMFSourceResolver IMFSourceResolver_iface; @@ -1976,6 +1989,17 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu if (data->hEvent) SetEvent(data->hEvent); + else + { + IUnknown *caller_state = IMFAsyncResult_GetStateNoAddRef(inner_result); + IMFAsyncResult *caller_result; + + if (SUCCEEDED(MFCreateAsyncResult(queued_result->object, data->pCallback, caller_state, &caller_result))) + { + MFInvokeCallback(caller_result); + IMFAsyncResult_Release(caller_result); + } + } } else heap_free(queued_result); @@ -1983,6 +2007,84 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu return S_OK; } +static struct resolver_cancel_object *impl_cancel_obj_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct resolver_cancel_object, IUnknown_iface); +} + +static HRESULT WINAPI resolver_cancel_object_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI resolver_cancel_object_AddRef(IUnknown *iface) +{ + struct resolver_cancel_object *object = impl_cancel_obj_from_IUnknown(iface); + return InterlockedIncrement(&object->refcount); +} + +static ULONG WINAPI resolver_cancel_object_Release(IUnknown *iface) +{ + struct resolver_cancel_object *object = impl_cancel_obj_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&object->refcount); + + if (!refcount) + { + if (object->cancel_cookie) + IUnknown_Release(object->cancel_cookie); + IUnknown_Release(object->u.handler); + heap_free(object); + } + + return refcount; +} + +static const IUnknownVtbl resolver_cancel_object_vtbl = +{ + resolver_cancel_object_QueryInterface, + resolver_cancel_object_AddRef, + resolver_cancel_object_Release, +}; + +static struct resolver_cancel_object *unsafe_impl_cancel_obj_from_IUnknown(IUnknown *iface) +{ + if (!iface) + return NULL; + + return (iface->lpVtbl == &resolver_cancel_object_vtbl) ? + CONTAINING_RECORD(iface, struct resolver_cancel_object, IUnknown_iface) : NULL; +} + +static HRESULT resolver_create_cancel_object(IUnknown *handler, enum resolved_object_origin origin, + IUnknown *cancel_cookie, IUnknown **cancel_object) +{ + struct resolver_cancel_object *object; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IUnknown_iface.lpVtbl = &resolver_cancel_object_vtbl; + object->refcount = 1; + object->u.handler = handler; + IUnknown_AddRef(object->u.handler); + object->cancel_cookie = cancel_cookie; + IUnknown_AddRef(object->cancel_cookie); + object->origin = origin; + + *cancel_object = &object->IUnknown_iface; + + return S_OK; +} + static HRESULT WINAPI source_resolver_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -2160,7 +2262,7 @@ static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum return hr; } -static HRESULT WINAPI mfsourceresolver_QueryInterface(IMFSourceResolver *iface, REFIID riid, void **obj) +static HRESULT WINAPI source_resolver_QueryInterface(IMFSourceResolver *iface, REFIID riid, void **obj) { mfsourceresolver *This = impl_from_IMFSourceResolver(iface); @@ -2309,49 +2411,86 @@ static HRESULT WINAPI mfsourceresolver_EndCreateObjectFromURL(IMFSourceResolver return E_NOTIMPL; } -static HRESULT WINAPI mfsourceresolver_BeginCreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, - const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, - IUnknown *unk_state) +static HRESULT WINAPI source_resolver_BeginCreateObjectFromByteStream(IMFSourceResolver *iface, IMFByteStream *stream, + const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, + IUnknown *state) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); + IMFByteStreamHandler *handler; + IUnknown *inner_cookie = NULL; + IMFAsyncResult *result; + HRESULT hr; - FIXME("(%p)->(%p, %s, %#x, %p, %p, %p, %p): stub\n", This, stream, debugstr_w(url), flags, props, cancel_cookie, - callback, unk_state); + TRACE("%p, %p, %s, %#x, %p, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, cancel_cookie, + callback, state); - return E_NOTIMPL; + if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler))) + return hr; + + if (cancel_cookie) + *cancel_cookie = NULL; + + hr = MFCreateAsyncResult((IUnknown *)handler, callback, state, &result); + IMFByteStreamHandler_Release(handler); + if (FAILED(hr)) + return hr; + + hr = IMFByteStreamHandler_BeginCreateObject(handler, stream, url, flags, props, + cancel_cookie ? &inner_cookie : NULL, &resolver->stream_callback, (IUnknown *)result); + + /* Cancel object wraps underlying handler cancel cookie with context necessary to call CancelObjectCreate(). */ + if (SUCCEEDED(hr) && inner_cookie) + resolver_create_cancel_object((IUnknown *)handler, OBJECT_FROM_BYTESTREAM, inner_cookie, cancel_cookie); + + IMFAsyncResult_Release(result); + + return hr; } -static HRESULT WINAPI mfsourceresolver_EndCreateObjectFromByteStream(IMFSourceResolver *iface, IMFAsyncResult *result, - MF_OBJECT_TYPE *obj_type, IUnknown **object) +static HRESULT WINAPI source_resolver_EndCreateObjectFromByteStream(IMFSourceResolver *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, result, obj_type, object); + TRACE("%p, %p, %p, %p.\n", iface, result, obj_type, object); - return E_NOTIMPL; + return resolver_end_create_object(resolver, OBJECT_FROM_BYTESTREAM, result, obj_type, object); } -static HRESULT WINAPI mfsourceresolver_CancelObjectCreation(IMFSourceResolver *iface, IUnknown *cancel_cookie) +static HRESULT WINAPI source_resolver_CancelObjectCreation(IMFSourceResolver *iface, IUnknown *cancel_cookie) { - mfsourceresolver *This = impl_from_IMFSourceResolver(iface); + struct resolver_cancel_object *object; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, cancel_cookie); + TRACE("%p, %p.\n", iface, cancel_cookie); - return E_NOTIMPL; + if (!(object = unsafe_impl_cancel_obj_from_IUnknown(cancel_cookie))) + return E_UNEXPECTED; + + switch (object->origin) + { + case OBJECT_FROM_BYTESTREAM: + hr = IMFByteStreamHandler_CancelObjectCreation(object->u.stream_handler, object->cancel_cookie); + break; + default: + hr = E_UNEXPECTED; + } + + return hr; } static const IMFSourceResolverVtbl mfsourceresolvervtbl = { - mfsourceresolver_QueryInterface, - source_resolver_AddRef, - source_resolver_Release, - mfsourceresolver_CreateObjectFromURL, - source_resolver_CreateObjectFromByteStream, - mfsourceresolver_BeginCreateObjectFromURL, - mfsourceresolver_EndCreateObjectFromURL, - mfsourceresolver_BeginCreateObjectFromByteStream, - mfsourceresolver_EndCreateObjectFromByteStream, - mfsourceresolver_CancelObjectCreation, + source_resolver_QueryInterface, + source_resolver_AddRef, + source_resolver_Release, + mfsourceresolver_CreateObjectFromURL, + source_resolver_CreateObjectFromByteStream, + mfsourceresolver_BeginCreateObjectFromURL, + mfsourceresolver_EndCreateObjectFromURL, + source_resolver_BeginCreateObjectFromByteStream, + source_resolver_EndCreateObjectFromByteStream, + source_resolver_CancelObjectCreation, }; /***********************************************************************

1 0

Nikolay Sivov : mfplat: Link to mfuuid.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: c3c503d4c56d96005b5450b72626247a1106ea57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c503d4c56d96005b5450b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:08 2019 +0300 mfplat: Link to mfuuid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 1 + dlls/mfplat/mfplat_private.h | 2 ++ dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 19 +++++++++---------- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index a117ede..e64e405 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 mfuuid C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7a8361f..e3b802c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -27,6 +27,7 @@ #include "winreg.h" #include "initguid.h" +#include "ole2.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 72f8f68..c42570c 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mfidl.h" #include "mferror.h" diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328..15b8e17 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat mfuuid C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7d26b3d..3fa729b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -29,6 +29,15 @@ #include "winreg.h" #include "initguid.h" +#include "ole2.h" + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); +DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); +DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); + +#undef INITGUID +#include <guiddef.h> #include "mfapi.h" #include "mfidl.h" #include "mferror.h" @@ -49,16 +58,6 @@ static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_q static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); static HRESULT (WINAPI *pMFRemovePeriodicCallback)(DWORD key); -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - -DEFINE_GUID(MF_BYTESTREAM_CONTENT_TYPE, 0xfc358289,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a); - -DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); - -DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); -DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); -DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); - static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; static WCHAR *load_resource(const WCHAR *name)

1 0

Michael Stefaniuc : gphoto2.ds: Remove useless casts to self.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: e8a82e230f086b5b42fa868f9dc56c8bf046fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a82e230f086b5b42fa868f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:21 2019 +0100 gphoto2.ds: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index cb3bbed..32f5267 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -192,7 +192,7 @@ static TW_UINT16 _get_image_and_startup_jpeg(void) { activeDS.jd.err = pjpeg_std_error(&activeDS.jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); activeDS.jd.src = &activeDS.xjsm; ret=pjpeg_read_header(&activeDS.jd,TRUE); activeDS.jd.out_color_space = JCS_RGB; @@ -610,7 +610,7 @@ _get_gphoto2_file_as_DIB( jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB;

1 0

Nikolay Sivov : include: Add more Media Foundation error codes.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 0a5597fb155e8b5c079e094a96104a35c37d55bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a5597fb155e8b5c079e094a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:06 2019 +0300 include: Add more Media Foundation error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mferror.h | 137 +++++++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a5597fb155e8b5c079e…

1 0

Hans Leidekker : msi: Skip the special SummaryInformation stream in msi_commit_streams.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 02a25a9d4fb170755d8de7aa7cb5d388c206b337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a25a9d4fb170755d8de7aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 11 15:46:54 2019 +0100 msi: Skip the special SummaryInformation stream in msi_commit_streams. Avoids adding a useless table stream when called on an existing database. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/streams.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index bc02fb2..cfce816 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -592,7 +592,10 @@ UINT msi_commit_streams( MSIDATABASE *db ) for (i = 0; i < db->num_streams; i++) { name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); + if (!strcmpW( name, szSumInfo )) continue; + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + TRACE("saving stream %s as %s\n", debugstr_w(name), debugstr_w(encname)); hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); if (SUCCEEDED( hr ))

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: c47355a3dc3685c44982ecb9944c0826c0b03526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47355a3dc3685c44982ecb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:33 2019 +0100 d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c5cedbb..6e5dfbd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3525,10 +3490,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); + if (param && count <= param->element_count) + { + unsigned int i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Nikolay Sivov : mfplat: Close event handle on async result release.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 8098edb6c63adefa127601dc8d746d107118052e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8098edb6c63adefa127601dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:04 2019 +0300 mfplat: Close event handle on async result release. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 2 ++ dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 408526f..66f8588 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -649,6 +649,8 @@ static ULONG WINAPI async_result_Release(IMFAsyncResult *iface) IUnknown_Release(result->object); if (result->state) IUnknown_Release(result->state); + if (result->result.hEvent) + CloseHandle(result->result.hEvent); heap_free(result); MFUnlockPlatform(); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7e8968b..7d26b3d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -904,7 +904,10 @@ static void test_MFCreateAsyncResult(void) IUnknown *state, *object; MFASYNCRESULT *data; ULONG refcount; + HANDLE event; + DWORD flags; HRESULT hr; + BOOL ret; init_test_callback(&callback); @@ -991,6 +994,35 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); refcount = IMFAsyncResult_Release(result); ok(!refcount, "Unexpected refcount %u\n.", refcount); + + /* Event handle is closed on release. */ + hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + ret = GetHandleInformation(event, &flags); + ok(ret, "Failed to get handle info.\n"); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + ret = GetHandleInformation(event, &flags); + ok(!ret, "Expected handle to be closed.\n"); + + hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + ret = GetHandleInformation(event, &flags); + ok(ret, "Failed to get handle info.\n"); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + ret = GetHandleInformation(event, &flags); + ok(!ret, "Expected handle to be closed.\n"); } static void test_startup(void) @@ -1693,6 +1725,40 @@ static void test_system_time_source(void) IMFPresentationTimeSource_Release(time_source); } +static void test_MFInvokeCallback(void) +{ + struct test_callback callback; + IMFAsyncResult *result; + MFASYNCRESULT *data; + ULONG refcount; + HRESULT hr; + DWORD ret; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + init_test_callback(&callback); + + hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + + hr = MFInvokeCallback(result); + ok(hr == S_OK, "Failed to invoke, hr %#x.\n", hr); + + ret = WaitForSingleObject(data->hEvent, 100); + ok(ret == WAIT_TIMEOUT, "Expected timeout, ret %#x.\n", ret); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1720,6 +1786,7 @@ START_TEST(mfplat) test_event_queue(); test_presentation_descriptor(); test_system_time_source(); + test_MFInvokeCallback(); CoUninitialize(); }

1 0

Nikolay Sivov : mfuuid: Define Media Platform guids.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: db8a6df46f624188bd2539eee9b12ee45faafebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8a6df46f624188bd2539ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:07 2019 +0300 mfuuid: Define Media Platform guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 7 +++---- dlls/mfreadwrite/tests/mfplat.c | 6 +----- dlls/mfuuid/mfuuid.c | 3 +++ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a83ece0..098100df 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -27,16 +27,15 @@ #include "initguid.h" #include "ole2.h" #include "rpcproxy.h" + +#undef INITGUID +#include <guiddef.h> #include "mfidl.h" #include "mfreadwrite.h" #include "wine/debug.h" #include "wine/heap.h" -DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); -DEFINE_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4); -DEFINE_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90); - WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static HINSTANCE mfinstance; diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b2675dc..58533cc 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "winreg.h" +#undef INITGUID #include "mfapi.h" #include "mfidl.h" #include "mferror.h" @@ -33,11 +34,6 @@ #include "wine/test.h" -#include "initguid.h" -DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61); -DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1); -DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); - static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void init_functions(void) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index f9b1a8a..5bfd521 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -23,6 +23,9 @@ #include "strmif.h" #include "mediaobj.h" +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID + #include "initguid.h" #include "mfapi.h"

1 0