wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Dmitry Timoshkov : kernel32: Filter out console handles in GetFileSize.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: c3ee3da58afe0cf7bb2c3abf55f4619a9bd6a7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ee3da58afe0cf7bb2c3abf5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 14 15:28:32 2014 +0900 kernel32: Filter out console handles in GetFileSize. --- dlls/kernel32/file.c | 6 ++++++ dlls/kernel32/tests/console.c | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2f5dee2..9bcd9e9 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -983,6 +983,12 @@ BOOL WINAPI GetFileSizeEx( HANDLE hFile, PLARGE_INTEGER lpFileSize ) IO_STATUS_BLOCK io; NTSTATUS status; + if (is_console_handle( hFile )) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + status = NtQueryInformationFile( hFile, &io, &info, sizeof(info), FileStandardInformation ); if (status == STATUS_SUCCESS) { diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 18d3cf9..52dcaac 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2553,6 +2553,47 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_ReadConsole(void) +{ + HANDLE std_input; + DWORD ret, bytes; + char buf[1024]; + + std_input = GetStdHandle(STD_INPUT_HANDLE); + + SetLastError(0xdeadbeef); + ret = GetFileSize(std_input, NULL); + ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + +if (0) /* FIXME: uncomment once Wine doesn't hang forever */ +{ + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(std_input, buf, -128, &bytes, NULL); + ok(!ret, "expected 0, got %u\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(!bytes, "expected 0, got %u\n", bytes); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); + ok(!ret, "expected 0, got %u\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); +} + +if (0) /* FIXME: uncomment once Wine doesn't hang forever */ +{ + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); + ok(!ret, "expected 0, got %u\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); +} +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2646,6 +2687,7 @@ START_TEST(console) ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); if (!ret) return; + test_ReadConsole(); /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Nikolay Sivov : crypt32: Fix properties list lookup (Coverity).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 991746b6050ab00fe0ee28f0027dee2067eba684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991746b6050ab00fe0ee28f00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:44:11 2014 +0400 crypt32: Fix properties list lookup (Coverity). --- dlls/crypt32/proplist.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index be9bf8d..d849fd6 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -175,12 +175,15 @@ DWORD ContextPropertyList_EnumPropIDs(CONTEXT_PROPERTY_LIST *list, DWORD id) EnterCriticalSection(&list->cs); if (id) { - CONTEXT_PROPERTY *cursor = NULL; + CONTEXT_PROPERTY *cursor = NULL, *prop; - LIST_FOR_EACH_ENTRY(cursor, &list->properties, CONTEXT_PROPERTY, entry) + LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry) { - if (cursor->propID == id) + if (prop->propID == id) + { + cursor = prop; break; + } } if (cursor) {

1 0

Nikolay Sivov : dsound: Remove duplicated parameter check (Coverity).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 8d178b185db535205b8d7e1629dedec7036bd653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d178b185db535205b8d7e162… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:43:55 2014 +0400 dsound: Remove duplicated parameter check (Coverity). --- dlls/dsound/capture.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 40f1702..17b1a04 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1223,11 +1223,6 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCa return DSERR_INVALIDPARAM; } - if (pUnk != NULL) { - WARN("invalid parameter: pUnk != NULL\n"); - return DSERR_INVALIDPARAM; - } - /* FIXME: We can only have one buffer so what do we do here? */ if (This->device->capture_buffer) { WARN("invalid parameter: already has buffer\n");

1 0

Nikolay Sivov : quartz: Check GetCurFile() return value (Coverity).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 44818ce0f9bfd36e68b5da0fcb8b6ed3d4c33709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44818ce0f9bfd36e68b5da0fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:43:40 2014 +0400 quartz: Check GetCurFile() return value (Coverity). --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 720ba2d..771a330 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1680,7 +1680,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR } /* The file has been already loaded */ - IFileSourceFilter_GetCurFile(pfile, &filename, &mt); + hr = IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { WARN("GetCurFile (%x)\n", hr); goto error;

1 0

Nikolay Sivov : msxml3: Fix transformation result output for stream and BSTR cases.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 52c6c6a1d192324ee4b6f3910c8834d5f5bb2151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c6c6a1d192324ee4b6f3910… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:00:51 2014 +0400 msxml3: Fix transformation result output for stream and BSTR cases. --- dlls/msxml3/main.c | 3 + dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 291 ++++++++++++++++++++++++++++++++++++++----- dlls/msxml3/stylesheet.c | 20 +-- dlls/msxml3/tests/domdoc.c | 14 +-- 5 files changed, 267 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c6c6a1d192324ee4b6f…

1 0

Ken Thomases : dinput: Add additional debug logging to Mac code.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 7367c68cc964d532a3d9a3d90b16c5ee2fd4ddc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7367c68cc964d532a3d9a3d90… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:26 2014 -0500 dinput: Add additional debug logging to Mac code. --- dlls/dinput/joystick_osx.c | 110 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7367c68cc964d532a3d9a…

1 0

Ken Thomases : dinput: Fix numerous leaks.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 180b9e63d92ed26adacb878eec33bbac194054d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180b9e63d92ed26adacb878ee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:23 2014 -0500 dinput: Fix numerous leaks. --- dlls/dinput/joystick_osx.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 69d8bd6..24fd29f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -95,7 +95,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -static IOHIDManagerRef hid_manager = NULL; static CFMutableArrayRef device_main_elements = NULL; typedef struct JoystickImpl JoystickImpl; @@ -211,6 +210,7 @@ static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) io_service_t service; CFMutableDictionaryRef matching; CFTypeRef location_id; + HRESULT hr; matching = IOServiceMatching(kIOHIDDeviceKey); if(!matching){ @@ -229,10 +229,13 @@ static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) service = IOServiceGetMatchingService(kIOMasterPortDefault, matching); - if(!ret) - return FFIsForceFeedback(service) == FF_OK ? S_OK : S_FALSE; + if (ret) + hr = osx_to_win32_hresult(FFCreateDevice(service, ret)); + else + hr = FFIsForceFeedback(service) == FF_OK ? S_OK : S_FALSE; - return osx_to_win32_hresult(FFCreateDevice(service, ret)); + IOObjectRelease(service); + return hr; } static CFMutableDictionaryRef create_osx_device_match(int usage) @@ -265,12 +268,14 @@ static CFMutableDictionaryRef create_osx_device_match(int usage) else { ERR("CFNumberCreate() failed.\n"); + CFRelease(result); return NULL; } } else { ERR("CFNumberCreate failed.\n"); + CFRelease(result); return NULL; } } @@ -315,6 +320,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ } } } + CFRelease(elements); } return total; } @@ -341,6 +347,7 @@ static void get_element_children(IOHIDElementRef element, CFMutableArrayRef all_ static int find_osx_devices(void) { + IOHIDManagerRef hid_manager; CFMutableDictionaryRef result; CFSetRef devset; CFMutableArrayRef matching; @@ -349,6 +356,7 @@ static int find_osx_devices(void) if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) { ERR("Couldn't open IOHIDManager.\n"); + CFRelease( hid_manager ); return 0; } @@ -360,18 +368,21 @@ static int find_osx_devices(void) if (!result) { CFRelease(matching); - return 0; + goto fail; } CFArrayAppendValue( matching, result ); + CFRelease( result ); result = create_osx_device_match(kHIDUsage_GD_GamePad); if (!result) { CFRelease(matching); - return 0; + goto fail; } CFArrayAppendValue( matching, result ); + CFRelease( result ); IOHIDManagerSetDeviceMatchingMultiple( hid_manager, matching); + CFRelease( matching ); devset = IOHIDManagerCopyDevices( hid_manager ); if (devset) { @@ -383,7 +394,10 @@ static int find_osx_devices(void) device_main_elements = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); if (!device_main_elements) - return 0; + { + CFRelease( devices ); + goto fail; + } num_main_elements = 0; for (idx = 0; idx < num_devices; idx++) @@ -401,6 +415,10 @@ static int find_osx_devices(void) TRACE("found %i device(s), %i collection(s)\n",(int)num_devices,(int)num_main_elements); return (int)num_main_elements; } + +fail: + IOHIDManagerClose( hid_manager, 0 ); + CFRelease( hid_manager ); return 0; } @@ -1018,6 +1036,8 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, FAILED: hr = DIERR_OUTOFMEMORY; + if (newDevice->ff) FFReleaseDevice(newDevice->ff); + if (newDevice->elements) CFRelease(newDevice->elements); if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); HeapFree(GetProcessHeap(), 0, df); release_DataFormat(&newDevice->generic.base.data_format);

1 0

Ken Thomases : dinput: Check array indexes to avoid exceeding array bounds.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 2d809218a9052aae3f2d3c63be532da7c58eb581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d809218a9052aae3f2d3c63b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:19 2014 -0500 dinput: Check array indexes to avoid exceeding array bounds. --- dlls/dinput/joystick_osx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index a98c1ea..69d8bd6 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -186,7 +186,7 @@ static IOHIDDeviceRef get_device_ref(int id) IOHIDElementRef device_main_element; IOHIDDeviceRef hid_device; - if (!device_main_elements) + if (!device_main_elements || id >= CFArrayGetCount(device_main_elements)) return 0; device_main_element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, id); @@ -325,8 +325,6 @@ static void get_element_children(IOHIDElementRef element, CFMutableArrayRef all_ CFArrayRef element_children = IOHIDElementGetChildren(element); cnt = CFArrayGetCount(element_children); - if (cnt < 1) - return; /* Either add the element to the array or grab its children */ for (idx=0; idx<cnt; idx++) @@ -454,7 +452,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) device->elements = NULL; - if (!device_main_elements) + if (!device_main_elements || device->id >= CFArrayGetCount(device_main_elements)) return; device_main_element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, device->id); @@ -585,7 +583,7 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) TRACE("polling device %i\n",device->id); - if (!device_main_elements) + if (!device_main_elements || device->id >= CFArrayGetCount(device_main_elements)) return; device_main_element = (IOHIDElementRef) CFArrayGetValueAtIndex(device_main_elements, device->id);

1 0

Ken Thomases : dinput: Overhaul how the array of Mac device elements is built and sorted.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: ab872f2f3629dab54e0a417462399ce5e554f7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab872f2f3629dab54e0a41746… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:16 2014 -0500 dinput: Overhaul how the array of Mac device elements is built and sorted. Use three separate arrays instead of one array with three sections that are separately tracked. Use the Core Foundation sort function rather than implementing a clumsy sort of our own. --- dlls/dinput/joystick_osx.c | 88 ++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 1d7e970..a98c1ea 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -108,7 +108,7 @@ struct JoystickImpl /* osx private */ int id; - CFMutableArrayRef elements; + CFArrayRef elements; ObjProps **propmap; FFDeviceObjectReference ff; struct list effects; @@ -434,35 +434,23 @@ static int get_osx_device_name(int id, char *name, int length) return 0; } -static void insert_sort_button(int header, IOHIDElementRef element, - CFMutableArrayRef elements, int index, - int target) +static CFComparisonResult button_usage_comparator(const void *val1, const void *val2, void *context) { - IOHIDElementRef targetElement; - int usage; - - CFArraySetValueAtIndex(elements, header+index, NULL); - targetElement = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, header+target); - if (targetElement == NULL) - { - CFArraySetValueAtIndex(elements, header+target,element); - return; - } - usage = IOHIDElementGetUsage( targetElement ); - usage --; /* usage 1 based index */ - - insert_sort_button(header, targetElement, elements, target, usage); - CFArraySetValueAtIndex(elements, header+target,element); + IOHIDElementRef element1 = (IOHIDElementRef)val1, element2 = (IOHIDElementRef)val2; + int usage1 = IOHIDElementGetUsage(element1), usage2 = IOHIDElementGetUsage(element2); + + if (usage1 < usage2) + return kCFCompareLessThan; + if (usage1 > usage2) + return kCFCompareGreaterThan; + return kCFCompareEqualTo; } static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDElementRef device_main_element; CFMutableArrayRef elements; - DWORD axes = 0; DWORD sliders = 0; - DWORD buttons = 0; - DWORD povs = 0; device->elements = NULL; @@ -480,8 +468,9 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) if (elements) { CFIndex idx, cnt = CFArrayGetCount( elements ); - /* build our element array in the order that dinput expects */ - device->elements = CFArrayCreateMutable(NULL,0,NULL); + CFMutableArrayRef axes = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + CFMutableArrayRef buttons = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + CFMutableArrayRef povs = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); for ( idx = 0; idx < cnt; idx++ ) { @@ -498,17 +487,13 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) continue; } - if (buttons < 128) - { - CFArrayInsertValueAtIndex(device->elements, (axes+povs+buttons), element); - buttons++; - } + if (CFArrayGetCount(buttons) < 128) + CFArrayAppendValue(buttons, element); break; } case kIOHIDElementTypeInput_Axis: { - CFArrayInsertValueAtIndex(device->elements, axes, element); - axes++; + CFArrayAppendValue(axes, element); break; } case kIOHIDElementTypeInput_Misc: @@ -518,8 +503,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { case kHIDUsage_GD_Hatswitch: { - CFArrayInsertValueAtIndex(device->elements, (axes+povs), element); - povs++; + CFArrayAppendValue(povs, element); break; } case kHIDUsage_GD_Slider: @@ -534,9 +518,8 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) case kHIDUsage_GD_Ry: case kHIDUsage_GD_Rz: { - CFArrayInsertValueAtIndex(device->elements, axes, element); - axis_map[axes]=usage; - axes++; + axis_map[CFArrayGetCount(axes)]=usage; + CFArrayAppendValue(axes, element); break; } default: @@ -548,22 +531,29 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) FIXME("Unhandled type %i\n",type); } } - } - device->generic.devcaps.dwAxes = axes; - device->generic.devcaps.dwButtons = buttons; - device->generic.devcaps.dwPOVs = povs; + /* Sort buttons into correct order */ + CFArraySortValues(buttons, CFRangeMake(0, CFArrayGetCount(buttons)), button_usage_comparator, NULL); - /* Sort buttons into correct order */ - for (buttons = 0; buttons < device->generic.devcaps.dwButtons; buttons++) - { - IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( device->elements, axes+povs+buttons); - uint32_t usage = IOHIDElementGetUsage( element ); - usage --; /* usage is 1 indexed we need 0 indexed */ - if (usage == buttons) - continue; + device->generic.devcaps.dwAxes = CFArrayGetCount(axes); + device->generic.devcaps.dwButtons = CFArrayGetCount(buttons); + device->generic.devcaps.dwPOVs = CFArrayGetCount(povs); - insert_sort_button(axes+povs, element, device->elements,buttons,usage); + /* build our element array in the order that dinput expects */ + CFArrayAppendArray(axes, povs, CFRangeMake(0, device->generic.devcaps.dwPOVs)); + CFArrayAppendArray(axes, buttons, CFRangeMake(0, device->generic.devcaps.dwButtons)); + device->elements = axes; + axes = NULL; + + CFRelease(povs); + CFRelease(buttons); + CFRelease(elements); + } + else + { + device->generic.devcaps.dwAxes = 0; + device->generic.devcaps.dwButtons = 0; + device->generic.devcaps.dwPOVs = 0; } }

1 0

Ken Thomases : dinput: Use the proper mutable Core Foundation types for mutable collections and avoid casting.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: bf938311a29eb66d158d4a365bfad54a3fc01e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf938311a29eb66d158d4a365… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:11 2014 -0500 dinput: Use the proper mutable Core Foundation types for mutable collections and avoid casting. --- dlls/dinput/joystick_osx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e5a6034..1d7e970 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -96,7 +96,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); static IOHIDManagerRef hid_manager = NULL; -static CFArrayRef device_main_elements = NULL; +static CFMutableArrayRef device_main_elements = NULL; typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; @@ -283,7 +283,7 @@ static CFMutableDictionaryRef create_osx_device_match(int usage) return result; } -static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_elements) +static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_elements) { CFArrayRef elements; CFIndex total = 0; @@ -310,7 +310,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_element if (usage_page == kHIDPage_GenericDesktop && (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad)) { - CFArrayAppendValue((CFMutableArrayRef)main_elements, element); + CFArrayAppendValue(main_elements, element); total++; } } @@ -319,7 +319,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_element return total; } -static void get_element_children(IOHIDElementRef element, CFArrayRef all_children) +static void get_element_children(IOHIDElementRef element, CFMutableArrayRef all_children) { CFIndex idx, cnt; CFArrayRef element_children = IOHIDElementGetChildren(element); @@ -337,7 +337,7 @@ static void get_element_children(IOHIDElementRef element, CFArrayRef all_childre if (IOHIDElementGetType(child) == kIOHIDElementTypeCollection) get_element_children(child, all_children); else - CFArrayAppendValue((CFMutableArrayRef)all_children, child); + CFArrayAppendValue(all_children, child); } } @@ -345,7 +345,7 @@ static int find_osx_devices(void) { CFMutableDictionaryRef result; CFSetRef devset; - CFArrayRef matching; + CFMutableArrayRef matching; hid_manager = IOHIDManagerCreate( kCFAllocatorDefault, 0L ); if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) @@ -364,14 +364,14 @@ static int find_osx_devices(void) CFRelease(matching); return 0; } - CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); + CFArrayAppendValue( matching, result ); result = create_osx_device_match(kHIDUsage_GD_GamePad); if (!result) { CFRelease(matching); return 0; } - CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); + CFArrayAppendValue( matching, result ); IOHIDManagerSetDeviceMatchingMultiple( hid_manager, matching); devset = IOHIDManagerCopyDevices( hid_manager ); @@ -458,7 +458,7 @@ static void insert_sort_button(int header, IOHIDElementRef element, static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDElementRef device_main_element; - CFArrayRef elements; + CFMutableArrayRef elements; DWORD axes = 0; DWORD sliders = 0; DWORD buttons = 0;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
50
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 April 2014