July 2006 - Wine-commits - list.winehq.org

Christoph Frick : dinput: Call fake_current_js_state on the places where it is actually needed in SetProperty .
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 141a267957852aefcb80095a54ae925ace8f4d08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=141a267957852aefcb80095… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:17:31 2006 +0200 dinput: Call fake_current_js_state on the places where it is actually needed in SetProperty. --- dlls/dinput/joystick_linuxinput.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c47caf3..f365010 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1140,6 +1140,7 @@ static HRESULT WINAPI JoystickAImpl_SetP This->wantmax[obj] = pr->lMax; } } + fake_current_js_state(This); return DI_OK; } case (DWORD)DIPROP_DEADZONE: { @@ -1157,6 +1158,7 @@ static HRESULT WINAPI JoystickAImpl_SetP This->deadz[obj] = pd->dwData; } } + fake_current_js_state(This); return DI_OK; } default: @@ -1164,7 +1166,6 @@ static HRESULT WINAPI JoystickAImpl_SetP break; } } - fake_current_js_state(This); return 0; }

1 0

Christoph Frick : dinput: Only fake the current state on axes that are actually there.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: cd7e1d57075783cd5676469552fb630be78fbbf9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd7e1d57075783cd5676469… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:16:57 2006 +0200 dinput: Only fake the current state on axes that are actually there. --- dlls/dinput/joystick_linuxinput.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index eaa34ff..c47caf3 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -688,14 +688,14 @@ static void fake_current_js_state(Joysti { int i; /* center the axes */ - ji->js.lX = map_axis(ji, ABS_X, ji->joydev->axes[ABS_X ][AXE_ABS]); - ji->js.lY = map_axis(ji, ABS_Y, ji->joydev->axes[ABS_Y ][AXE_ABS]); - ji->js.lZ = map_axis(ji, ABS_Z, ji->joydev->axes[ABS_Z ][AXE_ABS]); - ji->js.lRx = map_axis(ji, ABS_RX, ji->joydev->axes[ABS_RX][AXE_ABS]); - ji->js.lRy = map_axis(ji, ABS_RY, ji->joydev->axes[ABS_RY][AXE_ABS]); - ji->js.lRz = map_axis(ji, ABS_RZ, ji->joydev->axes[ABS_RZ][AXE_ABS]); - ji->js.rglSlider[0] = map_axis(ji, ABS_THROTTLE, ji->joydev->axes[ABS_THROTTLE][AXE_ABS]); - ji->js.rglSlider[1] = map_axis(ji, ABS_RUDDER, ji->joydev->axes[ABS_RUDDER ][AXE_ABS]); + ji->js.lX = test_bit(ji->joydev->absbits, ABS_X) ? map_axis(ji, ABS_X, ji->joydev->axes[ABS_X ][AXE_ABS]) : 0; + ji->js.lY = test_bit(ji->joydev->absbits, ABS_Y) ? map_axis(ji, ABS_Y, ji->joydev->axes[ABS_Y ][AXE_ABS]) : 0; + ji->js.lZ = test_bit(ji->joydev->absbits, ABS_Z) ? map_axis(ji, ABS_Z, ji->joydev->axes[ABS_Z ][AXE_ABS]) : 0; + ji->js.lRx = test_bit(ji->joydev->absbits, ABS_RX) ? map_axis(ji, ABS_RX, ji->joydev->axes[ABS_RX ][AXE_ABS]) : 0; + ji->js.lRy = test_bit(ji->joydev->absbits, ABS_RY) ? map_axis(ji, ABS_RY, ji->joydev->axes[ABS_RY ][AXE_ABS]) : 0; + ji->js.lRz = test_bit(ji->joydev->absbits, ABS_RZ) ? map_axis(ji, ABS_RZ, ji->joydev->axes[ABS_RZ ][AXE_ABS]) : 0; + ji->js.rglSlider[0] = test_bit(ji->joydev->absbits, ABS_THROTTLE) ? map_axis(ji, ABS_THROTTLE, ji->joydev->axes[ABS_THROTTLE][AXE_ABS]) : 0; + ji->js.rglSlider[1] = test_bit(ji->joydev->absbits, ABS_RUDDER) ? map_axis(ji, ABS_RUDDER, ji->joydev->axes[ABS_RUDDER ][AXE_ABS]) : 0; /* POV center is -1 */ for (i=0; i<4; i++) { ji->js.rgdwPOV[i] = -1;

1 0

Christoph Frick : dinput: Utilize the offsets and the transform to support the user
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 1817648a0f254d587b3cbabed06389b2bbadc6c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1817648a0f254d587b3cbab… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:15:36 2006 +0200 dinput: Utilize the offsets and the transform to support the user supplied data format. --- dlls/dinput/joystick_linuxinput.c | 298 +++++++++++++++++++++++++++++-------- 1 files changed, 237 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1817648a0f254d587b3…

1 0

Christoph Frick : dinput: Move the axes and button configs into the JoyDev struct.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: d478b7e4bed2d01f90bed888f30c7cca1f65b851 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d478b7e4bed2d01f90bed88… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:16:22 2006 +0200 dinput: Move the axes and button configs into the JoyDev struct. --- dlls/dinput/joystick_linuxinput.c | 121 +++++++++++++++++++------------------ 1 files changed, 61 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 567c742..eaa34ff 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -99,6 +99,21 @@ struct JoyDev { BYTE absbits[(ABS_MAX+7)/8]; BYTE keybits[(KEY_MAX+7)/8]; BYTE ffbits[(FF_MAX+7)/8]; + +#define AXE_ABS 0 +#define AXE_ABSMIN 1 +#define AXE_ABSMAX 2 +#define AXE_ABSFUZZ 3 +#define AXE_ABSFLAT 4 + + /* data returned by the EVIOCGABS() ioctl */ + int axes[ABS_MAX][5]; + /* LUT for KEY_ to offset in rgbButtons */ + BYTE buttons[KEY_MAX]; + + /* autodetecting ranges per axe by following movement */ + LONG havemax[ABS_MAX]; + LONG havemin[ABS_MAX]; }; struct JoystickImpl @@ -117,10 +132,6 @@ struct JoystickImpl LONG wantmax[ABS_MAX]; LONG deadz[ABS_MAX]; - /* autodetecting ranges per axe by following movement */ - LONG havemax[ABS_MAX]; - LONG havemin[ABS_MAX]; - int joyfd; LPDIDATAFORMAT internal_df; @@ -138,17 +149,6 @@ struct JoystickImpl int num_effects; EffectListItem* top_effect; int ff_state; - - /* data returned by the EVIOCGABS() ioctl */ - int axes[ABS_MAX][5]; - /* LUT for KEY_ to offset in rgbButtons */ - BYTE buttons[KEY_MAX]; - -#define AXE_ABS 0 -#define AXE_ABSMIN 1 -#define AXE_ABSMAX 2 -#define AXE_ABSFUZZ 3 -#define AXE_ABSFLAT 4 }; static void fake_current_js_state(JoystickImpl *ji); @@ -189,6 +189,7 @@ static void find_joydevs(void) struct JoyDev joydev = {0}; int fd; int no_ff_check = 0; + int j, buttons; snprintf(buf,MAX_PATH,EVDEVPREFIX"%d",i); buf[MAX_PATH-1] = 0; @@ -254,6 +255,32 @@ #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION } #endif + for (j=0;j<ABS_MAX;j++) { + if (test_bit(joydev.absbits,j)) { + if (-1!=ioctl(fd,EVIOCGABS(j),&(joydev.axes[j]))) { + TRACE(" ... with axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", + j, + joydev.axes[j][AXE_ABS], + joydev.axes[j][AXE_ABSMIN], + joydev.axes[j][AXE_ABSMAX], + joydev.axes[j][AXE_ABSFUZZ], + joydev.axes[j][AXE_ABSFLAT] + ); + joydev.havemin[j] = joydev.axes[j][AXE_ABSMIN]; + joydev.havemax[j] = joydev.axes[j][AXE_ABSMAX]; + } + } + } + + buttons = 0; + for (j=0;j<KEY_MAX;j++) { + if (test_bit(joydev.keybits,j)) { + TRACE(" ... with button %d: %d\n", j, buttons); + joydev.buttons[j] = 0x80 | buttons; + buttons++; + } + } + if (have_joydevs==0) { joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev)); } else { @@ -358,8 +385,10 @@ #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION #endif memcpy(&(newDevice->guid),rguid,sizeof(*rguid)); for (i=0;i<ABS_MAX;i++) { - newDevice->wantmin[i] = -32768; - newDevice->wantmax[i] = 32767; + /* apps expect the range to be the same they would get from the + * GetProperty/range method */ + newDevice->wantmin[i] = newDevice->joydev->havemin[i]; + newDevice->wantmax[i] = newDevice->joydev->havemax[i]; /* TODO: * direct input defines a default for the deadzone somewhere; but as long * as in map_axis the code for the dead zone is commented out its no @@ -576,7 +605,6 @@ static HRESULT WINAPI JoystickAImpl_SetD */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - int i, buttons; JoystickImpl *This = (JoystickImpl *)iface; TRACE("(this=%p)\n",This); @@ -597,33 +625,6 @@ static HRESULT WINAPI JoystickAImpl_Acqu } } - for (i=0;i<ABS_MAX;i++) { - if (test_bit(This->joydev->absbits,i)) { - if (-1==ioctl(This->joyfd,EVIOCGABS(i),&(This->axes[i]))) - continue; - TRACE("axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", - i, - This->axes[i][AXE_ABS], - This->axes[i][AXE_ABSMIN], - This->axes[i][AXE_ABSMAX], - This->axes[i][AXE_ABSFUZZ], - This->axes[i][AXE_ABSFLAT] - ); - This->havemin[i] = This->axes[i][AXE_ABSMIN]; - This->havemax[i] = This->axes[i][AXE_ABSMAX]; - } - } - buttons = 0; - for (i=0;i<KEY_MAX;i++) { - if (test_bit(This->joydev->keybits,i)) { - TRACE("button %d: %d\n", i, buttons); - This->buttons[i] = 0x80 | buttons; - buttons++; - } - } - - fake_current_js_state(This); - return 0; } @@ -651,16 +652,16 @@ static HRESULT WINAPI JoystickAImpl_Unac */ static int map_axis(JoystickImpl* This, int axis, int val) { - int xmin = This->axes[axis][AXE_ABSMIN]; - int xmax = This->axes[axis][AXE_ABSMAX]; - int hmax = This->havemax[axis]; - int hmin = This->havemin[axis]; + int xmin = This->joydev->axes[axis][AXE_ABSMIN]; + int xmax = This->joydev->axes[axis][AXE_ABSMAX]; + int hmax = This->joydev->havemax[axis]; + int hmin = This->joydev->havemin[axis]; int wmin = This->wantmin[axis]; int wmax = This->wantmax[axis]; int ret; - if (val > hmax) This->havemax[axis] = hmax = val; - if (val < hmin) This->havemin[axis] = hmin = val; + if (val > hmax) This->joydev->havemax[axis] = hmax = val; + if (val < hmin) This->joydev->havemin[axis] = hmin = val; if (xmin == xmax) return val; @@ -687,14 +688,14 @@ static void fake_current_js_state(Joysti { int i; /* center the axes */ - ji->js.lX = map_axis(ji, ABS_X, ji->axes[ABS_X ][AXE_ABS]); - ji->js.lY = map_axis(ji, ABS_Y, ji->axes[ABS_Y ][AXE_ABS]); - ji->js.lZ = map_axis(ji, ABS_Z, ji->axes[ABS_Z ][AXE_ABS]); - ji->js.lRx = map_axis(ji, ABS_RX, ji->axes[ABS_RX][AXE_ABS]); - ji->js.lRy = map_axis(ji, ABS_RY, ji->axes[ABS_RY][AXE_ABS]); - ji->js.lRz = map_axis(ji, ABS_RZ, ji->axes[ABS_RZ][AXE_ABS]); - ji->js.rglSlider[0] = map_axis(ji, ABS_THROTTLE, ji->axes[ABS_THROTTLE][AXE_ABS]); - ji->js.rglSlider[1] = map_axis(ji, ABS_RUDDER, ji->axes[ABS_RUDDER ][AXE_ABS]); + ji->js.lX = map_axis(ji, ABS_X, ji->joydev->axes[ABS_X ][AXE_ABS]); + ji->js.lY = map_axis(ji, ABS_Y, ji->joydev->axes[ABS_Y ][AXE_ABS]); + ji->js.lZ = map_axis(ji, ABS_Z, ji->joydev->axes[ABS_Z ][AXE_ABS]); + ji->js.lRx = map_axis(ji, ABS_RX, ji->joydev->axes[ABS_RX][AXE_ABS]); + ji->js.lRy = map_axis(ji, ABS_RY, ji->joydev->axes[ABS_RY][AXE_ABS]); + ji->js.lRz = map_axis(ji, ABS_RZ, ji->joydev->axes[ABS_RZ][AXE_ABS]); + ji->js.rglSlider[0] = map_axis(ji, ABS_THROTTLE, ji->joydev->axes[ABS_THROTTLE][AXE_ABS]); + ji->js.rglSlider[1] = map_axis(ji, ABS_RUDDER, ji->joydev->axes[ABS_RUDDER ][AXE_ABS]); /* POV center is -1 */ for (i=0; i<4; i++) { ji->js.rgdwPOV[i] = -1; @@ -886,7 +887,7 @@ static void joy_polldev(JoystickImpl *Th TRACE("input_event: type %d, code %d, value %d\n",ie.type,ie.code,ie.value); switch (ie.type) { case EV_KEY: /* button */ - btn = This->buttons[ie.code]; + btn = This->joydev->buttons[ie.code]; TRACE("(%p) %d -> %d\n", This, ie.code, btn); if (btn&0x80) { btn &= 0x7F;

1 0

Christoph Frick : dinput: Adds offset and transform and their basic handling to the joystick implementation .
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: f0f3b0a34a847f7811020ff6d67cbdec8054b481 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0f3b0a34a847f7811020ff… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:14:18 2006 +0200 dinput: Adds offset and transform and their basic handling to the joystick implementation. --- dlls/dinput/joystick_linuxinput.c | 61 ++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 669a474..b40a897 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -124,6 +124,8 @@ struct JoystickImpl int joyfd; LPDIDATAFORMAT df; + DataFormat *transform; /* wine to user format converter */ + int *offsets; /* object offsets */ HANDLE hEvent; LPDIDEVICEOBJECTDATA data_queue; int queue_head, queue_tail, queue_len; @@ -338,6 +340,10 @@ static JoystickImpl *alloc_device(REFGUI int i; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); + if (newDevice==NULL) { + return NULL; + } + newDevice->lpVtbl = jvt; newDevice->ref = 1; newDevice->joyfd = -1; @@ -358,7 +364,37 @@ #endif newDevice->deadz[i] = 0; } fake_current_js_state(newDevice); + + /* wine uses DIJOYSTATE2 as it's internal format so copy + * the already defined format c_dfDIJoystick2 */ + newDevice->df = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwSize); + if (newDevice->df == 0) + goto FAILED; + + CopyMemory(newDevice->df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); + + /* copy default objects */ + newDevice->df->rgodf = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwNumObjs*c_dfDIJoystick2.dwObjSize); + if (newDevice->df->rgodf == 0) + goto FAILED; + + CopyMemory(newDevice->df->rgodf,c_dfDIJoystick2.rgodf,c_dfDIJoystick2.dwNumObjs*c_dfDIJoystick2.dwObjSize); + + /* create an offsets array */ + newDevice->offsets = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,c_dfDIJoystick2.dwNumObjs*sizeof(int)); + if (newDevice->offsets == 0) + goto FAILED; + + /* create the default transform filter */ + newDevice->transform = create_DataFormat(&c_dfDIJoystick2, newDevice->df, newDevice->offsets); + return newDevice; + +FAILED: + HeapFree(GetProcessHeap(),0,newDevice->df->rgodf); + HeapFree(GetProcessHeap(),0,newDevice->df); + HeapFree(GetProcessHeap(),0,newDevice); + return NULL; } static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) @@ -378,6 +414,10 @@ static HRESULT joydev_create_deviceA(IDi IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, &joydevs[i]); TRACE("Creating a Joystick device (%p)\n", *pdev); + if (*pdev==0) { + ERR("out of memory\n"); + return DIERR_OUTOFMEMORY; + } return DI_OK; } else { return DIERR_NOINTERFACE; @@ -406,6 +446,10 @@ static HRESULT joydev_create_deviceW(IDi IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, &joydevs[i]); TRACE("Creating a Joystick device (%p)\n", *pdev); + if (*pdev==0) { + ERR("out of memory\n"); + return DIERR_OUTOFMEMORY; + } return DI_OK; } else { return DIERR_NOINTERFACE; @@ -443,10 +487,17 @@ static ULONG WINAPI JoystickAImpl_Releas HeapFree(GetProcessHeap(),0,This->data_queue); /* Free the DataFormat */ + HeapFree(GetProcessHeap(), 0, This->df->rgodf); HeapFree(GetProcessHeap(), 0, This->df); - HeapFree(GetProcessHeap(),0,This); - return 0; + /* Free the offsets array */ + HeapFree(GetProcessHeap(),0,This->offsets); + + /* release the data transform filter */ + release_DataFormat(This->transform); + + HeapFree(GetProcessHeap(),0,This); + return 0; } /****************************************************************************** @@ -478,6 +529,10 @@ static HRESULT WINAPI JoystickAImpl_SetD return DIERR_ACQUIRED; } + HeapFree(GetProcessHeap(),0,This->df->rgodf); + HeapFree(GetProcessHeap(),0,This->df); + release_DataFormat(This->transform); + /* Store the new data format */ This->df = HeapAlloc(GetProcessHeap(),0,df->dwSize); if (This->df==NULL) { @@ -491,6 +546,8 @@ static HRESULT WINAPI JoystickAImpl_SetD } memcpy(This->df->rgodf,df->rgodf,df->dwNumObjs*df->dwObjSize); + This->transform = create_DataFormat(&c_dfDIJoystick2, This->df, This->offsets); + return DI_OK; }

1 0

Christoph Frick : dinput: When handling axes, ignore the ABS_HAT. * as they are handled as POV.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 03260f738b03ac2152af3f8f0f6c73b7733db949 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03260f738b03ac2152af3f8… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:13:27 2006 +0200 dinput: When handling axes, ignore the ABS_HAT.* as they are handled as POV. --- dlls/dinput/joystick_linuxinput.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e89a4b7..669a474 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -994,7 +994,19 @@ static HRESULT WINAPI JoystickAImpl_GetC lpDIDevCaps->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); axes=0; - for (i=0;i<ABS_MAX;i++) if (test_bit(This->joydev->absbits,i)) axes++; + for (i=0;i<ABS_MAX;i++) { + if (!test_bit(This->joydev->absbits,i)) continue; + switch (i) { + case ABS_HAT0X: case ABS_HAT0Y: + case ABS_HAT1X: case ABS_HAT1Y: + case ABS_HAT2X: case ABS_HAT2Y: + case ABS_HAT3X: case ABS_HAT3Y: + /* will be handled as POV - see below */ + break; + default: + axes++; + } + } buttons=0; for (i=0;i<KEY_MAX;i++) if (test_bit(This->joydev->keybits,i)) buttons++; povs=0; @@ -1090,8 +1102,15 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.guidType = GUID_Slider; ddoi.dwOfs = DIJOFS_SLIDER(1); break; + case ABS_HAT0X: case ABS_HAT0Y: + case ABS_HAT1X: case ABS_HAT1Y: + case ABS_HAT2X: case ABS_HAT2Y: + case ABS_HAT3X: case ABS_HAT3Y: + /* will be handled as POV - see below */ + continue; default: - FIXME("unhandled abs axis %d, ignoring!\n",i); + FIXME("unhandled abs axis 0x%02x, ignoring!\n",i); + continue; } ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; /* Linux event force feedback supports only (and always) x and y axes */

1 0

Christoph Frick : dinput: Set the amount of POVs in the caps.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 14e9ee55ba259830ab91d28364881f31a69917f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14e9ee55ba259830ab91d28… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:12:43 2006 +0200 dinput: Set the amount of POVs in the caps. --- dlls/dinput/joystick_linuxinput.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3b4a4eb..e89a4b7 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -973,7 +973,7 @@ static HRESULT WINAPI JoystickAImpl_GetC LPDIDEVCAPS lpDIDevCaps) { JoystickImpl *This = (JoystickImpl *)iface; - int i,axes,buttons; + int i,axes,buttons,povs; TRACE("%p->(%p)\n",iface,lpDIDevCaps); @@ -997,12 +997,19 @@ static HRESULT WINAPI JoystickAImpl_GetC for (i=0;i<ABS_MAX;i++) if (test_bit(This->joydev->absbits,i)) axes++; buttons=0; for (i=0;i<KEY_MAX;i++) if (test_bit(This->joydev->keybits,i)) buttons++; + povs=0; + for (i=0; i<4; i++) { + if (test_bit(This->joydev->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->joydev->absbits,ABS_HAT0Y+(i<<1))) { + povs ++; + } + } if (This->has_ff) lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; lpDIDevCaps->dwAxes = axes; lpDIDevCaps->dwButtons = buttons; + lpDIDevCaps->dwPOVs = povs; return DI_OK; }

1 0

Christoph Frick : dinput: Detect more than one /dev/input/event joystick.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 8c1be245f772e3fcd5fcfa46a68115e47f6c3073 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c1be245f772e3fcd5fcfa4… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:12:07 2006 +0200 dinput: Detect more than one /dev/input/event joystick. --- dlls/dinput/joystick_linuxinput.c | 520 +++++++++++++++++-------------------- 1 files changed, 234 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8c1be245f772e3fcd5f…

1 0

Jason Green : wined3d: Fix D3DSIO_TEXKILL for GLSL.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: c562c4c771f395b978204fdf2c8ad33b4a468d9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c562c4c771f395b978204fd… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jul 7 10:13:42 2006 -0400 wined3d: Fix D3DSIO_TEXKILL for GLSL. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d7ec6a2..e7ba349 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1364,10 +1364,10 @@ void pshader_glsl_texbem(SHADER_OPCODE_A * If any of the first 3 components are < 0, discard this pixel */ void pshader_glsl_texkill(SHADER_OPCODE_ARG* arg) { - char src0_str[100], src0_name[50], src0_mask[6]; + char dst_str[100], dst_name[50], dst_mask[6]; - shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); - shader_addline(arg->buffer, "if (%s.x < 0.0 || %s.y < 0.0 || %s.z < 0.0) discard;\n", src0_name, src0_name, src0_name); + shader_glsl_add_param(arg, arg->dst, 0, FALSE, dst_name, dst_mask, dst_str); + shader_addline(arg->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_name); } /** Process the D3DSIO_DP2ADD instruction in GLSL.

1 0

Vitaliy Margolen : winecfg: Shift Graphics page up to fill the empty place.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 7e0e855aa7a1ea56d1bf8840cddd02822470b38a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e0e855aa7a1ea56d1bf884… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Jul 7 07:33:13 2006 -0600 winecfg: Shift Graphics page up to fill the empty place. --- programs/winecfg/En.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index dbe4848..4184501 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -62,31 +62,31 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Window settings ",IDC_STATIC,8,25,244,180 + GROUPBOX " Window settings ",IDC_STATIC,8,4,244,180 - CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 + CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", - IDC_STATIC,15,58,228,80 - CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + IDC_STATIC,15,37,228,80 + CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", - IDC_STATIC,15,146,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED + IDC_STATIC,15,125,228,28 + LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,50 - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,220,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Support: ",IDC_STATIC,15,199,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,197,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 + CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0