October 2018 - Wine-Commits

Nikolay Sivov : kernel32/tests: Remove workarounds for SearchPath().
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 6a106ac9bf5f14eb05a9d42106674b13a9d2bc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a106ac9bf5f14eb05a9d421… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 11:39:35 2018 +0300 kernel32/tests: Remove workarounds for SearchPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 64 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index df91b31..1f3d385 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -70,8 +70,6 @@ static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); -static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); -static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); @@ -1828,24 +1826,18 @@ static void test_SearchPathA(void) HANDLE handle; DWORD ret; - if (!pSearchPathA) - { - win_skip("SearchPathA isn't available\n"); - return; - } - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); /* NULL filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1861,38 +1853,38 @@ static void test_SearchPathA(void) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); ret = pActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too */ - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); @@ -1918,23 +1910,17 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; - if (!pSearchPathW) - { - win_skip("SearchPathW isn't available\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ - pSearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); } GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ret = SearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1950,15 +1936,15 @@ if (0) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); /* full path, name without 'dll' extension */ GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pSearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret == 0, "got %d\n", ret); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -1967,33 +1953,33 @@ if (0) ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too, meaning it takes precedence over normal search order */ - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); /* path is built using on manifest file name */ - ret = pSearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ret = pDeactivateActCtx(0, cookie); @@ -2134,8 +2120,6 @@ static void init_pointers(void) MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); - MAKEFUNC(SearchPathA); - MAKEFUNC(SearchPathW); MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW);

1 0

Francois Gouget : hnetcfg: Add a trailing '\n' to a TRACE().
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: da4df48ae7bb0f89736688dc81e7ed8da617f3bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4df48ae7bb0f89736688dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:14:47 2018 +0200 hnetcfg: Add a trailing '\n' to a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 7f3f6c5..2bb589a 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -631,7 +631,7 @@ static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void } else if(IsEqualGUID( riid, &IID_IProvideClassInfo)) { - TRACE("IProvideClassInfo not supported."); + TRACE("IProvideClassInfo not supported.\n"); return E_NOINTERFACE; } else

1 0

Alexandre Julliard : server: Add a separate request to exec a new process.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: a77ef5c44345701eca6fbbf065e0de3b8f88b6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77ef5c44345701eca6fbbf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 11:44:25 2018 +0200 server: Add a separate request to exec a new process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 +-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 43 ++++++++++++++++++++++++++++++++---------- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 6 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c3dc113..d0f269c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2228,9 +2228,8 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ { wine_server_send_fd( socketfd[1] ); close( socketfd[1] ); - SERVER_START_REQ( new_process ) + SERVER_START_REQ( exec_process ) { - req->create_flags = flags; req->socket_fd = socketfd[1]; req->exe_file = wine_server_obj_handle( hFile ); req->cpu = pe_info->cpu; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d3aa8e2..76d5f79 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -745,6 +745,20 @@ struct new_process_reply +struct exec_process_request +{ + struct request_header __header; + int socket_fd; + obj_handle_t exe_file; + cpu_type_t cpu; +}; +struct exec_process_reply +{ + struct reply_header __header; +}; + + + struct get_new_process_info_request { struct request_header __header; @@ -5632,6 +5646,7 @@ struct terminate_job_reply enum request { REQ_new_process, + REQ_exec_process, REQ_get_new_process_info, REQ_new_thread, REQ_get_startup_info, @@ -5928,6 +5943,7 @@ union generic_request struct request_max_size max_size; struct request_header request_header; struct new_process_request new_process_request; + struct exec_process_request exec_process_request; struct get_new_process_info_request get_new_process_info_request; struct new_thread_request new_thread_request; struct get_startup_info_request get_startup_info_request; @@ -6222,6 +6238,7 @@ union generic_reply struct request_max_size max_size; struct reply_header reply_header; struct new_process_reply new_process_reply; + struct exec_process_reply exec_process_reply; struct get_new_process_info_reply get_new_process_info_reply; struct new_thread_reply new_thread_reply; struct get_startup_info_reply get_startup_info_reply; @@ -6512,6 +6529,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 567 +#define SERVER_PROTOCOL_VERSION 568 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index b512141..b609a62 100644 --- a/server/process.c +++ b/server/process.c @@ -1112,16 +1112,6 @@ DECL_HANDLER(new_process) return; } - if (!req->info_size) /* create an orphaned process */ - { - if ((process = create_process( socket_fd, NULL, 0, sd ))) - { - create_thread( -1, process, NULL ); - release_object( process ); - } - return; - } - /* build the startup info for a new process */ if (!(info = alloc_object( &startup_info_ops ))) { @@ -1238,6 +1228,39 @@ DECL_HANDLER(new_process) release_object( info ); } +/* execute a new process, replacing the existing one */ +DECL_HANDLER(exec_process) +{ + struct process *process; + int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); + + if (socket_fd == -1) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (fcntl( socket_fd, F_SETFL, O_NONBLOCK ) == -1) + { + set_error( STATUS_INVALID_HANDLE ); + close( socket_fd ); + return; + } + if (shutdown_stage) + { + set_error( STATUS_SHUTDOWN_IN_PROGRESS ); + close( socket_fd ); + return; + } + if (!is_cpu_supported( req->cpu )) + { + close( socket_fd ); + return; + } + if (!(process = create_process( socket_fd, NULL, 0, NULL ))) return; + create_thread( -1, process, NULL ); + release_object( process ); +} + /* Retrieve information about a newly started process */ DECL_HANDLER(get_new_process_info) { diff --git a/server/protocol.def b/server/protocol.def index d849f73..96cb2d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -754,6 +754,14 @@ struct rawinput_device @END +/* Execute a process, replacing the current one */ +(a)REQ(exec_process) + int socket_fd; /* file descriptor for process socket */ + obj_handle_t exe_file; /* file handle for main exe */ + cpu_type_t cpu; /* CPU that the new process will use */ +(a)END + + /* Retrieve information about a newly started process */ @REQ(get_new_process_info) obj_handle_t info; /* info handle returned from new_process_request */ diff --git a/server/request.h b/server/request.h index 5044bf3..3719bbd 100644 --- a/server/request.h +++ b/server/request.h @@ -113,6 +113,7 @@ static inline void set_reply_data_ptr( void *data, data_size_t size ) /* ### make_requests begin ### */ DECL_HANDLER(new_process); +DECL_HANDLER(exec_process); DECL_HANDLER(get_new_process_info); DECL_HANDLER(new_thread); DECL_HANDLER(get_startup_info); @@ -408,6 +409,7 @@ typedef void (*req_handler)( const void *req, void *reply ); static const req_handler req_handlers[REQ_NB_REQUESTS] = { (req_handler)req_new_process, + (req_handler)req_exec_process, (req_handler)req_get_new_process_info, (req_handler)req_new_thread, (req_handler)req_get_startup_info, @@ -740,6 +742,10 @@ C_ASSERT( FIELD_OFFSET(struct new_process_reply, info) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); C_ASSERT( sizeof(struct new_process_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, socket_fd) == 12 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, exe_file) == 16 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 20 ); +C_ASSERT( sizeof(struct exec_process_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_request, info) == 12 ); C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, success) == 8 ); diff --git a/server/trace.c b/server/trace.c index 36d3021..087e3dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1246,6 +1246,13 @@ static void dump_new_process_reply( const struct new_process_reply *req ) fprintf( stderr, ", handle=%04x", req->handle ); } +static void dump_exec_process_request( const struct exec_process_request *req ) +{ + fprintf( stderr, " socket_fd=%d", req->socket_fd ); + fprintf( stderr, ", exe_file=%04x", req->exe_file ); + dump_cpu_type( ", cpu=", &req->cpu ); +} + static void dump_get_new_process_info_request( const struct get_new_process_info_request *req ) { fprintf( stderr, " info=%04x", req->info ); @@ -4529,6 +4536,7 @@ static void dump_terminate_job_request( const struct terminate_job_request *req static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, + (dump_func)dump_exec_process_request, (dump_func)dump_get_new_process_info_request, (dump_func)dump_new_thread_request, (dump_func)dump_get_startup_info_request, @@ -4821,6 +4829,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_reply, + NULL, (dump_func)dump_get_new_process_info_reply, (dump_func)dump_new_thread_reply, (dump_func)dump_get_startup_info_reply, @@ -5113,6 +5122,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { static const char * const req_names[REQ_NB_REQUESTS] = { "new_process", + "exec_process", "get_new_process_info", "new_thread", "get_startup_info",

1 0

Dmitry Timoshkov : kernel32: GetShortPathName should fail when called with a wildcard.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 3a78ec672a4c1635d848e0253f45127cb8690f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a78ec672a4c1635d848e025… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:38 2018 +0300 kernel32: GetShortPathName should fail when called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 11 ++++++++++- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7dcb937..a9db7e8 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ +static const WCHAR wildcardsW[] = {'*','?',0}; + /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) { @@ -445,7 +447,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WIN32_FIND_DATAW wfd; HANDLE goit; - TRACE("%s\n", debugstr_w(longpath)); + TRACE("%s,%p,%u\n", debugstr_w(longpath), shortpath, shortlen); if (!longpath) { @@ -474,6 +476,13 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 4; } + if (strpbrkW(longpath + lp, wildcardsW)) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + /* check for drive letter */ if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 5ca69d3..f0cfb4d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1477,9 +1477,7 @@ static void test_GetShortPathNameW(void) lstrcpyW(ptr, wildW); SetLastError(0xdeadbeef); length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); lstrcpyW(ptr, a_bcdeW);

1 0

Jacek Caban : ntdll: Set IO_STATUS_BLOCK on non-blocking NtFlushBuffersFile success.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 6bcd695c786575d7ba136b3fa7016085977167b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcd695c786575d7ba136b3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:19:17 2018 +0200 ntdll: Set IO_STATUS_BLOCK on non-blocking NtFlushBuffersFile success. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 21 ++++++++++++++------- dlls/ntdll/tests/file.c | 2 -- dlls/ntdll/tests/pipe.c | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 93af301..77d2d32 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3298,13 +3298,15 @@ NTSTATUS WINAPI NtSetEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, * Success: 0. IoStatusBlock is updated. * Failure: An NTSTATUS error code describing the error. */ -NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock ) +NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) { NTSTATUS ret; - HANDLE hEvent = NULL; + HANDLE wait_handle; enum server_fd_type type; int fd, needs_close; + if (!io || !virtual_check_buffer_for_write( io, sizeof(io) )) return STATUS_ACCESS_VIOLATION; + ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); if (ret == STATUS_ACCESS_DENIED) ret = server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); @@ -3317,16 +3319,21 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { SERVER_START_REQ( flush ) { - req->async = server_async( hFile, NULL, NULL, NULL, NULL, IoStatusBlock ); + req->async = server_async( hFile, NULL, NULL, NULL, NULL, io ); ret = wine_server_call( req ); - hEvent = wine_server_ptr_handle( reply->event ); + wait_handle = wine_server_ptr_handle( reply->event ); + if (wait_handle && ret != STATUS_PENDING) + { + io->u.Status = ret; + io->Information = 0; + } } SERVER_END_REQ; - if (hEvent) + if (wait_handle) { - NtWaitForSingleObject( hEvent, FALSE, NULL ); - ret = STATUS_SUCCESS; + NtWaitForSingleObject( wait_handle, FALSE, NULL ); + ret = io->u.Status; } } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0f4281d..e523990 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4501,11 +4501,9 @@ static void test_flush_buffers_file(void) ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); status = pNtFlushBuffersFile(hfile, &io_status_block); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 798df53..45c8466 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1378,8 +1378,8 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) { ok(status == STATUS_SUCCESS, "status = %x in %s state %u\n", status, is_server ? "server" : "client", state); - todo_wine ok(io.Status == status, "io.Status = %x\n", io.Status); + ok(!io.Information, "io.Information = %lx\n", io.Information); } if (state != FILE_PIPE_CONNECTED_STATE)

1 0

Gijs Vermeulen : include: Add FS_FILE_ENCRYPTION definition.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: a87097ba89c12dac44c0e68cbeace51257f0c4cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87097ba89c12dac44c0e68c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:45 2018 +0200 include: Add FS_FILE_ENCRYPTION definition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 7b99424..c38da9c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1194,6 +1194,7 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define FS_PERSISTENT_ACLS FILE_PERSISTENT_ACLS #define FS_VOL_IS_COMPRESSED FILE_VOLUME_IS_COMPRESSED #define FS_FILE_COMPRESSION FILE_FILE_COMPRESSION +#define FS_FILE_ENCRYPTION FILE_SUPPORTS_ENCRYPTION #define MUTEX_MODIFY_STATE MUTANT_QUERY_STATE #define MUTEX_ALL_ACCESS MUTANT_ALL_ACCESS

1 0

Gijs Vermeulen : include: Add FMS* definitions.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 7c0430bb557be16bb548586fbef5afda75c661b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0430bb557be16bb548586f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:44 2018 +0200 include: Add FMS* definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wfext.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/include/wfext.h b/include/wfext.h index e28c997..92cb4fb 100644 --- a/include/wfext.h +++ b/include/wfext.h @@ -57,6 +57,104 @@ extern "C" { #define FM_GETFILESEL WINELIB_NAME_AW(FM_GETFILESEL) #define FM_GETFILESELLFN WINELIB_NAME_AW(FM_GETFILESELLFN) +typedef struct _FMS_GETFILESELA +{ + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + CHAR szName[260]; +} FMS_GETFILESELA, *LPFMS_GETFILESELA; + +typedef struct _FMS_GETFILESELW +{ + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + WCHAR szName[260]; +} FMS_GETFILESELW, *LPFMS_GETFILESELW; + +#define FMS_GETFILESEL WINELIB_NAME_AW(FMS_GETFILESEL) +#define LPFMS_GETFILESEL WINELIB_NAME_AW(LPFMS_GETFILESEL) + +typedef struct _FMS_GETDRIVEINFOA +{ + DWORD dwTotalSpace; + DWORD dwFreeSpace; + CHAR szPath[260]; + CHAR szVolume[14]; + CHAR szShare[128]; +} FMS_GETDRIVEINFOA, *LPFMS_GETDRIVEINFOA; + +typedef struct _FMS_GETDRIVEINFOW +{ + DWORD dwTotalSpace; + DWORD dwFreeSpace; + WCHAR szPath[260]; + WCHAR szVolume[14]; + WCHAR szShare[128]; +} FMS_GETDRIVEINFOW, *LPFMS_GETDRIVEINFOW; + +#define FMS_GETDRIVEINFO WINELIB_NAME_AW(FMS_GETDRIVEINFO) +#define LPFMS_GETDRIVEINFO WINELIB_NAME_AW(LPFMS_GETDRIVEINFO) + +typedef struct _FMS_LOADA +{ + DWORD dwSize; + CHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADA, *LPFMS_LOADA; + +typedef struct _FMS_LOADW +{ + DWORD dwSize; + WCHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADW, *LPFMS_LOADW; + +#define FMS_LOAD WINELIB_NAME_AW(FMS_LOAD) +#define LPFMS_LOAD WINELIB_NAME_AW(LPFMS_LOAD) + +typedef struct tagEXT_BUTTON +{ + WORD idCommand; + WORD idsHelp; + WORD fsStyle; +} EXT_BUTTON, *LPEXT_BUTTON; + +typedef struct tagFMS_TOOLBARLOAD +{ + DWORD dwSize; + LPEXT_BUTTON lpButtons; + WORD cButtons; + WORD cBitmaps; + WORD idBitmap; + HBITMAP hBitmap; +} FMS_TOOLBARLOAD, *LPFMS_TOOLBARLOAD; + +typedef struct tagFMS_HELPSTRINGA +{ + INT idCommand; + HMENU hMenu; + CHAR szHelp[128]; +} FMS_HELPSTRINGA, *LPFMS_HELPSTRINGA; + +typedef struct tagFMS_HELPSTRINGW +{ + INT idCommand; + HMENU hMenu; + WCHAR szHelp[128]; +} FMS_HELPSTRINGW, *LPFMS_HELPSTRINGW; + +#define FMS_HELPSTRING WINELIB_NAME_AW(FMS_HELPSTRING) +#define LPFMS_HELPSTRING WINELIB_NAME_AW(LPFMS_HELPSTRING) + +typedef DWORD (WINAPI *FM_EXT_PROC)(HWND,WORD,LONG); +typedef DWORD (WINAPI *FM_UNDELETE_PROCA)(HWND,LPSTR); +typedef DWORD (WINAPI *FM_UNDELETE_PROCW)(HWND,LPWSTR); +DECL_WINELIB_TYPE_AW(FM_UNDELETE_PROC); + LONG WINAPI FMExtensionProc(HWND,WORD,LONG); LONG WINAPI FMExtensionProcW(HWND,WORD,LONG);

1 0

Jacek Caban : server: Improve error handling of disconnected named pipe clients.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: dd1769a16a8977f2eb106d04f6530a590a77fdd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1769a16a8977f2eb106d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:37 2018 +0200 server: Improve error handling of disconnected named pipe clients. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 1 - dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 10 ++++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b85e6ee..7f77df1 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1506,7 +1506,6 @@ static int test_DisconnectNamedPipe(void) ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n", ret, GetLastError()); ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 51024a2..798df53 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1348,7 +1348,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_PIPE_BROKEN; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) @@ -1363,7 +1362,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) buf, 1, buf+1, 1); if (!status || status == STATUS_PENDING) status = io.Status; - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1373,7 +1371,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) status = NtFlushBuffersFile(pipe, &io); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) { - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "status = %x in %s state %u\n", status, is_server ? "server" : "client", state); } @@ -1472,7 +1469,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_BUFFER_OVERFLOW; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (status == STATUS_BUFFER_OVERFLOW) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0d98bf8..ebd8c4f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -501,6 +501,12 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); + if (!pipe_end->pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + } + if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) { fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); @@ -888,7 +894,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) set_error( STATUS_PIPE_BROKEN ); return 0; default: - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; } @@ -932,7 +938,7 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) if (!pipe_end->connection) { - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; }

1 0

Dmitry Timoshkov : kernel32/tests: Add some tests for GetLongPathName/ GetShortPathName called with a wildcard.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 9bc6068843430f2874c53374323cd0cfe4996755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc6068843430f2874c53374… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:35 2018 +0300 kernel32/tests: Add some tests for GetLongPathName/GetShortPathName called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf3..5ca69d3 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1186,7 +1186,7 @@ static void test_GetTempPath(void) static void test_GetLongPathNameA(void) { DWORD length, explength, hostsize; - char tempfile[MAX_PATH]; + char tempfile[MAX_PATH], *name; char longpath[MAX_PATH]; char unc_prefix[MAX_PATH]; char unc_short[MAX_PATH], unc_long[MAX_PATH]; @@ -1197,7 +1197,17 @@ static void test_GetLongPathNameA(void) return; GetTempPathA(MAX_PATH, tempfile); - lstrcatA(tempfile, "longfilename.longext"); + name = tempfile + strlen(tempfile); + + strcpy(name, "*"); + SetLastError(0xdeadbeef); + length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); +todo_wine + ok(!length, "GetLongPathNameA should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + strcpy(name, "longfilename.longext"); file = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CloseHandle(file); @@ -1401,6 +1411,7 @@ static void test_GetShortPathNameW(void) static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + static const WCHAR wildW[] = { '*',0 }; WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; @@ -1463,6 +1474,15 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path )); ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + lstrcpyW(ptr, wildW); + SetLastError(0xdeadbeef); + length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); +todo_wine + ok(!length, "GetShortPathNameW should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + lstrcpyW(ptr, a_bcdeW); ret = DeleteFileW( path ); ok( ret, "Cannot delete file.\n" ); *ptr = 0;

1 0

Francois Gouget : po: Remove spaces before '\n's.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: c0539c6bfe0956f3afab97754320176578f64a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0539c6bfe0956f3afab9775… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:13:12 2018 +0200 po: Remove spaces before '\n's. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 8 ++++---- po/tr.po | 5 ++--- po/zh_CN.po | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8a99e0f..9370c8d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13000,18 +13000,18 @@ msgstr "" " Compatible avec toute autre option. Ignorée.\n" " /C Importer le contenu d'un fichier de registre.\n" " /D Effacer une clé de registre spécifiée.\n" -" /E Exporter le contenu d'une clé de registre spécifiée dans \n" +" /E Exporter le contenu d'une clé de registre spécifiée dans\n" " fichier. Si aucune clé n'est spécifiée, le registre " -"entier \n" +"entier\n" " est exporté.\n" " /S Mode silencieux. Aucun message ne sera affiché.\n" " /V Lancer l'interface graphique en mode avancé. Ignorée.\n" " /? Afficher ces informations et se terminer.\n" " [nom_fichier] L'emplacement du fichier contenant des informations de " -"registre \n" +"registre\n" " à importer.\n" " Si utilisée avec [/E], cette option spécifie " -"l'emplacement \n" +"l'emplacement\n" " du fichier où les informations du registre seront " "exportées.\n" " [clé_registre] La clé de registre à modifier.\n" diff --git a/po/tr.po b/po/tr.po index 85212a1..0a7a6ab 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12700,10 +12700,9 @@ msgstr "" " /S Sessiz kip. Herhangi bir ileti gösterilmez.\n" " /V Kullanıcı arayüzü gelişmiş kipte başlatılır. Önemsenmez.\n" " /? Bu yardımı gösterir.\n" -" [dosyaadı] Dışarıya verilecek kayıt bilgileri içeren dosyanın " -"konumu. \n" +" [dosyaadı] Dışarıya verilecek kayıt bilgileri içeren dosyanın konumu.\n" " [/E] seçeneğiyle kullanıldığında, kayıt bilgileri içeren " -"dosyanın \n" +"dosyanın\n" " nereye kaydedileceği belirtilir.\n" " [kayıt_anahtarı] Değiştirilecek kayıt defteri anahtarı.\n" "\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9051fc2..2e1b4c7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -15475,7 +15475,7 @@ msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" "语法:\n" -"XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H] \n" +"XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" "说明:\n"

1 0