wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Qian Hong : user32: Make CreateWindowExA and CreateWindowExW hotpatchable.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 26683adf36e5a13844a9c832826aae40cb1ebf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=26683adf36e5a13844a9c8328… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 24 15:24:11 2013 +0800 user32: Make CreateWindowExA and CreateWindowExW hotpatchable. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index db4881a..1b4d34b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1682,7 +1682,7 @@ failed: /*********************************************************************** * CreateWindowExA (USER32.@) */ -HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExA( DWORD exStyle, LPCSTR className, LPCSTR windowName, DWORD style, INT x, INT y, INT width, INT height, HWND parent, HMENU menu, @@ -1719,7 +1719,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, /*********************************************************************** * CreateWindowExW (USER32.@) */ -HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className, LPCWSTR windowName, DWORD style, INT x, INT y, INT width, INT height, HWND parent, HMENU menu,

1 0

André Hentschel : clusapi: Add stub for GetClusterInformation.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: c6acd7a41c818dee0ae5fdd45590ec48fd53c395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6acd7a41c818dee0ae5fdd45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 24 01:01:03 2013 +0200 clusapi: Add stub for GetClusterInformation. --- dlls/clusapi/clusapi.c | 14 ++++++++++++++ dlls/clusapi/clusapi.spec | 2 +- include/clusapi.h | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index f782d43..88c6fbf 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -28,6 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(clusapi); /*********************************************************************** + * GetClusterInformation (CLUSAPI.@) + * + */ +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo) +{ + FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo); + + *lpcchClusterName = 0; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * GetNodeClusterState (CLUSAPI.@) * * PARAMS diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec index 9c6abe2..01d3329 100644 --- a/dlls/clusapi/clusapi.spec +++ b/dlls/clusapi/clusapi.spec @@ -70,7 +70,7 @@ @ stub GetClusterFromResource @ stub GetClusterGroupKey @ stub GetClusterGroupState -@ stub GetClusterInformation +@ stdcall GetClusterInformation(ptr ptr ptr ptr) @ stub GetClusterKey @ stub GetClusterNetInterface @ stub GetClusterNetInterfaceKey diff --git a/include/clusapi.h b/include/clusapi.h index 7e04964..4ab07cc 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -26,7 +26,24 @@ extern "C" { typedef struct _HCLUSTER *HCLUSTER; typedef struct _HCLUSENUM *HCLUSENUM; + +typedef struct _CLUSTERVERSIONINFO +{ + DWORD dwVersionInfoSize; + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WCHAR szVendorId[64]; + WCHAR szCSDVersion[64]; + DWORD dwClusterHighestVersion; + DWORD dwClusterLowestVersion; + DWORD dwFlags; + DWORD dwReserved; +} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO; + BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType);

1 0

Detlef Riekenberg : include: Add missing InitOnce / RtlRunOnce prototypes.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: f8971d0342932579224a64bd63fd19a47d315f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8971d0342932579224a64bd6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 23 19:46:45 2013 +0200 include: Add missing InitOnce / RtlRunOnce prototypes. --- include/winbase.h | 2 ++ include/winnt.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index ad51af3..4e21049 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1951,6 +1951,8 @@ WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR, WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); +WINBASEAPI BOOL WINAPI InitOnceBeginInitialize(PINIT_ONCE, DWORD, PBOOL, PVOID*); +WINBASEAPI BOOL WINAPI InitOnceComplete(PINIT_ONCE, DWORD, PVOID); WINBASEAPI BOOL WINAPI InitOnceExecuteOnce(PINIT_ONCE,PINIT_ONCE_FN,PVOID,PVOID*); WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); diff --git a/include/winnt.h b/include/winnt.h index 6911f1c..171141e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5163,6 +5163,8 @@ typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; NTSYSAPI VOID WINAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); NTSYSAPI DWORD WINAPI RtlRunOnceExecuteOnce(PRTL_RUN_ONCE,PRTL_RUN_ONCE_INIT_FN,PVOID,PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PBOOL, PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceComplete(PRTL_RUN_ONCE, DWORD, PVOID); #include <pshpack8.h> typedef struct _IO_COUNTERS {

1 0

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

24 May '13

Module: wine Branch: master Commit: 51f97bb3f9213c0934e1dcb8c25ddc9d1e8c41e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f97bb3f9213c0934e1dcb8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:27 2013 -0500 dinput: Support DIPROP_FFGAIN for OSX joysticks. --- dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 555cbf4..66b020e 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This, return hr; } +static HRESULT osx_set_ffgain(JoystickImpl *This, const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_FFGAIN, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, const GUID *prop, const DIPROPHEADER *header) { @@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickWGenericImpl_SetProperty(iface, prop, header); @@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickAGenericImpl_SetProperty(iface, prop, header);

1 0

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

24 May '13

Module: wine Branch: master Commit: 0ba2a2f70b0d35a0accc253d816398167bb480b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba2a2f70b0d35a0accc253d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:24 2013 -0500 dinput: Support DIPROP_AUTOCENTER for OSX joysticks. --- dlls/dinput/joystick_osx.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b31774f..555cbf4 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1118,6 +1118,51 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_DEVICENOTREG; } +static HRESULT osx_set_autocenter(JoystickImpl *This, + const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_AUTOCENTER, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + +static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + } + + return JoystickWGenericImpl_SetProperty(iface, prop, header); +} + +static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + } + + return JoystickAGenericImpl_SetProperty(iface, prop, header); +} + static CFUUIDRef effect_win_to_mac(const GUID *effect) { #define DO_MAP(X) \ @@ -1240,7 +1285,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, JoystickAGenericImpl_GetProperty, - JoystickAGenericImpl_SetProperty, + JoystickAImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, @@ -1276,7 +1321,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWGenericImpl_GetProperty, - JoystickWGenericImpl_SetProperty, + JoystickWImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, JoystickWGenericImpl_GetDeviceState,

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

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: 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: 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

Alexandre Julliard : winetest: Use the original base URL in the redirect.
by Alexandre Julliard 23 May '13

23 May '13

Module: tools Branch: master Commit: 640251d21fa9bd458db0ec495a1647fbdaf83d5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=640251d21fa9bd458db0ec49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 21:40:19 2013 +0200 winetest: Use the original base URL in the redirect. --- winetest/site | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/winetest/site b/winetest/site index aa1afe0..f7996a6 100755 --- a/winetest/site +++ b/winetest/site @@ -49,7 +49,8 @@ if ($q->param('testing')) { } # redirect to data dir when no vars present -print $q->redirect("http://test.winehq.org/data/" . $build); +my $base = $q->url(-base => 1); +print $q->redirect($base . "/data/" . $build); # done exit();

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
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 May 2013