August 2007 - Wine-Commits - list.winehq.org

Vitaliy Margolen : dinput: Reuse common code and definition.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: b06786940c95e11729438ad6d0cb0bae765d5d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06786940c95e11729438ad6d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 5 12:24:04 2007 -0600 dinput: Reuse common code and definition. Unify object properties structure and he common axis mapping function for both joystick drivers. --- dlls/dinput/device_private.h | 11 +++ dlls/dinput/joystick_linux.c | 28 +-------- dlls/dinput/joystick_linuxinput.c | 124 +++++++++++++++++++------------------ 3 files changed, 77 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b06786940c95e11729438…

1 0

Vitaliy Margolen : dinput: Fix mapping of axes ids to property ids.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 9e36848303016215f3e52dbb22c772765d8a15b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e36848303016215f3e52dbb2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 5 12:18:26 2007 -0600 dinput: Fix mapping of axes ids to property ids. --- dlls/dinput/device.c | 2 +- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1dc6e4a..10e31cd 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -448,7 +448,7 @@ static int offset_to_object(const DataFormat *df, int offset) return -1; } -static int id_to_object(LPCDIDATAFORMAT df, int id) +int id_to_object(LPCDIDATAFORMAT df, int id) { int i; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 27bccc7..ade7f9e 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -78,6 +78,7 @@ extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *forma 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 id_to_object(LPCDIDATAFORMAT df, int id); extern int id_to_offset(const DataFormat *df, int id); extern int find_property(const DataFormat *df, LPCDIPROPHEADER ph); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 67cc493..79c7bc1 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -764,7 +764,7 @@ static void joy_polldev(JoystickImpl *This) { if (number < 12) { inst_id = DIDFT_MAKEINSTANCE(number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); - value = map_axis(This, jse.value, number); + value = map_axis(This, jse.value, id_to_object(This->base.data_format.wine_df, inst_id)); /* FIXME do deadzone and saturation here */ TRACE("changing axis %d => %d\n", jse.number, number); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6a8dd44..8e8dd4b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -667,7 +667,7 @@ static void joy_polldev(JoystickImpl *This) break; } inst_id = DIDFT_MAKEINSTANCE(axis) | (ie.code < ABS_HAT0X ? DIDFT_ABSAXIS : DIDFT_POV); - value = map_axis(This, axis, ie.value); + value = map_axis(This, id_to_object(This->base.data_format.wine_df, inst_id), ie.value); switch (ie.code) { case ABS_X: This->js.lX = value; break;

1 0

Roderick Colenbrander : wined3d: Another devmode bug.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: d1bc63090ec74e02f0878e1782f3fbceb8ef1d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bc63090ec74e02f0878e178… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 5 20:23:42 2007 +0200 wined3d: Another devmode bug. --- dlls/wined3d/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 260ce9c..91f6144 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1359,7 +1359,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic ReleaseDC(0, hdc); /* Change the display settings */ - memset(&devmode, 0, sizeof(DEVMODEW)); + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot change bpp */ devmode.dmPelsWidth = pPresentationParameters->BackBufferWidth; @@ -2042,6 +2043,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U * but we don't have any hwnd */ + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmBitsPerPel = formatDesc->bpp * 8; if(devmode.dmBitsPerPel == 24) devmode.dmBitsPerPel = 32;

1 0

Vitaliy Margolen : dinput: Fix handling of dead-zone in evdev joystick.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 1fdc0230f0f7a33b10ec7ac481fc98780d190c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdc0230f0f7a33b10ec7ac48… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 5 12:20:26 2007 -0600 dinput: Fix handling of dead-zone in evdev joystick. USB joysticks can and do provide dead-zone area. Use it to initialize the initial dead-zone. --- dlls/dinput/joystick_linuxinput.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8e8dd4b..f4c8018 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -389,7 +389,9 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].havemax = newDevice->joydev->axes[i][AXIS_ABSMAX]; newDevice->props[idx].wantmin = 0; newDevice->props[idx].wantmax = 0xffff; - newDevice->props[idx].deadzone = 0; + newDevice->props[idx].deadzone = MulDiv(newDevice->joydev->axes[i][AXIS_ABSFLAT], 0xffff, + newDevice->props[idx].havemax - newDevice->props[idx].havemin); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; } @@ -551,26 +553,24 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) * 'wanted' range. It also autodetects the possible range of the axis and * adapts values accordingly. */ -static int -map_axis(JoystickImpl* This, int axis, int val) { +static int map_axis(JoystickImpl* This, int axis, int val) +{ int hmax = This->props[axis].havemax; int hmin = This->props[axis].havemin; int wmin = This->props[axis].wantmin; int wmax = This->props[axis].wantmax; + int deadz= This->props[axis].deadzone; int ret; /* map the value from the hmin-hmax range into the wmin-wmax range */ ret = MulDiv( val - hmin, wmax - wmin, hmax - hmin ) + wmin; - TRACE("hmin=%d hmax=%d wmin=%d wmax=%d val=%d ret=%d\n", hmin, hmax, wmin, wmax, val, ret); + if ((ret >= -deadz / 2 ) && (ret <= deadz / 2)) + ret = (wmax - wmin) / 2 + wmin; + + TRACE("[%d] hmin=%d hmax=%d wmin=%d wmax=%d deadz=%d val=%d ret=%d\n", + axis, hmin, hmax, wmin, wmax, deadz, val, ret); -#if 0 - /* deadzone doesn't work comfortably enough right now. needs more testing*/ - if ((ret > -deadz/2 ) && (ret < deadz/2)) { - FIXME("%d in deadzone, return mid.\n",val); - return (wmax-wmin)/2+wmin; - } -#endif return ret; } @@ -772,6 +772,9 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, int i; TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { + /* Scale dead-zone */ + This->props[i].deadzone = MulDiv(This->props[i].deadzone, pr->lMax - pr->lMin, + This->props[i].wantmax - This->props[i].wantmin); This->props[i].wantmin = pr->lMin; This->props[i].wantmax = pr->lMax; } @@ -780,6 +783,9 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj); if (obj >= 0) { + /* Scale dead-zone */ + This->props[obj].deadzone = MulDiv(This->props[obj].deadzone, pr->lMax - pr->lMin, + This->props[obj].wantmax - This->props[obj].wantmin); This->props[obj].wantmin = pr->lMin; This->props[obj].wantmax = pr->lMax; }

1 0

Vitaliy Margolen : dinput: Fix POV calculation.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 19183e71d416b252721132324ee52a26b86936fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=19183e71d416b252721132324… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 5 12:22:49 2007 -0600 dinput: Fix POV calculation. Combine and simplify the POV calculations. Linux provides X,Y for the POV. While DirectInput returns dial-degrees*1000 (12 o-click is 0 degrees). --- dlls/dinput/device_private.h | 3 + dlls/dinput/joystick_linux.c | 126 +++++++++---------------------------- dlls/dinput/joystick_linuxinput.c | 75 ++++++++++------------ 3 files changed, 67 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19183e71d416b25272113…

1 0

Chris Robinson : wined3d: Initialize major and minor when filling GL caps.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: c6e6eae08c41003c2e07263e416fc42a9b389d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e6eae08c41003c2e07263e4… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Aug 5 12:33:30 2007 -0700 wined3d: Initialize major and minor when filling GL caps. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a0d7dd1..04679bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -409,7 +409,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { GLint gl_max; GLfloat gl_floatv[2]; Bool test = 0; - int major, minor; + int major = 1, minor = 0; BOOL return_value = TRUE; int i;

1 0

Chris Robinson : winex11: Be consistent with GLX_SLOW_CONFIG meaning GENERIC_ACCELERATION.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 68c5477d27f2082fbb8bd82286b40d10a4e3fdcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c5477d27f2082fbb8bd8228… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Aug 4 11:02:14 2007 -0700 winex11: Be consistent with GLX_SLOW_CONFIG meaning GENERIC_ACCELERATION. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d4ed729..ca3c50a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2532,7 +2532,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF if (hTest) goto get_error; switch (tmp) { case GLX_NONE: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - case GLX_SLOW_CONFIG: piValues[i] = WGL_NO_ACCELERATION_ARB; break; + case GLX_SLOW_CONFIG: piValues[i] = WGL_GENERIC_ACCELERATION_ARB; break; case GLX_NON_CONFORMANT_CONFIG: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; default: ERR("unexpected Config Caveat(%x)\n", tmp);

1 0

Chris Robinson : wined3d: Properly setup DevModeW before using it.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 9a319f28578c01c4d2fb937ecebd734476986859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a319f28578c01c4d2fb937ec… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Aug 5 10:50:45 2007 -0700 wined3d: Properly setup DevModeW before using it. --- dlls/wined3d/directx.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7da3ef2..a0d7dd1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1070,6 +1070,8 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad if (!DEBUG_SINGLE_MODE) { DEVMODEW DevModeW; + ZeroMemory(&DevModeW, sizeof(DevModeW)); + DevModeW.dmSize = sizeof(DevModeW); while (EnumDisplaySettingsExW(NULL, j, &DevModeW, 0)) { j++; switch (Format) @@ -1125,6 +1127,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte int i = 0; int j = 0; + ZeroMemory(&DevModeW, sizeof(DevModeW)); + DevModeW.dmSize = sizeof(DevModeW); + /* If we are filtering to a specific format (D3D9), then need to skip all unrelated modes, but if mode is irrelevant (D3D8), then we can just count through the ones with valid bit depths */ @@ -1222,6 +1227,9 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A int bpp = 0; DEVMODEW DevModeW; + ZeroMemory(&DevModeW, sizeof(DevModeW)); + DevModeW.dmSize = sizeof(DevModeW); + EnumDisplaySettingsExW(NULL, (DWORD)-1, &DevModeW, 0); pMode->Width = DevModeW.dmPelsWidth; pMode->Height = DevModeW.dmPelsHeight;

1 0

Chris Robinson : wined3d: Use the macro when querying the current display settings.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: ef561429eee4708ef160c3be75cb6f9b6db051cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef561429eee4708ef160c3be7… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Aug 5 19:42:09 2007 -0700 wined3d: Use the macro when querying the current display settings. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 04679bb..b3182a5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1230,7 +1230,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A ZeroMemory(&DevModeW, sizeof(DevModeW)); DevModeW.dmSize = sizeof(DevModeW); - EnumDisplaySettingsExW(NULL, (DWORD)-1, &DevModeW, 0); + EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &DevModeW, 0); pMode->Width = DevModeW.dmPelsWidth; pMode->Height = DevModeW.dmPelsHeight; bpp = DevModeW.dmBitsPerPel;

1 0

Chris Robinson : winex11: Properly handle WGL_PBUFFER_LOST_ARB.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: b4c11e30335f2320b81a2158af06af5ae2a6be21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c11e30335f2320b81a2158a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Aug 4 11:12:36 2007 -0700 winex11: Properly handle WGL_PBUFFER_LOST_ARB. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 91acd3b..d4ed729 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2279,7 +2279,11 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt break; case WGL_PBUFFER_LOST_ARB: - FIXME("unsupported WGL_PBUFFER_LOST_ARB (need glXSelectEvent/GLX_DAMAGED work)\n"); + /* GLX Pbuffers cannot be lost by default. We can support this by + * setting GLX_PRESERVED_CONTENTS to False and using glXSelectEvent + * to receive pixel buffer clobber events, however that may or may + * not give any benefit */ + *piValue = GL_FALSE; break; case WGL_TEXTURE_FORMAT_ARB:

1 0