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

Nikolay Sivov : mfplat/tests: Add some tests for calling scheme handler directly.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 0ece679210897774b3b43e483658fe6511a84676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ece679210897774b3b43e48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 2 17:09:10 2019 +0300 mfplat/tests: Add some tests for calling scheme handler directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 10c2fd1..0a378b5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -36,6 +36,7 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, 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); DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); +DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); #undef INITGUID #include <guiddef.h> @@ -288,15 +289,52 @@ static const IMFAsyncCallbackVtbl test_create_from_url_callback_vtbl = test_create_from_url_callback_Invoke, }; +static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFSchemeHandler *handler; + IUnknown *object, *object2; + MF_OBJECT_TYPE obj_type; + HRESULT hr; + + ok(!!result, "Unexpected result object.\n"); + + handler = (IMFSchemeHandler *)IMFAsyncResult_GetStateNoAddRef(result); + + hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); + ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); + + hr = IMFAsyncResult_GetObject(result, &object2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IUnknown_Release(object); + + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_create_from_file_handler_callback_Invoke, +}; + static void test_source_resolver(void) { static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; struct test_callback callback = { { &test_create_from_url_callback_vtbl } }; + struct test_callback callback2 = { { &test_create_from_file_handler_callback_vtbl } }; IMFSourceResolver *resolver, *resolver2; + IMFSchemeHandler *scheme_handler; IMFAttributes *attributes; IMFMediaSource *mediasource; IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; + BOOL selected, do_uninit; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; @@ -304,7 +342,6 @@ static void test_source_resolver(void) WCHAR pathW[MAX_PATH]; HRESULT hr; WCHAR *filename; - BOOL selected; GUID guid; if (!pMFCreateSourceResolver) @@ -417,8 +454,6 @@ todo_wine { if (SUCCEEDED(hr)) WaitForSingleObject(callback.event, INFINITE); - CloseHandle(callback.event); - /* With explicit scheme. */ lstrcpyW(pathW, fileschemeW); lstrcatW(pathW, filename); @@ -432,10 +467,40 @@ todo_wine IMFSourceResolver_Release(resolver); + /* Create directly through scheme handler. */ + hr = CoInitialize(NULL); + ok(SUCCEEDED(hr), "Failed to initialize, hr %#x.\n", hr); + do_uninit = hr == S_OK; + + hr = CoCreateInstance(&CLSID_FileSchemeHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSchemeHandler, + (void **)&scheme_handler); + ok(hr == S_OK, "Failed to create handler object, hr %#x.\n", hr); + + callback2.event = callback.event; + cancel_cookie = NULL; + hr = IMFSchemeHandler_BeginCreateObject(scheme_handler, pathW, MF_RESOLUTION_MEDIASOURCE, NULL, &cancel_cookie, + &callback2.IMFAsyncCallback_iface, (IUnknown *)scheme_handler); +todo_wine { + ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); + ok(!!cancel_cookie, "Unexpected cancel object.\n"); +} + if (cancel_cookie) + IUnknown_Release(cancel_cookie); + + if (SUCCEEDED(hr)) + WaitForSingleObject(callback2.event, INFINITE); + + IMFSchemeHandler_Release(scheme_handler); + + if (do_uninit) + CoUninitialize(); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); + + CloseHandle(callback.event); } static void init_functions(void)

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_init().
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: cfe9314b646abbde60d1b1d05f92c43f82a27c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe9314b646abbde60d1b1d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:52 2019 +0430 wined3d: Introduce wined3d_context_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 83 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4b6aaa9..223e6b2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1882,22 +1882,12 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, +static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; - struct wined3d_context_gl *context_gl; - struct wined3d_context *context; DWORD state; - TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); - - wined3d_from_cs(device->cs); - - if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) - return NULL; - context = &context_gl->c; - list_init(&context->timestamp_queries); list_init(&context->occlusion_queries); list_init(&context->fences); @@ -1910,31 +1900,28 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!device->shader_backend->shader_allocate_context_data(context)) { ERR("Failed to allocate shader backend context data.\n"); - goto out; + return FALSE; } + if (!device->adapter->fragment_pipe->allocate_context_data(context)) { ERR("Failed to allocate fragment pipeline context data.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + return FALSE; } if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((context->hdc = swapchain_get_backup_dc(swapchain))) - context->hdc_is_private = TRUE; - else + if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + return FALSE; } - } - - if (!device_context_add(device, context)) - { - ERR("Failed to add the newly created context to the context list\n"); - goto out; + context->hdc_is_private = TRUE; } context->win_handle = swapchain->win_handle; @@ -1956,13 +1943,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->current_rt.sub_resource_idx = 0; context->tid = GetCurrentThreadId(); - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) - { - device_context_remove(device, context); - goto out; - } - - device->shader_backend->shader_init_context_state(context); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) | (1u << WINED3D_SHADER_TYPE_GEOMETRY) @@ -1970,13 +1950,50 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); + return TRUE; +} + +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; + struct wined3d_context *context; + + TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); + + wined3d_from_cs(device->cs); + + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) + return NULL; + context = &context_gl->c; + + if (!(wined3d_context_init(context, swapchain, target, ds_format))) + { + heap_free(context_gl); + return NULL; + } + + if (!device_context_add(device, context)) + { + ERR("Failed to add the newly created context to the context list\n"); + goto fail; + } + + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + { + device_context_remove(device, context); + goto fail; + } + + device->shader_backend->shader_init_context_state(context); + TRACE("Created context %p.\n", context); return context; -out: - if (context->hdc) - wined3d_release_dc(swapchain->win_handle, context->hdc); +fail: + wined3d_release_dc(context->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); heap_free(context_gl);

1 0

Nikolay Sivov : mf: Register file: scheme handler.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 9e948c47f6c3d474eddbb026b88846bf393bd59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e948c47f6c3d474eddbb026… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 2 17:09:08 2019 +0300 mf: Register file: scheme handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 ++ dlls/mf/mf.rc | 24 ++++++++++++++++++++++++ dlls/mf/mf.rgs | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 5e18ab4..3499a4a 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ topology.c IDL_SRCS = mf.idl + +RC_SRCS = mf.rc diff --git a/dlls/mf/mf.rc b/dlls/mf/mf.rc new file mode 100644 index 0000000..90297b0 --- /dev/null +++ b/dlls/mf/mf.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: mf.rgs */ +1 WINE_REGISTRY mf.rgs diff --git a/dlls/mf/mf.rgs b/dlls/mf/mf.rgs new file mode 100644 index 0000000..f127df7 --- /dev/null +++ b/dlls/mf/mf.rgs @@ -0,0 +1,19 @@ +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + NoRemove 'Windows Media Foundation' + { + NoRemove 'SchemeHandlers' + { + 'file:' + { + val '{477ec299-1421-4bdd-971f-7ccb933f21ad}' = s 'File Scheme Handler' + } + } + } + } + } +}

1 0

Zebediah Figura : setupapi: Properly null-terminate the path in concat_W() .
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: db8e2388d940f908db009f34f620da1ac8b46d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8e2388d940f908db009f34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:11 2019 -0500 setupapi: Properly null-terminate the path in concat_W(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 0775507..c6c3440 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -122,6 +122,7 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const strcpyW( buffer, src1 ); buffer += strlenW(buffer ); if (buffer[-1] != '\\') *buffer++ = '\\'; + *buffer = 0; if (src2) while (*src2 == '\\') src2++; } @@ -130,6 +131,7 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const strcpyW( buffer, src2 ); buffer += strlenW(buffer ); if (buffer[-1] != '\\') *buffer++ = '\\'; + *buffer = 0; if (src3) while (*src3 == '\\') src3++; }

1 0

Zebediah Figura : setupapi: Use the source file name if the destination file name is NULL.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: cfe4ce28ebc0f381eb2f561ad3111eef71505546 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe4ce28ebc0f381eb2f561a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:12 2019 -0500 setupapi: Use the source file name if the destination file name is NULL. Do not do the reverse. Windows crashes if SourceFilename is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index c6c3440..ec5c9fa 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -539,7 +539,7 @@ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) op->dst_file = strdupW( params->TargetFilename ); /* some defaults */ - if (!op->src_file) op->src_file = op->dst_file; + if (!op->dst_file) op->dst_file = op->src_file; if (params->LayoutInf) FIXME("Unhandled LayoutInf %p.\n", params->LayoutInf);

1 0

Zebediah Figura : setupapi: Separate the entire copy operation into a helper function.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 3cb621e6ca78064adeb2415bf3467e476e9eba6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cb621e6ca78064adeb2415b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:07 2019 -0500 setupapi: Separate the entire copy operation into a helper function. So as to centralize SPFILENOTIFY_COPYERROR callbacks into one place. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d18ce9a..73929ea 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1228,6 +1228,24 @@ BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source return SetupInstallFileExW( hinf, inf_context, source, root, dest, style, handler, context, NULL ); } +static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, + const struct file_op *op, PSP_FILE_CALLBACK_W handler, void *context ) +{ + TRACE("copying file %s -> %s\n", debugstr_w(source), debugstr_w(dest)); + + if (op->dst_path && !create_full_pathW(op->dst_path)) + return FALSE; + + if (do_file_copyW(source, dest, op->style, handler, context)) + return TRUE; + + /* try to extract it from the cabinet file */ + if (op->src_tag && extract_cabinet_file(op->src_tag, op->src_root, op->src_file, dest)) + return TRUE; + + return FALSE; +} + /*********************************************************************** * SetupCommitFileQueueW (SETUPAPI.@) */ @@ -1312,27 +1330,10 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op_result == FILEOP_NEWPATH) op_result = FILEOP_DOIT; while (op_result == FILEOP_DOIT || op_result == FILEOP_NEWPATH) { - TRACE( "copying file %s -> %s\n", - debugstr_w( op_result == FILEOP_NEWPATH ? newpath : paths.Source ), - debugstr_w(paths.Target) ); - if (op->dst_path) - { - if (!create_full_pathW( op->dst_path )) - { - paths.Win32Error = GetLastError(); - op_result = handler( context, SPFILENOTIFY_COPYERROR, - (UINT_PTR)&paths, (UINT_PTR)newpath ); - if (op_result == FILEOP_ABORT) goto done; - } - } - if (do_file_copyW( op_result == FILEOP_NEWPATH ? newpath : paths.Source, - paths.Target, op->style, handler, context )) break; /* success */ - /* try to extract it from the cabinet file */ - if (op->src_tag) - { - if (extract_cabinet_file( op->src_tag, op->src_root, - op->src_file, paths.Target )) break; - } + if (queue_copy_file( op_result == FILEOP_NEWPATH ? newpath : paths.Source, + paths.Target, op, handler, context )) + break; + paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR, (UINT_PTR)&paths, (UINT_PTR)newpath );

1 0

Zebediah Figura : setupapi: Implement W -> A mapping of SPFILENOTIFY_NEEDMEDIA.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: e8c4dbcec21d9b65cb680c6c773e560f761d42f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8c4dbcec21d9b65cb680c6c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:10 2019 -0500 setupapi: Implement W -> A mapping of SPFILENOTIFY_NEEDMEDIA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index e160d9e..0775507 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -247,7 +247,28 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, break; case SPFILENOTIFY_NEEDMEDIA: - FIXME("mapping for %d not implemented\n",notification); + { + const SOURCE_MEDIA_W *mediaW = (const SOURCE_MEDIA_W *)param1; + char path[MAX_PATH]; + SOURCE_MEDIA_A mediaA; + + mediaA.Tagfile = strdupWtoA(mediaW->Tagfile); + mediaA.Description = strdupWtoA(mediaW->Description); + mediaA.SourcePath = strdupWtoA(mediaW->SourcePath); + mediaA.SourceFile = strdupWtoA(mediaW->SourceFile); + mediaA.Flags = mediaW->Flags; + path[0] = 0; + + ret = callback_ctx->orig_handler(callback_ctx->orig_context, notification, + (UINT_PTR)&mediaA, (UINT_PTR)&path); + MultiByteToWideChar(CP_ACP, 0, path, -1, (WCHAR *)param2, MAX_PATH); + + heap_free((char *)mediaA.Tagfile); + heap_free((char *)mediaA.Description); + heap_free((char *)mediaA.SourcePath); + heap_free((char *)mediaA.SourceFile); + break; + } case SPFILENOTIFY_STARTQUEUE: case SPFILENOTIFY_ENDQUEUE: case SPFILENOTIFY_STARTSUBQUEUE:

1 0

Jacek Caban : ntoskrnl.exe: Set IRP DeviceObject in IoCallDriver.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 0a8c36b8e3ed66a3cbdbb534a5fc0256b50751fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8c36b8e3ed66a3cbdbb534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:39 2019 +0200 ntoskrnl.exe: Set IRP DeviceObject in IoCallDriver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++---- dlls/ntoskrnl.exe/tests/driver.c | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6ac2a3e..c4c3bab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -622,7 +622,6 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; - irpsp->DeviceObject = device; irpsp->FileObject = file; irpsp->Parameters.Create.SecurityContext = NULL; /* FIXME */ irpsp->Parameters.Create.Options = params->create.options; @@ -667,7 +666,6 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CLOSE; - irpsp->DeviceObject = device; irpsp->FileObject = file; irp->Tail.Overlay.OriginalFileObject = file; @@ -1332,7 +1330,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, irpsp->Parameters.DeviceIoControl.IoControlCode = code; irpsp->Parameters.DeviceIoControl.InputBufferLength = in_len; irpsp->Parameters.DeviceIoControl.OutputBufferLength = out_len; - irpsp->DeviceObject = device; + irpsp->DeviceObject = NULL; irpsp->CompletionRoutine = NULL; switch (code & 3) @@ -1382,7 +1380,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; - irpsp->DeviceObject = device; + irpsp->DeviceObject = NULL; irpsp->CompletionRoutine = NULL; irp->AssociatedIrp.SystemBuffer = buffer; @@ -1966,6 +1964,7 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) --irp->CurrentLocation; irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation; + irpsp->DeviceObject = device; dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; TRACE_(relay)( "\1Call driver dispatch %p (device=%p,irp=%p)\n", dispatch, device, irp ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6d14a22..9ad2bb9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -712,7 +712,6 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - todo_wine ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); @@ -735,7 +734,6 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - todo_wine ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine);

1 0

Jacek Caban : ntoskrnl.exe: Support UserEvent in IoCompleteRequest.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 0ee017f2ed74690ef47567de8c5394a0a837a5ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ee017f2ed74690ef47567de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:48 2019 +0200 ntoskrnl.exe: Support UserEvent in IoCompleteRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/driver.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c4c3bab..b4afc1f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2304,6 +2304,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) if (irp->Flags & IRP_DEALLOCATE_BUFFER) HeapFree( GetProcessHeap(), 0, irp->AssociatedIrp.SystemBuffer ); + if (irp->UserEvent) KeSetEvent( irp->UserEvent, IO_NO_INCREMENT, FALSE ); IoFreeIrp( irp ); } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 9ad2bb9..35a86bb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -752,7 +752,6 @@ static void test_call_driver(DEVICE_OBJECT *device) IoCompleteRequest(irp, IO_NO_INCREMENT); status = wait_single(&event, 0); - todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status); }

1 0

Henri Verbeet : wined3d: Get rid of the redundant "device" parameter to context_destroy().
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: bad9cd29a8f93d8984dbb0cf70a3baeee7722cd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad9cd29a8f93d8984dbb0cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:50 2019 +0430 wined3d: Get rid of the redundant "device" parameter to context_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f4179d7..5015586 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1581,7 +1581,7 @@ void context_release(struct wined3d_context *context) if (context->destroy_delayed) { TRACE("Destroying context %p.\n", context); - context_destroy(context->device, context); + wined3d_context_destroy(context); } } } @@ -2280,8 +2280,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, return TRUE; } -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_context_destroy(struct wined3d_context *context) { + struct wined3d_device *device = context->device; BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2289,7 +2290,8 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont wined3d_from_cs(device->cs); /* We delay destroying a context when it is active. The context_release() - * function invokes context_destroy() again while leaving the last level. */ + * function invokes wined3d_context_destroy() again while leaving the last + * level. */ if (context->level) { TRACE("Delaying destruction of context %p.\n", context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23ba41c..e25565d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1019,7 +1019,7 @@ static void wined3d_device_delete_opengl_contexts_cs(void *object) if (device->contexts[0]->swapchain) swapchain_destroy_contexts(device->contexts[0]->swapchain); else - context_destroy(device, device->contexts[0]); + wined3d_context_destroy(device->contexts[0]); } } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c1429de..4ac091f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1095,7 +1095,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) { ERR("Out of memory when trying to allocate a new context array\n"); - context_destroy(swapchain->device, ctx); + wined3d_context_destroy(ctx); return NULL; } memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); @@ -1114,7 +1114,7 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) for (i = 0; i < swapchain->num_contexts; ++i) { - context_destroy(swapchain->device, swapchain->context[i]); + wined3d_context_destroy(swapchain->context[i]); } heap_free(swapchain->context); swapchain->num_contexts = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14444cb..daba669 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2189,7 +2189,7 @@ void context_copy_bo_address(struct wined3d_context *context, struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0