May 2015 - Wine-Commits - list.winehq.org

André Hentschel : server: Allow 32-bit connections on ARM64.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 6adcad498c6c68aaff1bd3bd1c97880717a09a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6adcad498c6c68aaff1bd3bd1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 5 23:50:36 2015 +0200 server: Allow 32-bit connections on ARM64. --- server/process.h | 2 +- server/thread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/process.h b/server/process.h index 59625f0..fa7f60d 100644 --- a/server/process.h +++ b/server/process.h @@ -107,7 +107,7 @@ struct process_snapshot }; #define CPU_FLAG(cpu) (1 << (cpu)) -#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64) +#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64)) /* process functions */ diff --git a/server/thread.c b/server/thread.c index 906b79d..6c5d12d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -62,7 +62,7 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__arm__) static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #elif defined(__aarch64__) -static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64); +static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64) | CPU_FLAG(CPU_ARM); #else #error Unsupported CPU #endif

1 0

Nikolay Sivov : shell32: Implement Application property of IShellFolderViewDual.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: ce87d64ab4414e5786c6d05a1001a0a312c1284e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce87d64ab4414e5786c6d05a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 08:35:47 2015 +0300 shell32: Implement Application property of IShellFolderViewDual. --- dlls/shell32/shlview.c | 9 +++- dlls/shell32/tests/shelldispatch.c | 87 ++++++++++++++++++++++++++------------ include/shldisp.idl | 18 +++++--- 3 files changed, 78 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8352157..6ddb937 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3518,8 +3518,13 @@ static HRESULT WINAPI shellfolderviewdual_get_Application(IShellFolderViewDual3 IDispatch **disp) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p %p\n", This, disp); - return E_NOTIMPL; + + TRACE("%p %p\n", This, disp); + + if (!disp) + return E_INVALIDARG; + + return IShellDispatch_Constructor(NULL, &IID_IDispatch, (void**)disp); } static HRESULT WINAPI shellfolderviewdual_get_Parent(IShellFolderViewDual3 *iface, IDispatch **disp) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index b7773ad..f034132 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -364,8 +364,42 @@ static void test_service(void) IShellDispatch2_Release(sd); } +static void test_dispatch_typeinfo(IDispatch *disp, REFIID *riid) +{ + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + UINT count; + HRESULT hr; + + count = 10; + hr = IDispatch_GetTypeInfoCount(disp, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IDispatch_GetTypeInfo(disp, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "got 0x%08x\n", hr); + while (!IsEqualGUID(*riid, &IID_NULL)) { + if (IsEqualGUID(&typeattr->guid, *riid)) + break; + riid++; + } + ok(IsEqualGUID(&typeattr->guid, *riid), "unexpected type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); +} + static void test_ShellFolderViewDual(void) { + static const REFIID shelldisp_riids[] = { + &IID_IShellDispatch6, + &IID_IShellDispatch5, + &IID_IShellDispatch4, + &IID_NULL + }; IShellFolderViewDual *viewdual; IShellFolder *desktop, *tmpdir; IShellView *view, *view2; @@ -399,6 +433,18 @@ static void test_ShellFolderViewDual(void) hr = IShellFolderViewDual_QueryInterface(viewdual, &IID_IShellView, (void**)&view2); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + /* get_Application() */ + +if (0) /* crashes on pre-vista */ { + hr = IShellFolderViewDual_get_Application(viewdual, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + hr = IShellFolderViewDual_get_Application(viewdual, &disp2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(disp2 != (IDispatch*)viewdual, "got %p, %p\n", disp2, viewdual); + test_dispatch_typeinfo(disp2, shelldisp_riids); + IDispatch_Release(disp2); + IShellFolderViewDual_Release(viewdual); IDispatch_Release(disp); @@ -510,35 +556,29 @@ todo_wine { ok(ret == 0, "got %d\n", ret); } else { + static const REFIID browser_riids[] = { + &IID_IWebBrowser2, + &IID_NULL + }; + + static const REFIID viewdual_riids[] = { + &IID_IShellFolderViewDual3, + &IID_NULL + }; + IShellFolderViewDual *view; IShellBrowser *sb, *sb2; IServiceProvider *sp; IDispatch *doc, *app; - ITypeInfo *typeinfo; - TYPEATTR *typeattr; IWebBrowser2 *wb; IShellView *sv; IUnknown *unk; - UINT count; ok(disp != NULL, "got %p\n", disp); ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ - count = 10; - hr = IDispatch_GetTypeInfoCount(disp, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 1, "got %u\n", count); - - hr = IDispatch_GetTypeInfo(disp, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&typeattr->guid, &IID_IWebBrowser2), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); - - ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); - ITypeInfo_Release(typeinfo); + test_dispatch_typeinfo(disp, browser_riids); /* IWebBrowser2 */ hr = IDispatch_QueryInterface(disp, &IID_IWebBrowser2, (void**)&wb); @@ -556,18 +596,9 @@ todo_wine hr = IWebBrowser2_get_Document(wb, &doc); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { - hr = IDispatch_GetTypeInfo(doc, 0, LOCALE_SYSTEM_DEFAULT, &typeinfo); - ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) + test_dispatch_typeinfo(doc, viewdual_riids); - hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&typeattr->guid, &IID_IShellFolderViewDual3), "type guid %s\n", wine_dbgstr_guid(&typeattr->guid)); - IDispatch_Release(doc); - - ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); - ITypeInfo_Release(typeinfo); -} IWebBrowser2_Release(wb); /* IServiceProvider */ diff --git a/include/shldisp.idl b/include/shldisp.idl index 506c5d2..56be778 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -403,7 +403,6 @@ interface FolderItemVerbs : IDispatch * IShellDispatch interface */ [ - object, uuid(d8f015c0-c278-11ce-a49e-444553540000), oleautomation, hidden, @@ -465,7 +464,6 @@ interface IShellDispatch : IDispatch } [ - object, uuid(a4c6892c-3ba9-11d2-9dea-00c04fb16162), oleautomation, hidden, @@ -486,7 +484,6 @@ interface IShellDispatch2 : IShellDispatch } [ - object, uuid(177160ca-bb5a-411c-841d-bd38facdeaa0), oleautomation, hidden, @@ -498,7 +495,6 @@ interface IShellDispatch3 : IShellDispatch2 } [ - object, uuid(efd84b2d-4bcf-4298-be25-eb542a59fbda), oleautomation, hidden, @@ -513,7 +509,6 @@ interface IShellDispatch4 : IShellDispatch3 } [ - object, uuid(866738b9-6cf2-4de8-8767-f794ebe74f4e), oleautomation, hidden, @@ -525,11 +520,22 @@ interface IShellDispatch5 : IShellDispatch4 } [ + uuid(286e6f1b-7113-4355-9562-96b7e9d64c54), + oleautomation, + hidden, + dual, +] +interface IShellDispatch6 : IShellDispatch5 +{ + HRESULT SearchCommand(void); +} + +[ uuid(13709620-c279-11ce-a49e-444553540000) ] coclass Shell { - [default] interface IShellDispatch2; + [default] interface IShellDispatch6; } [

1 0

Alexandre Julliard : ntoskrnl: Add support for read and write requests.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 2cd717a604ace11de820d85211ea1e5143c21fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd717a604ace11de820d8521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 14:24:00 2015 +0900 ntoskrnl: Add support for read and write requests. --- dlls/ntoskrnl.exe/ntoskrnl.c | 159 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 125 insertions(+), 34 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f8e1f18..de99970 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -128,26 +128,96 @@ static HANDLE get_device_manager(void) return ret; } -/* process an ioctl request for a given device */ -static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, - ULONG in_size, ULONG out_size, HANDLE ioctl ) +static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp ) { - IRP *irp; - void *out_buff = NULL; - FILE_OBJECT file; LARGE_INTEGER count; + FILE_OBJECT file; - TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, out_size ); + irp->RequestorMode = UserMode; + irp->Tail.Overlay.OriginalFileObject = &file; - /* so we can spot things that we should initialize */ memset( &file, 0x88, sizeof(file) ); + file.FsContext = NULL; + file.FsContext2 = NULL; + + KeQueryTickCount( &count ); /* update the global KeTickCount */ + + device->CurrentIrp = irp; + + IoCallDriver( device, irp ); + + device->CurrentIrp = NULL; + + return STATUS_SUCCESS; +} + +/* process a read request for a given device */ +static NTSTATUS dispatch_read( DEVICE_OBJECT *device, const irp_params_t *params, + void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ) +{ + IRP *irp; + void *out_buff; + LARGE_INTEGER offset; + IO_STACK_LOCATION *irpsp; + + TRACE( "device %p size %u\n", device, out_size ); + + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; + + offset.QuadPart = params->read.pos; - if ((code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); + /* note: we abuse UserIosb to store the server irp handle */ + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_READ, device, out_buff, out_size, + &offset, NULL, irp_handle ))) + { + HeapFree( GetProcessHeap(), 0, out_buff ); + return STATUS_NO_MEMORY; + } + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->Parameters.Read.Key = params->read.key; + + return dispatch_irp( device, irp ); +} + +/* process a write request for a given device */ +static NTSTATUS dispatch_write( DEVICE_OBJECT *device, const irp_params_t *params, + void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ) +{ + IRP *irp; + LARGE_INTEGER offset; + IO_STACK_LOCATION *irpsp; + + TRACE( "device %p size %u\n", device, in_size ); + + offset.QuadPart = params->write.pos; + + /* note: we abuse UserIosb to store the server irp handle */ + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_WRITE, device, in_buff, in_size, + &offset, NULL, irp_handle ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->Parameters.Write.Key = params->write.key; + + return dispatch_irp( device, irp ); +} + +/* process an ioctl request for a given device */ +static NTSTATUS dispatch_ioctl( DEVICE_OBJECT *device, const irp_params_t *params, + void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ) +{ + IRP *irp; + void *out_buff = NULL; + + TRACE( "ioctl %x device %p in_size %u out_size %u\n", params->ioctl.code, device, in_size, out_size ); + + if ((params->ioctl.code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); if (out_size) { if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; - if ((code & 3) == METHOD_BUFFERED) + if ((params->ioctl.code & 3) == METHOD_BUFFERED) { memcpy( out_buff, in_buff, in_size ); in_buff = out_buff; @@ -155,29 +225,50 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, } /* note: we abuse UserIosb to store the server handle to the ioctl */ - irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, out_size, - FALSE, NULL, (IO_STATUS_BLOCK *)ioctl ); + irp = IoBuildDeviceIoControlRequest( params->ioctl.code, device, in_buff, in_size, out_buff, out_size, + FALSE, NULL, irp_handle ); if (!irp) { HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_NO_MEMORY; } - irp->RequestorMode = UserMode; - irp->Tail.Overlay.OriginalFileObject = &file; - - file.FsContext = NULL; - file.FsContext2 = NULL; - - KeQueryTickCount( &count ); /* update the global KeTickCount */ - - device->CurrentIrp = irp; - - IoCallDriver( device, irp ); - - device->CurrentIrp = NULL; - - return STATUS_SUCCESS; -} + return dispatch_irp( device, irp ); +} + +typedef NTSTATUS (*dispatch_func)( DEVICE_OBJECT *device, const irp_params_t *params, + void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ); + +static const dispatch_func dispatch_funcs[IRP_MJ_MAXIMUM_FUNCTION + 1] = +{ + NULL, /* IRP_MJ_CREATE */ + NULL, /* IRP_MJ_CREATE_NAMED_PIPE */ + NULL, /* IRP_MJ_CLOSE */ + dispatch_read, /* IRP_MJ_READ */ + dispatch_write, /* IRP_MJ_WRITE */ + NULL, /* IRP_MJ_QUERY_INFORMATION */ + NULL, /* IRP_MJ_SET_INFORMATION */ + NULL, /* IRP_MJ_QUERY_EA */ + NULL, /* IRP_MJ_SET_EA */ + NULL, /* IRP_MJ_FLUSH_BUFFERS */ + NULL, /* IRP_MJ_QUERY_VOLUME_INFORMATION */ + NULL, /* IRP_MJ_SET_VOLUME_INFORMATION */ + NULL, /* IRP_MJ_DIRECTORY_CONTROL */ + NULL, /* IRP_MJ_FILE_SYSTEM_CONTROL */ + dispatch_ioctl, /* IRP_MJ_DEVICE_CONTROL */ + NULL, /* IRP_MJ_INTERNAL_DEVICE_CONTROL */ + NULL, /* IRP_MJ_SHUTDOWN */ + NULL, /* IRP_MJ_LOCK_CONTROL */ + NULL, /* IRP_MJ_CLEANUP */ + NULL, /* IRP_MJ_CREATE_MAILSLOT */ + NULL, /* IRP_MJ_QUERY_SECURITY */ + NULL, /* IRP_MJ_SET_SECURITY */ + NULL, /* IRP_MJ_POWER */ + NULL, /* IRP_MJ_SYSTEM_CONTROL */ + NULL, /* IRP_MJ_DEVICE_CHANGE */ + NULL, /* IRP_MJ_QUERY_QUOTA */ + NULL, /* IRP_MJ_SET_QUOTA */ + NULL, /* IRP_MJ_PNP */ +}; /*********************************************************************** @@ -235,16 +326,16 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) switch(status) { case STATUS_SUCCESS: - switch (irp_params.major) + if (irp_params.major > IRP_MJ_MAXIMUM_FUNCTION || + !dispatch_funcs[irp_params.major] || + !device->DriverObject->MajorFunction[irp_params.major]) { - case IRP_MJ_DEVICE_CONTROL: - status = process_ioctl( device, irp_params.ioctl.code, in_buff, in_size, out_size, irp ); - break; - default: - FIXME( "unsupported request %u\n", irp_params.major ); + WARN( "unsupported request %u\n", irp_params.major ); status = STATUS_NOT_SUPPORTED; break; } + status = dispatch_funcs[irp_params.major]( device, &irp_params, + in_buff, in_size, out_size, irp ); if (status == STATUS_SUCCESS) irp = 0; /* status reported by IoCompleteRequest */ break; case STATUS_BUFFER_OVERFLOW:

1 0

Alexandre Julliard : ntdll: Fallback to server calls for read and write on objects without a file descriptor.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: c07a0561dbaba98305aa2bf8744d5c65a2043094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07a0561dbaba98305aa2bf87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 13:35:57 2015 +0900 ntdll: Fallback to server calls for read and write on objects without a file descriptor. --- dlls/ntdll/file.c | 179 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 140 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d25c792..e43ef41 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -353,6 +353,14 @@ struct async_fileio_write unsigned int count; }; +struct async_irp +{ + struct async_fileio io; + HANDLE event; /* async event */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ +}; + static struct async_fileio *fileio_freelist; static void release_fileio( struct async_fileio *io ) @@ -387,6 +395,33 @@ static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROU return io; } +/* callback for irp async I/O completion */ +static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ) +{ + struct async_irp *async = user; + + if (status == STATUS_ALERTED) + { + SERVER_START_REQ( get_irp_result ) + { + req->handle = wine_server_obj_handle( async->io.handle ); + req->user_arg = wine_server_client_ptr( async ); + wine_server_set_reply( req, async->buffer, async->size ); + status = wine_server_call( req ); + if (status != STATUS_PENDING) io->Information = reply->size; + } + SERVER_END_REQ; + } + if (status != STATUS_PENDING) + { + io->u.Status = status; + *apc = async->io.apc; + *arg = async->io.apc_arg; + release_fileio( &async->io ); + } + return status; +} + /*********************************************************************** * FILE_GetNtStatus(void) * @@ -499,6 +534,102 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, return status; } +/* do a read call through the server */ +static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, void *buffer, ULONG size, + LARGE_INTEGER *offset, ULONG *key ) +{ + struct async_irp *async; + NTSTATUS status; + HANDLE wait_handle; + ULONG options; + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; + + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + return STATUS_NO_MEMORY; + + async->event = event; + async->buffer = buffer; + async->size = size; + + SERVER_START_REQ( read ) + { + req->blocking = !apc && !event && !cvalue; + req->async.handle = wine_server_obj_handle( handle ); + req->async.callback = wine_server_client_ptr( irp_completion ); + req->async.iosb = wine_server_client_ptr( io ); + req->async.arg = wine_server_client_ptr( async ); + req->async.event = wine_server_obj_handle( event ); + req->async.cvalue = cvalue; + req->pos = offset ? offset->QuadPart : 0; + wine_server_set_reply( req, buffer, size ); + status = wine_server_call( req ); + wait_handle = wine_server_ptr_handle( reply->wait ); + options = reply->options; + if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + + if (wait_handle) + { + NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); + status = io->u.Status; + NtClose( wait_handle ); + } + + return status; +} + +/* do a write call through the server */ +static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, const void *buffer, ULONG size, + LARGE_INTEGER *offset, ULONG *key ) +{ + struct async_irp *async; + NTSTATUS status; + HANDLE wait_handle; + ULONG options; + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; + + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + return STATUS_NO_MEMORY; + + async->event = event; + async->buffer = NULL; + async->size = 0; + + SERVER_START_REQ( write ) + { + req->blocking = !apc && !event && !cvalue; + req->async.handle = wine_server_obj_handle( handle ); + req->async.callback = wine_server_client_ptr( irp_completion ); + req->async.iosb = wine_server_client_ptr( io ); + req->async.arg = wine_server_client_ptr( async ); + req->async.event = wine_server_obj_handle( event ); + req->async.cvalue = cvalue; + req->pos = offset ? offset->QuadPart : 0; + wine_server_add_data( req, buffer, size ); + status = wine_server_call( req ); + wait_handle = wine_server_ptr_handle( reply->wait ); + options = reply->options; + if (status != STATUS_PENDING) io->Information = reply->size; + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + + if (wait_handle) + { + NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); + status = io->u.Status; + NtClose( wait_handle ); + } + + return status; +} + struct io_timeouts { int interval; /* max interval between two bytes */ @@ -675,6 +806,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_READ_DATA, &unix_handle, &needs_close, &type, &options ); + if (status == STATUS_BAD_DEVICE_TYPE) + return server_read_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); + if (status) return status; async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); @@ -1056,6 +1190,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &options ); + if (status == STATUS_BAD_DEVICE_TYPE) + return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); + if (status == STATUS_ACCESS_DENIED) { status = server_get_unix_fd( hFile, FILE_APPEND_DATA, &unix_handle, @@ -1352,42 +1489,6 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } -struct async_ioctl -{ - struct async_fileio io; - HANDLE event; /* async event */ - void *buffer; /* buffer for output */ - ULONG size; /* size of buffer */ -}; - -/* callback for ioctl async I/O completion */ -static NTSTATUS ioctl_completion( void *user, IO_STATUS_BLOCK *io, - NTSTATUS status, void **apc, void **arg ) -{ - struct async_ioctl *async = user; - - if (status == STATUS_ALERTED) - { - SERVER_START_REQ( get_irp_result ) - { - req->handle = wine_server_obj_handle( async->io.handle ); - req->user_arg = wine_server_client_ptr( async ); - wine_server_set_reply( req, async->buffer, async->size ); - status = wine_server_call( req ); - if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); - } - SERVER_END_REQ; - } - if (status != STATUS_PENDING) - { - io->u.Status = status; - *apc = async->io.apc; - *arg = async->io.apc_arg; - release_fileio( &async->io ); - } - return status; -} - /* do an ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, @@ -1395,13 +1496,13 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, const void *in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size ) { - struct async_ioctl *async; + struct async_irp *async; NTSTATUS status; HANDLE wait_handle; ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_ioctl *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; async->buffer = out_buffer; @@ -1412,7 +1513,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->code = code; req->blocking = !apc && !event && !cvalue; req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( ioctl_completion ); + req->async.callback = wine_server_client_ptr( irp_completion ); req->async.iosb = wine_server_client_ptr( io ); req->async.arg = wine_server_client_ptr( async ); req->async.event = wine_server_obj_handle( event );

1 0

Nikolay Sivov : shell32: Update to IShellDispatch6.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: c2ecf3b0bf1c906f20ae5dd6e6a80a1a5b42b866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ecf3b0bf1c906f20ae5dd6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 08:38:53 2015 +0300 shell32: Update to IShellDispatch6. --- dlls/shell32/shelldispatch.c | 142 +++++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2ecf3b0bf1c906f20ae5…

1 0

Alexandre Julliard : ntoskrnl: Flesh out IoBuildSynchronousFsdRequest implementation.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: a78f8f298a92237d08f9ed68586d490c3375c67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78f8f298a92237d08f9ed685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 14:22:52 2015 +0900 ntoskrnl: Flesh out IoBuildSynchronousFsdRequest implementation. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++++----- include/ddk/wdm.h | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7f6a1c7..f8e1f18 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -549,16 +549,30 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, PIRP irp; PIO_STACK_LOCATION irpsp; - FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); + TRACE("(%d %p %p %d %p %p %p)\n", majorfunc, device, buffer, length, startoffset, event, iosb); - irp = IoAllocateIrp( device->StackSize, FALSE ); - if (irp == NULL) - return NULL; + if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return NULL; irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; - /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ + irpsp->DeviceObject = device; + irpsp->CompletionRoutine = NULL; + + irp->AssociatedIrp.SystemBuffer = buffer; + if (device->Flags & DO_DIRECT_IO) IoAllocateMdl( buffer, length, FALSE, FALSE, irp ); + switch (majorfunc) + { + case IRP_MJ_READ: + irpsp->Parameters.Read.Length = length; + irpsp->Parameters.Read.ByteOffset = *startoffset; + break; + case IRP_MJ_WRITE: + irpsp->Parameters.Write.Length = length; + irpsp->Parameters.Write.ByteOffset = *startoffset; + break; + } + irp->RequestorMode = KernelMode; irp->UserIosb = iosb; irp->UserEvent = event; irp->UserBuffer = buffer; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c234375..10832cf 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1201,6 +1201,7 @@ PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); +PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PLARGE_INTEGER,PKEVENT,IO_STATUS_BLOCK*); NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**);

1 0

Alexandre Julliard : server: Make the APC callback optional in async calls.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 481517178ff7dd542966d7f11f3d61b3fc8a0776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481517178ff7dd542966d7f11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 17:10:31 2015 +0900 server: Make the APC callback optional in async calls. --- server/async.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/server/async.c b/server/async.c index a8f3b05..e1650fe 100644 --- a/server/async.c +++ b/server/async.c @@ -145,8 +145,6 @@ static void async_queue_destroy( struct object *obj ) /* notifies client thread of new status of its async request */ void async_terminate( struct async *async, unsigned int status ) { - apc_call_t data; - assert( status != STATUS_PENDING ); if (async->status != STATUS_PENDING) @@ -156,14 +154,22 @@ void async_terminate( struct async *async, unsigned int status ) return; } - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.func = async->data.callback; - data.async_io.user = async->data.arg; - data.async_io.sb = async->data.iosb; - data.async_io.status = status; - thread_queue_apc( async->thread, &async->obj, &data ); async->status = status; + + if (async->data.callback) + { + apc_call_t data; + + memset( &data, 0, sizeof(data) ); + data.type = APC_ASYNC_IO; + data.async_io.func = async->data.callback; + data.async_io.user = async->data.arg; + data.async_io.sb = async->data.iosb; + data.async_io.status = status; + thread_queue_apc( async->thread, &async->obj, &data ); + } + else async_set_result( &async->obj, STATUS_SUCCESS, 0, 0, 0 ); + async_reselect( async ); release_object( async ); /* so that it gets destroyed when the async is done */ }

1 0

Alexandre Julliard : server: Add a common structure to store irp parameters.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 311f78628618d25afa78149bedf9a3bce186c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=311f78628618d25afa78149be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 11:21:40 2015 +0900 server: Add a common structure to store irp parameters. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++------ include/wine/server_protocol.h | 31 ++++++++++++++++++++++++++----- server/device.c | 35 ++++++++++++++++++++++------------- server/protocol.def | 27 ++++++++++++++++++++++++--- server/request.h | 18 +++++++++--------- server/trace.c | 33 +++++++++++++++++++++++++++++---- tools/make_requests | 1 + 7 files changed, 116 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=311f78628618d25afa781…

1 0

Alexandre Julliard : server: Add read and write fd member functions.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 837b39b20284a101d103af8e78af37473a83756b URL: http://source.winehq.org/git/wine.git/?a=commit;h=837b39b20284a101d103af8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 12:17:45 2015 +0900 server: Add read and write fd member functions. Also rename no_flush() to no_fd_flush() for consistency. --- server/change.c | 4 +++- server/console.c | 4 +++- server/device.c | 4 +++- server/fd.c | 28 ++++++++++++++++++++++------ server/file.c | 4 +++- server/file.h | 13 ++++++++++--- server/mailslot.c | 12 +++++++++--- server/mapping.c | 4 +++- server/named_pipe.c | 12 +++++++++--- server/serial.c | 4 +++- server/sock.c | 10 +++++++--- 11 files changed, 75 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=837b39b20284a101d103a…

1 0

Alexandre Julliard : server: Retrieve ioctl data directly from the request.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 6f2ed23c160206ca71114b30eb43f72d6784ad9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2ed23c160206ca71114b30e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 12:02:59 2015 +0900 server: Retrieve ioctl data directly from the request. --- server/device.c | 7 ++++--- server/fd.c | 9 +++------ server/file.h | 9 +++------ server/named_pipe.c | 19 ++++++++++--------- server/sock.c | 6 ++---- 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/server/device.c b/server/device.c index 7ca5ba5..f7fa970 100644 --- a/server/device.c +++ b/server/device.c @@ -128,7 +128,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static enum server_fd_type device_get_fd_type( struct fd *fd ); static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ); + int blocking ); static const struct object_ops device_ops = { @@ -311,7 +311,7 @@ static struct irp_call *find_irp_call( struct device *device, struct thread *thr } static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ) + int blocking ) { struct device *device = get_fd_user( fd ); struct irp_call *irp; @@ -323,7 +323,8 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ return 0; } - if (!(irp = create_irp( device, IRP_MJ_DEVICE_CONTROL, data, size, get_reply_max_size() ))) + if (!(irp = create_irp( device, IRP_MJ_DEVICE_CONTROL, get_req_data(), get_req_data_size(), + get_reply_max_size() ))) return 0; irp->code = code; diff --git a/server/fd.c b/server/fd.c index e3b722c..a36df10 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2164,16 +2164,14 @@ static void unmount_device( struct fd *device_fd ) release_object( device ); } -obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ) +obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; } /* default ioctl() routine */ -obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ) +obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ) { switch(code) { @@ -2301,8 +2299,7 @@ DECL_HANDLER(ioctl) if (fd) { - reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, req->blocking, - get_req_data(), get_req_data_size() ); + reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, req->blocking ); reply->options = fd->options; release_object( fd ); } diff --git a/server/file.h b/server/file.h index 85e4257..a466354 100644 --- a/server/file.h +++ b/server/file.h @@ -42,8 +42,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform an ioctl on the file */ - obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking, - const void *data, data_size_t size); + obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); /* queue an async operation */ void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); /* selected events for async i/o need an update */ @@ -86,10 +85,8 @@ extern void default_poll_event( struct fd *fd, int event ); extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ); -extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ); +extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); +extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 706cce8..6d5fc5e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -144,7 +144,7 @@ static void pipe_server_destroy( struct object *obj); static void pipe_server_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ); + int blocking ); static const struct object_ops pipe_server_ops = { @@ -227,8 +227,8 @@ static struct object *named_pipe_device_open_file( struct object *obj, unsigned unsigned int sharing, unsigned int options ); static void named_pipe_device_destroy( struct object *obj ); static enum server_fd_type named_pipe_device_get_fd_type( struct fd *fd ); -static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ); +static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, + const async_data_t *async_data, int blocking ); static const struct object_ops named_pipe_device_ops = { @@ -591,7 +591,7 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) } static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ) + int blocking ) { struct pipe_server *server = get_fd_user( fd ); struct async *async; @@ -672,7 +672,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a return 0; default: - return default_fd_ioctl( fd, code, async_data, blocking, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking ); } } @@ -868,8 +868,8 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return &client->obj; } -static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ) +static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, + const async_data_t *async_data, int blocking ) { struct named_pipe_device *device = get_fd_user( fd ); @@ -877,7 +877,8 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c { case FSCTL_PIPE_WAIT: { - const FILE_PIPE_WAIT_FOR_BUFFER *buffer = data; + const FILE_PIPE_WAIT_FOR_BUFFER *buffer = get_req_data(); + data_size_t size = get_req_data_size(); obj_handle_t wait_handle = 0; struct named_pipe *pipe; struct pipe_server *server; @@ -931,7 +932,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c } default: - return default_fd_ioctl( fd, code, async_data, blocking, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking ); } } diff --git a/server/sock.c b/server/sock.c index 823c846..ad0ec71 100644 --- a/server/sock.c +++ b/server/sock.c @@ -130,8 +130,7 @@ static void sock_destroy_ifchange_q( struct sock *sock ); static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); -static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - int blocking, const void *data, data_size_t size ); +static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); @@ -534,8 +533,7 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } -obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - int blocking, const void *data, data_size_t size ) +obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, int blocking ) { struct sock *sock = get_fd_user( fd ); obj_handle_t wait_handle = 0;

1 0