October 2018 - Wine-commits

Dmitry Timoshkov : kernel32: MoveFile(source, source) should succeed.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 7edfcd63ada3206b62f4fcee7b65d7a165a0cd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7edfcd63ada3206b62f4fcee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Oct 14 10:44:37 2018 +0300 kernel32: MoveFile(source, source) should succeed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 15 ++++++++++----- dlls/kernel32/tests/file.c | 2 +- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 48a3e33..33b2358 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1281,7 +1281,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - HANDLE source_handle = 0, dest_handle; + HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; DWORD options; @@ -1341,18 +1341,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - NtClose( dest_handle ); if (!(flag & MOVEFILE_REPLACE_EXISTING)) { - SetLastError( ERROR_ALREADY_EXISTS ); - RtlFreeUnicodeString( &nt_name ); - goto error; + if (!is_same_file( source_handle, dest_handle )) + { + SetLastError( ERROR_ALREADY_EXISTS ); + RtlFreeUnicodeString( &nt_name ); + goto error; + } } else if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) /* cannot replace directory */ { SetLastError( ERROR_ACCESS_DENIED ); goto error; } + + NtClose( dest_handle ); } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1412,6 +1416,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, error: if (source_handle) NtClose( source_handle ); + if (dest_handle) NtClose( dest_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); return FALSE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 433a2e5..87e722b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1894,7 +1894,7 @@ static void test_MoveFileA(void) ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); ret = MoveFileA(source, source); - todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); ret = MoveFileA(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 2e63555..ac38aa6 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1529,7 +1529,7 @@ static void test_tr2_sys__Rename(void) CloseHandle(file); ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1"); - todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index a3f9211..870573e 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1148,7 +1148,7 @@ static void test_Rename(void) CloseHandle(file); ret = p_Rename(f1W, f1W); - todo_wine ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 797a9cc..bb27c6d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1313,8 +1313,8 @@ file move succeeded @todo_wine(a)bar@or_broken(a)baz read-only files are moveable file moved in subdirectory -(a)todo_wine@moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! -(a)todo_wine@ErrorLevel: 0(a)or_broken@ErrorLevel: 1 +moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! +ErrorLevel: 0(a)or_broken@ErrorLevel: 1 --- directory move simple directory move succeeded moving a directory to itself gives error; errlevel 1

1 0

Dmitry Timoshkov : kernel32: MoveFile should make sure that it has the delete access to the source file.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: f184a396a86782318886cd5b7239ebf655809033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f184a396a86782318886cd5b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Oct 14 10:44:40 2018 +0300 kernel32: MoveFile should make sure that it has the delete access to the source file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 7 ++++--- dlls/kernel32/tests/file.c | 20 ++++++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 33b2358..841a12b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1310,7 +1310,8 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &source_handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &source_handle, DELETE | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) status = wine_nt_to_unix_file_name( &nt_name, &source_unix, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); @@ -1334,11 +1335,11 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; - status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); + status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { if (!(flag & MOVEFILE_REPLACE_EXISTING)) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 87e722b..0c99fca 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1914,12 +1914,10 @@ static void test_MoveFileA(void) ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError()); ret = MoveFileA(source, dest); - todo_wine { - ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ - "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); CloseHandle(hmapfile); CloseHandle(hfile); @@ -1934,12 +1932,10 @@ static void test_MoveFileA(void) ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError()); ret = MoveFileA(source, dest); - todo_wine { - ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ - "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); CloseHandle(hmapfile); CloseHandle(hfile);

1 0

Michał Janiszewski : winevulkan: Remove duplicate format_string in make_vulkan.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: ad242e7d41fc42969afd7367f68fff3991efd697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad242e7d41fc42969afd7367… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Fri Oct 12 00:07:53 2018 +0200 winevulkan: Remove duplicate format_string in make_vulkan. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 65ea2ef..bd04ad4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1334,9 +1334,6 @@ class VkParam(object): return self._direction - def format_string(self): - return self.format_str - def dispatch_table(self): """ Return functions dispatch table pointer for dispatchable objects. """

1 0

Michał Janiszewski : winevulkan: Print all the arguments in make_vulkan.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 83fd23347a7fccc85ea57c7e05cc21e432c5d5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fd23347a7fccc85ea57c7e… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Fri Oct 12 00:07:54 2018 +0200 winevulkan: Print all the arguments in make_vulkan. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index bd04ad4..82b4c8d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1162,7 +1162,7 @@ class VkParam(object): self._set_conversions() def __repr__(self): - return "{0} {1} {2} {3} {4}".format(self.const, self.type, self.pointer, self.name, self.array_len, self.dyn_array_len) + return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, self.dyn_array_len) @staticmethod def from_xml(param, types):

1 0

Louis Lenders : mscms: Add stub for WcsEnumColorProfilesSize.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 920b1371ac470f616280b37f1cd213081d3559a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=920b1371ac470f616280b37f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 15 14:21:31 2018 +0200 mscms: Add stub for WcsEnumColorProfilesSize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45994 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 10 ++++++++++ include/icm.h | 7 +++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index 9992bf5..f521ac6 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -89,7 +89,7 @@ @ stub WcsCreateIccProfile @ stub WcsDisassociateColorProfileFromDevice @ stub WcsEnumColorProfiles -@ stub WcsEnumColorProfilesSize +@ stdcall WcsEnumColorProfilesSize(long ptr ptr) @ stub WcsGetCalibrationManagementState @ stub WcsGetDefaultColorProfile @ stub WcsGetDefaultColorProfileSize diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 53016ef..039a271 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1535,3 +1535,13 @@ BOOL WINAPI WcsGetUsePerUserProfiles( const WCHAR* name, DWORD class, BOOL* use_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsEnumColorProfilesSize [MSCMS.@] + */ +BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTYPEW *record, DWORD *size ) +{ + FIXME( "%d %p %p\n", scope, record, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/include/icm.h b/include/icm.h index 8a666fa..fbbdede 100644 --- a/include/icm.h +++ b/include/icm.h @@ -176,6 +176,12 @@ typedef enum BM_16b_GRAY, } BMFORMAT, *PBMFORMAT, *LPBMFORMAT; +typedef enum +{ + WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE, + WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER +} WCS_PROFILE_MANAGEMENT_SCOPE; + typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; @@ -403,6 +409,7 @@ BOOL WINAPI UninstallColorProfileW(PCWSTR,PCWSTR,BOOL); BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) +BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); #define PROFILE_FILENAME 1

1 0

Louis Lenders : kernel32: Add stub for MoveFileTransacted{A,W}.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 35f62f644d069a2bb568a17f35a1af9a089b585a URL: https://source.winehq.org/git/wine.git/?a=commit;h=35f62f644d069a2bb568a17f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 15 14:28:32 2018 +0200 kernel32: Add stub for MoveFileTransacted{A,W}. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45995 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 19 +++++++++++++++++++ include/winbase.h | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e17ee97..52120dd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1088,8 +1088,8 @@ @ stdcall MoveFileA(str str) @ stdcall MoveFileExA(str str long) @ stdcall MoveFileExW(wstr wstr long) -# @ stub MoveFileTransactedA -# @ stub MoveFileTransactedW +@ stdcall MoveFileTransactedA(str str ptr ptr long ptr) +@ stdcall MoveFileTransactedW(wstr wstr ptr ptr long ptr) @ stdcall MoveFileW(wstr wstr) @ stdcall MoveFileWithProgressA(str str ptr ptr long) @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 841a12b..7dcb937 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1268,6 +1268,25 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, return ret; } +/************************************************************************** + * MoveFileTransactedA (KERNEL32.@) + */ +BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) +{ + FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/************************************************************************** + * MoveFileTransactedW (KERNEL32.@) + */ +BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) +{ + FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /************************************************************************** * MoveFileWithProgressW (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index ea450e1..7b99424 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2425,6 +2425,9 @@ WINBASEAPI BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR); WINBASEAPI BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD); WINBASEAPI BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD); #define MoveFileEx WINELIB_NAME_AW(MoveFileEx) +WINBASEAPI BOOL WINAPI MoveFileTransactedA(const char*,const char*,LPPROGRESS_ROUTINE,void*,DWORD,HANDLE); +WINBASEAPI BOOL WINAPI MoveFileTransactedW(const WCHAR*,const WCHAR*,LPPROGRESS_ROUTINE,void*,DWORD,HANDLE); +#define MoveFileTransacted WINELIB_NAME_AW(MoveFiletransacted) WINBASEAPI BOOL WINAPI MoveFileWithProgressA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); WINBASEAPI BOOL WINAPI MoveFileWithProgressW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); #define MoveFileWithProgress WINELIB_NAME_AW(MoveFileWithProgress)

1 0

Alexandre Julliard : kernel32: Pass the standard process parameters structure to create_process().
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: ed551282b4121f94f619682ad0d2fcbf982d7f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed551282b4121f94f619682a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 17:00:31 2018 +0200 kernel32: Pass the standard process parameters structure to create_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 135 ++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed551282b4121f94f619…

1 0

Alexandre Julliard : kernel32: Pass the standard process parameters structure to fork_and_exec().
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 27ba57e80444e2ba25e7f9a59d067bd022b678da URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ba57e80444e2ba25e7f9a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 17:05:31 2018 +0200 kernel32: Pass the standard process parameters structure to fork_and_exec(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 58 +++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6c9c8cf..f56bb09 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1663,14 +1663,13 @@ static char **build_envp( const WCHAR *envW ) * * Fork and exec a new Unix binary, checking for errors. */ -static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHAR *env, - const char *newdir, DWORD flags, STARTUPINFOW *startup ) +static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir, DWORD flags ) { int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; - char **argv, **envp; + char *filename, **argv, **envp; - if (!env) env = GetEnvironmentStringsW(); + if (!(filename = wine_get_unix_file_name( params->ImagePathName.Buffer ))) return -1; #ifdef HAVE_PIPE2 if (pipe2( fd, O_CLOEXEC ) == -1) @@ -1679,42 +1678,19 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (pipe(fd) == -1) { SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + HeapFree( GetProcessHeap(), 0, filename ); return -1; } fcntl( fd[0], F_SETFD, FD_CLOEXEC ); fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) - { - HANDLE hstdin, hstdout, hstderr; - - if (startup->dwFlags & STARTF_USESTDHANDLES) - { - hstdin = startup->hStdInput; - hstdout = startup->hStdOutput; - hstderr = startup->hStdError; - } - else - { - hstdin = GetStdHandle(STD_INPUT_HANDLE); - hstdout = GetStdHandle(STD_OUTPUT_HANDLE); - hstderr = GetStdHandle(STD_ERROR_HANDLE); - } + wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); + wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + wine_server_handle_to_fd( params->hStdError, FILE_WRITE_DATA, &stderr_fd, NULL ); - if (is_console_handle( hstdin )) - hstdin = wine_server_ptr_handle( console_handle_unmap( hstdin )); - if (is_console_handle( hstdout )) - hstdout = wine_server_ptr_handle( console_handle_unmap( hstdout )); - if (is_console_handle( hstderr )) - hstderr = wine_server_ptr_handle( console_handle_unmap( hstderr )); - wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); - wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); - wine_server_handle_to_fd( hstderr, FILE_WRITE_DATA, &stderr_fd, NULL ); - } - - argv = build_argv( cmdline, 0 ); - envp = build_envp( env ); + argv = build_argv( params->CommandLine.Buffer, 0 ); + envp = build_envp( params->Environment ); if (!(pid = fork())) /* child */ { @@ -1772,6 +1748,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA } HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, envp ); + HeapFree( GetProcessHeap(), 0, filename ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); if (stderr_fd != -1) close( stderr_fd ); @@ -2743,18 +2720,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A } /* fall through */ case BINARY_UNIX_EXE: - { - /* unknown file, try as unix executable */ - char *unix_name; - - TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); - - if ((unix_name = wine_get_unix_file_name( name ))) - { - retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags, startup_info ) != -1); - HeapFree( GetProcessHeap(), 0, unix_name ); - } - } + /* unknown file, try as unix executable */ + TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); + retv = (fork_and_exec( params, unixdir, flags ) != -1); break; } if (hFile) CloseHandle( hFile );

1 0

Stefan Dösinger : ddraw/tests: Look for more messages when losing focus.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 4e80641d87f2fa8d1fbf50f9485709058d062ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e80641d87f2fa8d1fbf50f9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:50 2018 -0700 ddraw/tests: Look for more messages when losing focus. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- dlls/ddraw/tests/ddraw4.c | 6 +++++- dlls/ddraw/tests/ddraw7.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ee4fa5b..aad7bbf 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2447,8 +2447,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9394705..29c3c84 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2572,8 +2572,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6a3630a..7cf61ce 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2713,8 +2713,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5bb2951..6ae4207 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2442,8 +2442,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now.

1 0

Stefan Dösinger : wined3d: Deactivate the device before minimizing the window.
by Alexandre Julliard 15 Oct '18

15 Oct '18

Module: wine Branch: master Commit: 222d30754e55ac32939e0689dcb027e7a4518150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=222d30754e55ac32939e0689… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 16:13:51 2018 -0700 wined3d: Deactivate the device before minimizing the window. This fixes tabbing out of Deus Ex Game of the Year edition. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 -- dlls/wined3d/swapchain.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index abb2a89..70d43e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5319,8 +5319,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL for (i = 0; i < device->swapchain_count; i++) wined3d_swapchain_activate(device->swapchains[i], wparam); - - device->device_parent->ops->activate(device->device_parent, wparam); } else if (message == WM_SYSCOMMAND) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b068cf1..9c48de2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1162,6 +1162,9 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa device->adapter->ordinal, &swapchain->d3d_mode))) ERR("Failed to set display mode.\n"); } + + if (swapchain == device->swapchains[0]) + device->device_parent->ops->activate(device->device_parent, TRUE); } else { @@ -1171,6 +1174,17 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa swapchain->reapply_mode = TRUE; + /* Some DDraw apps (Deus Ex: GOTY, and presumably all UT 1 based games) destroy the device + * during window minimization. Do our housekeeping now, as the device may not exist after + * the ShowWindow call. + * + * In d3d9, the device is marked lost after the window is minimized. If we find an app + * that needs this behavior (e.g. because it calls TestCooperativeLevel in the window proc) + * we'll have to control this via a create flag. Note that the device and swapchain are not + * safe to access after the ShowWindow call. */ + if (swapchain == device->swapchains[0]) + device->device_parent->ops->activate(device->device_parent, FALSE); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) && IsWindowVisible(swapchain->device_window)) ShowWindow(swapchain->device_window, SW_MINIMIZE);

1 0