March 2009 - Wine-Commits - list.winehq.org

Aric Stewart : dinput: Remove easy redundancy from linuxinput.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 36f538eb91f0e18b5d5744198b351c1b6f3ca22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f538eb91f0e18b5d5744198… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 9 10:07:27 2009 -0500 dinput: Remove easy redundancy from linuxinput. --- dlls/dinput/joystick_linuxinput.c | 50 +----------------------------------- 1 files changed, 2 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 548f920..f5dc542 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1069,52 +1069,6 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, return DI_OK; } -/****************************************************************************** - * GetObjectInfo : get information about a device object such as a button - * or axis - */ -static HRESULT WINAPI JoystickWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) -{ - static const WCHAR axisW[] = {'A','x','i','s',' ','%','d',0}; - static const WCHAR povW[] = {'P','O','V',' ','%','d',0}; - static const WCHAR buttonW[] = {'B','u','t','t','o','n',' ','%','d',0}; - HRESULT res; - - res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); - if (res != DI_OK) return res; - - if (pdidoi->dwType & DIDFT_AXIS) - sprintfW(pdidoi->tszName, axisW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_POV) - sprintfW(pdidoi->tszName, povW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_BUTTON) - sprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType)); - - _dump_OBJECTINSTANCEW(pdidoi); - return res; -} - -static HRESULT WINAPI JoystickAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) -{ - HRESULT res; - DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; - - didoiW.dwSize = sizeof(didoiW); - res = JoystickWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); - if (res != DI_OK) return res; - - memset(pdidoi, 0, pdidoi->dwSize); - memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); - pdidoi->dwSize = dwSize; - WideCharToMultiByte(CP_ACP, 0, didoiW.tszName, -1, pdidoi->tszName, - sizeof(pdidoi->tszName), NULL, NULL); - - return res; -} - /****************************************************************************** * CreateEffect - Create a new FF effect with the specified params */ @@ -1516,7 +1470,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, - JoystickAImpl_GetObjectInfo, + JoystickAGenericImpl_GetObjectInfo, JoystickAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, @@ -1558,7 +1512,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - JoystickWImpl_GetObjectInfo, + JoystickWGenericImpl_GetObjectInfo, JoystickWImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,

1 0

Aric Stewart : dinput: Move joystick mapping functions to the generic part.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: e90e7e5b7746e4c3b1f8fbd68bbcb65307b4135f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90e7e5b7746e4c3b1f8fbd68… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 9 10:07:07 2009 -0500 dinput: Move joystick mapping functions to the generic part. --- dlls/dinput/joystick.c | 55 +++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linuxinput.c | 57 +------------------------------------ dlls/dinput/joystick_private.h | 3 ++ 3 files changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 006e5be..a19cf27 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -387,3 +387,58 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( return DI_OK; } + +/* + * This maps the read value (from the input event) to a value in the + * 'wanted' range. + * Notes: + * Dead zone is in % multiplied by a 100 (range 0..10000) + */ +LONG joystick_map_axis(ObjProps *props, int val) +{ + LONG ret; + LONG dead_zone = MulDiv( props->lDeadZone, props->lDevMax - props->lDevMin, 10000 ); + LONG dev_range = props->lDevMax - props->lDevMin - dead_zone; + + /* Center input */ + val -= (props->lDevMin + props->lDevMax) / 2; + + /* Remove dead zone */ + if (abs( val ) <= dead_zone / 2) + val = 0; + else + val = val < 0 ? val + dead_zone / 2 : val - dead_zone / 2; + + /* Scale and map the value from the device range into the required range */ + ret = MulDiv( val, props->lMax - props->lMin, dev_range ) + + (props->lMin + props->lMax) / 2; + + /* Clamp in case or rounding errors */ + if (ret > props->lMax) ret = props->lMax; + else if (ret < props->lMin) ret = props->lMin; + + TRACE( "(%d <%d> %d) -> (%d <%d> %d): val=%d ret=%d\n", + props->lDevMin, dead_zone, props->lDevMax, + props->lMin, props->lDeadZone, props->lMax, + val, ret ); + + return ret; +} + +/* + * Maps POV x & y event values to a DX "clock" position: + * 0 + * 31500 4500 + * 27000 -1 9000 + * 22500 13500 + * 18000 + */ +DWORD joystick_map_pov(POINTL *p) +{ + if (p->x > 0) + return p->y < 0 ? 4500 : !p->y ? 9000 : 13500; + else if (p->x < 0) + return p->y < 0 ? 31500 : !p->y ? 27000 : 22500; + else + return p->y < 0 ? 0 : !p->y ? -1 : 18000; +} diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c24ade9..548f920 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -64,65 +64,10 @@ #include "dinput_private.h" #include "device_private.h" +#include "joystick_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); - -/* - * Maps POV x & y event values to a DX "clock" position: - * 0 - * 31500 4500 - * 27000 -1 9000 - * 22500 13500 - * 18000 - */ -DWORD joystick_map_pov(POINTL *p) -{ - if (p->x > 0) - return p->y < 0 ? 4500 : !p->y ? 9000 : 13500; - else if (p->x < 0) - return p->y < 0 ? 31500 : !p->y ? 27000 : 22500; - else - return p->y < 0 ? 0 : !p->y ? -1 : 18000; -} - -/* - * This maps the read value (from the input event) to a value in the - * 'wanted' range. - * Notes: - * Dead zone is in % multiplied by a 100 (range 0..10000) - */ -LONG joystick_map_axis(ObjProps *props, int val) -{ - LONG ret; - LONG dead_zone = MulDiv( props->lDeadZone, props->lDevMax - props->lDevMin, 10000 ); - LONG dev_range = props->lDevMax - props->lDevMin - dead_zone; - - /* Center input */ - val -= (props->lDevMin + props->lDevMax) / 2; - - /* Remove dead zone */ - if (abs( val ) <= dead_zone / 2) - val = 0; - else - val = val < 0 ? val + dead_zone / 2 : val - dead_zone / 2; - - /* Scale and map the value from the device range into the required range */ - ret = MulDiv( val, props->lMax - props->lMin, dev_range ) + - (props->lMin + props->lMax) / 2; - - /* Clamp in case or rounding errors */ - if (ret > props->lMax) ret = props->lMax; - else if (ret < props->lMin) ret = props->lMin; - - TRACE( "(%d <%d> %d) -> (%d <%d> %d): val=%d ret=%d\n", - props->lDevMin, dead_zone, props->lDevMax, - props->lMin, props->lDeadZone, props->lMax, - val, ret ); - - return ret; -} - #ifdef HAVE_CORRECT_LINUXINPUT_H #define EVDEVPREFIX "/dev/input/event" diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 3d87c7c..e1709e9 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -46,6 +46,9 @@ typedef struct JoystickGenericImpl joy_polldev_handler *joy_polldev; } JoystickGenericImpl; +LONG joystick_map_axis(ObjProps *props, int val); + +DWORD joystick_map_pov(POINTL *p); HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow);

1 0

Aric Stewart : dinput: Move joystick Polling and Device State to the generic part.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 94a5e0978d832a488798acd6b9a41afa1299cb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a5e0978d832a488798acd6b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 9 10:06:57 2009 -0500 dinput: Move joystick Polling and Device State to the generic part. --- dlls/dinput/joystick.c | 42 +++++++++++++++++++++ dlls/dinput/joystick_linux.c | 78 ++++++++++----------------------------- dlls/dinput/joystick_private.h | 12 ++++++ 3 files changed, 74 insertions(+), 58 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index d1299cb..006e5be 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -345,3 +345,45 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( return DI_OK; } + +HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) +{ + JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + + TRACE("(%p)\n",This); + + if (!This->base.acquired) { + WARN("not acquired\n"); + return DIERR_NOTACQUIRED; + } + + This->joy_polldev(This); + return DI_OK; +} + +/****************************************************************************** + * GetDeviceState : returns the "state" of the joystick. + * + */ +HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( + LPDIRECTINPUTDEVICE8A iface, + DWORD len, + LPVOID ptr) +{ + JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + + TRACE("(%p,0x%08x,%p)\n", This, len, ptr); + + if (!This->base.acquired) { + WARN("not acquired\n"); + return DIERR_NOTACQUIRED; + } + + /* update joystick state */ + This->joy_polldev(This); + + /* convert and copy data to user supplied buffer */ + fill_DataFormat(ptr, len, &This->js, &This->base.data_format); + + return DI_OK; +} diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ad9ad02..2fb0ff4 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -87,7 +87,6 @@ struct JoystickImpl /* joystick private */ int joyfd; - DIJOYSTATE2 js; /* wine data */ LONG deadzone; int *axis_map; int axes; @@ -105,6 +104,8 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 static INT joystick_devices_count = -1; static LPSTR joystick_devices[MAX_JOYSTICKS]; +static void joy_polldev(JoystickGenericImpl *This); + static INT find_joystick_devices(void) { INT i; @@ -379,6 +380,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } newDevice->generic.guidProduct = DInput_Wine_Joystick_GUID; + newDevice->generic.joy_polldev = joy_polldev; /* get the device name */ #if defined(JSIOCGNAME) @@ -649,9 +651,11 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) return DI_NOEFFECT; } -static void joy_polldev(JoystickImpl *This) { +static void joy_polldev(JoystickGenericImpl *This_in) { struct pollfd plfd; struct js_event jse; + JoystickImpl *This = (JoystickImpl*) This_in; + TRACE("(%p)\n", This); if (This->joyfd==-1) { @@ -678,7 +682,7 @@ static void joy_polldev(JoystickImpl *This) { if (jse.number >= This->generic.devcaps.dwButtons) return; inst_id = DIDFT_MAKEINSTANCE(jse.number) | DIDFT_PSHBUTTON; - This->js.rgbButtons[jse.number] = value = jse.value ? 0x80 : 0x00; + This->generic.js.rgbButtons[jse.number] = value = jse.value ? 0x80 : 0x00; } else if (jse.type & JS_EVENT_AXIS) { @@ -691,14 +695,14 @@ static void joy_polldev(JoystickImpl *This) { TRACE("changing axis %d => %d\n", jse.number, number); switch (number) { - case 0: This->js.lX = value; break; - case 1: This->js.lY = value; break; - case 2: This->js.lZ = value; break; - case 3: This->js.lRx = value; break; - case 4: This->js.lRy = value; break; - case 5: This->js.lRz = value; break; - case 6: This->js.rglSlider[0] = value; break; - case 7: This->js.rglSlider[1] = value; break; + case 0: This->generic.js.lX = value; break; + case 1: This->generic.js.lY = value; break; + case 2: This->generic.js.lZ = value; break; + case 3: This->generic.js.lRx = value; break; + case 4: This->generic.js.lRy = value; break; + case 5: This->generic.js.lRz = value; break; + case 6: This->generic.js.rglSlider[0] = value; break; + case 7: This->generic.js.rglSlider[1] = value; break; case 8: case 9: case 10: case 11: { int idx = number - 8; @@ -708,7 +712,7 @@ static void joy_polldev(JoystickImpl *This) { else This->povs[idx].x = jse.value; - This->js.rgdwPOV[idx] = value = joystick_map_pov(&This->povs[idx]); + This->generic.js.rgdwPOV[idx] = value = joystick_map_pov(&This->povs[idx]); break; } default: @@ -722,48 +726,6 @@ static void joy_polldev(JoystickImpl *This) { } } -/****************************************************************************** - * GetDeviceState : returns the "state" of the joystick. - * - */ -static HRESULT WINAPI JoystickAImpl_GetDeviceState( - LPDIRECTINPUTDEVICE8A iface, - DWORD len, - LPVOID ptr) -{ - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(%p,0x%08x,%p)\n", This, len, ptr); - - if (!This->generic.base.acquired) { - WARN("not acquired\n"); - return DIERR_NOTACQUIRED; - } - - /* update joystick state */ - joy_polldev(This); - - /* convert and copy data to user supplied buffer */ - fill_DataFormat(ptr, len, &This->js, &This->generic.base.data_format); - - return DI_OK; -} - -static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(%p)\n",This); - - if (!This->generic.base.acquired) { - WARN("not acquired\n"); - return DIERR_NOTACQUIRED; - } - - joy_polldev(This); - return DI_OK; -} - static const IDirectInputDevice8AVtbl JoystickAvt = { IDirectInputDevice2AImpl_QueryInterface, @@ -775,7 +737,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_SetProperty, JoystickAImpl_Acquire, JoystickAImpl_Unacquire, - JoystickAImpl_GetDeviceState, + JoystickAGenericImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, @@ -791,7 +753,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, - JoystickAImpl_Poll, + JoystickAGenericImpl_Poll, IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, @@ -817,7 +779,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SetProperty)JoystickAGenericImpl_SetProperty, XCAST(Acquire)JoystickAImpl_Acquire, XCAST(Unacquire)JoystickAImpl_Unacquire, - XCAST(GetDeviceState)JoystickAImpl_GetDeviceState, + XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, @@ -833,7 +795,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, XCAST(Escape)IDirectInputDevice2AImpl_Escape, - XCAST(Poll)JoystickAImpl_Poll, + XCAST(Poll)JoystickAGenericImpl_Poll, XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 36f5b47..3d87c7c 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -29,14 +29,21 @@ #include "dinput_private.h" #include "device_private.h" +struct JoystickGenericImpl; + +typedef void joy_polldev_handler(struct JoystickGenericImpl *This); + typedef struct JoystickGenericImpl { struct IDirectInputDevice2AImpl base; ObjProps *props; DIDEVCAPS devcaps; + DIJOYSTATE2 js; /* wine data */ GUID guidProduct; char *name; + + joy_polldev_handler *joy_polldev; } JoystickGenericImpl; @@ -63,4 +70,9 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi); +HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface); + +HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface, + DWORD len, LPVOID ptr); + #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Aric Stewart : dinput: Move joystick productGuid and Name to the generic part.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: cbd34748e9ce24d19ffa815be17685ed69a26d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd34748e9ce24d19ffa815be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 9 10:06:50 2009 -0500 dinput: Move joystick productGuid and Name to the generic part. --- dlls/dinput/joystick.c | 71 ++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 89 ++++------------------------------------ dlls/dinput/joystick_private.h | 7 +++ 3 files changed, 87 insertions(+), 80 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index f6d2271..d1299cb 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -274,3 +274,74 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty( return DI_OK; } + +/****************************************************************************** + * GetDeviceInfo : get information about a device's identity + */ +HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( + LPDIRECTINPUTDEVICE8A iface, + LPDIDEVICEINSTANCEA pdidi) +{ + JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + + TRACE("(%p,%p)\n", iface, pdidi); + + if (pdidi == NULL) { + WARN("invalid pointer\n"); + return E_POINTER; + } + + if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && + (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) { + WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); + return DIERR_INVALIDPARAM; + } + + /* Return joystick */ + pdidi->guidInstance = GUID_Joystick; + pdidi->guidProduct = This->guidProduct; + /* we only support traditional joysticks for now */ + pdidi->dwDevType = This->devcaps.dwDevType; + strcpy(pdidi->tszInstanceName, "Joystick"); + strcpy(pdidi->tszProductName, This->name); + if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { + pdidi->guidFFDriver = GUID_NULL; + pdidi->wUsagePage = 0; + pdidi->wUsage = 0; + } + + return DI_OK; +} + +/****************************************************************************** + * GetDeviceInfo : get information about a device's identity + */ +HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( + LPDIRECTINPUTDEVICE8W iface, + LPDIDEVICEINSTANCEW pdidi) +{ + JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + + TRACE("(%p,%p)\n", iface, pdidi); + + if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && + (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) { + WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); + return DIERR_INVALIDPARAM; + } + + /* Return joystick */ + pdidi->guidInstance = GUID_Joystick; + pdidi->guidProduct = This->guidProduct; + /* we only support traditional joysticks for now */ + pdidi->dwDevType = This->devcaps.dwDevType; + MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, pdidi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, This->name, -1, pdidi->tszProductName, MAX_PATH); + if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3W)) { + pdidi->guidFFDriver = GUID_NULL; + pdidi->wUsagePage = 0; + pdidi->wUsage = 0; + } + + return DI_OK; +} diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index edbdf70..ad9ad02 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -88,7 +88,6 @@ struct JoystickImpl /* joystick private */ int joyfd; DIJOYSTATE2 js; /* wine data */ - char *name; LONG deadzone; int *axis_map; int axes; @@ -264,13 +263,13 @@ static HRESULT setup_dinput_options(JoystickImpl * device) device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); if (!device->axis_map) return DIERR_OUTOFMEMORY; - if (!get_config_key( hkey, appkey, device->name, buffer, MAX_PATH )) { + if (!get_config_key( hkey, appkey, device->generic.name, buffer, MAX_PATH )) { static const char *axis_names[] = {"X", "Y", "Z", "Rx", "Ry", "Rz", "Slider1", "Slider2", "POV1", "POV2", "POV3", "POV4"}; const char *delim = ","; char * ptr; - TRACE("\"%s\" = \"%s\"\n", device->name, buffer); + TRACE("\"%s\" = \"%s\"\n", device->generic.name, buffer); if ((ptr = strtok(buffer, delim)) != NULL) { do { @@ -379,6 +378,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di return DIERR_DEVICENOTREG; } + newDevice->generic.guidProduct = DInput_Wine_Joystick_GUID; + /* get the device name */ #if defined(JSIOCGNAME) if (ioctl(newDevice->joyfd,JSIOCGNAME(MAX_PATH),name) < 0) { @@ -390,8 +391,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di #endif /* copy the device name */ - newDevice->name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); - strcpy(newDevice->name, name); + newDevice->generic.name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); + strcpy(newDevice->generic.name, name); #ifdef JSIOCGAXES if (ioctl(newDevice->joyfd,JSIOCGAXES,&newDevice->axes) < 0) { @@ -504,7 +505,7 @@ FAILED1: HeapFree(GetProcessHeap(), 0, df); release_DataFormat(&newDevice->generic.base.data_format); HeapFree(GetProcessHeap(),0,newDevice->axis_map); - HeapFree(GetProcessHeap(),0,newDevice->name); + HeapFree(GetProcessHeap(),0,newDevice->generic.name); HeapFree(GetProcessHeap(),0,newDevice->generic.props); HeapFree(GetProcessHeap(),0,newDevice); *pdev = 0; @@ -763,78 +764,6 @@ static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } - -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI JoystickAImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEINSTANCEA pdidi) -{ - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(%p,%p)\n", iface, pdidi); - - if (pdidi == NULL) { - WARN("invalid pointer\n"); - return E_POINTER; - } - - if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && - (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) { - WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); - return DIERR_INVALIDPARAM; - } - - /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; - pdidi->guidProduct = DInput_Wine_Joystick_GUID; - /* we only support traditional joysticks for now */ - pdidi->dwDevType = This->generic.devcaps.dwDevType; - strcpy(pdidi->tszInstanceName, "Joystick"); - strcpy(pdidi->tszProductName, This->name); - if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { - pdidi->guidFFDriver = GUID_NULL; - pdidi->wUsagePage = 0; - pdidi->wUsage = 0; - } - - return DI_OK; -} - -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI JoystickWImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEINSTANCEW pdidi) -{ - JoystickImpl *This = (JoystickImpl *)iface; - - TRACE("(%p,%p)\n", iface, pdidi); - - if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && - (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) { - WARN("invalid parameter: pdidi->dwSize = %d\n", pdidi->dwSize); - return DIERR_INVALIDPARAM; - } - - /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; - pdidi->guidProduct = DInput_Wine_Joystick_GUID; - /* we only support traditional joysticks for now */ - pdidi->dwDevType = This->generic.devcaps.dwDevType; - MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, pdidi->tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, This->name, -1, pdidi->tszProductName, MAX_PATH); - if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3W)) { - pdidi->guidFFDriver = GUID_NULL; - pdidi->wUsagePage = 0; - pdidi->wUsage = 0; - } - - return DI_OK; -} - static const IDirectInputDevice8AVtbl JoystickAvt = { IDirectInputDevice2AImpl_QueryInterface, @@ -852,7 +781,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickAGenericImpl_GetObjectInfo, - JoystickAImpl_GetDeviceInfo, + JoystickAGenericImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, IDirectInputDevice2AImpl_CreateEffect, @@ -894,7 +823,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickWGenericImpl_GetObjectInfo, - JoystickWImpl_GetDeviceInfo, + JoystickWGenericImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 40a3336..36f5b47 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -35,6 +35,8 @@ typedef struct JoystickGenericImpl ObjProps *props; DIDEVCAPS devcaps; + GUID guidProduct; + char *name; } JoystickGenericImpl; @@ -55,5 +57,10 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps); HRESULT WINAPI JoystickAGenericImpl_SetProperty( LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph); +HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, + LPDIDEVICEINSTANCEA pdidi); + +HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, + LPDIDEVICEINSTANCEW pdidi); #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Aric Stewart : dinput: Begin joystick separation into a generic module.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 620839d24e8cae6c9ce0fbe689ff7043e7b7461d URL: http://source.winehq.org/git/wine.git/?a=commit;h=620839d24e8cae6c9ce0fbe68… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 9 10:06:41 2009 -0500 dinput: Begin joystick separation into a generic module. --- dlls/dinput/Makefile.in | 1 + dlls/dinput/joystick.c | 276 ++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 364 +++++++--------------------------------- dlls/dinput/joystick_private.h | 59 +++++++ 4 files changed, 396 insertions(+), 304 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=620839d24e8cae6c9ce0f…

1 0

Tony Wasserka : d3dx9: Recognize the D3DXSPRITE_DO_NOT_ADDREF_TEXTURE flag.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 3b9332a41d0d1c847316aa3ca9dd87efbe678164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9332a41d0d1c847316aa3ca… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Mar 9 17:10:28 2009 +0100 d3dx9: Recognize the D3DXSPRITE_DO_NOT_ADDREF_TEXTURE flag. --- dlls/d3dx9_36/sprite.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index afca6cf..ce9938e 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -222,7 +222,6 @@ D3DXSPRITE_OBJECTSPACE: do not change device transforms D3DXSPRITE_SORT_DEPTH_BACKTOFRONT: sort by position D3DXSPRITE_SORT_DEPTH_FRONTTOBACK: sort by position D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) -D3DXSPRITE_DO_NOT_ADDREF_TEXTURE: don't call AddRef/Release on every Draw/Flush call */ if(This->vdecl==NULL) { static const D3DVERTEXELEMENT9 elements[] = @@ -283,7 +282,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Draw(LPD3DXSPRITE iface, LPDIRECT3DTEXTURE This->sprites=HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sprites, This->allocated_sprites*sizeof(SPRITE)); } This->sprites[This->sprite_count].texture=texture; - IUnknown_AddRef(texture); + if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) + IDirect3DTexture9_AddRef(texture); /* Reuse the texture desc if possible */ if(This->sprite_count) { @@ -381,8 +381,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) } HeapFree(GetProcessHeap(), 0, vertices); - for(i=0;i<This->sprite_count;i++) - if(This->sprites[i].texture) + if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) + for(i=0;i<This->sprite_count;i++) IDirect3DTexture9_Release(This->sprites[i].texture); This->sprite_count=0;

1 0

Tony Wasserka : d3dx9: Recognize the D3DXSPRITE_DONOTSAVESTATE flag.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 02e43a5276feaf345b7506ce1b19b7bba14307ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e43a5276feaf345b7506ce1… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Mar 9 17:06:38 2009 +0100 d3dx9: Recognize the D3DXSPRITE_DONOTSAVESTATE flag. --- dlls/d3dx9_36/sprite.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 41767d8..afca6cf 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -223,7 +223,6 @@ D3DXSPRITE_SORT_DEPTH_BACKTOFRONT: sort by position D3DXSPRITE_SORT_DEPTH_FRONTTOBACK: sort by position D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) D3DXSPRITE_DO_NOT_ADDREF_TEXTURE: don't call AddRef/Release on every Draw/Flush call -D3DXSPRITE_DONOTSAVESTATE: don't restore the current device state on ID3DXSprite_End */ if(This->vdecl==NULL) { static const D3DVERTEXELEMENT9 elements[] = @@ -236,22 +235,23 @@ D3DXSPRITE_DONOTSAVESTATE: don't restore the current device state on ID3DXSprite IDirect3DDevice9_CreateVertexDeclaration(This->device, elements, &This->vdecl); } - if(This->stateblock==NULL) { - /* Tell our state block what it must store */ - hr=IDirect3DDevice9_BeginStateBlock(This->device); - if(hr!=D3D_OK) return hr; + if(!(flags & D3DXSPRITE_DONOTSAVESTATE)) { + if(This->stateblock==NULL) { + /* Tell our state block what it must store */ + hr=IDirect3DDevice9_BeginStateBlock(This->device); + if(hr!=D3D_OK) return hr; - set_states(This); + set_states(This); - IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(SPRITEVERTEX)); - IDirect3DDevice9_SetIndices(This->device, NULL); - IDirect3DDevice9_SetTexture(This->device, 0, NULL); + IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); + IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_SetIndices(This->device, NULL); + IDirect3DDevice9_SetTexture(This->device, 0, NULL); - IDirect3DDevice9_EndStateBlock(This->device, &This->stateblock); + IDirect3DDevice9_EndStateBlock(This->device, &This->stateblock); + } + IDirect3DStateBlock9_Capture(This->stateblock); /* Save current state */ } - /* Save current state */ - IDirect3DStateBlock9_Capture(This->stateblock); /* Apply device state */ set_states(This); @@ -400,7 +400,9 @@ static HRESULT WINAPI ID3DXSpriteImpl_End(LPD3DXSPRITE iface) if(!This->ready) return D3DERR_INVALIDCALL; ID3DXSprite_Flush(iface); - if(This->stateblock) IDirect3DStateBlock9_Apply(This->stateblock); /* Restore old state */ + + if(!(This->flags & D3DXSPRITE_DONOTSAVESTATE)) + if(This->stateblock) IDirect3DStateBlock9_Apply(This->stateblock); /* Restore old state */ This->ready=FALSE;

1 0

Huw Davies : gdi32/tests: Win9x's GetDIBits() sets biSizeImage to zero for BI_RGB dibs.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: 3d461dbe853db17db8b452471dd47d64de0f81ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d461dbe853db17db8b452471… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 9 17:03:40 2009 +0000 gdi32/tests: Win9x's GetDIBits() sets biSizeImage to zero for BI_RGB dibs. --- dlls/gdi32/tests/bitmap.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f095d6a..ec466dd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1564,7 +1564,9 @@ static void test_GetDIBits(void) lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", lines, bm.bmHeight, GetLastError()); - ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1), "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage); + ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1) || + broken(bi->bmiHeader.biSizeImage == 0), /* win9x */ + "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage); /* the color table consists of black and white */ ok(bi->bmiColors[0].rgbRed == 0 && bi->bmiColors[0].rgbGreen == 0 && @@ -1614,7 +1616,9 @@ static void test_GetDIBits(void) lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", lines, bm.bmHeight, GetLastError()); - ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24), "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage); + ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24) || + broken(bi->bmiHeader.biSizeImage == 0), /* win9x */ + "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage); /* the color table doesn't exist for 24-bit images */ for (i = 0; i < 256; i++) @@ -1675,7 +1679,9 @@ static void test_GetDIBits(void) lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", lines, bm.bmHeight, GetLastError()); - ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1), "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage); + ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_1) || + broken(bi->bmiHeader.biSizeImage == 0), /* win9x */ + "expected 16*4, got %u\n", bi->bmiHeader.biSizeImage); /* the color table consists of black and white */ ok(bi->bmiColors[0].rgbRed == 0 && bi->bmiColors[0].rgbGreen == 0 && @@ -1726,7 +1732,9 @@ todo_wine lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", lines, bm.bmHeight, GetLastError()); - ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24), "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage); + ok(bi->bmiHeader.biSizeImage == sizeof(dib_bits_24) || + broken(bi->bmiHeader.biSizeImage == 0), /* win9x */ + "expected 16*16*3, got %u\n", bi->bmiHeader.biSizeImage); /* the color table doesn't exist for 24-bit images */ for (i = 0; i < 256; i++)

1 0

Huw Davies : gdi32/tests: Marked another win9x failure as broken.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: f7608053e7ab1d6e0a91720156b68fa81c1047bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7608053e7ab1d6e0a9172015… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 9 16:55:16 2009 +0000 gdi32/tests: Marked another win9x failure as broken. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 221c6bd..f095d6a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2197,7 +2197,9 @@ static void test_get16dibits(void) info->bmiHeader.biCompression = BI_RGB; ret = GetDIBits(screen_dc, hbmp, 0, 0, NULL, info, 0); - ok(ret != 0, "GetDIBits failed got %d\n", ret); + ok(ret != 0 || + broken(ret == 0), /* win9x */ + "GetDIBits failed got %d\n", ret); for (p = ((BYTE *) info) + sizeof(info->bmiHeader); (p - ((BYTE *) info)) < info_len; p++) if (*p != '!')

1 0

Henri Verbeet : d3d8: Handles aren't supposed to be pointers.
by Alexandre Julliard March 10, 2009

March 10, 2009

Module: wine Branch: master Commit: f9d82ed1ded8ae507b429da8a10ac359416768d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d82ed1ded8ae507b429da8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 09:48:49 2009 +0100 d3d8: Handles aren't supposed to be pointers. This might even make d3d8 a bit more 64-bit safe. --- dlls/d3d8/device.c | 127 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 189b18f..7f891ff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1283,91 +1283,138 @@ static HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface object->wineD3DStateBlock = wineD3DStateBlock; - *pToken = (DWORD)object; - TRACE("(%p)Returning %p %p\n", This, object, wineD3DStateBlock); - + *pToken = d3d8_allocate_handle(&This->handle_table, object); LeaveCriticalSection(&d3d8_cs); + + if (*pToken == D3D8_INVALID_HANDLE) + { + ERR("Failed to create a handle\n"); + IDirect3DStateBlock8_Release((IDirect3DStateBlock8 *)object); + return E_FAIL; + } + ++*pToken; + + TRACE("Returning %#x (%p).\n", *pToken, object); + return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { - IDirect3DStateBlock8Impl *pSB = (IDirect3DStateBlock8Impl*) Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DStateBlock8Impl *pSB; HRESULT hr; - TRACE("(%p) %p Relay\n", This, pSB); + TRACE("(%p) %#x Relay\n", This, Token); EnterCriticalSection(&d3d8_cs); + pSB = d3d8_get_object(&This->handle_table, Token - 1); + if (!pSB) + { + WARN("Invalid handle (%#x) passed.\n", Token); + LeaveCriticalSection(&d3d8_cs); + return D3DERR_INVALIDCALL; + } hr = IWineD3DStateBlock_Apply(pSB->wineD3DStateBlock); LeaveCriticalSection(&d3d8_cs); return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { - IDirect3DStateBlock8Impl* pSB = (IDirect3DStateBlock8Impl *)Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DStateBlock8Impl *pSB; HRESULT hr; - TRACE("(%p) %p Relay\n", This, pSB); + TRACE("(%p) %#x Relay\n", This, Token); EnterCriticalSection(&d3d8_cs); + pSB = d3d8_get_object(&This->handle_table, Token - 1); + if (!pSB) + { + WARN("Invalid handle (%#x) passed.\n", Token); + LeaveCriticalSection(&d3d8_cs); + return D3DERR_INVALIDCALL; + } hr = IWineD3DStateBlock_Capture(pSB->wineD3DStateBlock); LeaveCriticalSection(&d3d8_cs); return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { - IDirect3DStateBlock8Impl* pSB = (IDirect3DStateBlock8Impl *)Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DStateBlock8Impl *pSB; TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); + pSB = d3d8_free_handle(&This->handle_table, Token - 1); + LeaveCriticalSection(&d3d8_cs); + + if (!pSB) + { + WARN("Invalid handle (%#x) passed.\n", Token); + return D3DERR_INVALIDCALL; + } if (IUnknown_Release((IUnknown *)pSB)) { ERR("Stateblock %p has references left, this shouldn't happen.\n", pSB); } - LeaveCriticalSection(&d3d8_cs); - return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(LPDIRECT3DDEVICE8 iface, D3DSTATEBLOCKTYPE Type, DWORD* pToken) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - IDirect3DStateBlock8Impl *object; - HRESULT hrc = D3D_OK; +static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *iface, + D3DSTATEBLOCKTYPE Type, DWORD *handle) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DStateBlock8Impl *object; + HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("(%p) Relay\n", This); - if(Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE && - Type != D3DSBT_VERTEXSTATE ) { - WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL\n"); - return D3DERR_INVALIDCALL; - } + if (Type != D3DSBT_ALL + && Type != D3DSBT_PIXELSTATE + && Type != D3DSBT_VERTEXSTATE) + { + WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL\n"); + return D3DERR_INVALIDCALL; + } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock8Impl)); - if (NULL == object) { - *pToken = 0; - return E_OUTOFMEMORY; - } - object->lpVtbl = &Direct3DStateBlock8_Vtbl; - object->ref = 1; - - EnterCriticalSection(&d3d8_cs); - hrc = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown *)object); - LeaveCriticalSection(&d3d8_cs); - if(D3D_OK != hrc){ - FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", This); - HeapFree(GetProcessHeap(), 0, object); - *pToken = 0; - } else { - *pToken = (DWORD)object; - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, object); - } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock8Impl)); + if (!object) + { + ERR("Failed to allocate memory.\n"); + return E_OUTOFMEMORY; + } - return hrc; + object->lpVtbl = &Direct3DStateBlock8_Vtbl; + object->ref = 1; + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, + &object->wineD3DStateBlock, (IUnknown *)object); + if (FAILED(hr)) + { + LeaveCriticalSection(&d3d8_cs); + ERR("IWineD3DDevice_CreateStateBlock failed, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + *handle = d3d8_allocate_handle(&This->handle_table, object); + LeaveCriticalSection(&d3d8_cs); + + if (*handle == D3D8_INVALID_HANDLE) + { + ERR("Failed to allocate a handle.\n"); + IDirect3DStateBlock8_Release((IDirect3DStateBlock8 *)object); + return E_FAIL; + } + ++*handle; + + TRACE("Returning %#x (%p).\n", *handle, object); + + return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface, CONST D3DCLIPSTATUS8* pClipStatus) {

1 0