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

Jacek Caban : mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 1d04b6044631fc43ba94d9ac70728da671669eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d04b6044631fc43ba94d9ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:53:59 2019 +0100 mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index aec12fc..ee504f9 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1573,9 +1573,9 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) } if(This->doc && &This->doc->node != This) { - HTMLDocument *doc = &This->doc->basedoc; + HTMLDocumentNode *doc = This->doc; This->doc = NULL; - htmldoc_release(doc); + htmldoc_release(&doc->basedoc); }else { This->doc = NULL; }

1 0

Jacek Caban : mshtml: Use detach_document_node in detach_gecko_browser.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: d49d83a18e7fee9122d94adf1a675d4e47c2eed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49d83a18e7fee9122d94adf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:04 2019 +0100 mshtml: Use detach_document_node in detach_gecko_browser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 956ba37..33d251d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2197,8 +2197,7 @@ void detach_gecko_browser(GeckoBrowser *This) while(!list_empty(&This->document_nodes)) { HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); - list_remove(&doc->browser_entry); - doc->browser = NULL; + detach_document_node(doc); } while(!list_empty(&This->outer_windows)) {

1 0

Jacek Caban : mshtml: Bind events directly to document node for documents with no window associated.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: b574cd98bd91f4d2e52247b5d77da3bb1644b34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b574cd98bd91f4d2e52247b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:11 2019 +0100 mshtml: Bind events directly to document node for documents with no window associated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4fc557d..0ba0bb9 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -384,18 +385,29 @@ static void init_listener(nsEventListener *This, nsDocumentEventListener *listen This->This = listener; } +static nsIDOMEventTarget *get_default_document_target(HTMLDocumentNode *doc) +{ + nsIDOMEventTarget *target; + nsISupports *target_iface; + nsresult nsres; + + target_iface = doc->window ? (nsISupports*)doc->basedoc.window->nswindow : (nsISupports*)doc->nsdoc; + nsres = nsISupports_QueryInterface(target_iface, &IID_nsIDOMEventTarget, (void**)&target); + return NS_SUCCEEDED(nsres) ? target : NULL; +} + void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR type) { nsIDOMEventTarget *target; nsresult nsres; - if(nsnode) + if(nsnode) { nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMEventTarget, (void**)&target); - else - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); - return; + assert(nsres == NS_OK); + }else { + target = get_default_document_target(doc); + if(!target) + return; } init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, @@ -409,14 +421,9 @@ static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventL nsAString type_str; nsresult nsres; - if(!doc->basedoc.window) - return; - - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, @@ -455,7 +462,6 @@ void init_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener; nsIDOMEventTarget *target; - nsresult nsres; listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) @@ -474,11 +480,9 @@ void init_nsevents(HTMLDocumentNode *doc) doc->nsevent_listener = listener; - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE);

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2:: createHTMLDocument implementation.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 7e0e55f76f31018554ada8aa71a472ab830d959a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0e55f76f31018554ada8aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:22 2019 +0100 mshtml: Add IHTMLDOMImplementation2::createHTMLDocument implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 26 +++++++++++-------- dlls/mshtml/htmlwindow.c | 6 ++++- dlls/mshtml/mshtml_private.h | 6 +++-- dlls/mshtml/nsiface.idl | 16 +++++++++++- dlls/mshtml/omnavigator.c | 62 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 ++++++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e0e55f76f31018554ad…

1 0

Jacek Caban : mshtml: Correctly handle documents with no window associated in IHTMLDocument2:: get_location.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: fc1bdc65a7b909aba258d871c7840ec52635790c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1bdc65a7b909aba258d871… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:30 2019 +0100 mshtml: Correctly handle documents with no window associated in IHTMLDocument2::get_location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9d57ef9..d5e2a70 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -745,12 +745,12 @@ static HRESULT WINAPI HTMLDocument_get_referrer(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLocation **p) { - HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface)->doc_node; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); + if(!This->nsdoc || !This->window) { + WARN("NULL window\n"); return E_UNEXPECTED; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index adb1fa5..52d353f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6921,7 +6921,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDOMImplementation_QueryInterface(dom_implementation, &IID_IHTMLDOMImplementation2, (void**)&dom_implementation2); if(SUCCEEDED(hres)) { + IHTMLDocument2 *new_document2; IHTMLDocument7 *new_document; + IHTMLLocation *location; str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); @@ -6930,6 +6932,13 @@ static void test_dom_implementation(IHTMLDocument2 *doc) test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); + hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + hres = IHTMLDocument2_get_location(new_document2, &location); + ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); }else {

1 0

Stefan Dösinger : ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper().
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: e809a500d73c07c0012e80e185e95a5255a82e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e809a500d73c07c0012e80e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 13 22:04:23 2019 +0330 ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper(). 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/ddraw/surface.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b788bd..b8cc2d2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4408,39 +4408,25 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetClipper - * - * Returns the IDirectDrawClipper interface of the clipper assigned to this - * surface - * - * Params: - * Clipper: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Clipper is NULL - * DDERR_NOCLIPPERATTACHED if there's no clipper attached - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper) +static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **clipper) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, clipper); - if (!Clipper) + if (!clipper) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (!surface->clipper) { wined3d_mutex_unlock(); + *clipper = NULL; return DDERR_NOCLIPPERATTACHED; } - *Clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*Clipper); + *clipper = &surface->clipper->IDirectDrawClipper_iface; + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK;

1 0

Henri Verbeet : d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 73355cab96de112f5125907424b37289afc6ebe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73355cab96de112f51259074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 22:04:24 2019 +0330 d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP. This fails intermittently on the testbot. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9318610..0ce9948 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8747,8 +8747,7 @@ static void test_vshader_input(void) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 - || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x0b, 0x75, 0x80), 1)), + ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 || broken(warp), "Got unexpected color 0x%08x for quad 2 (different colors).\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : mfplat: Add support for work item priority.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: e3b048c16230f4a71d65ab947f35bdb0d54cefa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b048c16230f4a71d65ab94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:33 2019 +0300 mfplat: Add support for work item priority. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 ++ dlls/mfplat/queue.c | 92 +++++++++++++++++++++++++++++++++++++++---------- include/mfapi.h | 2 ++ 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c47af72..be5d8b2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -123,7 +123,9 @@ @ stdcall MFLockWorkQueue(long) @ stdcall MFPutWaitingWorkItem(long long ptr ptr) @ stdcall MFPutWorkItem(long ptr ptr) +@ stdcall MFPutWorkItem2(long long ptr ptr) @ stdcall MFPutWorkItemEx(long ptr) +@ stdcall MFPutWorkItemEx2(long long ptr) @ stub MFRecordError @ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index e579168..c2cc623 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -59,10 +59,17 @@ struct work_item } u; }; +static const TP_CALLBACK_PRIORITY priorities[] = +{ + TP_CALLBACK_PRIORITY_HIGH, + TP_CALLBACK_PRIORITY_NORMAL, + TP_CALLBACK_PRIORITY_LOW, +}; + struct queue { TP_POOL *pool; - TP_CALLBACK_ENVIRON_V3 env; + TP_CALLBACK_ENVIRON_V3 envs[ARRAY_SIZE(priorities)]; CRITICAL_SECTION cs; struct list pending_items; }; @@ -160,16 +167,23 @@ static void release_work_item(struct work_item *item) static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *queue) { - unsigned int max_thread; + TP_CALLBACK_ENVIRON_V3 env; + unsigned int max_thread, i; queue->pool = CreateThreadpool(NULL); - memset(&queue->env, 0, sizeof(queue->env)); - queue->env.Version = 3; - queue->env.Size = sizeof(queue->env); - queue->env.Pool = queue->pool; - queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); - queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; - queue->env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + + memset(&env, 0, sizeof(env)); + env.Version = 3; + env.Size = sizeof(env); + env.Pool = queue->pool; + env.CleanupGroup = CreateThreadpoolCleanupGroup(); + env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + { + queue->envs[i] = env; + queue->envs[i].CallbackPriority = priorities[i]; + } list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); @@ -267,7 +281,7 @@ static void shutdown_queue(struct queue *queue) if (!queue->pool) return; - CloseThreadpoolCleanupGroupMembers(queue->env.CleanupGroup, TRUE, NULL); + CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); CloseThreadpool(queue->pool); queue->pool = NULL; @@ -339,15 +353,23 @@ static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void release_work_item(item); } -static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) +static HRESULT queue_submit_item(struct queue *queue, LONG priority, IMFAsyncResult *result) { + TP_CALLBACK_PRIORITY callback_priority; struct work_item *item; TP_WORK *work_object; if (!(item = alloc_work_item(queue, result))) return E_OUTOFMEMORY; - work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&queue->env); + if (priority == 0) + callback_priority = TP_CALLBACK_PRIORITY_NORMAL; + else if (priority < 0) + callback_priority = TP_CALLBACK_PRIORITY_LOW; + else + callback_priority = TP_CALLBACK_PRIORITY_HIGH; + work_object = CreateThreadpoolWork(standard_queue_worker, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); SubmitThreadpoolWork(work_object); TRACE("dispatched %p.\n", result); @@ -355,7 +377,7 @@ static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) return S_OK; } -static HRESULT queue_put_work_item(DWORD queue_id, IMFAsyncResult *result) +static HRESULT queue_put_work_item(DWORD queue_id, LONG priority, IMFAsyncResult *result) { struct queue *queue; HRESULT hr; @@ -363,7 +385,7 @@ static HRESULT queue_put_work_item(DWORD queue_id, IMFAsyncResult *result) if (FAILED(hr = grab_queue(queue_id, &queue))) return hr; - hr = queue_submit_item(queue, result); + hr = queue_submit_item(queue, priority, result); return hr; } @@ -380,7 +402,7 @@ static HRESULT invoke_async_callback(IMFAsyncResult *result) if (FAILED(lock_user_queue(queue))) queue = MFASYNC_CALLBACK_QUEUE_STANDARD; - hr = queue_put_work_item(queue, result); + hr = queue_put_work_item(queue, 0, result); unlock_user_queue(queue); @@ -486,7 +508,8 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit else callback = waiting_item_callback; - item->u.wait_object = CreateThreadpoolWait(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); + item->u.wait_object = CreateThreadpoolWait(callback, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]); SetThreadpoolWait(item->u.wait_object, event, NULL); TRACE("dispatched %p.\n", result); @@ -519,7 +542,8 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; - item->u.timer_object = CreateThreadpoolTimer(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); + item->u.timer_object = CreateThreadpoolTimer(callback, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]); SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); @@ -828,7 +852,27 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - hr = queue_put_work_item(queue, result); + hr = queue_put_work_item(queue, 0, result); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFPutWorkItem2 (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = queue_put_work_item(queue, priority, result); IMFAsyncResult_Release(result); @@ -842,7 +886,17 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) { TRACE("%#x, %p\n", queue, result); - return queue_put_work_item(queue, result); + return queue_put_work_item(queue, 0, result); +} + +/*********************************************************************** + * MFPutWorkItemEx2 (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result) +{ + TRACE("%#x, %d, %p\n", queue, priority, result); + + return queue_put_work_item(queue, priority, result); } /*********************************************************************** diff --git a/include/mfapi.h b/include/mfapi.h index fd5fbeb..21876fe 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -173,7 +173,9 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result); HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput,

1 0

Nikolay Sivov : mfreadwrite: Keep source reference in source reader.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: eca0e8bb4f740983d6cc23438e807b13569f323a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca0e8bb4f740983d6cc2343… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:34 2019 +0300 mfreadwrite: Keep source reference in source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 88903ce..6b6c516 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -70,10 +70,11 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } -typedef struct _srcreader +typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; - LONG ref; + LONG refcount; + IMFMediaSource *source; } srcreader; struct sink_writer @@ -117,7 +118,7 @@ static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID r static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) { srcreader *This = impl_from_IMFSourceReader(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->refcount); TRACE("(%p) ref=%u\n", This, ref); @@ -126,17 +127,18 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { - srcreader *This = impl_from_IMFSourceReader(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct source_reader *reader = impl_from_IMFSourceReader(iface); + ULONG refcount = InterlockedDecrement(&reader->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + IMFMediaSource_Release(reader->source); + heap_free(reader); } - return ref; + return refcount; } static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) @@ -244,7 +246,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; - object->ref = 1; + object->refcount = 1; + object->source = source; + IMFMediaSource_AddRef(object->source); hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); IMFSourceReader_Release(&object->IMFSourceReader_iface);

1 0

Nikolay Sivov : mfreadwrite: Return source flags through MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 9ef27b8d247e12536994b82561ceef1afc235f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef27b8d247e12536994b825… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:35 2019 +0300 mfreadwrite: Return source flags through MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 35 ++++++++++++++++++++++++++++++++--- include/mfreadwrite.idl | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6b6c516..f3fd3b2 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -211,10 +212,38 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO } static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index, - REFGUID guid, PROPVARIANT *attr) + REFGUID guid, PROPVARIANT *value) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %s, %p\n", This, index, debugstr_guid(guid), attr); + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %s, %p.\n", iface, index, debugstr_guid(guid), value); + + switch (index) + { + case MF_SOURCE_READER_MEDIASOURCE: + if (IsEqualGUID(guid, &MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS)) + { + DWORD flags; + + if (FAILED(hr = IMFMediaSource_GetCharacteristics(reader->source, &flags))) + return hr; + + value->vt = VT_UI4; + value->u.ulVal = flags; + return S_OK; + } + else + { + FIXME("Unsupported source attribute %s.\n", debugstr_guid(guid)); + return E_NOTIMPL; + } + break; + default: + FIXME("Unsupported index %#x.\n", index); + return E_NOTIMPL; + } + return E_NOTIMPL; } diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 2647127..9097b5a 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -78,6 +78,8 @@ cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x08 cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") + interface IMFMediaSource; [

1 0