March 2019 - Wine-Devel - list.winehq.org

[PATCH 1/2] kernel32: Partially implement VirtualAllocExNuma
by Fabian Maurer March 31, 2019

March 31, 2019

Ignoring the preferred node should be good enough Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46927 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c8d52cec58..1cf7b58a02 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1559,7 +1559,7 @@ @ stdcall VerifyVersionInfoW(long long int64) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) -# @ stub VirtualAllocExNuma +@ stdcall VirtualAllocExNuma(long ptr long long long long) @ stub VirtualBufferExceptionHandler @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 42da7f0d8c..e859dd4dcb 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -46,6 +46,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); +WINE_DECLARE_DEBUG_CHANNEL(virtual); /*********************************************************************** @@ -100,6 +101,32 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SI return ret; } +/*********************************************************************** + * VirtualAllocExNuma (KERNEL32.@) + * + * Seems to be just as VirtualAllocEx, but with a preferred NUMA node. + * + * PARAMS + * hProcess [I] Handle to process to do mem operation. + * addr [I] Address of region to reserve or commit. + * size [I] Size of region. + * type [I] Type of allocation. + * protect [I] Type of access protection. + * numa_node[I] Preferred NUMA node. + * + * + * RETURNS + * Success: Base address of allocated region of pages. + * Failure: NULL. + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocExNuma(HANDLE hProcess, LPVOID addr, SIZE_T size, + DWORD type, DWORD protect, DWORD numa_node) +{ + FIXME_(virtual)("Ignoring preferred numa_node\n"); + + return VirtualAllocEx(hProcess, addr, size, type, protect); +} + /*********************************************************************** * VirtualFree (KERNEL32.@) -- 2.21.0

2 3

Winetest fails to write to log file
by Isira Seneviratne March 31, 2019

March 31, 2019

Hi, I'm getting a bizarre issue where Winetest displays an error message box saying that it cannot write to the log file (error code is 6) with the attached patch applied to the code. I referred to the following Perl script as well: https://source.winehq.org/git/tools.git/blob/HEAD:/winetest/dissect Also, I tried iterating through the log file after all the tests have finished executing, but that does not display any results as intended, so I reverted to the method that I used in the prior patches. -- Isira Seneviratne isirasen96(a)gmail.com

2 1

[PATCH] dinput: Map wheel, gas, and brake axes as well
by Tim Schumacher March 31, 2019

March 31, 2019

The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 628674644e..d1e9d43470 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) { -- 2.21.0

1 2

[PATCH] kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE)
by Detlef Riekenberg March 31, 2019

March 31, 2019

Microsoft changed FormatMessageA/W and set LastError to ERROR_NO_WORK_DONE, when nothing was done. (After Sep. 2015, but before ot with Win10 v1709) I do not expect, that apps depend on this recently used failure-code, so I did not touch our implementation to save some bytes and code cycles Example failed tests: >From the big 90 failure package afer updating win7 to win10: http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_… win10_cw1-hd6800-1709-* fail since a long time. 30. Jan 2019 as example http://test.winehq.org/data/7003ba44892d39ec0f409c793b97a0c5f4ae72d0/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50231 One machine failed with ERROR_RESOURCE_TYPE_NOT_FOUND, so i changed that test also. -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/kernel32/tests/format_msg.c | 26 ++++++++++++++++++-------- include/winerror.h | 1 + 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78af9e..364741e6ff 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -155,7 +155,8 @@ static void test_message_from_string_wide(void) error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); - ok(error==0xdeadbeef, "last error %u\n", error); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error); /* format placeholder with no specifier */ SetLastError(0xdeadbeef); @@ -443,7 +444,8 @@ static void test_message_from_string(void) r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); - ok(GetLastError()==0xdeadbeef, + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), "last error %u\n", GetLastError()); /* format placeholder with no specifier */ @@ -745,7 +747,9 @@ static void test_message_ignore_inserts(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, @@ -855,7 +859,9 @@ static void test_message_ignore_inserts_wide(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, @@ -1294,8 +1300,9 @@ static void test_message_allocate_buffer(void) "", 0, 0, (char *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1391,8 +1398,9 @@ static void test_message_allocate_buffer_wide(void) empty, 0, 0, (WCHAR *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + /* Since Win10-1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1522,6 +1530,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, @@ -1533,6 +1542,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..79be438e16 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NO_DATA 232 #define ERROR_PIPE_NOT_CONNECTED 233 #define ERROR_MORE_DATA 234 +#define ERROR_NO_WORK_DONE 235 #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 -- 2.21.0.windows.1

1 0

[PATCH v2] kernel32/tests: Add tests for FindFirstFileA with invalid characters.
by Vijay Kiran Kamuju March 30, 2019

March 30, 2019

Includes testcases by Vincent Pelletier. Mark some test as todo. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/tests/file.c | 81 +++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..0d241df02e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2543,11 +2543,58 @@ static char get_windows_drive(void) return windowsdir[0]; } +struct +{ + const char *path; + BOOL expected; + BOOL todo; +} +static const invalid_char_tests[] = +{ + { "./test-dir", TRUE }, + { "./test-dir/", FALSE }, + { ".\\test-dir", TRUE }, + { ".\\test-dir\\", FALSE }, + { "/>test-dir", FALSE }, + { "<\"test->dir", FALSE }, + { "<test->dir", FALSE }, + { "\"test-dir\"", FALSE }, + { "\"test-file\"", FALSE }, + { "test-/>dir", FALSE }, + { "test-dir/", FALSE }, + { "test-dir//", FALSE }, + { "test-dir/:", FALSE }, + { "test-dir/?", TRUE }, + { "test-dir/*", TRUE }, + { "test-dir/<", TRUE, TRUE }, + { "test-dir/\"", TRUE, TRUE }, + { "test-dir/\\", FALSE }, + { "test-dir/|", FALSE }, + { "test-dir<", TRUE, TRUE }, + { "test-dir</", FALSE }, + { "test-dir<<<><><>\"\"\"\"<<<>", TRUE, TRUE }, + { "test-dir>\"", TRUE, TRUE }, + { "test-dir\"/", FALSE }, + { "test-dir\"<", TRUE, TRUE }, + { "test-dir\"\"", TRUE, TRUE }, + { "test-dir\\/", FALSE }, + { "test-dir\\\"", TRUE, TRUE }, + { "test-dir\\\\", FALSE }, + { "test-file/", FALSE }, + { "test-file\\", FALSE }, + { "test-file|", FALSE }, + { "test-file?", TRUE, TRUE }, + { "test-file*", TRUE }, + { "test-file>", TRUE, TRUE }, + { "test-file\"", TRUE, TRUE }, + { "test-file\\", FALSE }, +}; + static void test_FindFirstFileA(void) { HANDLE handle; WIN32_FIND_DATAA data; - int err; + int err, i; char buffer[5] = "C:\\"; char buffer2[100]; char nonexistent[MAX_PATH]; @@ -2715,6 +2762,38 @@ static void test_FindFirstFileA(void) err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + + /* try FindFirstFileA with invalid characters */ + CreateDirectoryA("test-dir", NULL); + _lclose(_lcreat("test-file", 0)); + + for (i = 0; i < sizeof(invalid_char_tests) / sizeof(invalid_char_tests[0]); i++) + { + handle = FindFirstFileA(invalid_char_tests[i].path, &data); + if (invalid_char_tests[i].expected) + { + if (invalid_char_tests[i].todo) + { + todo_wine ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + else + { + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + } + else + { + ok(handle == INVALID_HANDLE_VALUE, "FindFirstFileA on %s should fail\n", + invalid_char_tests[i].path); + } + if (handle != INVALID_HANDLE_VALUE) + FindClose(handle); + } + + DeleteFileA("test-file"); + RemoveDirectoryA("test-dir"); } static void test_FindNextFileA(void) -- 2.21.0

1 0

[PATCH resend] uianimation: Add stub dll
by Vijay Kiran Kamuju March 30, 2019

March 30, 2019

based on patch from Louis Lenders Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/uianimation/Makefile.in | 4 +++ dlls/uianimation/main.c | 46 +++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 4 +++ 5 files changed, 57 insertions(+) create mode 100644 dlls/uianimation/Makefile.in create mode 100644 dlls/uianimation/main.c create mode 100644 dlls/uianimation/uianimation.spec diff --git a/configure b/configure index 44d97a89f6..6f9013c3a5 100755 --- a/configure +++ b/configure @@ -1564,6 +1564,7 @@ enable_traffic enable_twain_32 enable_tzres enable_ucrtbase +enable_uianimation enable_uiautomationcore enable_uiribbon enable_unicows @@ -19970,6 +19971,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16 wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests +wine_fn_config_makefile dlls/uianimation enable_uianimation wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon diff --git a/configure.ac b/configure.ac index d5640ed0e9..6c725667dc 100644 --- a/configure.ac +++ b/configure.ac @@ -3691,6 +3691,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) +WINE_CONFIG_MAKEFILE(dlls/uianimation) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in new file mode 100644 index 0000000000..b504181b9a --- /dev/null +++ b/dlls/uianimation/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uianimation.dll + +C_SRCS = \ + main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c new file mode 100644 index 0000000000..0fa9bfb415 --- /dev/null +++ b/dlls/uianimation/main.c @@ -0,0 +1,46 @@ +/* + * Uianimation main file. + * + * Copyright (C) 2018 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "uianimation.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uianimation); + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p %d %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec new file mode 100644 index 0000000000..a43b12d26a --- /dev/null +++ b/dlls/uianimation/uianimation.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow() +@ stub DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer() -- 2.21.0

1 0

Wine staging 4.5 release
by Alistair Leslie-Hughes March 30, 2019

March 30, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.5 (759 patches are applied to wine vanilla) NOTE: All FAudio patches has been reverted due to the lack of official package support. This will allow games that require XAudio2 support to still function. Upstreamed (Either directly from staging or fixed with a similar patch). * winex11: Forward all clipping requests to the right thread (including fullscreen clipping). * advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs * uianimation.idl: Add more interfaces * imagehlp: Implement ImageLoad and cleanup ImageUnload. * imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes. * msi: Always return MSIDBSTATE_ERROR when MsiGetDatabaseState is called from a custom action. * urlmon: Use unescaped Urls for FTP actions. * urlmon/tests: Add FTP encoded url test. * d3dx9_36/tests: Add initial tests for dummy skininfo interface. * imagehlp: Catch invalid memory access in CheckSumMappedFile and add tests. * imagehlp: Fix checksum calculation for odd sizes. * wintrust/tests: Add tests for WinVerifyTrust. * wintrust/tests: Add some additional tests. * kernel32: Allow empty profile section and key name strings. Added: * [46470] opencl: Add support for OpenCL 1.2. Updated: * wined3d-Indexed_Vertex_Blending * wined3d-SWVP-shaders * dinput-remap-joystick * ddraw-version-check * ddraw-Rendering_Targets Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 2/2] po: Update French translation.
by Isira Seneviratne March 30, 2019

March 30, 2019

1 0

[PATCH 1/2] po: Update Sinhala translation.
by Isira Seneviratne March 30, 2019

March 30, 2019

1 0

[PATCH] uninstaller: Re-exec as 64-bit in wow64.
by Vincent Povirk March 30, 2019

March 30, 2019

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- programs/uninstaller/main.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 142d3d16f7..fa9a23c2d7 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -165,6 +165,31 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; int i = 1; + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } while( i<argc ) { -- 2.17.1

1 0