June 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : mfplat/tests: Added MFCreateMediaType test.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 9a06379d17f189440398ec0e3bab7af5fca2a075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a06379d17f189440398ec0e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 01:46:38 2017 +0000 mfplat/tests: Added MFCreateMediaType test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83e1538..edbce46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -191,6 +191,33 @@ static void init_functions(void) #undef X } +static void test_MFCreateMediaType(void) +{ + HRESULT hr; + IMFMediaType *mediatype; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + +if(0) +{ + /* Crash on Windows Vista/7 */ + hr = MFCreateMediaType(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaType_Release(mediatype); + + MFShutdown(); +} + + START_TEST(mfplat) { CoInitialize(NULL); @@ -199,6 +226,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); + test_MFCreateMediaType(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi: Implement Get/SetRetransmitParams.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 4373eb30a498412a8a49a220c9dd4569b0c462a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4373eb30a498412a8a49a220c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:49 2017 +0100 wsdapi: Implement Get/SetRetransmitParams. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 34 +++++++++++++++++++++++++++++---- dlls/wsdapi/tests/msgparams.c | 44 +++++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index 6675fa5..e5ec8b1 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -38,6 +38,7 @@ typedef struct IWSDMessageParametersImpl { typedef struct IWSDUdpMessageParametersImpl { IWSDMessageParametersImpl base; + WSDUdpRetransmitParams retransmitParams; } IWSDUdpMessageParametersImpl; static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMessageParameters *iface) @@ -248,14 +249,32 @@ static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLowerParameters(IWSDUdpMes static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRetransmitParams(IWSDUdpMessageParameters *This, const WSDUdpRetransmitParams *pParams) { - FIXME("(%p, %p)\n", This, pParams); - return E_NOTIMPL; + IWSDUdpMessageParametersImpl *impl = impl_from_IWSDUdpMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pParams); + + if (pParams == NULL) + { + return E_INVALIDARG; + } + + impl->retransmitParams = *pParams; + return S_OK; } static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRetransmitParams(IWSDUdpMessageParameters *This, WSDUdpRetransmitParams *pParams) { - FIXME("(%p, %p)\n", This, pParams); - return E_NOTIMPL; + IWSDUdpMessageParametersImpl *impl = impl_from_IWSDUdpMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pParams); + + if (pParams == NULL) + { + return E_POINTER; + } + + * pParams = impl->retransmitParams; + return S_OK; } static const IWSDUdpMessageParametersVtbl udpMsgParamsVtbl = @@ -297,6 +316,13 @@ HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxPara obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; obj->base.ref = 1; + /* Populate default retransmit parameters */ + obj->retransmitParams.ulSendDelay = 0; + obj->retransmitParams.ulRepeat = 1; + obj->retransmitParams.ulRepeatMinDelay = 50; + obj->retransmitParams.ulRepeatMaxDelay = 250; + obj->retransmitParams.ulRepeatUpperDelay = 450; + *ppTxParams = (IWSDUdpMessageParameters *)&obj->base.IWSDMessageParameters_iface; TRACE("Returning iface %p\n", *ppTxParams); diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 55ca7f3..0621950 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -197,17 +197,17 @@ static void RetransmitParams_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); /* Check if the default values are returned */ rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); /* Now try setting some custom parameters */ origParams.ulSendDelay = 100; @@ -217,18 +217,22 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 500; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); - todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Try setting a null parameter */ + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, NULL); + ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08x\n", rc); /* Now attempt to set some invalid parameters - these appear to be accepted */ origParams.ulSendDelay = INFINITE; @@ -238,18 +242,18 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 100; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); - todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0

Hugh McMaster : regedit: Free the binary data buffer after saving the new value (Coverity).
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: b25337e6d6b7bfc9717d2c66f7c9b0b01a04929f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25337e6d6b7bfc9717d2c66f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 28 10:47:29 2017 +0000 regedit: Free the binary data buffer after saving the new value (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 403def4..2c47bdc 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -165,6 +165,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + HeapFree(GetProcessHeap(), 0, pData); } else lRet = ERROR_OUTOFMEMORY;

1 0

Huw Davies : wineandroid: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 99069934f735fe57978b011f8a57792638de5047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069934f735fe57978b011f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:38 2017 +0100 wineandroid: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f7a13df..ff8b1e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1247,7 +1247,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -1297,11 +1297,13 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Jacek Caban : server: Close async wait handle when wait is satisfied.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 0e0834ae92291e9857ed01f3cb116240abda642b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0834ae92291e9857ed01f3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:17:51 2017 +0200 server: Close async wait handle when wait is satisfied. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - server/async.c | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd5a690..5329c79 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -589,7 +589,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; - NtClose( wait_handle ); } return status; diff --git a/server/async.c b/server/async.c index 4c6c6a9..f50cdc5 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async static void async_dump( struct object *obj, int verbose ); static int async_signaled( struct object *obj, struct wait_queue_entry *entry ); +static void async_satisfied( struct object * obj, struct wait_queue_entry *entry ); static void async_destroy( struct object *obj ); static const struct object_ops async_ops = @@ -63,7 +64,7 @@ static const struct object_ops async_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ async_signaled, /* signaled */ - no_satisfied, /* satisfied */ + async_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ no_map_access, /* map_access */ @@ -132,6 +133,19 @@ static int async_signaled( struct object *obj, struct wait_queue_entry *entry ) return async->signaled; } +static void async_satisfied( struct object *obj, struct wait_queue_entry *entry ) +{ + struct async *async = (struct async *)obj; + assert( obj->ops == &async_ops ); + + /* close wait handle here to avoid extra server round trip */ + if (async->wait_handle) + { + close_handle( async->thread->process, async->wait_handle ); + async->wait_handle = 0; + } +} + static void async_destroy( struct object *obj ) { struct async *async = (struct async *)obj; @@ -300,7 +314,6 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success ) { - obj_handle_t handle; if (!success) { close_handle( async->thread->process, async->wait_handle ); @@ -313,10 +326,8 @@ obj_handle_t async_handoff( struct async *async, int success ) close_handle( async->thread->process, async->wait_handle); async->wait_handle = 0; } - handle = async->wait_handle; - async->wait_handle = 0; set_error( STATUS_PENDING ); - return handle; + return async->wait_handle; } /* set the timeout of an async operation */

1 0

Alistair Leslie-Hughes : dmime: Add TRACE to IDirectMusicSegment8 QueryInterface.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: d5380f0d008ede8da5fdb403830c7345d93591ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5380f0d008ede8da5fdb4038… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 06:50:51 2017 +0000 dmime: Add TRACE to IDirectMusicSegment8 QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index dd07971..ad8561f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -46,6 +46,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegmen { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + *ret_iface = NULL; if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicSegment) ||

1 0

Jacek Caban : ntdll: Set iosb status in server_ioctl_file.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 4e02a3bb1383f7191226b6b03c07aee47151c80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e02a3bb1383f7191226b6b03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:56 2017 +0200 ntdll: Set iosb status in server_ioctl_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b73af7e..0d7efc3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1560,6 +1560,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtClose( wait_handle ); } + if (status != STATUS_PENDING && code != FSCTL_PIPE_LISTEN) io->u.Status = status; return status; } @@ -1644,8 +1645,8 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event, } if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); if (status != STATUS_PENDING) io->u.Status = status; return status; @@ -1694,7 +1695,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); if (!status) status = DIR_unmount_device( handle ); - break; + return status; case FSCTL_PIPE_PEEK: { @@ -1710,8 +1711,8 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if ((status = server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) { if (status == STATUS_BAD_DEVICE_TYPE) - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); break; } @@ -1767,11 +1768,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc int fd = server_remove_fd_from_cache( handle ); if (fd != -1) close( fd ); } - break; - - case FSCTL_PIPE_LISTEN: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); return status; case FSCTL_PIPE_IMPERSONATE: @@ -1814,11 +1810,9 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc io->Information = 0; status = STATUS_SUCCESS; break; - case FSCTL_PIPE_WAIT: default: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - break; + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); } if (status != STATUS_PENDING) io->u.Status = status;

1 0

Jacek Caban : server: Allow async_handoff users to set result themselves.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 74364ed0172ad91f0516cc95a4a5c1062a561e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74364ed0172ad91f0516cc95a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:40 2017 +0200 server: Allow async_handoff users to set result themselves. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 409c9b5..3a83a63 100644 --- a/server/async.c +++ b/server/async.c @@ -338,13 +338,23 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul return 0; } - if (async->iosb->status != STATUS_PENDING) + if (get_error() != STATUS_PENDING) + { + /* status and data are already set and returned */ + async_terminate( async, get_error() ); + } + else if (async->iosb->status != STATUS_PENDING) { + /* result is already available in iosb, return it */ if (async->iosb->out_data) { set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + } + + if (async->iosb->status != STATUS_PENDING) + { if (result) *result = async->iosb->result; async->signaled = 1; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 9c84b06524b62012c775d3f0a5b2b42ff0c35547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c84b06524b62012c775d3f0a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 28 09:48:23 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 284 +++++++++++++++++++++++---------------------------------------- 1 file changed, 102 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c84b06524b62012c775d…

1 0

Alistair Leslie-Hughes : dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: f62a891385f3f58925787283254171f2a25e215d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62a891385f3f589257872832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 10:50:52 2017 +0000 dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 21 ++++++++++----------- dlls/dmime/tests/dmime.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 04f0af0..cc7e4d1 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -137,17 +137,16 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_BUFFER: if (This->pDSBuffer) { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } + if (IsEqualIID (iidInterface, &IID_IUnknown) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || + IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + } + + WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); + *ppObject = NULL; + return E_NOINTERFACE; } break; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a154eac..62a977e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <dmusici.h> #include <audioclient.h> +#include <guiddef.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -45,8 +46,14 @@ static void test_COM_audiopath(void) IDirectMusicAudioPath *dmap; IUnknown *unk; IDirectMusicPerformance8 *performance; + IDirectSoundBuffer *dsound; + IDirectSoundBuffer8 *dsound8; + IDirectSoundNotify *notify; + IDirectSound3DBuffer *dsound3d; + IKsPropertySet *propset; ULONG refcount; HRESULT hr; + DWORD buffer = 0; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); @@ -89,6 +96,39 @@ static void test_COM_audiopath(void) ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer, (void**)&dsound); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer_Release(dsound); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer8_Release(dsound8); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundNotify, (void**)&notify); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IKsPropertySet, (void**)&propset); + todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + if (propset) + IKsPropertySet_Release(propset); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Failed: %08x\n", hr); + IUnknown_Release(unk); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &GUID_NULL, (void**)&unk); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); IDirectMusicPerformance8_Release(performance);

1 0