July 2016 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice*::Add/ DeleteDestroyCallback.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: ce64ef51e245155d30babb3470868003ae5b1500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce64ef51e245155d30babb347… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jul 10 22:29:11 2016 +0530 d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/device.c | 43 ++++++++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 059d480..4394fcc 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -83,6 +83,7 @@ struct d3drm_viewport struct d3drm_device { + struct d3drm_object obj; IDirect3DRMDevice IDirect3DRMDevice_iface; IDirect3DRMDevice2 IDirect3DRMDevice2_iface; IDirect3DRMDevice3 IDirect3DRMDevice3_iface; @@ -92,7 +93,6 @@ struct d3drm_device IDirectDrawSurface *primary_surface, *render_target; IDirectDrawClipper *clipper; IDirect3DDevice *device; - LONG ref; BOOL dither; D3DRMRENDERQUALITY quality; DWORD rendermode; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index b0af035..b388b63 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -47,6 +47,7 @@ static inline struct d3drm_device *impl_from_IDirect3DRMDevice3(IDirect3DRMDevic void d3drm_device_destroy(struct d3drm_device *device) { + d3drm_object_cleanup((IDirect3DRMObject *)&device->IDirect3DRMDevice_iface, &device->obj); if (device->device) { TRACE("Releasing attached ddraw interfaces.\n"); @@ -299,7 +300,7 @@ static HRESULT WINAPI d3drm_device1_QueryInterface(IDirect3DRMDevice *iface, REF static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - ULONG refcount = InterlockedIncrement(&device->ref); + ULONG refcount = InterlockedIncrement(&device->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -327,7 +328,7 @@ static ULONG WINAPI d3drm_device1_AddRef(IDirect3DRMDevice *iface) static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - ULONG refcount = InterlockedDecrement(&device->ref); + ULONG refcount = InterlockedDecrement(&device->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -386,49 +387,61 @@ static HRESULT WINAPI d3drm_device1_Clone(IDirect3DRMDevice *iface, static HRESULT WINAPI d3drm_device3_AddDestroyCallback(IDirect3DRMDevice3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&device->obj, cb, ctx); } static HRESULT WINAPI d3drm_device2_AddDestroyCallback(IDirect3DRMDevice2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_device3_AddDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device1_AddDestroyCallback(IDirect3DRMDevice *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_device3_AddDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device3_DeleteDestroyCallback(IDirect3DRMDevice3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&device->obj, cb, ctx); } static HRESULT WINAPI d3drm_device2_DeleteDestroyCallback(IDirect3DRMDevice2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_device3_DeleteDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device1_DeleteDestroyCallback(IDirect3DRMDevice *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_device3_DeleteDestroyCallback(&device->IDirect3DRMDevice3_iface, cb, ctx); } static HRESULT WINAPI d3drm_device3_SetAppData(IDirect3DRMDevice3 *iface, DWORD data) @@ -1582,7 +1595,7 @@ HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) object->IDirect3DRMDevice3_iface.lpVtbl = &d3drm_device3_vtbl; object->IDirect3DRMWinDevice_iface.lpVtbl = &d3drm_device_win_vtbl; object->d3drm = d3drm; - object->ref = 1; + d3drm_object_init(&object->obj); *device = object;

1 0

David Lawrie : dinput: Alter function name and code style.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: c543c603a541c050cc30bc5b502e5f8031d4f6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c543c603a541c050cc30bc5b5… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Mon Jul 11 04:06:02 2016 -0700 dinput: Alter function name and code style. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e937647..637692b 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -198,10 +198,9 @@ static long get_device_location_ID(IOHIDDeviceRef device) return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); } - -static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) +static void copy_set_to_array(const void *value, void *context) { - CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); + CFArrayAppendValue(context, value); } static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) @@ -486,10 +485,12 @@ static int find_osx_devices(void) if (devset) { CFIndex num_devices, num_main_elements, idx; - CFMutableArrayRef devices = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); - CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, devices); - CFRelease( devset); - num_devices = CFArrayGetCount(devices); + CFMutableArrayRef devices; + + num_devices = CFSetGetCount(devset); + devices = CFArrayCreateMutable(kCFAllocatorDefault, num_devices, &kCFTypeArrayCallBacks); + CFSetApplyFunction(devset, copy_set_to_array, devices); + CFRelease(devset); CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_comparator, NULL); device_main_elements = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);

1 0

David Lawrie : winejoystick.drv: Sort devices by location ID on the Mac.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: b69b9a6ead7af50ebee4a63373414e5a4b0f16d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69b9a6ead7af50ebee4a6337… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Mon Jul 11 04:06:04 2016 -0700 winejoystick.drv: Sort devices by location ID on the Mac. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 42 ++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index bda9163..7e2e97f 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -314,6 +314,33 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ } /************************************************************************** + * device_location_comparator + * + * Helper to sort device array by location ID since location IDs are consistent across boots & launches + */ +static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) +{ + IOHIDDeviceRef device1 = (IOHIDDeviceRef)val1, device2 = (IOHIDDeviceRef)val2; + long loc1 = get_device_location_ID(device1), loc2 = get_device_location_ID(device2); + + if (loc1 < loc2) + return kCFCompareLessThan; + else if (loc1 > loc2) + return kCFCompareGreaterThan; + return kCFCompareEqualTo; +} + +/************************************************************************** + * copy_set_to_array + * + * Helper to copy the CFSet to a CFArray + */ +static void copy_set_to_array(const void *value, void *context) +{ + CFArrayAppendValue(context, value); +} + +/************************************************************************** * find_osx_devices */ static int find_osx_devices(void) @@ -358,20 +385,13 @@ static int find_osx_devices(void) if (devset) { CFIndex num_devices, num_main_elements; - const void** refs; - CFArrayRef devices; + CFMutableArrayRef devices; num_devices = CFSetGetCount(devset); - refs = HeapAlloc(GetProcessHeap(), 0, num_devices * sizeof(*refs)); - if (!refs) - { - CFRelease(devset); - goto fail; - } + devices = CFArrayCreateMutable(kCFAllocatorDefault, num_devices, &kCFTypeArrayCallBacks); + CFSetApplyFunction(devset, copy_set_to_array, (void *)devices); + CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_comparator, NULL); - CFSetGetValues(devset, refs); - devices = CFArrayCreate(NULL, refs, num_devices, &kCFTypeArrayCallBacks); - HeapFree(GetProcessHeap(), 0, refs); CFRelease(devset); if (!devices) goto fail;

1 0

Akihiro Sagawa : mciqtz32: Use dB unit when setting audio volume.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: cab9db9d9565f53c81fa08eafab4eca2f8c40048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab9db9d9565f53c81fa08eaf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 9 17:50:52 2016 +0900 mciqtz32: Use dB unit when setting audio volume. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 4c9074b..54f3b78 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -1070,7 +1071,7 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P switch (lpParms->dwItem) { case MCI_DGV_SETAUDIO_VOLUME: if (dwFlags & MCI_DGV_SETAUDIO_VALUE) { - long vol = -10000; + long vol; HRESULT hr; if (lpParms->dwValue > 1000) { ret = MCIERR_OUTOFRANGE; @@ -1078,7 +1079,11 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P } if (dwFlags & MCI_TEST) break; - vol += (long)lpParms->dwValue * 10; + if (lpParms->dwValue != 0) + vol = (long)(2000.0 * (log10(lpParms->dwValue) - 3.0)); + else + vol = -10000; + TRACE("Setting volume to %ld\n", vol); hr = IBasicAudio_put_Volume(wma->audio, vol); if (FAILED(hr)) { WARN("Cannot set volume (hr = %x)\n", hr);

1 0

Nikolay Sivov : webservices/tests: Fix WsCreateMessage() arguments (Clang) .
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 5eff8517b2b967eec48fb72188856d1041aa6e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eff8517b2b967eec48fb7218… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 11 00:08:16 2016 +0300 webservices/tests: Fix WsCreateMessage() arguments (Clang). 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/webservices/tests/msg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index ae2876d..24ec0bd 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -36,10 +36,10 @@ static void test_WsCreateMessage(void) hr = WsCreateMessage( 0, 0, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, 0, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, 0, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( 0, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( 0, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); env_version = WS_ENVELOPE_VERSION_SOAP_1_1; @@ -50,7 +50,7 @@ static void test_WsCreateMessage(void) 1, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -169,7 +169,7 @@ static void test_WsInitializeMessage(void) hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -220,7 +220,7 @@ static void test_WsAddressMessage(void) hr = WsAddressMessage( NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -250,7 +250,7 @@ static void test_WsAddressMessage(void) ok( addressed == TRUE, "unexpected value %d\n", addressed ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -353,7 +353,7 @@ static void test_WsWriteEnvelopeStart(void) hr = WsWriteEnvelopeStart( NULL, writer, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -395,7 +395,7 @@ static void test_WsWriteEnvelopeEnd(void) hr = WsWriteEnvelopeEnd( NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -457,7 +457,7 @@ static void test_WsWriteBody(void) UINT32 val; } test, *ptr; - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Michael Stefaniuc : d3d9: Use SetRect() instead of open coding it.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 05525db80676adb4b7738da8fb18fb809cb4a66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05525db80676adb4b7738da8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:08:13 2016 +0200 d3d9: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a26e075..85bc1d0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1284,16 +1284,10 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); - dst_rect.left = 0; - dst_rect.top = 0; - dst_rect.right = wined3d_desc.width; - dst_rect.bottom = wined3d_desc.height; + SetRect(&dst_rect, 0, 0, wined3d_desc.width, wined3d_desc.height); wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &wined3d_desc); - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = wined3d_desc.width; - src_rect.bottom = wined3d_desc.height; + SetRect(&src_rect, 0, 0, wined3d_desc.width, wined3d_desc.height); /* TODO: Check surface sizes, pools, etc. */ if (wined3d_desc.multisample_type) @@ -1341,20 +1335,14 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); if (!dst_rect) { - d.left = 0; - d.top = 0; - d.right = dst_desc.width; - d.bottom = dst_desc.height; + SetRect(&d, 0, 0, dst_desc.width, dst_desc.height); dst_rect = &d; } wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); if (!src_rect) { - s.left = 0; - s.top = 0; - s.right = src_desc.width; - s.bottom = src_desc.height; + SetRect(&s, 0, 0, src_desc.width, src_desc.height); src_rect = &s; }

1 0

David Lawrie : dinput: Sort devices by location ID on the Mac.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 33c43473c0a5d1a872b50757a9bace654a6502c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c43473c0a5d1a872b50757a… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Mon Jul 11 04:06:01 2016 -0700 dinput: Sort devices by location ID on the Mac. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 21d8d51..e937647 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -204,6 +204,18 @@ static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); } +static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) +{ + IOHIDDeviceRef device1 = (IOHIDDeviceRef)val1, device2 = (IOHIDDeviceRef)val2; + long loc1 = get_device_location_ID(device1), loc2 = get_device_location_ID(device2); + + if (loc1 < loc2) + return kCFCompareLessThan; + else if (loc1 > loc2) + return kCFCompareGreaterThan; + return kCFCompareEqualTo; +} + static const char* debugstr_cf(CFTypeRef t) { CFStringRef s; @@ -478,6 +490,7 @@ static int find_osx_devices(void) CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, devices); CFRelease( devset); num_devices = CFArrayGetCount(devices); + CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_comparator, NULL); device_main_elements = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); if (!device_main_elements)

1 0

David Lawrie : dinput: Print location ID in debugstr_device on the Mac.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: fef170af85e4f7727c4145f2c2ad4b2d169c9a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef170af85e4f7727c4145f2c… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Mon Jul 11 04:06:00 2016 -0700 dinput: Print location ID in debugstr_device on the Mac. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index c9c30fd..21d8d51 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -175,6 +175,30 @@ static HRESULT osx_to_win32_hresult(HRESULT in) return in; } +static long get_device_property_long(IOHIDDeviceRef device, CFStringRef key) +{ + CFTypeRef ref; + long result = 0; + + if (device) + { + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); + + ref = IOHIDDeviceGetProperty(device, key); + + if (ref && CFNumberGetTypeID() == CFGetTypeID(ref)) + CFNumberGetValue((CFNumberRef)ref, kCFNumberLongType, &result); + } + + return result; +} + +static long get_device_location_ID(IOHIDDeviceRef device) +{ + return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); +} + + static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) { CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); @@ -212,8 +236,9 @@ static const char* debugstr_cf(CFTypeRef t) static const char* debugstr_device(IOHIDDeviceRef device) { - return wine_dbg_sprintf("<IOHIDDevice %p product %s>", device, - debugstr_cf(IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)))); + return wine_dbg_sprintf("<IOHIDDevice %p product %s IOHIDLocationID %lu>", device, + debugstr_cf(IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey))), + get_device_location_ID(device)); } static const char* debugstr_element(IOHIDElementRef element)

1 0

Nikolay Sivov : webservices/tests: Fix WsReadValue type argument values ( Clang).
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 3d94c1ac4d1dc4487645dedd6b6fea800ad49d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d94c1ac4d1dc4487645dedd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 11 00:13:30 2016 +0300 webservices/tests: Fix WsReadValue type argument values (Clang). 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/webservices/tests/reader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 77f7964..e57fc0c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3351,23 +3351,23 @@ static void test_WsReadValue(void) ok( hr == S_OK, "got %08x\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); - hr = WsReadValue( NULL, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + hr = WsReadValue( NULL, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); - hr = WsReadValue( reader, WS_UINT32_TYPE, NULL, sizeof(val), NULL ); + hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, NULL, sizeof(val), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); /* reader must be positioned correctly */ prepare_struct_type_test( reader, "<t>1</t>" ); - hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); @@ -3378,7 +3378,7 @@ static void test_WsReadValue(void) ok( hr == S_OK, "got %08x\n", hr ); val = 0xdeadbeef; - hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( val == 1, "got %u\n", val ); @@ -3386,7 +3386,7 @@ static void test_WsReadValue(void) hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); WsFreeReader( reader );

1 0

Michael Stefaniuc : riched20: Get rid of casts from COM objects to interfaces.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: d357dbfdd7722d4ed4fda6cec8935da797ac46dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d357dbfdd7722d4ed4fda6cec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:03:57 2016 +0200 riched20: Get rid of casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/clipboard.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index c536665..d4560db 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -159,7 +159,8 @@ static const IEnumFORMATETCVtbl VT_EnumFormatImpl = { EnumFormatImpl_Clone }; -static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc) +static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, + IEnumFORMATETC **formatetc) { EnumFormatImpl *ret; TRACE("\n"); @@ -171,7 +172,7 @@ static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, I ret->fmtetc_cnt = fmtetc_cnt; ret->fmtetc = GlobalAlloc(GMEM_ZEROINIT, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; + *formatetc = &ret->IEnumFORMATETC_iface; return S_OK; } @@ -401,8 +402,8 @@ static HGLOBAL get_rtf_text(ME_TextEditor *editor, const ME_Cursor *start, int n return gds.hData; } -HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, - int nChars, LPDATAOBJECT *lplpdataobj) +HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, + IDataObject **dataobj) { DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, ME_GetCursorOfs(start), nChars); @@ -426,6 +427,6 @@ HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, InitFormatEtc(obj->fmtetc[1], cfRTF, TYMED_HGLOBAL); } - *lplpdataobj = (LPDATAOBJECT)obj; + *dataobj = &obj->IDataObject_iface; return S_OK; }

1 0