wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice*::Add/ DeleteDestroyCallback.
by Alexandre Julliard 14 Jul '16

14 Jul '16

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

Aaryaman Vasishta : d3drm: Rearrange version 1, 2 functions after version 3 for IDirect3DRMDevice*.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 474b6e3e0e200fc7b7d09f6d0cfd20779681fbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474b6e3e0e200fc7b7d09f6d0… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jul 10 22:29:10 2016 +0530 d3drm: Rearrange version 1, 2 functions after version 3 for IDirect3DRMDevice*. 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/device.c | 1130 +++++++++++++++++++++++++-------------------------- 1 file changed, 565 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=474b6e3e0e200fc7b7d09…

1 0

Aaryaman Vasishta : d3drm: Move struct d3drm_device to d3drm_private.h.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 90d97a93469d206e0cccbb33a32834dbcfa33697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d97a93469d206e0cccbb33a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Jul 12 19:07:25 2016 +0200 d3drm: Move struct d3drm_device to d3drm_private.h. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 16 ++++++++-------- dlls/d3drm/d3drm_private.h | 24 ++++++++++++++++++++---- dlls/d3drm/device.c | 35 ----------------------------------- 3 files changed, 28 insertions(+), 47 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index d0145d9..87fffc9 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -279,7 +279,7 @@ static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface, if (FAILED(hr = d3drm_device_create(&object, iface))) return hr; - *device = IDirect3DRMDevice_from_impl(object); + *device = &object->IDirect3DRMDevice_iface; return D3DRM_OK; } @@ -304,7 +304,7 @@ static HRESULT WINAPI d3drm1_CreateDeviceFromSurface(IDirect3DRM *iface, GUID *g return hr; if (SUCCEEDED(hr = d3drm_device_init(object, 1, ddraw, backbuffer, TRUE))) - *device = IDirect3DRMDevice_from_impl(object); + *device = &object->IDirect3DRMDevice_iface; else d3drm_device_destroy(object); @@ -333,7 +333,7 @@ static HRESULT WINAPI d3drm1_CreateDeviceFromD3D(IDirect3DRM *iface, d3drm_device_destroy(object); return hr; } - *device = IDirect3DRMDevice_from_impl(object); + *device = &object->IDirect3DRMDevice_iface; return D3DRM_OK; } @@ -381,7 +381,7 @@ static HRESULT WINAPI d3drm1_CreateDeviceFromClipper(IDirect3DRM *iface, if (FAILED(hr)) d3drm_device_destroy(object); else - *device = IDirect3DRMDevice_from_impl(object); + *device = &object->IDirect3DRMDevice_iface; return hr; } @@ -759,7 +759,7 @@ static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface, if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) return hr; - *device = IDirect3DRMDevice2_from_impl(object); + *device = &object->IDirect3DRMDevice2_iface; return D3DRM_OK; } @@ -1309,7 +1309,7 @@ static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface, if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) return hr; - *device = IDirect3DRMDevice3_from_impl(object); + *device = &object->IDirect3DRMDevice3_iface; return D3DRM_OK; } @@ -1338,7 +1338,7 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID * use_z_surface = !(flags & D3DRMDEVICE_NOZBUFFER); if (SUCCEEDED(hr = d3drm_device_init(object, 3, ddraw, backbuffer, use_z_surface))) - *device = IDirect3DRMDevice3_from_impl(object); + *device = &object->IDirect3DRMDevice3_iface; else d3drm_device_destroy(object); @@ -1428,7 +1428,7 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface, if (FAILED(hr)) d3drm_device_destroy(object); else - *device = IDirect3DRMDevice3_from_impl(object); + *device = &object->IDirect3DRMDevice3_iface; return hr; } diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 1a2aff1..059d480 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -23,6 +23,7 @@ #include "d3drm.h" #include "dxfile.h" +#include "d3drmwin.h" #include "wine/list.h" @@ -30,7 +31,6 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) #endif -struct d3drm_device; struct d3drm_object { LONG ref; @@ -81,6 +81,25 @@ struct d3drm_viewport D3DRMPROJECTIONTYPE projection; }; +struct d3drm_device +{ + IDirect3DRMDevice IDirect3DRMDevice_iface; + IDirect3DRMDevice2 IDirect3DRMDevice2_iface; + IDirect3DRMDevice3 IDirect3DRMDevice3_iface; + IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; + IDirect3DRM *d3drm; + IDirectDraw *ddraw; + IDirectDrawSurface *primary_surface, *render_target; + IDirectDrawClipper *clipper; + IDirect3DDevice *device; + LONG ref; + BOOL dither; + D3DRMRENDERQUALITY quality; + DWORD rendermode; + DWORD height; + DWORD width; +}; + HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface) DECLSPEC_HIDDEN; @@ -98,9 +117,6 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; -IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; -IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index ba61c29..fd9c15c 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -27,29 +27,9 @@ #include "d3drm_private.h" #include "initguid.h" -#include "d3drmwin.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct d3drm_device -{ - IDirect3DRMDevice IDirect3DRMDevice_iface; - IDirect3DRMDevice2 IDirect3DRMDevice2_iface; - IDirect3DRMDevice3 IDirect3DRMDevice3_iface; - IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; - IDirect3DRM *d3drm; - IDirectDraw *ddraw; - IDirectDrawSurface *primary_surface, *render_target; - IDirectDrawClipper *clipper; - IDirect3DDevice *device; - LONG ref; - BOOL dither; - D3DRMRENDERQUALITY quality; - DWORD rendermode; - DWORD height; - DWORD width; -}; - static inline struct d3drm_device *impl_from_IDirect3DRMDevice(IDirect3DRMDevice *iface) { return CONTAINING_RECORD(iface, struct d3drm_device, IDirect3DRMDevice_iface); @@ -65,21 +45,6 @@ static inline struct d3drm_device *impl_from_IDirect3DRMDevice3(IDirect3DRMDevic return CONTAINING_RECORD(iface, struct d3drm_device, IDirect3DRMDevice3_iface); } -IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) -{ - return &device->IDirect3DRMDevice_iface; -} - -IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) -{ - return &device->IDirect3DRMDevice2_iface; -} - -IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) -{ - return &device->IDirect3DRMDevice3_iface; -} - void d3drm_device_destroy(struct d3drm_device *device) { if (device->device)

1 0

Aaryaman Vasishta : d3drm: Store reference to IDirect3DRM in d3drm_device_create().
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 44af0bb81befde9197b6b80d3a392d56a79e2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44af0bb81befde9197b6b80d3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Jul 12 19:07:24 2016 +0200 d3drm: Store reference to IDirect3DRM in d3drm_device_create(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 43 ++++++++++++++++++------------------------- dlls/d3drm/d3drm_private.h | 20 +++++++++----------- dlls/d3drm/device.c | 17 ++++++++--------- 3 files changed, 35 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44af0bb81befde9197b6b…

1 0

Stefan Dösinger : ddraw/tests: Skip A4R4G4B4 ckey tests on Nvidia.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: f8bda14d66073e7bf588397ad713e7cc8c8aef34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bda14d66073e7bf588397ad… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 10 22:55:44 2016 +0100 ddraw/tests: Skip A4R4G4B4 ckey tests on Nvidia. 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/ddraw/tests/ddraw1.c | 63 ++++++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw2.c | 63 ++++++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 69 ++++++++++++++++++++++++++++------------------- dlls/ddraw/tests/ddraw7.c | 65 ++++++++++++++++++++++++++++---------------- 4 files changed, 166 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8bda14d66073e7bf5883…

1 0

David Lawrie : dinput: Alter function name and code style.
by Alexandre Julliard 14 Jul '16

14 Jul '16

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 : dinput: Sort devices by location ID on the Mac.
by Alexandre Julliard 14 Jul '16

14 Jul '16

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 14 Jul '16

14 Jul '16

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

David Lawrie : winejoystick.drv: Sort devices by location ID on the Mac.
by Alexandre Julliard 14 Jul '16

14 Jul '16

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

David Lawrie : winejoystick.drv: Print location ID in debugstr_device on the Mac.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: c6b3e34b846a9c880ee18618d15a28c78d75140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b3e34b846a9c880ee18618d… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Mon Jul 11 04:06:03 2016 -0700 winejoystick.drv: 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/winejoystick.drv/joystick_osx.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 12ccff7..bda9163 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -121,6 +121,28 @@ typedef struct { static joystick_t joysticks[MAXJOYSTICK]; static CFMutableArrayRef device_main_elements = NULL; +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 const char* debugstr_cf(CFTypeRef t) { @@ -154,8 +176,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

← Newer
1
...
34
35
36
37
38
39
40
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016