May 2013 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 0fe64ce339e2b47ff2c7369a6463b61cbffbe713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe64ce339e2b47ff2c7369a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 21 20:39:09 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES. --- dlls/oledb32/convert.c | 23 ++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 490685b..9550e52 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -121,7 +121,7 @@ static int get_length(DBTYPE type) case DBTYPE_UI2: return 2; case DBTYPE_BOOL: - return sizeof(VARIANT_BOOL); + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: @@ -143,6 +143,7 @@ static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: @@ -1363,6 +1364,26 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, } } break; + case DBTYPE_BYTES: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); + else + WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + + return S_OK; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); + return E_NOTIMPL; + } + } + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 089b28c..a3884dc 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2464,6 +2464,21 @@ static void test_getconversionsize(void) todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&var); + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); } static void test_converttobytes(void)

1 0

Alistair Leslie-Hughes : oledb32: GetConversionSize only returns a valid size of BSTR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 338cb2e5dd70320b45b23c4456262422faefac41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338cb2e5dd70320b45b23c445… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 15:12:24 2013 +1000 oledb32: GetConversionSize only returns a valid size of BSTR. --- dlls/oledb32/convert.c | 34 ++++++++-------------------------- dlls/oledb32/tests/convert.c | 1 - 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 9550e52..abbc76b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1305,7 +1305,6 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, switch (dst_type) { case DBTYPE_STR: - { switch (src_type) { case DBTYPE_VARIANT: @@ -1326,26 +1325,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); return E_NOTIMPL; } - } - break; + break; case DBTYPE_WSTR: - { switch (src_type) { case DBTYPE_VARIANT: - { - VARIANT v; - - VariantInit(&v); - if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - { - *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR); - VariantClear(&v); - } + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); else - return hr; - } - break; + WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + break; case DBTYPE_STR: if(src_len) *dst_len = (*src_len + 1) * sizeof(WCHAR); @@ -1362,28 +1351,21 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); return E_NOTIMPL; } - } - break; + break; case DBTYPE_BYTES: - { switch (src_type) { case DBTYPE_VARIANT: - { if(V_VT((VARIANT*)src) == VT_BSTR) *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); else WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); - - return S_OK; - } - break; + break; default: FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); return E_NOTIMPL; } - } - break; + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a3884dc..ff44e0a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2461,7 +2461,6 @@ static void test_getconversionsize(void) V_I4(&var) = 4; hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&var); dst_len = 0;

1 0

Henri Verbeet : wined3d: Also clear context-> current_fbo in context_apply_blit_state().
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 7ca6839c943229cce653586da3c14d7e11fd4d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca6839c943229cce653586da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:48 2013 +0200 wined3d: Also clear context->current_fbo in context_apply_blit_state(). The draw buffer handling code depends on this being current. This fixes a bug exposed by commit 075fa6547c0edf2b1b2c1cabae7731fdc1308cc2. --- dlls/wined3d/context.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b3fd62..e6f2c1a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2149,6 +2149,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { + context->current_fbo = NULL; context_bind_fbo(context, GL_FRAMEBUFFER, NULL); rt_mask = context_generate_rt_mask_from_surface(rt); }

1 0

Alexandre Julliard : Wine release 1.5.31
by Alexandre Julliard 24 May '13

24 May '13

Module: website Branch: master Commit: eed280315b39968cdd815086808eeb766dd65e2e URL: http://source.winehq.org/git/website.git/?a=commit;h=eed280315b39968cdd8150… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:32:20 2013 +0200 Wine release 1.5.31 --- news/en/2013052401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013052401.xml b/news/en/2013052401.xml new file mode 100644 index 0000000..cdefb34 --- /dev/null +++ b/news/en/2013052401.xml @@ -0,0 +1,15 @@ +<news> +<date>May 24, 2013</date> +<title>Wine 1.5.31 Released</title> +<body> + The Wine development release 1.5.31 is now available. + <a href="{$root}/announce/1.5.31">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 21.</li> + <li>Joystick force feedback support on Mac OS X.</li> + <li>Window management fixes in the Mac driver.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.31.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 120cee4f857acbac4ecfe2bd435d4fa9a72af6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=120cee4f857acbac4ecfe2bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:20:05 2013 +0200 Release 1.5.31. --- ANNOUNCE | 632 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 354 insertions(+), 298 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=120cee4f857acbac4ecfe…

1 0

Tag wine-1.5.31 : Alexandre Julliard : Release 1.5.31
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: refs/tags/wine-1.5.31 Tag: d0e39592136ddc895f9fbbd3ecb0089f39ffe90c URL: http://source.winehq.org/git/wine.git/?a=tag;h=d0e39592136ddc895f9fbbd3ecb0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:20:06 2013 +0200 Release 1.5.31

1 0

Andrew Eikum : dinput: Translate OSX errors to win32 errors.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 44a2d36f7082b761e715b010e9bc0e74c6edc70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a2d36f7082b761e715b010e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:07 2013 -0500 dinput: Translate OSX errors to win32 errors. --- dlls/dinput/joystick_osx.c | 51 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0d3927a..3ec6fea 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -147,6 +147,35 @@ static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-4 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} }; +static HRESULT osx_to_win32_hresult(HRESULT in) +{ + /* OSX returns 16-bit COM runtime errors, which we should + * convert to win32 */ + switch(in){ + case 0x80000001: + return E_NOTIMPL; + case 0x80000002: + return E_OUTOFMEMORY; + case 0x80000003: + return E_INVALIDARG; + case 0x80000004: + return E_NOINTERFACE; + case 0x80000005: + return E_POINTER; + case 0x80000006: + return E_HANDLE; + case 0x80000007: + return E_ABORT; + case 0x80000008: + return E_FAIL; + case 0x80000009: + return E_ACCESSDENIED; + case 0x8000FFFF: + return E_UNEXPECTED; + } + return in; +} + static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) { CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); @@ -203,7 +232,7 @@ static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) if(!ret) return FFIsForceFeedback(service) == FF_OK ? S_OK : S_FALSE; - return FFCreateDevice(service, ret); + return osx_to_win32_hresult(FFCreateDevice(service, ret)); } static CFMutableDictionaryRef creates_osx_device_match(int usage) @@ -1106,8 +1135,8 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, effect->device = This; /* Mac's FFEFFECT and Win's DIEFFECT are binary identical. */ - hr = FFDeviceCreateEffect(This->ff, effect_win_to_mac(type), - (FFEFFECT*)params, &effect->effect); + hr = osx_to_win32_hresult(FFDeviceCreateEffect(This->ff, + effect_win_to_mac(type), (FFEFFECT*)params, &effect->effect)); if(FAILED(hr)){ WARN("FFDeviceCreateEffect failed: %08x\n", hr); HeapFree(GetProcessHeap(), 0, effect); @@ -1273,7 +1302,7 @@ static HRESULT WINAPI effect_GetParameters(IDirectInputEffect *iface, { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p %p 0x%x\n", This, effect, flags); - return FFEffectGetParameters(This->effect, (FFEFFECT*)effect, flags); + return osx_to_win32_hresult(FFEffectGetParameters(This->effect, (FFEFFECT*)effect, flags)); } static HRESULT WINAPI effect_SetParameters(IDirectInputEffect *iface, @@ -1281,7 +1310,7 @@ static HRESULT WINAPI effect_SetParameters(IDirectInputEffect *iface, { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p %p 0x%x\n", This, effect, flags); - return FFEffectSetParameters(This->effect, (FFEFFECT*)effect, flags); + return osx_to_win32_hresult(FFEffectSetParameters(This->effect, (FFEFFECT*)effect, flags)); } static HRESULT WINAPI effect_Start(IDirectInputEffect *iface, DWORD iterations, @@ -1289,42 +1318,42 @@ static HRESULT WINAPI effect_Start(IDirectInputEffect *iface, DWORD iterations, { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p 0x%x 0x%x\n", This, iterations, flags); - return FFEffectStart(This->effect, iterations, flags); + return osx_to_win32_hresult(FFEffectStart(This->effect, iterations, flags)); } static HRESULT WINAPI effect_Stop(IDirectInputEffect *iface) { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p\n", This); - return FFEffectStop(This->effect); + return osx_to_win32_hresult(FFEffectStop(This->effect)); } static HRESULT WINAPI effect_GetEffectStatus(IDirectInputEffect *iface, DWORD *flags) { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p %p\n", This, flags); - return FFEffectGetEffectStatus(This->effect, (UInt32*)flags); + return osx_to_win32_hresult(FFEffectGetEffectStatus(This->effect, (UInt32*)flags)); } static HRESULT WINAPI effect_Download(IDirectInputEffect *iface) { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p\n", This); - return FFEffectDownload(This->effect); + return osx_to_win32_hresult(FFEffectDownload(This->effect)); } static HRESULT WINAPI effect_Unload(IDirectInputEffect *iface) { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p\n", This); - return FFEffectUnload(This->effect); + return osx_to_win32_hresult(FFEffectUnload(This->effect)); } static HRESULT WINAPI effect_Escape(IDirectInputEffect *iface, DIEFFESCAPE *escape) { EffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("%p %p\n", This, escape); - return FFEffectEscape(This->effect, (FFEFFESCAPE*)escape); + return osx_to_win32_hresult(FFEffectEscape(This->effect, (FFEFFESCAPE*)escape)); } static const IDirectInputEffectVtbl EffectVtbl = {

1 0

Andrew Eikum : dinput: Debug print DIEFFECT structure.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 5135f80a2798d836bc95ddea5ad152eb2d147565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5135f80a2798d836bc95ddea5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:12 2013 -0500 dinput: Debug print DIEFFECT structure. --- dlls/dinput/effect_linuxinput.c | 199 +------------------------------------- dlls/dinput/joystick.c | 178 ++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_osx.c | 2 + dlls/dinput/joystick_private.h | 3 + 4 files changed, 189 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5135f80a2798d836bc95d…

1 0

Andrew Eikum : dinput: Support SendForceFeedbackCommand for OSX joysticks.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 1b0b0ab9a540c6fa7d5809e5d54274c43dec7fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0b0ab9a540c6fa7d5809e5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:16 2013 -0500 dinput: Support SendForceFeedbackCommand for OSX joysticks. --- dlls/dinput/joystick_osx.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index fe7c10f..464b137 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1164,6 +1164,36 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, type, params, out, outer); } +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8W *iface, + DWORD flags) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + HRESULT hr; + + TRACE("%p 0x%x\n", This, flags); + + if(!This->ff) + return DI_NOEFFECT; + + hr = osx_to_win32_hresult(FFDeviceSendForceFeedbackCommand(This->ff, flags)); + if(FAILED(hr)){ + WARN("FFDeviceSendForceFeedbackCommand failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(IDirectInputDevice8A *iface, + DWORD flags) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p 0x%x\n", This, flags); + + return JoystickWImpl_SendForceFeedbackCommand(&This->generic.base.IDirectInputDevice8W_iface, flags); +} + const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", joydev_enum_deviceA, @@ -1195,7 +1225,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, - IDirectInputDevice2AImpl_SendForceFeedbackCommand, + JoystickAImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, JoystickAGenericImpl_Poll, @@ -1231,7 +1261,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, - IDirectInputDevice2WImpl_SendForceFeedbackCommand, + JoystickWImpl_SendForceFeedbackCommand, IDirectInputDevice2WImpl_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, JoystickWGenericImpl_Poll,

1 0

Andrew Eikum : dinput: Report axes that support FF for OSX joysticks.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 4ce1da041fc6070d647fee780807ff398e91d2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce1da041fc6070d647fee780… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:20 2013 -0500 dinput: Report axes that support FF for OSX joysticks. --- dlls/dinput/device.c | 8 +++--- dlls/dinput/joystick_osx.c | 47 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b3875a8..2ca26fb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -145,13 +145,13 @@ void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) { } void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) { - TRACE(" - enumerating : %s ('%s') - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName); + TRACE(" - enumerating : %s ('%s') - %2d - 0x%08x - %s - 0x%x\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName, ddoi->dwFlags); } void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) { - TRACE(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName)); + TRACE(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s - 0x%x\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName), ddoi->dwFlags); } /* This function is a helper to convert a GUID into any possible DInput GUID out there */ diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 464b137..b31774f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -841,6 +841,15 @@ static const char *osx_ff_axis_name(UInt8 axis) return ret; } +static int osx_axis_has_ff(FFCAPABILITIES *ffcaps, UInt8 axis) +{ + int i; + for(i = 0; i < ffcaps->numFfAxes; ++i) + if(ffcaps->ffAxes[i] == axis) + return 1; + return 0; +} + static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, JoystickImpl **pdev, unsigned short index) { @@ -939,24 +948,46 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, for (i = 0; i < newDevice->generic.devcaps.dwAxes; i++) { - int wine_obj = -1; + int wine_obj = -1, has_ff = 0; switch (axis_map[i]) { - case kHIDUsage_GD_X: wine_obj = 0; break; - case kHIDUsage_GD_Y: wine_obj = 1; break; - case kHIDUsage_GD_Z: wine_obj = 2; break; - case kHIDUsage_GD_Rx: wine_obj = 3; break; - case kHIDUsage_GD_Ry: wine_obj = 4; break; - case kHIDUsage_GD_Rz: wine_obj = 5; break; + case kHIDUsage_GD_X: + wine_obj = 0; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_X); + break; + case kHIDUsage_GD_Y: + wine_obj = 1; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Y); + break; + case kHIDUsage_GD_Z: + wine_obj = 2; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Z); + break; + case kHIDUsage_GD_Rx: + wine_obj = 3; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RX); + break; + case kHIDUsage_GD_Ry: + wine_obj = 4; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RY); + break; + case kHIDUsage_GD_Rz: + wine_obj = 5; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RZ); + break; case kHIDUsage_GD_Slider: wine_obj = 6 + slider_count; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_SLIDER(slider_count)); slider_count++; break; } if (wine_obj < 0 ) continue; memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[wine_obj], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + df->rgodf[idx].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + if(has_ff) + df->rgodf[idx].dwFlags |= DIDOI_FFACTUATOR; + ++idx; } for (i = 0; i < newDevice->generic.devcaps.dwPOVs; i++)

1 0