Nikolay Sivov : mfplat: Use underlying work queue calls more to get rid of duplicated traces.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bd3ae4a0c4e3e4b54788204759fe2e259a8a8fd0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bd3ae4a0c4e3e4b54788204759fe2e259a8a8fd0

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Mar  2 13:35:52 2020 +0300

mfplat: Use underlying work queue calls more to get rid of duplicated traces.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfplat/queue.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c
index c0279f1744..d39d6af3a5 100644
--- a/dlls/mfplat/queue.c
+++ b/dlls/mfplat/queue.c
@@ -44,17 +44,17 @@ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue)
  */
 HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state)
 {
-    IMFAsyncResult *result;
+    IRtwqAsyncResult *result;
     HRESULT hr;
 
     TRACE("%#x, %p, %p.\n", queue, callback, state);
 
-    if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result)))
+    if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
         return hr;
 
-    hr = MFPutWorkItemEx2(queue, 0, result);
+    hr = RtwqPutWorkItem(queue, 0, result);
 
-    IMFAsyncResult_Release(result);
+    IRtwqAsyncResult_Release(result);
 
     return hr;
 }
@@ -64,17 +64,17 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *
  */
 HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state)
 {
-    IMFAsyncResult *result;
+    IRtwqAsyncResult *result;
     HRESULT hr;
 
     TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state);
 
-    if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result)))
+    if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
         return hr;
 
-    hr = MFPutWorkItemEx2(queue, priority, result);
+    hr = RtwqPutWorkItem(queue, priority, result);
 
-    IMFAsyncResult_Release(result);
+    IRtwqAsyncResult_Release(result);
 
     return hr;
 }
@@ -86,7 +86,7 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result)
 {
     TRACE("%#x, %p\n", queue, result);
 
-    return MFPutWorkItemEx2(queue, 0, result);
+    return RtwqPutWorkItem(queue, 0, (IRtwqAsyncResult *)result);
 }
 
 /***********************************************************************
@@ -104,17 +104,17 @@ HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *resu
  */
 HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key)
 {
-    IMFAsyncResult *result;
+    IRtwqAsyncResult *result;
     HRESULT hr;
 
     TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key);
 
-    if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result)))
+    if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
         return hr;
 
-    hr = MFScheduleWorkItemEx(result, timeout, key);
+    hr = RtwqScheduleWorkItem(result, timeout, key);
 
-    IMFAsyncResult_Release(result);
+    IRtwqAsyncResult_Release(result);
 
     return hr;
 }