wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Andrey Gusev : api-ms-win-appmodel-runtime-l1-1-2: Add dll.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: d56c576bc1fe5be78e98c9972343b5093e141935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c576bc1fe5be78e98c9972… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 3 12:01:11 2017 +0300 api-ms-win-appmodel-runtime-l1-1-2: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in | 1 + .../api-ms-win-appmodel-runtime-l1-1-2.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index cc49fa4..74fd4d4 100755 --- a/configure +++ b/configure @@ -881,6 +881,7 @@ enable_advpack enable_amstream enable_api_ms_win_appmodel_identity_l1_1_0 enable_api_ms_win_appmodel_runtime_l1_1_1 +enable_api_ms_win_appmodel_runtime_l1_1_2 enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 @@ -17953,6 +17954,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-appmodel-identity-l1-1-0 enable_api_ms_win_appmodel_identity_l1_1_0 wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-1 enable_api_ms_win_appmodel_runtime_l1_1_1 +wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-2 enable_api_ms_win_appmodel_runtime_l1_1_2 wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 diff --git a/configure.ac b/configure.ac index b958ff3..2f6922f 100644 --- a/configure.ac +++ b/configure.ac @@ -2734,6 +2734,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-appmodel-identity-l1-1-0) WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in new file mode 100644 index 0000000..ea8597e --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-appmodel-runtime-l1-1-2.dll diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec new file mode 100644 index 0000000..ce38d95 --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -0,0 +1,17 @@ +@ stub AppPolicyGetClrCompat +@ stub AppPolicyGetCreateFileAccess +@ stub AppPolicyGetLifecycleManagement +@ stub AppPolicyGetMediaFoundationCodecLoading +@ stub AppPolicyGetProcessTerminationMethod +@ stub AppPolicyGetShowDeveloperDiagnostic +@ stub AppPolicyGetThreadInitializationType +@ stub AppPolicyGetWindowingModel +@ stub GetApplicationUserModelIdFromToken +@ stub GetPackageFamilyNameFromToken +@ stub GetPackageFullNameFromToken +@ stub OpenPackageInfoByFullNameForUser +@ stub VerifyApplicationUserModelId +@ stub VerifyPackageFamilyName +@ stub VerifyPackageFullName +@ stub VerifyPackageId +@ stub VerifyPackageRelativeApplicationId diff --git a/tools/make_specfiles b/tools/make_specfiles index 3d29af8..d5747c4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -292,6 +292,7 @@ my @dll_groups = ], [ "kernelbase", + "api-ms-win-appmodel-runtime-l1-1-2", "api-ms-win-core-quirks-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ],

1 0

Nikolay Sivov : ws2_32/tests: Initialize address length argument before calling recvfrom()/WSARecvFrom( ) (Coverity).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 4f8c3d4750ea8f87d19adb706478b0ee3c6fbb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8c3d4750ea8f87d19adb706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 3 11:56:41 2017 +0300 ws2_32/tests: Initialize address length argument before calling recvfrom()/WSARecvFrom() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 91305f9..137c0f6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6862,7 +6862,7 @@ static DWORD CALLBACK write_watch_thread( void *arg ) { struct write_watch_thread_args *args = arg; struct sockaddr addr; - int addr_len, ret; + int addr_len = sizeof(addr), ret; DWORD bytes, flags = 0; WSABUF buf[1];

1 0

Nikolay Sivov : shell32: Improve error handling in ParseName() (Coverity).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 4c160b6f8cb74de09c32c9dba4f35eca6dc97131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c160b6f8cb74de09c32c9dba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 3 11:41:10 2017 +0300 shell32: Improve error handling in ParseName() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 0baab6b..11890f1 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1536,10 +1536,10 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem return S_FALSE; if ((hr = IShellFolder2_GetDisplayNameOf(This->folder, pidl, SHGDN_FORPARSING, &strret)) == S_OK) - StrRetToBSTR(&strret, pidl, &path); + hr = StrRetToBSTR(&strret, pidl, &path); ILFree(pidl); - if (FAILED(hr)) + if (hr != S_OK) return S_FALSE; hr = FolderItem_Constructor(This, path, item);

1 0

Nikolay Sivov : wbemprox/tests: Fix some leaks (Valgrind).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 5773203afd0636b942078fd37b94be779bb6af5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5773203afd0636b942078fd37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 21:35:05 2017 +0300 wbemprox/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8ff9803..083a717 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1012,6 +1012,7 @@ static void test_SystemSecurity( IWbemServices *services ) win_skip( "__SystemSecurity not available\n" ); return; } + IWbemClassObject_Release( reg ); sid_size = sizeof(sid_admin_buffer); ret = CreateWellKnownSid( WinBuiltinAdministratorsSid, NULL, sid_admin, &sid_size ); @@ -1297,6 +1298,7 @@ static void test_PhysicalMemory( IWbemServices *services ) VariantClear( &val ); IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); }

1 0

Alexandre Julliard : ws2_32: Lock the user output buffer during receives.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: dc203dd83318b0addda1e09ac596005ba00ca6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc203dd83318b0addda1e09ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 13:36:40 2017 +0200 ws2_32: Lock the user output buffer during receives. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 +++ dlls/ntdll/virtual.c | 33 +++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 4 +++- dlls/ws2_32/tests/sock.c | 5 ----- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5e27f0a..ab801ac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1480,6 +1480,9 @@ @ cdecl wine_server_send_fd(long) @ cdecl __wine_make_process_system() +# Virtual memory +@ cdecl __wine_locked_recvmsg(long ptr long) + # Version @ cdecl wine_get_version() NTDLL_wine_get_version @ cdecl wine_get_build_id() NTDLL_wine_get_build_id diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d0d25c7..7bb4eb4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -32,6 +32,9 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -1904,6 +1907,36 @@ ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) } +/*********************************************************************** + * __wine_locked_recvmsg + */ +ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) +{ + sigset_t sigset; + size_t i; + BOOL has_write_watch = FALSE; + int err = EFAULT; + + ssize_t ret = recvmsg( fd, hdr, flags ); + if (ret != -1 || errno != EFAULT) return ret; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + for (i = 0; i < hdr->msg_iovlen; i++) + if (check_write_access( hdr->msg_iov[i].iov_base, hdr->msg_iov[i].iov_len, &has_write_watch )) + break; + if (i == hdr->msg_iovlen) + { + ret = recvmsg( fd, hdr, flags ); + err = errno; + } + if (has_write_watch) + while (i--) update_write_watches( hdr->msg_iov[i].iov_base, hdr->msg_iov[i].iov_len, 0 ); + + server_leave_uninterrupted_section( &csVirtual, &sigset ); + errno = err; + return ret; +} + /*********************************************************************** * virtual_is_valid_code_address diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 681f340..79b9333 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -241,6 +241,8 @@ static struct interface_filter generic_interface_filter = { }; #endif /* LINUX_BOUND_IF */ +extern ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ); + /* * The actual definition of WSASendTo, wrapped in a different function name * so that internal calls from ws2_32 itself will not trigger programs like @@ -2356,7 +2358,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa, int flags ) hdr.msg_flags = 0; #endif - while ((n = recvmsg(fd, &hdr, flags)) == -1) + while ((n = __wine_locked_recvmsg( fd, &hdr, flags )) == -1) { if (errno != EINTR) return -1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02f7473..91305f9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6962,13 +6962,10 @@ static void test_write_watch(void) send(src, "test message", sizeof("test message"), 0); ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); - todo_wine - { ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); ok( !memcmp( base + 0x4000, "message", 8 ), "wrong data %s\n", base + 0x4000 ); - } count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); @@ -6984,7 +6981,6 @@ static void test_write_watch(void) bufs[1].len = 0x4000; bufs[1].buf = base + 0x2000; ret = WSARecvFrom( dest, bufs, 2, NULL, &flags, &addr, &addr_len, &ov, NULL); - todo_wine ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", ret, GetLastError()); @@ -6992,7 +6988,6 @@ static void test_write_watch(void) ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); ok( count == 5, "wrong count %lu\n", count ); - todo_wine ok( !base[0], "data set\n" ); send(src, "test message", sizeof("test message"), 0);

1 0

Alexandre Julliard : server: Use the correct process when looking for a mapped dll.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: c583953b95cddcb8d2712b9d2312681b9c371ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c583953b95cddcb8d2712b9d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 11:59:20 2017 +0200 server: Use the correct process when looking for a mapped dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 18 ++++++++++++++---- server/file.h | 4 ++-- server/mapping.c | 15 +++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 37f1934..79b7e52 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -147,6 +147,7 @@ static int fill_create_process_event( struct debug_event *event, const void *arg struct process *process = thread->process; struct process_dll *exe_module = get_process_exe_module( process ); const client_ptr_t *entry = arg; + struct file *file; obj_handle_t handle; /* documented: PROCESS_VM_READ | PROCESS_VM_WRITE */ @@ -170,8 +171,12 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.unicode = 1; /* the doc says write access too, but this doesn't seem a good idea */ - event->data.create_process.file = open_mapping_file( debugger, exe_module->base, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE ); + if ((file = get_mapping_file( process, exe_module->base, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ))) + { + event->data.create_process.file = alloc_handle( debugger, file, GENERIC_READ, 0 ); + release_object( file ); + } return 1; } @@ -191,8 +196,10 @@ static int fill_exit_process_event( struct debug_event *event, const void *arg ) static int fill_load_dll_event( struct debug_event *event, const void *arg ) { + struct process *process = event->sender->process; struct process *debugger = event->debugger->process; const struct process_dll *dll = arg; + struct file *file; event->data.load_dll.handle = 0; event->data.load_dll.base = dll->base; @@ -200,8 +207,11 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; - event->data.load_dll.handle = open_mapping_file( debugger, dll->base, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE ); + if ((file = get_mapping_file( process, dll->base, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE ))) + { + event->data.load_dll.handle = alloc_handle( debugger, file, GENERIC_READ, 0 ); + release_object( file ); + } return 1; } diff --git a/server/file.h b/server/file.h index 403da65..31946cc 100644 --- a/server/file.h +++ b/server/file.h @@ -149,8 +149,8 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, - unsigned int access, unsigned int sharing ); +extern struct file *get_mapping_file( struct process *process, client_ptr_t base, + unsigned int access, unsigned int sharing ); extern void free_mapped_views( struct process *process ); extern int get_page_size(void); diff --git a/server/mapping.c b/server/mapping.c index 0e4143f..096c15e 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -733,19 +733,14 @@ struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, u return (struct mapping *)get_handle_obj( process, handle, access, &mapping_ops ); } -/* open a new file handle to the file backing the mapping */ -obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, - unsigned int access, unsigned int sharing ) +/* open a new file for the file descriptor backing the mapping */ +struct file *get_mapping_file( struct process *process, client_ptr_t base, + unsigned int access, unsigned int sharing ) { - obj_handle_t handle; struct memory_view *view = find_mapped_view( process, base ); - struct file *file; - if (!view || !view->fd) return 0; - if (!(file = create_file_for_fd_obj( view->fd, access, sharing ))) return 0; - handle = alloc_handle( process, file, access, 0 ); - release_object( file ); - return handle; + if (!view || !view->fd) return NULL; + return create_file_for_fd_obj( view->fd, access, sharing ); } static void mapping_dump( struct object *obj, int verbose )

1 0

Alexandre Julliard : server: Fix allocation size (Coverity).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 541e7ba79a0084d51dced4e14f2d4af0217f2abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=541e7ba79a0084d51dced4e14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 10:28:50 2017 +0200 server: Fix allocation size (Coverity). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 57641d1..0e4143f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -600,7 +600,7 @@ static struct ranges *create_ranges(void) if (!ranges) return NULL; ranges->count = 0; ranges->max = 8; - if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(ranges->ranges) ))) + if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(*ranges->ranges) ))) { release_object( ranges ); return NULL;

1 0

Austin English : readme: Document that wine can be run from the build directory.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: c6ac658019b00e366cee59bf4c7ac923d696b59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ac658019b00e366cee59bf4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 2 12:40:47 2017 -0500 readme: Document that wine can be run from the build directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README b/README index 70cb004..3d2e4cf 100644 --- a/README +++ b/README @@ -19,6 +19,14 @@ run: ./configure make +Then either install wine: + +make install + +Or run from it the build directory: + +./wine notepad + Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and especially the wealth of information found at http://www.winehq.org.

1 0

Jacek Caban : server: Add FileFsDeviceInformation implementation for named pipes.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 3f07c6e256d59f6564ffb6be09e0dffe7c09e061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f07c6e256d59f6564ffb6be0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 16:42:24 2017 +0200 server: Add FileFsDeviceInformation implementation for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index c448526..897c44b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1115,25 +1115,21 @@ static void test_volume_info(void) memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); - todo_wine { ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), "Characteristics = %x\n", device_info->Characteristics ); - } memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); - todo_wine { ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), "Characteristics = %x\n", device_info->Characteristics ); - } CloseHandle( read ); CloseHandle( write ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6dd2fd6..d0ec38f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -156,6 +156,7 @@ static const struct object_ops named_pipe_ops = static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); +static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -196,7 +197,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_server_flush, /* flush */ - no_fd_get_volume_info, /* get_volume_info */ + pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ @@ -240,7 +241,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ - no_fd_get_volume_info, /* get_volume_info */ + pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ @@ -685,6 +686,28 @@ static int pipe_client_flush( struct fd *fd, struct async *async ) return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; } +static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) +{ + switch (info_class) + { + case FileFsDeviceInformation: + { + static const FILE_FS_DEVICE_INFORMATION device_info = + { + FILE_DEVICE_NAMED_PIPE, + FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL + }; + if (get_reply_max_size() >= sizeof(device_info)) + set_reply_data( &device_info, sizeof(device_info) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } +} + static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) { struct pipe_message *message;

1 0

Jacek Caban : server: Allow server side NtQueryVolumeInformationFile implementation.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 2ab2f31f18fd2089c311a529f80a9d5ff6a52beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab2f31f18fd2089c311a529f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 16:42:16 2017 +0200 server: Allow server side NtQueryVolumeInformationFile implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 15 ++++++++++++++- include/wine/server_protocol.h | 18 +++++++++++++++++- server/change.c | 1 + server/console.c | 1 + server/device.c | 1 + server/fd.c | 18 ++++++++++++++++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/protocol.def | 7 +++++++ server/request.h | 6 ++++++ server/serial.c | 1 + server/sock.c | 2 ++ server/trace.c | 14 ++++++++++++++ 16 files changed, 93 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ab2f31f18fd2089c311a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017