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

Nikolay Sivov : mf: Register file: scheme handler.
by Alexandre Julliard 02 May '19

02 May '19

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

Nikolay Sivov : mfplat: Use file url scheme as a fallback.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 75def3a11e4f9dd8d0005fc263670a3d8de2c2a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75def3a11e4f9dd8d0005fc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 2 17:09:09 2019 +0300 mfplat: Use file url scheme as a fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 68 +++++++++------ dlls/mfplat/tests/mfplat.c | 211 ++++++++++++++++++++++++++++++--------------- 2 files changed, 186 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75def3a11e4f9dd8d000…

1 0

Nikolay Sivov : mfplat/tests: Add some tests for calling scheme handler directly.
by Alexandre Julliard 02 May '19

02 May '19

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

Zebediah Figura : setupapi: Separate the entire copy operation into a helper function.
by Alexandre Julliard 02 May '19

02 May '19

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: Keep track of source media in a separate list.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 31bb0097ad85090b1e006ade020c68aa5582dc0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=31bb0097ad85090b1e006ade… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:08 2019 -0500 setupapi: Keep track of source media in a separate list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 122 +++++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 51 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 73929ea..fb0c401 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -51,17 +51,21 @@ struct default_callback_context DWORD_PTR unk3[5]; }; +struct source_media +{ + WCHAR root[MAX_PATH]; + WCHAR *desc, *tag; +}; + struct file_op { struct file_op *next; UINT style; - WCHAR *src_root; WCHAR *src_path; WCHAR *src_file; - WCHAR *src_descr; - WCHAR *src_tag; WCHAR *dst_path; WCHAR *dst_file; + struct source_media *media; }; struct file_op_queue @@ -76,7 +80,9 @@ struct file_queue struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; - DWORD flags; + DWORD flags; + struct source_media **sources; + unsigned int source_count; }; @@ -97,11 +103,8 @@ static void free_file_op_queue( struct file_op_queue *queue ) while( op ) { - HeapFree( GetProcessHeap(), 0, op->src_root ); HeapFree( GetProcessHeap(), 0, op->src_path ); HeapFree( GetProcessHeap(), 0, op->src_file ); - HeapFree( GetProcessHeap(), 0, op->src_descr ); - HeapFree( GetProcessHeap(), 0, op->src_tag ); HeapFree( GetProcessHeap(), 0, op->dst_path ); if (op->dst_file != op->src_file) HeapFree( GetProcessHeap(), 0, op->dst_file ); t = op; @@ -145,7 +148,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->src_root) src_len += strlenW(op->src_root) + 1; + if (op->media) src_len += strlenW(op->media->root) + 1; if (op->src_path) src_len += strlenW(op->src_path) + 1; if (op->src_file) src_len += strlenW(op->src_file) + 1; if (op->dst_path) dst_len += strlenW(op->dst_path) + 1; @@ -164,7 +167,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - concat_W( source, op->src_root, op->src_path, op->src_file ); + concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); concat_W( target, NULL, op->dst_path, op->dst_file ); paths->Win32Error = 0; paths->Flags = 0; @@ -416,10 +419,18 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) { struct file_queue *queue = handle; + unsigned int i; free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); + for (i = 0; i < queue->source_count; ++i) + { + heap_free( queue->sources[i]->desc ); + heap_free( queue->sources[i]->tag ); + heap_free( queue->sources[i] ); + } + heap_free( queue->sources ); HeapFree( GetProcessHeap(), 0, queue ); return TRUE; } @@ -459,22 +470,48 @@ BOOL WINAPI SetupQueueCopyIndirectA( SP_FILE_COPY_PARAMS_A *paramsA ) return ret; } +static BOOL equal_str(const WCHAR *a, const WCHAR *b) +{ + return (!a && !b) || (a && b && !strcmpW(a, b)); +} + +static struct source_media *get_source_media(struct file_queue *queue, + const WCHAR *root, const WCHAR *desc, const WCHAR *tag) +{ + unsigned int i; + + for (i = 0; i < queue->source_count; ++i) + { + if (!strcmpW(root, queue->sources[i]->root) + && equal_str(desc, queue->sources[i]->desc) + && equal_str(tag, queue->sources[i]->tag)) + { + return queue->sources[i]; + } + } + + queue->sources = heap_realloc( queue->sources, ++queue->source_count * sizeof(*queue->sources) ); + queue->sources[i] = heap_alloc( sizeof(*queue->sources[i]) ); + strcpyW(queue->sources[i]->root, root); + queue->sources[i]->desc = strdupW(desc); + queue->sources[i]->tag = strdupW(tag); + + return queue->sources[i]; +} /*********************************************************************** * SetupQueueCopyIndirectW (SETUPAPI.@) */ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) { + static const WCHAR emptyW[] = {0}; struct file_queue *queue = params->QueueHandle; struct file_op *op; if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; op->style = params->CopyStyle; - op->src_root = strdupW( params->SourceRootPath ); op->src_path = strdupW( params->SourcePath ); op->src_file = strdupW( params->SourceFilename ); - op->src_descr = strdupW( params->SourceDescription ); - op->src_tag = strdupW( params->SourceTagfile ); op->dst_path = strdupW( params->TargetDirectory ); op->dst_file = strdupW( params->TargetFilename ); @@ -483,10 +520,13 @@ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) if (params->LayoutInf) FIXME("Unhandled LayoutInf %p.\n", params->LayoutInf); + op->media = get_source_media( queue, params->SourceRootPath ? params->SourceRootPath : emptyW, + params->SourceDescription, params->SourceTagfile ); + TRACE( "root=%s path=%s file=%s -> dir=%s file=%s descr=%s tag=%s\n", - debugstr_w(op->src_root), debugstr_w(op->src_path), debugstr_w(op->src_file), + debugstr_w(op->media->root), debugstr_w(op->src_path), debugstr_w(op->src_file), debugstr_w(op->dst_path), debugstr_w(op->dst_file), - debugstr_w(op->src_descr), debugstr_w(op->src_tag) ); + debugstr_w(op->media->desc), debugstr_w(op->media->tag) ); queue_file_op( &queue->copy_queue, op ); return TRUE; @@ -614,15 +654,9 @@ BOOL WINAPI SetupQueueDeleteA( HSPFILEQ handle, PCSTR part1, PCSTR part2 ) struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = NULL; - op->src_file = NULL; - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupAtoW( part1 ); - op->dst_file = strdupAtoW( part2 ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->dst_path = strdupAtoW( part1 ); + op->dst_file = strdupAtoW( part2 ); queue_file_op( &queue->delete_queue, op ); return TRUE; } @@ -636,15 +670,9 @@ BOOL WINAPI SetupQueueDeleteW( HSPFILEQ handle, PCWSTR part1, PCWSTR part2 ) struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = NULL; - op->src_file = NULL; - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupW( part1 ); - op->dst_file = strdupW( part2 ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->dst_path = strdupW( part1 ); + op->dst_file = strdupW( part2 ); queue_file_op( &queue->delete_queue, op ); return TRUE; } @@ -659,15 +687,11 @@ BOOL WINAPI SetupQueueRenameA( HSPFILEQ handle, PCSTR SourcePath, PCSTR SourceFi struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = strdupAtoW( SourcePath ); - op->src_file = strdupAtoW( SourceFilename ); - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupAtoW( TargetPath ); - op->dst_file = strdupAtoW( TargetFilename ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->src_path = strdupAtoW( SourcePath ); + op->src_file = strdupAtoW( SourceFilename ); + op->dst_path = strdupAtoW( TargetPath ); + op->dst_file = strdupAtoW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; } @@ -682,15 +706,11 @@ BOOL WINAPI SetupQueueRenameW( HSPFILEQ handle, PCWSTR SourcePath, PCWSTR Source struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = strdupW( SourcePath ); - op->src_file = strdupW( SourceFilename ); - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupW( TargetPath ); - op->dst_file = strdupW( TargetFilename ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->src_path = strdupW( SourcePath ); + op->src_file = strdupW( SourceFilename ); + op->dst_path = strdupW( TargetPath ); + op->dst_file = strdupW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; } @@ -1240,7 +1260,7 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, 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)) + if (op->media->tag && extract_cabinet_file(op->media->tag, op->media->root, op->src_file, dest)) return TRUE; return FALSE;

1 0

Zebediah Figura : setupapi: Implement SetupDefaultQueueCallback( SPFILENOTIFY_NEEDMEDIA).
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 46dc6dddf3d1ef02aa773d0e25c121b8643d4bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dc6dddf3d1ef02aa773d0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:09 2019 -0500 setupapi: Implement SetupDefaultQueueCallback(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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index fb0c401..e160d9e 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1601,8 +1601,12 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification, debugstr_a(paths->Source), debugstr_a(paths->Target) ); return FILEOP_SKIP; case SPFILENOTIFY_NEEDMEDIA: - TRACE( "need media\n" ); - return FILEOP_SKIP; + { + const SOURCE_MEDIA_A *media = (const SOURCE_MEDIA_A *)param1; + TRACE( "need media %s %s\n", debugstr_a(media->SourcePath), debugstr_a(media->SourceFile) ); + strcpy( (char *)param2, media->SourcePath ); + return FILEOP_DOIT; + } default: FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break; @@ -1666,8 +1670,12 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, debugstr_w(paths->Source), debugstr_w(paths->Target) ); return FILEOP_SKIP; case SPFILENOTIFY_NEEDMEDIA: - TRACE( "need media\n" ); - return FILEOP_SKIP; + { + const SOURCE_MEDIA_W *media = (const SOURCE_MEDIA_W *)param1; + TRACE( "need media %s %s\n", debugstr_w(media->SourcePath), debugstr_w(media->SourceFile) ); + strcpyW( (WCHAR *)param2, media->SourcePath ); + return FILEOP_DOIT; + } default: FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break;

1 0

Zebediah Figura : setupapi: Implement W -> A mapping of SPFILENOTIFY_NEEDMEDIA.
by Alexandre Julliard 02 May '19

02 May '19

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

Zebediah Figura : setupapi: Properly null-terminate the path in concat_W() .
by Alexandre Julliard 02 May '19

02 May '19

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 02 May '19

02 May '19

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: Implement source media path resolution.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 3e5c9798a80641e0e39e95e4467c60405b22b062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e5c9798a80641e0e39e95e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:13 2019 -0500 setupapi: Implement source media path resolution. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47107 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 110 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 98 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index ec5c9fa..c065c6e 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -55,6 +55,8 @@ struct source_media { WCHAR root[MAX_PATH]; WCHAR *desc, *tag; + BOOL resolved; + BOOL cabinet; }; struct file_op @@ -518,6 +520,8 @@ static struct source_media *get_source_media(struct file_queue *queue, strcpyW(queue->sources[i]->root, root); queue->sources[i]->desc = strdupW(desc); queue->sources[i]->tag = strdupW(tag); + queue->sources[i]->resolved = FALSE; + queue->sources[i]->cabinet = FALSE; return queue->sources[i]; } @@ -1284,7 +1288,10 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, /* try to extract it from the cabinet file */ if (op->media->tag && extract_cabinet_file(op->media->tag, op->media->root, op->src_file, dest)) + { + op->media->cabinet = TRUE; return TRUE; + } return FALSE; } @@ -1367,22 +1374,101 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC { WCHAR newpath[MAX_PATH]; - build_filepathsW( op, &paths ); - op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); - if (op_result == FILEOP_ABORT) goto done; - if (op_result == FILEOP_NEWPATH) op_result = FILEOP_DOIT; - while (op_result == FILEOP_DOIT || op_result == FILEOP_NEWPATH) + if (!op->media->resolved) { - if (queue_copy_file( op_result == FILEOP_NEWPATH ? newpath : paths.Source, - paths.Target, op, handler, context )) + /* The NEEDMEDIA callback asks for the folder containing the + * first file, but that might be in a subdir of the source + * disk's root directory. We have to do some contortions to + * correct for this. Pretend that the file we're using + * actually isn't in a subdirectory, but keep track of what it + * was, and then later strip it from the root path that we + * ultimately resolve the source disk to. */ + WCHAR *src_path = op->src_path; + + op->src_path = NULL; + if (src_path) + { + strcatW(op->media->root, backslashW); + strcatW(op->media->root, src_path); + } + + for (;;) + { + SOURCE_MEDIA_W media; + media.Reserved = NULL; + media.Tagfile = op->media->tag; + media.Description = op->media->desc; + media.SourcePath = op->media->root; + media.SourceFile = op->src_file; + media.Flags = op->style & (SP_COPY_WARNIFSKIP | SP_COPY_NOSKIP | SP_FLAG_CABINETCONTINUATION | SP_COPY_NOBROWSE); + + newpath[0] = 0; + op_result = handler( context, SPFILENOTIFY_NEEDMEDIA, (UINT_PTR)&media, (UINT_PTR)newpath ); + + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) + break; + else if (op_result == FILEOP_NEWPATH) + strcpyW(op->media->root, newpath); + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + + build_filepathsW( op, &paths ); + op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) + break; + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + + if (queue_copy_file( paths.Source, paths.Target, op, handler, context )) + { + if (src_path && !op->media->cabinet) + { + size_t root_len = strlenW(op->media->root), path_len = strlenW(src_path); + if (path_len <= root_len && !strncmpiW(op->media->root + root_len - path_len, src_path, path_len)) + op->media->root[root_len - path_len - 1] = 0; + heap_free( src_path ); + } + op->media->resolved = TRUE; + handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); + break; + } + } + } + else + { + build_filepathsW( op, &paths ); + op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) break; + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); - paths.Win32Error = GetLastError(); - op_result = handler( context, SPFILENOTIFY_COPYERROR, - (UINT_PTR)&paths, (UINT_PTR)newpath ); - if (op_result == FILEOP_ABORT) goto done; + while (op_result == FILEOP_DOIT || op_result == FILEOP_NEWPATH) + { + if (queue_copy_file( paths.Source, paths.Target, op, handler, context )) + break; + + paths.Win32Error = GetLastError(); + newpath[0] = 0; + op_result = handler( context, SPFILENOTIFY_COPYERROR, (UINT_PTR)&paths, (UINT_PTR)newpath ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_NEWPATH) + { + strcpyW(op->media->root, newpath); + build_filepathsW(op, &paths); + } + else if (op_result != FILEOP_SKIP && op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + } + handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); } - handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); } handler( context, SPFILENOTIFY_ENDSUBQUEUE, FILEOP_COPY, 0 ); }

1 0