Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[akhaldi] 72268: [QEDIT] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:48:26 2016 New Revision: 72268 URL: http://svn.reactos.org/svn/reactos?rev=72268&view=rev Log: [QEDIT] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] Thu Aug 18 09:48:26 2016 @@ -77,8 +77,7 @@ TRACE("(%p) new ref = %u\n", This, refCount); if (refCount == 0) { - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This); } return refCount; @@ -264,10 +263,8 @@ IMemInputPin_Release(This->memOutput); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); - if (This->bufferData) - CoTaskMemFree(This->bufferData); + CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->bufferData); if(This->seekthru_unk) IUnknown_Release(This->seekthru_unk); } @@ -372,8 +369,7 @@ size = 0; EnterCriticalSection(&This->filter.csFilter); if (This->bufferLen != size) { - if (This->bufferData) - CoTaskMemFree(This->bufferData); + CoTaskMemFree(This->bufferData); This->bufferData = size ? CoTaskMemAlloc(size) : NULL; This->bufferLen = size; } @@ -574,8 +570,7 @@ debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), type->lSampleSize, debugstr_guid(&type->formattype), type->cbFormat); - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->mtype.pbFormat); This->mtype = *type; This->mtype.pUnk = NULL; if (type->cbFormat) { @@ -924,8 +919,7 @@ !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) && !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (This->sg->mtype.pbFormat) - CoTaskMemFree(This->sg->mtype.pbFormat); + CoTaskMemFree(This->sg->mtype.pbFormat); This->sg->mtype = *type; This->sg->mtype.pUnk = NULL; if (type->cbFormat) { @@ -1288,7 +1282,8 @@ else obj->outer_unk = &obj->IUnknown_inner; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&obj->seekthru_unk); if(hr) return hr; IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:48:26 2016 @@ -38,7 +38,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4

8 years, 4 months

[akhaldi] 72267: [DPLAYX] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:46:58 2016 New Revision: 72267 URL: http://svn.reactos.org/svn/reactos?rev=72267&view=rev Log: [DPLAYX] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] Thu Aug 18 09:46:58 2016 @@ -165,7 +165,7 @@ } /* NOTE: This must be called with the semaphore acquired. - * TRUE/FALSE with a pointer to it's data returned. Pointer data is + * TRUE/FALSE with a pointer to its data returned. Pointer data is * is only valid if TRUE is returned. */ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData ) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:46:58 2016 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72266: [DMUSIC] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:45:45 2016 New Revision: 72266 URL: http://svn.reactos.org/svn/reactos?rev=72266&view=rev Log: [DMUSIC] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c trunk/reactos/dll/directx/wine/dmusic/dmusic.c trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/cl… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] Thu Aug 18 09:45:45 2016 @@ -121,7 +121,7 @@ IReferenceClockImpl* clock; HRESULT hr; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); if (!clock) { Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] Thu Aug 18 09:45:45 2016 @@ -403,7 +403,7 @@ IDirectMusic8Impl *dmusic; HRESULT ret; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); *ret_iface = NULL; if (unkouter) Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Thu Aug 18 09:45:45 2016 @@ -755,7 +755,8 @@ HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); *object = NULL; @@ -840,14 +841,16 @@ HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; } HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:45:45 2016 @@ -32,7 +32,7 @@ reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29

8 years, 4 months

[akhaldi] 72265: [DINPUT_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:44:21 2016 New Revision: 72265 URL: http://svn.reactos.org/svn/reactos?rev=72265&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/dinput/dinput.c Modified: trunk/rostests/winetests/dinput/dinput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/dinput.c… ============================================================================== --- trunk/rostests/winetests/dinput/dinput.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/dinput.c [iso-8859-1] Thu Aug 18 09:44:21 2016 @@ -128,12 +128,7 @@ enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags); - if (enum_devices_tests[i].todo) - { - todo_wine - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); - } - else + todo_wine_if(enum_devices_tests[i].todo) ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); }

8 years, 4 months

[akhaldi] 72264: [DINPUT] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:43:58 2016 New Revision: 72264 URL: http://svn.reactos.org/svn/reactos?rev=72264&view=rev Log: [DINPUT] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/wine/dinput/joystick_osx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Thu Aug 18 09:43:58 2016 @@ -512,7 +512,7 @@ return DIERR_OUTOFMEMORY; } -/* find an object by it's offset in a data format */ +/* find an object by its offset in a data format */ static int offset_to_object(const DataFormat *df, int offset) { int i; Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Thu Aug 18 09:43:58 2016 @@ -57,10 +57,13 @@ { char device[MAX_PATH]; char name[MAX_PATH]; + GUID guid_product; BYTE axis_count; BYTE button_count; int *dev_axes_map; + + WORD vendor_id, product_id; }; typedef struct JoystickImpl JoystickImpl; @@ -100,6 +103,19 @@ {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; +/* + * Construct the GUID in the same way of Windows doing this. + * Data1 is concatenation of productid and vendorid. + * Data2 and Data3 are NULL. + * Data4 seems to be a constant. + */ +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { + 0x000000000, + 0x0000, + 0x0000, + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} +}; + #define MAX_JOYSTICKS 64 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; @@ -115,9 +131,10 @@ joystick_devices_count = 0; for (i = 0; i < MAX_JOYSTICKS; i++) { - int fd; + int fd, sys_fd; struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; + char sys_path[sizeof("/sys/class/input/js/device/id/product") + 10], id_str[5]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) < 0) @@ -184,6 +201,47 @@ joydev.dev_axes_map[j] = -1; } + /* Find vendor_id and product_id in sysfs */ + joydev.vendor_id = 0; + joydev.product_id = 0; + + sprintf(sys_path, "/sys/class/input/js%d/device/id/vendor", i); + sys_fd = open(sys_path, O_RDONLY); + if (sys_fd > 0) + { + if (read(sys_fd, id_str, 4) == 4) + { + id_str[4] = '\0'; + joydev.vendor_id = strtol(id_str, NULL, 16); + } + + close(sys_fd); + } + + sprintf(sys_path, "/sys/class/input/js%d/device/id/product", i); + sys_fd = open(sys_path, O_RDONLY); + if (sys_fd > 0) + { + if (read(sys_fd, id_str, 4) == 4) + { + id_str[4] = '\0'; + joydev.product_id = strtol(id_str, NULL, 16); + } + + close(sys_fd); + } + + if (joydev.vendor_id == 0 || joydev.product_id == 0) + { + joydev.guid_product = DInput_Wine_Joystick_GUID; + } + else + { + /* Concatenate product_id with vendor_id to mimic Windows behaviour */ + joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); + } + close(fd); if (!joystick_devices_count) @@ -214,7 +272,7 @@ lpddi->dwSize = dwSize; lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -237,7 +295,7 @@ lpddi->dwSize = dwSize; lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Thu Aug 18 09:43:58 2016 @@ -77,6 +77,7 @@ char *device; char *name; GUID guid; + GUID guid_product; BOOL has_ff; int num_effects; @@ -140,6 +141,19 @@ 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} +}; + +/* + * Construct the GUID in the same way of Windows doing this. + * Data1 is concatenation of productid and vendorid. + * Data2 and Data3 are NULL. + * Data4 seems to be a constant. + */ +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { + 0x000000000, + 0x0000, + 0x0000, + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} }; #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) @@ -274,11 +288,18 @@ } if (ioctl(fd, EVIOCGID, &device_id) == -1) + { WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); + joydev.guid_product = DInput_Wine_Joystick_Base_GUID; + } else { joydev.vendor_id = device_id.vendor; joydev.product_id = device_id.product; + + /* Concatenate product_id with vendor_id to mimic Windows behaviour */ + joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } if (!have_joydevs) @@ -308,7 +329,7 @@ lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) @@ -329,7 +350,7 @@ lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) Modified: trunk/reactos/dll/directx/wine/dinput/joystick_osx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_osx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_osx.c [iso-8859-1] Thu Aug 18 09:43:58 2016 @@ -175,9 +175,86 @@ return in; } -static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) -{ - CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); +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 CFStringRef copy_device_name(IOHIDDeviceRef device) +{ + CFStringRef name; + + if (device) + { + CFTypeRef ref_name; + + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); + + ref_name = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); + + if (ref_name && CFStringGetTypeID() == CFGetTypeID(ref_name)) + name = CFStringCreateCopy(kCFAllocatorDefault, ref_name); + else + { + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("0x%04lx 0x%04lx"), vendID, prodID); + } + } + else + { + ERR("NULL device\n"); + name = CFStringCreateCopy(kCFAllocatorDefault, CFSTR("")); + } + + return name; +} + +static long get_device_location_ID(IOHIDDeviceRef device) +{ + return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); +} + +static void copy_set_to_array(const void *value, void *context) +{ + CFArrayAppendValue(context, value); +} + +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) +{ + CFStringRef name1 = copy_device_name(device1), name2 = copy_device_name(device2); + CFComparisonResult result = CFStringCompare(name1, name2, (kCFCompareForcedOrdering | kCFCompareNumerically)); + CFRelease(name1); + CFRelease(name2); + return result; +} + +static CFComparisonResult device_location_name_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; + /* virtual joysticks may not have a kIOHIDLocationIDKey and will default to location ID of 0, this orders virtual joysticks by their name */ + return device_name_comparator(device1, device2); } static const char* debugstr_cf(CFTypeRef t) @@ -212,8 +289,9 @@ 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) @@ -449,10 +527,13 @@ 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_name_comparator, NULL); device_main_elements = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); if (!device_main_elements) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:43:58 2016 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.16 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72263: [DEVENUM] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:42:25 2016 New Revision: 72263 URL: http://svn.reactos.org/svn/reactos?rev=72263&view=rev Log: [DEVENUM] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Thu Aug 18 09:42:25 2016 @@ -257,8 +257,8 @@ error_cleanup_types: - if (clsMajorType) CoTaskMemFree(clsMajorType); - if (clsMinorType) CoTaskMemFree(clsMinorType); + CoTaskMemFree(clsMajorType); + CoTaskMemFree(clsMinorType); } RegCloseKey(hkeyMajorType); @@ -353,7 +353,7 @@ error_cleanup: RegCloseKey(hkeyPinKey); - if (rgPin->strName) CoTaskMemFree(rgPin->strName); + CoTaskMemFree(rgPin->strName); } RegCloseKey(hkeyPins); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:42:25 2016 @@ -29,7 +29,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72262: [D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:40:45 2016 New Revision: 72262 URL: http://svn.reactos.org/svn/reactos?rev=72262&view=rev Log: [D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c trunk/reactos/dll/directx/wine/d3dxof/parsing.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] Thu Aug 18 09:40:45 2016 @@ -889,7 +889,7 @@ object->level = 0; object->from_ref = TRUE; - *ppDataObj = (LPDIRECTXFILEDATA)object; + *ppDataObj = &object->IDirectXFileData_iface; return DXFILE_OK; } @@ -1044,10 +1044,10 @@ goto error; } - *ppDataObj = (LPDIRECTXFILEDATA)object; + *ppDataObj = &object->IDirectXFileData_iface; /* Get a reference to created object */ - This->pRefObjects[This->nb_xobjects] = (LPDIRECTXFILEDATA)object; + This->pRefObjects[This->nb_xobjects] = &object->IDirectXFileData_iface; IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]); This->nb_xobjects++; Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] Thu Aug 18 09:40:45 2016 @@ -736,7 +736,7 @@ { buf->list_nb_elements--; buf->list_separator = FALSE; - /* Insert separarator between each values and since list does not accept separator at the end + /* Insert separator between each value, and since list does not accept separator at the end use a comma so any extra separator will generate an error */ token = TOKEN_COMMA; } @@ -749,7 +749,7 @@ *(DWORD*)buf->value = value; buf->list_separator = TRUE; - /* Convert list into a serie of their basic type counterpart */ + /* Convert list into a series of their basic type counterpart */ token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; } dump_TOKEN(token); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 09:40:45 2016 @@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72261: [SHELL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:39:10 2016 New Revision: 72261 URL: http://svn.reactos.org/svn/reactos?rev=72261&view=rev Log: [SHELL32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellole.c Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… ============================================================================== --- trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] Thu Aug 18 09:39:10 2016 @@ -424,7 +424,9 @@ } if (0) /* crashes on native */ +{ hr = pGetCurrentProcessExplicitAppUserModelID(NULL); +} appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… ============================================================================== --- trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] Thu Aug 18 09:39:10 2016 @@ -30,6 +30,8 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; + static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); @@ -50,7 +52,6 @@ static void test_namespace(void) { - static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', @@ -306,6 +307,136 @@ IShellDispatch_Release(sd); } +static void test_items(void) +{ + WCHAR wstr[MAX_PATH], orig_dir[MAX_PATH]; + HRESULT r; + IShellDispatch *sd = NULL; + Folder *folder = NULL; + FolderItems *items = NULL; + FolderItems2 *items2 = NULL; + FolderItems3 *items3 = NULL; + FolderItem *item = (FolderItem*)0xdeadbeef; + IDispatch *disp = NULL; + IUnknown *unk = NULL; + FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef; + VARIANT var; + LONG lcount = -1; + + r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd); + ok(SUCCEEDED(r), "CoCreateInstance failed: %08x\n", r); + ok(!!sd, "sd is null\n"); + + GetTempPathW(MAX_PATH, wstr); + GetCurrentDirectoryW(MAX_PATH, orig_dir); + SetCurrentDirectoryW(wstr); + CreateDirectoryW(winetestW, NULL); + GetFullPathNameW(winetestW, MAX_PATH, wstr, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(wstr); + r = IShellDispatch_NameSpace(sd, var, &folder); + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + ok(!!folder, "folder is null\n"); + SysFreeString(V_BSTR(&var)); + IShellDispatch_Release(sd); + SetCurrentDirectoryW(winetestW); + + r = Folder_Items(folder, &items); + ok(r == S_OK, "Folder::Items failed: %08x\n", r); + ok(!!items, "items is null\n"); + r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); + ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); + ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); + r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); + ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); + ok(!!items3, "items3 is null\n"); + Folder_Release(folder); + + if (0) /* crashes on all versions of Windows */ + r = FolderItems_get_Count(items, NULL); + + r = FolderItems_get_Count(items, &lcount); +todo_wine + ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); +todo_wine + ok(!lcount, "expected 0 files, got %d\n", lcount); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + + if (0) /* crashes on all versions of Windows */ + r = FolderItems_Item(items, var, NULL); + + r = FolderItems_Item(items, var, &item); +todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + ok(!item, "item is not null\n"); + + if (0) /* crashes on xp */ + { + r = FolderItems_get_Application(items, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems_get_Application(items, &disp); +todo_wine + ok(r == S_OK, "FolderItems::get_Application failed: %08x\n", r); +todo_wine + ok(!!disp, "disp is null\n"); + if (disp) IDispatch_Release(disp); + + if (0) /* crashes on xp */ + { + r = FolderItems_get_Parent(items, NULL); + ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); + } + + disp = (IDispatch*)0xdeadbeef; + r = FolderItems_get_Parent(items, &disp); + ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); + ok(!disp, "disp is not null\n"); + + if (0) /* crashes on xp */ + { + r = FolderItems__NewEnum(items, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems__NewEnum(items, &unk); +todo_wine + ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); +todo_wine + ok(!!unk, "unk is null\n"); + if (unk) IUnknown_Release(unk); + + if (items3) + { + r = FolderItems3_Filter(items3, 0, NULL); +todo_wine + ok(r == S_OK, "expected S_OK, got %08x\n", r); + + if (0) /* crashes on xp */ + { + r = FolderItems3_get_Verbs(items3, NULL); + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); + } + + r = FolderItems3_get_Verbs(items3, &verbs); +todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + ok(!verbs, "verbs is not null\n"); + } + + GetTempPathW(MAX_PATH, wstr); + SetCurrentDirectoryW(wstr); + RemoveDirectoryW(winetestW); + SetCurrentDirectoryW(orig_dir); + + FolderItems_Release(items); + if (items2) FolderItems2_Release(items2); + if (items3) FolderItems3_Release(items3); +} + static void test_service(void) { static const WCHAR spooler[] = {'S','p','o','o','l','e','r',0}; @@ -597,7 +728,9 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) +{ test_dispatch_typeinfo(doc, viewdual_riids); +} IWebBrowser2_Release(wb); @@ -879,6 +1012,7 @@ init_function_pointers(); test_namespace(); + test_items(); test_service(); test_ShellFolderViewDual(); test_ShellWindows(); Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… ============================================================================== --- trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] Thu Aug 18 09:39:10 2016 @@ -248,7 +248,7 @@ strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - ok(!strcmp(buffer, "C:\\nonexistent\\file") || + todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file") || broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ "case doesn't match\n"); Modified: trunk/rostests/winetests/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellol… ============================================================================== --- trunk/rostests/winetests/shell32/shellole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shellole.c [iso-8859-1] Thu Aug 18 09:39:10 2016 @@ -871,7 +871,9 @@ } if (0) /* crashes on native */ +{ hr = pSHCreateSessionKey(KEY_READ, NULL); +} hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey);

8 years, 4 months

[akhaldi] 72260: [PSDK] Update shldisp.idl. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:38:10 2016 New Revision: 72260 URL: http://svn.reactos.org/svn/reactos?rev=72260&view=rev Log: [PSDK] Update shldisp.idl. CORE-11866 Modified: trunk/reactos/sdk/include/psdk/shldisp.idl Modified: trunk/reactos/sdk/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shldisp.i… ============================================================================== --- trunk/reactos/sdk/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shldisp.idl [iso-8859-1] Thu Aug 18 09:38:10 2016 @@ -356,6 +356,36 @@ [id(DISPID_NEWENUM)] HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * FolderItems2 interface + */ +[ + uuid(c94f0ad0-f363-11d2-a327-00c04f8eec7f), + oleautomation, + dual +] +interface FolderItems2 : FolderItems +{ + HRESULT InvokeVerbEx( [in, optional] VARIANT verb, + [in, optional] VARIANT args ); +} + +/***************************************************************************** + * FolderItems3 interface + */ +[ + uuid(eaa7c309-bbec-49d5-821d-64d966cb667f), + oleautomation, + dual +] +interface FolderItems3 : FolderItems2 +{ + HRESULT Filter( [in] long flags, [in] BSTR spec ); + + [id(0), propget] + HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); } /*****************************************************************************

8 years, 4 months

[akhaldi] 72259: [D3DRM_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 09:37:07 2016 New Revision: 72259 URL: http://svn.reactos.org/svn/reactos?rev=72259&view=rev Log: [D3DRM_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/d3drm/d3drm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/d3drm.c?r…

8 years, 4 months

← Newer
1
...
24
25
26
27
28
29
30
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016