October 2019 - Wine-commits

Zebediah Figura : quartz/filtergraph: Iterate filters directly in IMediaSeeking::SetPositions().
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 1c0985013e4cf6aacd384bc69806aa1c557dd806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c0985013e4cf6aacd384bc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 16:54:47 2019 -0500 quartz/filtergraph: Iterate filters directly in IMediaSeeking::SetPositions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 103 ++++++++++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 4 +- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 96c9ae31f0..966f427b15 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2552,64 +2552,65 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL return S_OK; } -struct pos_args { - LONGLONG* current, *stop; - DWORD curflags, stopflags; -}; - -static HRESULT WINAPI found_setposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) +static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *current_ptr, + DWORD current_flags, LONGLONG *stop_ptr, DWORD stop_flags) { - struct pos_args *args = (void*)pargs; - LONGLONG current = args->current ? *args->current : 0, stop = args->stop ? *args->stop : 0; - HRESULT hr; + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = E_NOTIMPL, filter_hr; + IMediaSeeking *seeking; + struct filter *filter; + FILTER_STATE state; + + TRACE("graph %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", graph, + current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags, + stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags); + + if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning + && (current_flags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Unhandled current_flags %#x.\n", current_flags & 0x7); - if (SUCCEEDED(hr = IMediaSeeking_SetPositions(seek, &current, - args->curflags, &stop, args->stopflags))) + if ((stop_flags & 0x7) != AM_SEEKING_NoPositioning + && (stop_flags & 0x7) != AM_SEEKING_AbsolutePositioning) + FIXME("Unhandled stop_flags %#x.\n", stop_flags & 0x7); + + EnterCriticalSection(&graph->cs); + + state = graph->state; + if (state == State_Running && !(current_flags & AM_SEEKING_NoFlush)) + IMediaControl_Pause(&graph->IMediaControl_iface); + + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { - if (args->current && (args->curflags & AM_SEEKING_ReturnTime)) - *args->current = current; - if (args->stop && (args->stopflags & AM_SEEKING_ReturnTime)) - *args->stop = stop; - } - return hr; -} + LONGLONG current = current_ptr ? *current_ptr : 0, stop = stop_ptr ? *stop_ptr : 0; -static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, - DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags) -{ - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - HRESULT hr = S_OK; - FILTER_STATE state; - struct pos_args args; + if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + continue; - TRACE("(%p/%p)->(%p, %08x, %p, %08x)\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); + filter_hr = IMediaSeeking_SetPositions(seeking, &current, current_flags, &stop, stop_flags); + IMediaSeeking_Release(seeking); + if (SUCCEEDED(filter_hr)) + { + hr = S_OK; - EnterCriticalSection(&This->cs); - state = This->state; - TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); - - if ((dwCurrentFlags & 0x7) != AM_SEEKING_AbsolutePositioning && - (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) - FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); - - if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning - && (dwStopFlags & 0x7) != AM_SEEKING_AbsolutePositioning) - FIXME("Stop position not handled yet!\n"); - - if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) - IMediaControl_Pause(&This->IMediaControl_iface); - args.current = pCurrent; - args.stop = pStop; - args.curflags = dwCurrentFlags; - args.stopflags = dwStopFlags; - hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); - - if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) - This->pause_time = This->start_time = -1; - if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) - IMediaControl_Run(&This->IMediaControl_iface); - LeaveCriticalSection(&This->cs); + if (current_ptr && (current_flags & AM_SEEKING_ReturnTime)) + *current_ptr = current; + if (stop_ptr && (stop_flags & AM_SEEKING_ReturnTime)) + *stop_ptr = stop; + } + else if (filter_hr != E_NOTIMPL) + { + LeaveCriticalSection(&graph->cs); + return filter_hr; + } + } + + if ((current_flags & 0x7) != AM_SEEKING_NoPositioning) + graph->pause_time = graph->start_time = -1; + if (state == State_Running && !(current_flags & AM_SEEKING_NoFlush)) + IMediaControl_Run(&graph->IMediaControl_iface); + + LeaveCriticalSection(&graph->cs); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a768b737fb..bffbc82b98 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3818,12 +3818,12 @@ static void test_graph_seeking(void) filter1.seek_hr = filter2.seek_hr = 0xbeef; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); filter1.seek_hr = E_NOTIMPL; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); filter1.seek_hr = 0xdeadbeef; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning,

1 0

Hans-Kristian Arntzen : vkd3d: Bump RootSignature version to 1.1.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: vkd3d Branch: master Commit: c002aee119b638d30eeb7cdc91099449ccafeafc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c002aee119b638d30eeb7cd… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Wed Oct 16 13:05:42 2019 +0200 vkd3d: Bump RootSignature version to 1.1. There appears to be a complete implementation of RS 1.1 already, so enable this feature. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3da4273..d30c447 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2512,8 +2512,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Root signature version 1_1 not supported yet.\n"); - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK;

1 0

Philip Rebohle : vkd3d-shader: Don't shift output array component write mask.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: vkd3d Branch: master Commit: 907d733ffe18635e17338a89edbc3b4947188de6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=907d733ffe18635e17338a8… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Oct 16 21:55:35 2019 +0200 vkd3d-shader: Don't shift output array component write mask. Fixes an assertion when compiling shaders with more than four clip or cull distances. Output arrays are arrays of scalars, so shifting the write mask is not very meaningful. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 75a3a4f..4b93e01 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4536,7 +4536,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi ptr_type_id, output_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, index)); object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); - vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0 << index, + vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0, output_info->component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_0 << i, object_id); ++index; }

1 0

Francois Gouget : testbot/web: Use double quotes for the content-disposition filename.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: tools Branch: master Commit: 0b94f8cc624e46e0696232ea1cee0c07edc9aac9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0b94f8cc624e46e0696232e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:14:23 2019 +0200 testbot/web: Use double quotes for the content-disposition filename. It does not support single quotes which end up being included in the suggested filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 83e723e..35f2433 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -49,7 +49,7 @@ sub SendTaskFile($$$$$) $Request->content_type("text/plain"); $Request->headers_out->add("Content-length", $FileSize); $Request->headers_out->add("Content-Disposition", - "attachment; filename='$File'"); + "attachment; filename=\"$File\""); $BlkSize ||= 16384; print $_ while (sysread($fh, $_, $BlkSize));

1 0

Francois Gouget : testbot: Allow hyphens in test filenames.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: tools Branch: master Commit: 6ad03750bac7cc8baba51d134be96e83e48729b1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6ad03750bac7cc8baba51d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:13:49 2019 +0200 testbot: Allow hyphens in test filenames. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1946482..a6a10a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -341,7 +341,7 @@ sub ParseWineTestReport($$$) foreach my $Line (<$LogFile>) { $Cur->{UnitSize} += length($Line); - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Francois Gouget : testbot/web: Include the task key in GetTaskFile's suggested filename.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: tools Branch: master Commit: 636d727f509c88d8caa722021ee0734cae53c8d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=636d727f509c88d8caa7220… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:14:26 2019 +0200 testbot/web: Include the task key in GetTaskFile's suggested filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 35f2433..6353219 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -49,7 +49,7 @@ sub SendTaskFile($$$$$) $Request->content_type("text/plain"); $Request->headers_out->add("Content-length", $FileSize); $Request->headers_out->add("Content-Disposition", - "attachment; filename=\"$File\""); + "attachment; filename=\"job${JobId}_${StepNo}_${TaskNo}_$File\""); $BlkSize ||= 16384; print $_ while (sysread($fh, $_, $BlkSize));

1 0

Brendan Shanks : kernel32/tests: Test loading system DLLs with WoW64 redirection disabled.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: de9406bccd100b9c09afb3cd84173f956e0aa52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9406bccd100b9c09afb3cd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 17 13:23:50 2019 -0700 kernel32/tests: Test loading system DLLs with WoW64 redirection disabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 65184887b8..e5b8c3b28e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -84,6 +84,8 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3812,6 +3814,50 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_wow64_redirection_for_dll(const char *libname) +{ + HMODULE lib; + char buf[256]; + + if (!GetModuleHandleA(libname)) + { + lib = LoadLibraryExA(libname, NULL, 0); + todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); + if (lib) + { + /* Win 7/2008R2 return the un-redirected path (i.e. c:\windows\system32\dwrite.dll), test loading it. */ + GetModuleFileNameA(lib, buf, sizeof(buf)); + FreeLibrary(lib); + lib = LoadLibraryExA(buf, NULL, 0); + ok(lib != NULL, "Loading %s from full path should succeed with WOW64 redirection disabled\n", libname); + if (lib) + FreeLibrary(lib); + } + } + else + { + skip("%s was already loaded in the process\n", libname); + } +} + +static void test_wow64_redirection(void) +{ + void *OldValue; + + if (!is_wow64) + return; + + /* Disable FS redirection, then test loading system libraries (pick ones that shouldn't + * already be loaded in this process). + */ + ok(pWow64DisableWow64FsRedirection(&OldValue), "Disabling FS redirection failed\n"); + test_wow64_redirection_for_dll("wlanapi.dll"); + test_wow64_redirection_for_dll("dxgi.dll"); + test_wow64_redirection_for_dll("dwrite.dll"); + ok(pWow64RevertWow64FsRedirection(OldValue), "Re-enabling FS redirection failed\n"); +} + static void test_dll_file( const char *name ) { HMODULE module = GetModuleHandleA( name ); @@ -3897,6 +3943,8 @@ START_TEST(loader) pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); pIsWow64Process = (void *)GetProcAddress(kernel32, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); @@ -3930,6 +3978,7 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_wow64_redirection(); test_dll_file( "ntdll.dll" ); test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" );

1 0

Vincent Povirk : regsvr32: Re-exec as 32-bit or 64-bit if necessary.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: e90cca8e7a429c58076262626b8bb4d3f4f2c5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e90cca8e7a429c5807626262… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 18 15:46:34 2019 -0500 regsvr32: Re-exec as 32-bit or 64-bit if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47075 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 122 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 4aa3f7d5c1..a7fb12e0fc 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -83,6 +83,97 @@ static void WINAPIV output_write(UINT id, ...) LocalFree(str); } +static LPCWSTR find_arg_start(LPCWSTR cmdline) +{ + LPCWSTR s; + BOOL in_quotes; + int bcount; + + bcount=0; + in_quotes=FALSE; + s=cmdline; + while (1) { + if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { + /* end of this command line argument */ + break; + } else if (*s=='\\') { + /* '\', count them */ + bcount++; + } else if ((*s=='"') && ((bcount & 1)==0)) { + /* unescaped '"' */ + in_quotes=!in_quotes; + bcount=0; + } else { + /* a regular character */ + bcount=0; + } + s++; + } + return s; +} + +static void reexec_self(void) +{ + /* restart current process as 32-bit or 64-bit with same command line */ + static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; +#ifndef _WIN64 + static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; + BOOL wow64; +#endif + WCHAR systemdir[MAX_PATH]; + LPCWSTR args; + WCHAR *cmdline; + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + +#ifdef _WIN64 + TRACE("restarting as 32-bit\n"); + GetSystemWow64DirectoryW(systemdir, MAX_PATH); +#else + TRACE("restarting as 64-bit\n"); + + if (!IsWow64Process(GetCurrentProcess(), &wow64) || !wow64) + { + TRACE("not running in wow64, can't restart as 64-bit\n"); + return; + } + + GetWindowsDirectoryW(systemdir, MAX_PATH); + wcscat(systemdir, sysnative); +#endif + + args = find_arg_start(GetCommandLineW()); + + cmdline = HeapAlloc(GetProcessHeap(), 0, + (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + + wcscpy(cmdline, systemdir); + wcscat(cmdline, exe_name); + wcscat(cmdline, args); + + si.cb = sizeof(si); + + if (CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + DWORD exit_code; + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &exit_code); + ExitProcess(exit_code); + } + else + { + WINE_TRACE("failed to restart, err=%d\n", GetLastError()); + } + + HeapFree(GetProcessHeap(), 0, cmdline); +} + +#ifdef _WIN64 +# define ALT_BINARY_TYPE SCS_32BIT_BINARY +#else +# define ALT_BINARY_TYPE SCS_64BIT_BINARY +#endif + /** * Loads procedure. * @@ -90,14 +181,22 @@ static void WINAPIV output_write(UINT id, ...) * strDll - name of the dll. * procName - name of the procedure to load from the dll. * DllHandle - a variable that receives the handle of the loaded dll. + * firstDll - true if this is the first dll in the command line. */ -static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle) +static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle, BOOL firstDll) { VOID* (*proc)(void); *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { + DWORD binary_type; + if (firstDll && GetLastError() == ERROR_BAD_EXE_FORMAT && + GetBinaryTypeW(strDll, &binary_type) && + binary_type == ALT_BINARY_TYPE) + { + reexec_self(); + } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED); } @@ -111,13 +210,13 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan return proc; } -static int RegisterDll(const WCHAR* strDll) +static int RegisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLREGISTER pfRegister; HMODULE DllHandle = NULL; - pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle, firstDll); if (!pfRegister) return GETPROCADDRESS_FAILED; @@ -134,13 +233,13 @@ static int RegisterDll(const WCHAR* strDll) return 0; } -static int UnregisterDll(const WCHAR* strDll) +static int UnregisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLUNREGISTER pfUnregister; HMODULE DllHandle = NULL; - pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle); + pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle, firstDll); if (!pfUnregister) return GETPROCADDRESS_FAILED; @@ -157,13 +256,13 @@ static int UnregisterDll(const WCHAR* strDll) return 0; } -static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line) +static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line, BOOL firstDll) { HRESULT hr; DLLINSTALL pfInstall; HMODULE DllHandle = NULL; - pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + pfInstall = LoadProc(strDll, "DllInstall", &DllHandle, firstDll); if (!pfInstall) return GETPROCADDRESS_FAILED; @@ -278,11 +377,12 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (argv[i]) { WCHAR *DllName = argv[i]; + BOOL firstDll = !DllFound; res = 0; DllFound = TRUE; if (CallInstall && Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); /* The Windows version stops processing the current file on the first error. */ if (res) @@ -294,9 +394,9 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (!CallInstall || CallRegister) { if(Unregister) - res = UnregisterDll(DllName); + res = UnregisterDll(DllName, firstDll); else - res = RegisterDll(DllName); + res = RegisterDll(DllName, firstDll); } if (res) @@ -306,7 +406,7 @@ int __cdecl wmain(int argc, WCHAR* argv[]) } if (CallInstall && !Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); if (res) {

1 0

Sven Baars : msvcp120: Add a helper for tr2_sys__Equivalent.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: fb1fa3a404b88d120abef9c3c4b40bdced25ce76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb1fa3a404b88d120abef9c3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 20:01:45 2019 +0200 msvcp120: Add a helper for tr2_sys__Equivalent. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 3 ++ dlls/msvcp90/ios.c | 65 ++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 8f7b75aab4..d484cdd7ed 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1230,6 +1230,7 @@ static void test_tr2_sys__Equivalent(void) char temp_path[MAX_PATH], current_path[MAX_PATH]; WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_dirW[] = {'t','r','2','_','t','e','s','t','_','d','i','r',0}; struct { char const *path1; char const *path2; @@ -1273,6 +1274,8 @@ static void test_tr2_sys__Equivalent(void) ok(val == 1, "tr2_sys__Equivalent(): expect: 1, got %d\n", val); val = p_tr2_sys__Equivalent_wchar(testW, testW2); ok(val == 0, "tr2_sys__Equivalent(): expect: 0, got %d\n", val); + val = p_tr2_sys__Equivalent_wchar(test_dirW, test_dirW); + ok(val == -1, "tr2_sys__Equivalent(): expect: -1, got %d\n", val); ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 84174e4f95..8f0e5cfd7b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14680,40 +14680,42 @@ ULONGLONG __cdecl tr2_sys__File_size(char const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +static int equivalent_handles(HANDLE h1, HANDLE h2) +{ + int ret; + BY_HANDLE_FILE_INFORMATION info1, info2; + + if(h1 == INVALID_HANDLE_VALUE) + return h2 == INVALID_HANDLE_VALUE ? -1 : 0; + else if(h2 == INVALID_HANDLE_VALUE) + return 0; + + ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + if(!ret) + return -1; + return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow + ); +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2) { HANDLE h1, h2; int ret; - BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_a(path1), debugstr_a(path2)); h1 = CreateFileA(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); h2 = CreateFileA(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if(h1 == INVALID_HANDLE_VALUE) { - if(h2 == INVALID_HANDLE_VALUE) { - return -1; - }else { - CloseHandle(h2); - return 0; - } - }else if(h2 == INVALID_HANDLE_VALUE) { - CloseHandle(h1); - return 0; - } - - ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + ret = equivalent_handles(h1, h2); CloseHandle(h1); CloseHandle(h2); - if(!ret) - return -1; - return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber - && info1.nFileIndexHigh == info2.nFileIndexHigh - && info1.nFileIndexLow == info2.nFileIndexLow - ); + return ret; } /* ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z */ @@ -15617,34 +15619,17 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) { HANDLE h1, h2; int ret; - BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); - if(h1 == INVALID_HANDLE_VALUE) { - if(h2 == INVALID_HANDLE_VALUE) { - return -1; - }else { - CloseHandle(h2); - return 0; - } - }else if(h2 == INVALID_HANDLE_VALUE) { - CloseHandle(h1); - return 0; - } - - ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + ret = equivalent_handles(h1, h2); CloseHandle(h1); CloseHandle(h2); - if(!ret) - return -1; - return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber - && info1.nFileIndexHigh == info2.nFileIndexHigh - && info1.nFileIndexLow == info2.nFileIndexLow - ); + return ret; } /* ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */

1 0

Sven Baars : msvcp140: Add an _Equivalent implementation that allows for directories.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: aeeb299f9840c15044d4a6810ed9c975952c789f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeeb299f9840c15044d4a681… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 20:01:54 2019 +0200 msvcp140: Add an _Equivalent implementation that allows for directories. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 6 +++++- dlls/msvcp90/ios.c | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index a5b2bd40b2..70caad8dba 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3638,7 +3638,7 @@ @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest -@ cdecl _Equivalent(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl _Equivalent(wstr wstr) _Equivalent @ cdecl _Exp(ptr double long) _Exp @ stub _FCosh @ extern _FDenorm _FDenorm diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 04406240e0..8ad172495d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1400,7 +1400,6 @@ static void test_Equivalent(void) { f1W, NULL, 0 }, { f1W, wine_test_dirW, 0 }, { wine_test_dirW, f1W, 0 }, - { wine_test_dirW, wine_test_dirW, -1 }, { f1W_subdir, f2W, 0 }, { f1W, f1W, 1 }, { not_existW, f1W, 0 }, @@ -1429,6 +1428,11 @@ static void test_Equivalent(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } + errno = 0xdeadbeef; + val = p_Equivalent(wine_test_dirW, wine_test_dirW); + ok(val == 1 || broken(val == -1), "_Equivalent() returned %d, expected %d\n", val, 1); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(DeleteFileW(f1W), "expect wine_test_dir/f1 to exist\n"); ok(DeleteFileW(f2W), "expect wine_test_dir/f2 to exist\n"); ok(p_Remove_dir(wine_test_dirW), "expect wine_test_dir to exist\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f0e5cfd7b..a632659f9a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15632,6 +15632,24 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) return ret; } +/* _Equivalent, msvcp140 version */ +int __cdecl _Equivalent(WCHAR const* path1, WCHAR const* path2) +{ + HANDLE h1, h2; + int ret; + + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); + + h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ret = equivalent_handles(h1, h2); + CloseHandle(h1); + CloseHandle(h2); + return ret; +} + /* ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */ /* ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z */ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path)

1 0