January 2007 - Wine-Commits

Vitaliy Margolen : dinput: Internal data format is not const anymore.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: dbd2112eee793ef9b9dec8436ff1681259fd7ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd2112eee793ef9b9dec8436… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 10 06:50:52 2007 -0700 dinput: Internal data format is not const anymore. --- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_linux.c | 264 +++++-------------------------------- dlls/dinput/joystick_linuxinput.c | 4 +- dlls/dinput/keyboard.c | 4 +- dlls/dinput/mouse.c | 4 +- 5 files changed, 43 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbd2112eee793ef9b9dec…

1 0

Vitaliy Margolen : dinput: Don' t copy no longer used user data format object array.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: a1dd4cb76acfb33ab6a93b7e5a37ffaad2dfc874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1dd4cb76acfb33ab6a93b7e5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:45:00 2007 -0700 dinput: Don't copy no longer used user data format object array. --- dlls/dinput/device.c | 52 -------------------------------------------------- 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 217618a..3a32ca5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -288,8 +288,6 @@ void release_DataFormat(DataFormat * for format->dt = NULL; HeapFree(GetProcessHeap(), 0, format->offsets); format->offsets = NULL; - if (format->user_df) - HeapFree(GetProcessHeap(), 0, format->user_df->rgodf); HeapFree(GetProcessHeap(), 0, format->user_df); format->user_df = NULL; } @@ -300,48 +298,6 @@ inline LPDIOBJECTDATAFORMAT dataformat_t return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); } -/* Make all instances sequential */ -static void calculate_ids(LPDIDATAFORMAT df) -{ - int i, axis = 0, pov = 0, button = 0; - int axis_base, pov_base, button_base; - DWORD type; - - /* Make two passes over the format. The first counts the number - * for each type and the second sets the id */ - for (i = 0; i < df->dwNumObjs; i++) - { - type = DIDFT_GETTYPE(df->rgodf[i].dwType); - if (type & DIDFT_AXIS) axis++; - else if (type & DIDFT_POV) pov++; - else if (type & DIDFT_BUTTON) button++; - } - - axis_base = 0; - pov_base = axis_base + axis; - button_base = pov_base + pov; - axis = pov = button = 0; - - for (i = 0; i < df->dwNumObjs; i++) - { - type = DIDFT_GETTYPE(df->rgodf[i].dwType); - if (type & DIDFT_AXIS) - { - type |= DIDFT_MAKEINSTANCE(axis_base + axis++); - TRACE("axis type = 0x%08x\n", type); - } else if (type & DIDFT_POV) - { - type |= DIDFT_MAKEINSTANCE(pov_base + pov++); - TRACE("POV type = 0x%08x\n", type); - } else if (type & DIDFT_BUTTON) - { - type |= DIDFT_MAKEINSTANCE(button_base + button++); - TRACE("button type = 0x%08x\n", type); - } - df->rgodf[i].dwType = type; - } -} - HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; @@ -363,10 +319,6 @@ HRESULT create_DataFormat(LPCDIDATAFORMA goto failed; memcpy(format->user_df, asked_format, asked_format->dwSize); - if (!(format->user_df->rgodf = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs*asked_format->dwObjSize))) - goto failed; - memcpy(format->user_df->rgodf, asked_format->rgodf, asked_format->dwNumObjs*asked_format->dwObjSize); - TRACE("Creating DataTransform :\n"); for (i = 0; i < format->wine_df->dwNumObjs; i++) @@ -469,8 +421,6 @@ HRESULT create_DataFormat(LPCDIDATAFORMA HeapFree(GetProcessHeap(), 0, done); - /* Last step - reset all instances of the new format */ - calculate_ids(format->user_df); return DI_OK; failed: @@ -479,8 +429,6 @@ failed: format->dt = NULL; HeapFree(GetProcessHeap(), 0, format->offsets); format->offsets = NULL; - if (format->user_df) - HeapFree(GetProcessHeap(), 0, format->user_df->rgodf); HeapFree(GetProcessHeap(), 0, format->user_df); format->user_df = NULL;

1 0

Vitaliy Margolen : dinput: Use internal data format for object lookups.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: da78a7af5e527640aeca00acfda2419b42ada8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=da78a7af5e527640aeca00acf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:44:54 2007 -0700 dinput: Use internal data format for object lookups. --- dlls/dinput/device.c | 13 +++++++------ dlls/dinput/device_private.h | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index edf8350..217618a 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -488,13 +488,14 @@ failed: } /* find an object by it's offset in a data format */ -int offset_to_object(LPCDIDATAFORMAT df, int offset) +static int offset_to_object(DataFormat *df, int offset) { int i; - for (i = 0; i < df->dwNumObjs; i++) - if (dataformat_to_odf(df, i)->dwOfs == offset) - return i; + if (!df->offsets) return -1; + + for (i = 0; i < df->wine_df->dwNumObjs; i++) + if (df->offsets[i] == offset) return i; return -1; } @@ -522,8 +523,8 @@ int find_property(DataFormat *df, LPCDIP { switch (ph->dwHow) { - case DIPH_BYID: return id_to_object(df->user_df, ph->dwObj); - case DIPH_BYOFFSET: return offset_to_object(df->user_df, ph->dwObj); + case DIPH_BYID: return id_to_object(df->wine_df, ph->dwObj); + case DIPH_BYOFFSET: return offset_to_object(df, ph->dwObj); } FIXME("Unhandled ph->dwHow=='%04X'\n", (unsigned int)ph->dwHow); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e541b86..ae2da3c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -73,7 +73,6 @@ extern HRESULT create_DataFormat(LPCDIDA extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ -extern int offset_to_object(LPCDIDATAFORMAT df, int offset); extern int id_to_offset(DataFormat *df, int id); extern int find_property(DataFormat *df, LPCDIPROPHEADER ph);

1 0

Vitaliy Margolen : dinput: [joystick_linuxinput] Use correct offset to queue events.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 3d093256cac9bc5579e2f126d734d53c0cc4a1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d093256cac9bc5579e2f126d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:44:49 2007 -0700 dinput: [joystick_linuxinput] Use correct offset to queue events. --- dlls/dinput/joystick_linuxinput.c | 112 +++++++++++++------------------------ 1 files changed, 40 insertions(+), 72 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 86e8d16..3ce3949 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -146,7 +146,6 @@ struct JoystickImpl static void fake_current_js_state(JoystickImpl *ji); static DWORD map_pov(int event_value, int is_x); static void find_joydevs(void); -static int lxinput_to_user_offset(JoystickImpl *This, int ie_type, int ie_code); /* This GUID is slightly different from the linux joystick one. Take note. */ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ @@ -660,8 +659,7 @@ static DWORD map_pov(int event_value, in } /* defines how the linux input system offset mappings into c_dfDIJoystick2 */ -static int -lxinput_to_user_offset(JoystickImpl *This, int ie_type, int ie_code ) +static int lxinput_to_user_index(JoystickImpl *This, int ie_type, int ie_code ) { int offset = -1; switch (ie_type) { @@ -696,19 +694,23 @@ lxinput_to_user_offset(JoystickImpl *Thi FIXME("Unhandled type(0x%02X)\n", ie_type); return -1; } - return This->base.data_format.offsets[offset]; + return offset; } /* convert wine format offset to user format object index */ -static void joy_polldev(JoystickImpl *This) { +static void joy_polldev(JoystickImpl *This) +{ struct pollfd plfd; - struct input_event ie; - int btn, offset; + struct input_event ie; if (This->joyfd==-1) return; - while (1) { + while (1) + { + LONG value = 0; + int inst_id = -1; + plfd.fd = This->joyfd; plfd.events = POLLIN; @@ -722,86 +724,48 @@ 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->joydev->buttons[ie.code]; + { + int btn = This->joydev->buttons[ie.code]; + TRACE("(%p) %d -> %d\n", This, ie.code, btn); - if (btn&0x80) { - btn &= 0x7F; - if ((offset = lxinput_to_user_offset(This, ie.type, btn)) == -1) { - return; - } - This->js.rgbButtons[btn] = ie.value?0x80:0x00; - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rgbButtons[btn], - ie.time.tv_usec, This->dinput->evsequence++); + if (btn & 0x80) + { + btn &= 0x7F; + inst_id = DIDFT_MAKEINSTANCE(btn) | DIDFT_PSHBUTTON; + This->js.rgbButtons[btn] = value = ie.value ? 0x80 : 0x00; } break; + } case EV_ABS: - if ((offset = lxinput_to_user_offset(This, ie.type, ie.code)) == -1) { - return; - } + if ((inst_id = lxinput_to_user_index(This, ie.type, ie.code)) == -1) + return; + inst_id = DIDFT_MAKEINSTANCE(inst_id) | (inst_id < ABS_HAT0X ? DIDFT_AXIS : DIDFT_POV); + value = map_axis(This, ie.code, ie.value); + switch (ie.code) { - case ABS_X: - This->js.lX = map_axis(This,ABS_X,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lX, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_Y: - This->js.lY = map_axis(This,ABS_Y,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lY, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_Z: - This->js.lZ = map_axis(This,ABS_Z,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lZ, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_RX: - This->js.lRx = map_axis(This,ABS_RX,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lRx, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_RY: - This->js.lRy = map_axis(This,ABS_RY,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lRy, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_RZ: - This->js.lRz = map_axis(This,ABS_RZ,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.lRz, - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_THROTTLE: - This->js.rglSlider[0] = map_axis(This,ABS_THROTTLE,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rglSlider[0], - ie.time.tv_usec, This->dinput->evsequence++); - break; - case ABS_RUDDER: - This->js.rglSlider[1] = map_axis(This,ABS_RUDDER,ie.value); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rglSlider[1], - ie.time.tv_usec, This->dinput->evsequence++); - break; + case ABS_X: This->js.lX = value; break; + case ABS_Y: This->js.lY = value; break; + case ABS_Z: This->js.lZ = value; break; + case ABS_RX: This->js.lRx = value; break; + case ABS_RY: This->js.lRy = value; break; + case ABS_RZ: This->js.lRz = value; break; + case ABS_THROTTLE: This->js.rglSlider[0] = value; break; + case ABS_RUDDER: This->js.rglSlider[1] = value; break; case ABS_HAT0X: case ABS_HAT0Y: - This->js.rgdwPOV[0] = map_pov(ie.value,ie.code==ABS_HAT0X); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rgdwPOV[0], - ie.time.tv_usec, This->dinput->evsequence++); + This->js.rgdwPOV[0] = value = map_pov(ie.value, ie.code==ABS_HAT0X); break; case ABS_HAT1X: case ABS_HAT1Y: - This->js.rgdwPOV[1] = map_pov(ie.value,ie.code==ABS_HAT1X); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rgdwPOV[1], - ie.time.tv_usec, This->dinput->evsequence++); + This->js.rgdwPOV[1] = value = map_pov(ie.value, ie.code==ABS_HAT1X); break; case ABS_HAT2X: case ABS_HAT2Y: - This->js.rgdwPOV[2] = map_pov(ie.value,ie.code==ABS_HAT2X); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rgdwPOV[2], - ie.time.tv_usec, This->dinput->evsequence++); + This->js.rgdwPOV[2] = value = map_pov(ie.value, ie.code==ABS_HAT2X); break; case ABS_HAT3X: case ABS_HAT3Y: - This->js.rgdwPOV[3] = map_pov(ie.value,ie.code==ABS_HAT3X); - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, This->js.rgdwPOV[3], - ie.time.tv_usec, This->dinput->evsequence++); + This->js.rgdwPOV[3] = value = map_pov(ie.value, ie.code==ABS_HAT3X); break; default: FIXME("unhandled joystick axe event (code %d, value %d)\n",ie.code,ie.value); @@ -822,6 +786,10 @@ static void joy_polldev(JoystickImpl *Th FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); break; } + if (inst_id >= 0) + queue_event((LPDIRECTINPUTDEVICE8A)This, + id_to_offset(&This->base.data_format, inst_id), + value, ie.time.tv_usec, This->dinput->evsequence++); } }

1 0

Vitaliy Margolen : dinput: [joystick_linuxinput] Rewrite GetObjectInfo and EnumObjects on top of base class.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: d81e17d5c003f00fdfd21b7f78348a404b01a426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81e17d5c003f00fdfd21b7f7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:44:42 2007 -0700 dinput: [joystick_linuxinput] Rewrite GetObjectInfo and EnumObjects on top of base class. --- dlls/dinput/joystick_linuxinput.c | 203 +++++++++---------------------------- 1 files changed, 50 insertions(+), 153 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b410a47..86e8d16 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -993,155 +993,6 @@ static HRESULT WINAPI JoystickAImpl_Poll } /****************************************************************************** - * EnumObjects : enumerate the different buttons and axis... - */ -static HRESULT WINAPI JoystickAImpl_EnumObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - JoystickImpl *This = (JoystickImpl *)iface; - DIDEVICEOBJECTINSTANCEA ddoi; - int user_offset, user_object; - - TRACE("(this=%p,%p,%p,%08x)\n", This, lpCallback, lpvRef, dwFlags); - if (TRACE_ON(dinput)) { - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); - } - - memset(&ddoi, 0, sizeof(ddoi)); - /* Only the fields till dwFFMaxForce are relevant */ - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - - /* For the joystick, do as is done in the GetCapabilities function */ - /* FIXME: needs more items */ - if ((dwFlags == DIDFT_ALL) || - (dwFlags & DIDFT_AXIS)) { - BYTE i; - - for (i = 0; i < ABS_MAX; i++) { - if (!test_bit(This->joydev->absbits,i)) continue; - - switch (i) { - case ABS_X: - ddoi.guidType = GUID_XAxis; - break; - case ABS_Y: - ddoi.guidType = GUID_YAxis; - break; - case ABS_Z: - ddoi.guidType = GUID_ZAxis; - break; - case ABS_RX: - ddoi.guidType = GUID_RxAxis; - break; - case ABS_RY: - ddoi.guidType = GUID_RyAxis; - break; - case ABS_RZ: - ddoi.guidType = GUID_RzAxis; - break; - case ABS_THROTTLE: - case ABS_RUDDER: - ddoi.guidType = GUID_Slider; - 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 0x%02x, ignoring!\n",i); - continue; - } - if ((user_offset = lxinput_to_user_offset(This, EV_ABS, i)) == -1) { - continue; - } - user_object = offset_to_object(This->base.data_format.user_df, user_offset); - ddoi.dwType = This->base.data_format.user_df->rgodf[user_object].dwType & 0x00ffffff; - ddoi.dwOfs = This->base.data_format.user_df->rgodf[user_object].dwOfs; - /* Linux event force feedback supports only (and always) x and y axes */ - if (i == ABS_X || i == ABS_Y) { - if (This->joydev->has_ff) - ddoi.dwFlags |= DIDOI_FFACTUATOR; - } - sprintf(ddoi.tszName, "%d-Axis", i); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - return DI_OK; - } - } - } - - if ((dwFlags == DIDFT_ALL) || - (dwFlags & DIDFT_POV)) { - int i; - ddoi.guidType = GUID_POV; - 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))) { - if ((user_offset = lxinput_to_user_offset(This, EV_ABS, ABS_HAT0X+i))== -1) { - continue; - } - user_object = offset_to_object(This->base.data_format.user_df, user_offset); - ddoi.dwType = This->base.data_format.user_df->rgodf[user_object].dwType & 0x00ffffff; - ddoi.dwOfs = This->base.data_format.user_df->rgodf[user_object].dwOfs; - sprintf(ddoi.tszName, "%d-POV", i); - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - return DI_OK; - } - } - } - } - - if ((dwFlags == DIDFT_ALL) || - (dwFlags & DIDFT_BUTTON)) { - int i, btncount=0; - - /*The DInput SDK says that GUID_Button is only for mouse buttons but well*/ - - ddoi.guidType = GUID_Button; - - for (i = 0; i < KEY_MAX; i++) { - if (!test_bit(This->joydev->keybits,i)) continue; - if ((user_offset = lxinput_to_user_offset(This, EV_KEY, btncount)) == -1) { - continue; - } - user_object = offset_to_object(This->base.data_format.user_df, user_offset); - ddoi.dwType = This->base.data_format.user_df->rgodf[user_object].dwType & 0x00ffffff; - ddoi.dwOfs = This->base.data_format.user_df->rgodf[user_object].dwOfs; - sprintf(ddoi.tszName, "%d-Button", btncount); - btncount++; - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - return DI_OK; - } - } - } - - return DI_OK; -} - -static HRESULT WINAPI JoystickWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, - LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - JoystickImpl *This = (JoystickImpl *)iface; - - device_enumobjects_AtoWcb_data data; - - data.lpCallBack = lpCallback; - data.lpvRef = lpvRef; - - return JoystickAImpl_EnumObjects((LPDIRECTINPUTDEVICE8A) This, (LPDIENUMDEVICEOBJECTSCALLBACKA) DIEnumDevicesCallbackAtoW, (LPVOID) &data, dwFlags); -} - -/****************************************************************************** * GetProperty : get input device properties */ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, @@ -1179,6 +1030,52 @@ static HRESULT WINAPI JoystickAImpl_GetP 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 */ @@ -1517,7 +1414,7 @@ static const IDirectInputDevice8AVtbl Jo IDirectInputDevice2AImpl_AddRef, JoystickAImpl_Release, JoystickAImpl_GetCapabilities, - JoystickAImpl_EnumObjects, + IDirectInputDevice2AImpl_EnumObjects, JoystickAImpl_GetProperty, JoystickAImpl_SetProperty, JoystickAImpl_Acquire, @@ -1527,7 +1424,7 @@ static const IDirectInputDevice8AVtbl Jo IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, - IDirectInputDevice2AImpl_GetObjectInfo, + JoystickAImpl_GetObjectInfo, IDirectInputDevice2AImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, @@ -1559,7 +1456,7 @@ static const IDirectInputDevice8WVtbl Jo XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, XCAST(Release)JoystickAImpl_Release, XCAST(GetCapabilities)JoystickAImpl_GetCapabilities, - JoystickWImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAImpl_GetProperty, XCAST(SetProperty)JoystickAImpl_SetProperty, XCAST(Acquire)JoystickAImpl_Acquire, @@ -1569,7 +1466,7 @@ static const IDirectInputDevice8WVtbl Jo XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - IDirectInputDevice2WImpl_GetObjectInfo, + JoystickWImpl_GetObjectInfo, IDirectInputDevice2WImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,

1 0

Vitaliy Margolen : dinput: [joystick_linuxinput] Copy and modify default data format.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: bfa64b98ed804acad02fbd25df60b36c56827b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa64b98ed804acad02fbd25d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:44:32 2007 -0700 dinput: [joystick_linuxinput] Copy and modify default data format. --- dlls/dinput/joystick_linuxinput.c | 67 +++++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b9c581d..b410a47 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -356,13 +356,13 @@ static BOOL joydev_enum_deviceW(DWORD dw static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, struct JoyDev *joydev) { - JoystickImpl* newDevice; - int i; + JoystickImpl* newDevice; + LPDIDATAFORMAT df = NULL; + int i, idx = 0; + int axis = 0, pov = 0, btn = 0; - newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); - if (newDevice==NULL) { - return NULL; - } + newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); + if (!newDevice) return NULL; newDevice->base.lpVtbl = jvt; newDevice->base.ref = 1; @@ -388,18 +388,47 @@ static JoystickImpl *alloc_device(REFGUI } fake_current_js_state(newDevice); - /* wine uses DIJOYSTATE2 as it's internal format */ - newDevice->base.data_format.wine_df = &c_dfDIJoystick2; + /* Create copy of default data format */ + if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto failed; + memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); + if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; + + /* Supported Axis & POVs should map 1-to-1 */ + for (i = 0; i < 8; i++) + { + if (!test_bit(newDevice->joydev->absbits, i)) continue; + + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[axis + WINE_JOYSTICK_AXIS_BASE], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(axis++) | DIDFT_ABSAXIS; + } + for (i = 0; i < 4; i++) + { + if (!test_bit(newDevice->joydev->absbits, ABS_HAT0X + i * 2) || + !test_bit(newDevice->joydev->absbits, ABS_HAT0Y + i * 2)) + continue; + + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[pov + WINE_JOYSTICK_POV_BASE], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(pov++) | DIDFT_POV; + } + /* Buttons can be anywhere, so check all */ + for (i = 0; i < KEY_MAX && btn < 128; i++) + { + if (!test_bit(newDevice->joydev->keybits, i)) continue; + + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[btn + WINE_JOYSTICK_BUTTON_BASE], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(btn++) | DIDFT_PSHBUTTON; + } + df->dwNumObjs = idx; - /* create the default transform filter */ - if (create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format) == DI_OK) - { + newDevice->base.data_format.wine_df = df; IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); return newDevice; - } - HeapFree(GetProcessHeap(),0,newDevice); - return NULL; +failed: + if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); + HeapFree(GetProcessHeap(), 0, df); + HeapFree(GetProcessHeap(), 0, newDevice); + return NULL; } static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) @@ -492,6 +521,8 @@ static ULONG WINAPI JoystickAImpl_Releas HeapFree(GetProcessHeap(), 0, This->base.data_queue); /* release the data transform filter */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df->rgodf); + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); release_DataFormat(&This->base.data_format); IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); @@ -839,12 +870,12 @@ static HRESULT WINAPI JoystickAImpl_SetP if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { case (DWORD)DIPROP_RANGE: { - LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; + LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { int i; TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); - for (i = 0; i < This->base.data_format.user_df->dwNumObjs; i++) { + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { This->wantmin[i] = pr->lMin; This->wantmax[i] = pr->lMax; } @@ -861,11 +892,11 @@ static HRESULT WINAPI JoystickAImpl_SetP break; } case (DWORD)DIPROP_DEADZONE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { int i; TRACE("deadzone(%d) all\n", pd->dwData); - for (i = 0; i < This->base.data_format.user_df->dwNumObjs; i++) { + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { This->deadz[i] = pd->dwData; } } else {

1 0

Vitaliy Margolen : dinput: [joystick_linux] Use correct offset to queue events.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 1bc557eea06a81a729d9d9a4bf26abbf57936452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc557eea06a81a729d9d9a4b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:44:07 2007 -0700 dinput: [joystick_linux] Use correct offset to queue events. --- dlls/dinput/joystick_linux.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c297f70..1a6b063 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -778,7 +778,11 @@ static void joy_polldev(JoystickImpl *Th WARN("no device\n"); return; } - while (1) { + while (1) + { + LONG value; + int inst_id = -1; + plfd.fd = This->joyfd; plfd.events = POLLIN; if (poll(&plfd,1,0) != 1) @@ -789,19 +793,19 @@ static void joy_polldev(JoystickImpl *Th } TRACE("js_event: type 0x%x, number %d, value %d\n", jse.type,jse.number,jse.value); - if (jse.type & JS_EVENT_BUTTON) { - int offset = This->base.data_format.offsets[jse.number + 12]; - int value = jse.value?0x80:0x00; - - This->js.rgbButtons[jse.number] = value; - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, value, jse.time, This->dinput->evsequence++); - } else if (jse.type & JS_EVENT_AXIS) { + if (jse.type & JS_EVENT_BUTTON) + { + inst_id = DIDFT_MAKEINSTANCE(jse.number) | DIDFT_PSHBUTTON; + This->js.rgbButtons[jse.number] = value = jse.value ? 0x80 : 0x00; + } + else if (jse.type & JS_EVENT_AXIS) + { int number = This->axis_map[jse.number]; /* wine format object index */ - if (number < 12) { - int offset = This->base.data_format.offsets[number]; - int index = offset_to_object(This->base.data_format.user_df, offset); - LONG value = map_axis(This, jse.value, index); + if (number < 12) + { + inst_id = DIDFT_MAKEINSTANCE(jse.number) | (number < 8 ? DIDFT_AXIS : DIDFT_POV); + value = map_axis(This, jse.value, number); /* FIXME do deadzone and saturation here */ TRACE("changing axis %d => %d\n", jse.number, number); @@ -860,11 +864,13 @@ static void joy_polldev(JoystickImpl *Th value = calculate_pov(This, 3); break; } - - queue_event((LPDIRECTINPUTDEVICE8A)This, offset, value, jse.time, This->dinput->evsequence++); } else WARN("axis %d not supported\n", number); } + if (inst_id >= 0) + queue_event((LPDIRECTINPUTDEVICE8A)This, + id_to_offset(&This->base.data_format, inst_id), + value, jse.time, This->dinput->evsequence++); } }

1 0

Vitaliy Margolen : dinput: [joystick_linux] Reuse the same properties array .
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 60948ab1f07127431bc9a02f54736ecffaa4e686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60948ab1f07127431bc9a02f5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:43:59 2007 -0700 dinput: [joystick_linux] Reuse the same properties array. --- dlls/dinput/joystick_linux.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index e4a891d..c297f70 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -654,7 +654,6 @@ static HRESULT WINAPI JoystickAImpl_SetD { JoystickImpl *This = (JoystickImpl *)iface; unsigned int i; - ObjProps * new_props = 0; HRESULT hr; TRACE("(%p,%p)\n",This,df); @@ -662,13 +661,8 @@ static HRESULT WINAPI JoystickAImpl_SetD hr = IDirectInputDevice2AImpl_SetDataFormat(iface, df); if (FAILED(hr)) return hr; - new_props = HeapAlloc(GetProcessHeap(),0,df->dwNumObjs*sizeof(ObjProps)); - if (!new_props) return DIERR_OUTOFMEMORY; - - HeapFree(GetProcessHeap(),0,This->props); - - This->props = new_props; - for (i = 0; i < df->dwNumObjs; i++) { + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) + { This->props[i].lMin = 0; This->props[i].lMax = 0xffff; This->props[i].lDeadZone = 1000; @@ -925,10 +919,10 @@ static HRESULT WINAPI JoystickAImpl_SetP if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { case (DWORD)DIPROP_RANGE: { - LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; + LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); - for (i = 0; i < This->base.data_format.user_df->dwNumObjs; i++) { + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { This->props[i].lMin = pr->lMin; This->props[i].lMax = pr->lMax; } @@ -945,10 +939,10 @@ static HRESULT WINAPI JoystickAImpl_SetP break; } case (DWORD)DIPROP_DEADZONE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("deadzone(%d) all\n", pd->dwData); - for (i = 0; i < This->base.data_format.user_df->dwNumObjs; i++) + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) This->props[i].lDeadZone = pd->dwData; } else { int obj = find_property(&This->base.data_format, ph); @@ -962,10 +956,10 @@ static HRESULT WINAPI JoystickAImpl_SetP break; } case (DWORD)DIPROP_SATURATION: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("saturation(%d) all\n", pd->dwData); - for (i = 0; i < This->base.data_format.user_df->dwNumObjs; i++) + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) This->props[i].lSaturation = pd->dwData; } else { int obj = find_property(&This->base.data_format, ph);

1 0

Vitaliy Margolen : dinput: [joystick_linux] Copy and modify default data format.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 3989e0feb8d7f773385094d91007fad907c6602d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3989e0feb8d7f773385094d91… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Jan 9 13:43:47 2007 -0700 dinput: [joystick_linux] Copy and modify default data format. Copy only what we have. --- dlls/dinput/joystick_linux.c | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 91ee183..e4a891d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -396,6 +396,8 @@ static HRESULT alloc_device(REFGUID rgui JoystickImpl* newDevice; char name[MAX_PATH]; HRESULT hr; + LPDIDATAFORMAT df = NULL; + int idx = 0; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); if (newDevice == 0) { @@ -464,6 +466,31 @@ static HRESULT alloc_device(REFGUID rgui newDevice->axis_map[i] = i; } + /* Create copy of default data format */ + if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; + memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); + + /* Axes include POVs */ + df->dwNumObjs = newDevice->axes + newDevice->buttons; + if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED; + + for (i = 0; i < newDevice->axes; i++) + { + int wine_obj = newDevice->axis_map[i]; + + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[wine_obj], df->dwObjSize); + if (wine_obj < 8) + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + else + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj - 8) | DIDFT_POV; + } + for (i = 0; i < newDevice->buttons; i++) + { + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i + 12], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; + } + newDevice->base.data_format.wine_df = df; + /* create default properties */ newDevice->props = HeapAlloc(GetProcessHeap(),0,c_dfDIJoystick2.dwNumObjs*sizeof(ObjProps)); if (newDevice->props == 0) @@ -477,13 +504,6 @@ static HRESULT alloc_device(REFGUID rgui newDevice->props[i].lSaturation = 0; } - /* wine uses DIJOYSTATE2 as it's internal format */ - newDevice->base.data_format.wine_df = &c_dfDIJoystick2; - - /* create the default transform filter */ - hr = create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format); - if (hr != DI_OK) goto FAILED; - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); newDevice->devcaps.dwSize = sizeof(newDevice->devcaps); @@ -499,7 +519,7 @@ static HRESULT alloc_device(REFGUID rgui newDevice->devcaps.dwFFDriverVersion = 0; if (TRACE_ON(dinput)) { - _dump_DIDATAFORMAT(newDevice->base.data_format.user_df); + _dump_DIDATAFORMAT(newDevice->base.data_format.wine_df); for (i = 0; i < (newDevice->axes); i++) TRACE("axis_map[%d] = %d\n", i, newDevice->axis_map[i]); _dump_DIDEVCAPS(&newDevice->devcaps); @@ -512,6 +532,8 @@ static HRESULT alloc_device(REFGUID rgui FAILED: hr = DIERR_OUTOFMEMORY; FAILED1: + if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); + HeapFree(GetProcessHeap(), 0, df); release_DataFormat(&newDevice->base.data_format); HeapFree(GetProcessHeap(),0,newDevice->axis_map); HeapFree(GetProcessHeap(),0,newDevice->name); @@ -610,6 +632,8 @@ static ULONG WINAPI JoystickAImpl_Releas HeapFree(GetProcessHeap(), 0, This->props); /* release the data transform filter */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df->rgodf); + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); release_DataFormat(&This->base.data_format); This->base.crit.DebugInfo->Spare[0] = 0;

1 0

Dmitry Timoshkov : gdi32: Print status of the hinting support in the debug log.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 101785d1a99e62814df3358e5a3c739c69158de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101785d1a99e62814df3358e5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 11 16:42:06 2007 +0800 gdi32: Print status of the hinting support in the debug log. --- dlls/gdi32/freetype.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e5d7e6..bb58646 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4435,7 +4435,10 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERI static int hinting = -1; if(hinting == -1) + { hinting = is_hinting_enabled(); + TRACE("hinting is %senabled\n", hinting ? "" : "NOT "); + } lprs->nSize = sizeof(RASTERIZER_STATUS); lprs->wFlags = TT_AVAILABLE | TT_ENABLED | (hinting ? WINE_TT_HINTER_ENABLED : 0);

1 0