wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 4cae0e6bc2c3a1dd1a8c2fd446d0ae1034ffa091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cae0e6bc2c3a1dd1a8c2fd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:35:00 2020 -0600 http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5fbae66b75..25c8a1955a 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1112,6 +1112,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) WARN("Address %s is already in use.\n", debugstr_a(params->url)); return STATUS_SHARING_VIOLATION; } + else if (WSAGetLastError() == WSAEACCES) + { + WARN("Not enough permissions to bind to address %s.\n", debugstr_a(params->url)); + return STATUS_ACCESS_DENIED; + } ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; }

1 0

Zebediah Figura : http.sys: Cancel outstanding requests when a handle is closed.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: d942f12871c22d0a11840c2ba7af3a67cf1f1317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d942f12871c22d0a11840c2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:59 2020 -0600 http.sys: Cancel outstanding requests when a handle is closed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 9587eaa9a8..5fbae66b75 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1396,8 +1396,20 @@ static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct request_queue *queue = stack->FileObject->FsContext; + LIST_ENTRY *entry; TRACE("Closing queue %p.\n", queue); + + EnterCriticalSection(&http_cs); + + while ((entry = queue->irp_queue.Flink) != &queue->irp_queue) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + IoCancelIrp(queued_irp); + } + + LeaveCriticalSection(&http_cs); + close_queue(queue); irp->IoStatus.Status = STATUS_SUCCESS;

1 0

Zebediah Figura : http.sys: Support cancelling IRPs.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: fb35743f843dea8ae47cfdeee04894465ab71c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb35743f843dea8ae47cfdee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:58 2020 -0600 http.sys: Support cancelling IRPs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 28 ++++++++++++++++++++++++++-- dlls/httpapi/tests/httpapi.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4259ca618f..9587eaa9a8 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1178,6 +1178,20 @@ static struct connection *get_connection(HTTP_REQUEST_ID req_id) return NULL; } +static void WINAPI http_receive_request_cancel(DEVICE_OBJECT *device, IRP *irp) +{ + TRACE("device %p, irp %p.\n", device, irp); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + EnterCriticalSection(&http_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&http_cs); + + irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1199,8 +1213,18 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) if (params->id == HTTP_NULL_ID) { TRACE("Queuing IRP %p.\n", irp); - InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); - ret = STATUS_PENDING; + + IoSetCancelRoutine(irp, http_receive_request_cancel); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* The IRP was canceled before we set the cancel routine. */ + ret = STATUS_CANCELLED; + } + else + { + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); + ret = STATUS_PENDING; + } } else ret = STATUS_CONNECTION_INVALID; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fced1b5e2f..5a9f3c3178 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -348,6 +348,18 @@ static void test_v1_server(void) ret = remove_url_v1(queue, port); ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + + ret = CancelIo(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret_size = 0xdeadbeef; + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); + ok(!ret_size, "Got size %u.\n", ret_size); + closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue);

1 0

Jacek Caban : makedep: Build builtin programs with ucrt.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 0959d189c86eb4b218a8f4a49a6d6d897c09255b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0959d189c86eb4b218a8f4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:40:02 2020 +0100 makedep: Build builtin programs with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6dec1b3900..c324802916 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4260,11 +4260,6 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = 1; } - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); - LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - - make->is_cross = crosstarget && make->use_msvcrt; - if (make->use_msvcrt) { for (i = 0; i < make->imports.count; i++) @@ -4273,10 +4268,23 @@ static void load_sources( struct makefile *make ) if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; } - if (!crt_dll) crt_dll = "msvcrt"; + if (!crt_dll) + { + if (make->use_msvcrt && make->is_exe) + { + strarray_add( &make->imports, "ucrtbase" ); + crt_dll = "ucrtbase"; + } + else crt_dll = "msvcrt"; + } if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); + + make->is_cross = crosstarget && make->use_msvcrt; + if (make->is_cross) { for (i = 0; i < make->imports.count; i++)

1 0

Jacek Caban : msvcrt: Silence wide environment initialization debug messages.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 72633d509d700d07dc01d810f0146400e8cfddf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72633d509d700d07dc01d810… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:39:57 2020 +0100 msvcrt: Silence wide environment initialization debug messages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index af7a13528f..9cc380f74a 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -651,7 +651,7 @@ MSVCRT_wchar_t** CDECL _get_initial_wide_environment(void) */ int CDECL _configure_wide_argv(int mode) { - FIXME("(%d) stub\n", mode); + WARN("(%d) stub\n", mode); return 0; } @@ -660,7 +660,7 @@ int CDECL _configure_wide_argv(int mode) */ int CDECL _initialize_wide_environment(void) { - FIXME("stub\n"); + WARN("stub\n"); return 0; }

1 0

Jacek Caban : ucrtbase: Add exe entry points implementation.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 78eca968878cfac7f5b75ca9ccb3f2ad5100309d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78eca968878cfac7f5b75ca9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 15:25:23 2020 +0100 ucrtbase: Add exe entry points implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index 81ec188058..fa325d64b3 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl mainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; char **argv, **env; +#ifdef _UCRT + _configure_narrow_argv(_crt_argv_unexpanded_arguments); + _initialize_narrow_environment(); + argc = *__p___argc(); + argv = *__p___argv(); + env = _get_initial_narrow_environment(); +#else + int new_mode = 0; __getmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = main(argc, argv, env); diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 77eb4dbfa7..6bc20e2e0f 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl wmainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; WCHAR **argv, **env; +#ifdef _UCRT + _configure_wide_argv(_crt_argv_unexpanded_arguments); + _initialize_wide_environment(); + argc = *__p___argc(); + argv = *__p___wargv(); + env = _get_initial_wide_environment(); +#else + int new_mode = 0; __wgetmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = wmain(argc, argv, env); diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 2caef7c8c7..6711b4e66c 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -7,6 +7,11 @@ PARENTSRC = ../msvcrt C_SRCS = \ console.c \ cpp.c \ + crt_gccmain.c \ + crt_main.c \ + crt_winmain.c \ + crt_wmain.c \ + crt_wwinmain.c \ ctype.c \ data.c \ dir.c \

1 0

Roman Pišl : shell32: Implement SHCreateAssociationRegistration.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 82a4e7203666a2f0167f0da5a135956424800398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a4e7203666a2f0167f0da5… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Feb 29 18:47:50 2020 +0100 shell32: Implement SHCreateAssociationRegistration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44253 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 8 ++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index a501dea2e7..49751048f3 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1139,6 +1139,14 @@ static const IEnumAssocHandlersVtbl enumassochandlersvtbl = { enumassochandlers_Next }; +/************************************************************************** + * SHCreateAssociationRegistration [SHELL32.@] + */ +HRESULT WINAPI SHCreateAssociationRegistration(REFIID riid, LPVOID *ppv) +{ + return ApplicationAssociationRegistration_Constructor(NULL, riid, ppv); +} + /************************************************************************** * SHAssocEnumHandlers [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 96251a87ca..d4571212ce 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -338,6 +338,7 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume +@ stdcall SHCreateAssociationRegistration(ptr ptr) @ stdcall SHCreateDataObject(ptr long ptr ptr ptr ptr) @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr)

1 0

Serge Gautherie : shell32: Fix SHCNE_UPDATEITEM number of items.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 83acbb79c1a059cbfec58fbb05619e7a6f703f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=83acbb79c1a059cbfec58fbb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Feb 27 14:32:26 2020 +0100 shell32: Fix SHCNE_UPDATEITEM number of items. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/changenotify.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2efb297ad5..a87913c1f0 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -64,10 +64,11 @@ static LONG next_id; SHCNE_DRIVEADDGUI | SHCNE_DRIVEREMOVED | SHCNE_FREESPACE | \ SHCNE_MEDIAINSERTED | SHCNE_MEDIAREMOVED | SHCNE_MKDIR | \ SHCNE_NETSHARE | SHCNE_NETUNSHARE | SHCNE_RMDIR | \ - SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE ) + SHCNE_SERVERDISCONNECT | SHCNE_UPDATEDIR | SHCNE_UPDATEIMAGE | \ + SHCNE_UPDATEITEM ) #define SHCNE_TWOITEMEVENTS ( \ - SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_UPDATEITEM ) + SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM ) /* for dumping events */ static const char * DumpEvent( LONG event )

1 0

Nikolay Sivov : rtworkq: Change RtwqPutWorkItem() trace format for consistency.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: b464695ab2a61225e0478b03017d191620f1ecd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b464695ab2a61225e0478b03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:36:51 2020 +0300 rtworkq: Change RtwqPutWorkItem() trace format for consistency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 70af6a7658..85e84d46d6 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1380,7 +1380,7 @@ HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result) HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result) { - TRACE("%d, %d, %p.\n", queue, priority, result); + TRACE("%#x, %d, %p.\n", queue, priority, result); return queue_put_work_item(queue, priority, result); }

1 0

Nikolay Sivov : mfplat: Use underlying work queue calls more to get rid of duplicated traces.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: bd3ae4a0c4e3e4b54788204759fe2e259a8a8fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd3ae4a0c4e3e4b547882047… Author: Nikolay Sivov <nsivov(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020