July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make D3DRS_ZBIAS work.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: ddc29c40e66f686190a40ac4bc2578e81785f56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc29c40e66f686190a40ac4b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 4 21:39:35 2011 +0200 wined3d: Make D3DRS_ZBIAS work. D3DRS_ZBIAS is poorly defined, but it makes sense that the bias should be format independent. Looking at application behaviour, it seems to include a slope scale factor as well. This fixes a couple of regressions introduced by 96b758f7b37033bf382ce40dd3310965d3ac3f76, although it was broken before as well, just in a different way. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d8/device.c | 22 ++-------------------- dlls/ddraw/ddraw.c | 3 ++- dlls/ddraw/device.c | 30 ++++-------------------------- dlls/wined3d/state.c | 38 +++++++++++++++++++++++++------------- include/wine/wined3d.h | 1 + 6 files changed, 35 insertions(+), 61 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 9b1ad37..7e7da43 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -45,7 +45,7 @@ IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = wined3d_create(8, 0, &object->IDirect3D8_iface); + object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS, &object->IDirect3D8_iface); TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ebab791..c4d4ea9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1445,22 +1445,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(IDirect3DDevice8 *iface, return hr; } -/* This factor is the result of a trial-and-error search. Both ZBIAS and DEPTHBIAS require - * guesswork by design. d3d9 apps usually use a DEPTHBIAS of -0.00002(Mass Effect 2, WoW). - * d3d8 apps(Final Fantasy XI) set ZBIAS to 15 and still expect the depth test to sort - * objects properly. */ -static const float zbias_factor = -0.000005f; - static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE State, DWORD Value) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; - union - { - DWORD d; - float f; - } wined3d_value; TRACE("iface %p, state %#x, value %#x.\n", iface, State, Value); @@ -1468,8 +1457,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(IDirect3DDevice8 *ifac switch (State) { case D3DRS_ZBIAS: - wined3d_value.f = Value * zbias_factor; - hr = wined3d_device_set_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, wined3d_value.d); + hr = wined3d_device_set_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, Value); break; default: @@ -1485,11 +1473,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(IDirect3DDevice8 *ifac { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; - union - { - DWORD d; - float f; - } wined3d_value; TRACE("iface %p, state %#x, value %p.\n", iface, State, pValue); @@ -1497,8 +1480,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(IDirect3DDevice8 *ifac switch (State) { case D3DRS_ZBIAS: - hr = wined3d_device_get_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, &wined3d_value.d); - if (SUCCEEDED(hr)) *pValue = (DWORD)(wined3d_value.f / zbias_factor); + hr = wined3d_device_get_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, pValue); break; default: diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 34b4dbd..bde3703 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -6060,7 +6060,8 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wineD3D = wined3d_create(7, WINED3D_PALETTE_PER_SURFACE, &ddraw->IDirectDraw7_iface); + ddraw->wineD3D = wined3d_create(7, WINED3D_PALETTE_PER_SURFACE | WINED3D_LEGACY_DEPTH_BIAS, + &ddraw->IDirectDraw7_iface); if (!ddraw->wineD3D) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 85f9dda..b395272 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2261,12 +2261,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_End(IDirect3DDevice2 *iface, DWORD d * DDERR_INVALIDPARAMS if Value == NULL * *****************************************************************************/ -static const float zbias_factor = -0.000005f; - -static HRESULT -IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, - D3DRENDERSTATETYPE RenderStateType, - DWORD *Value) +static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, + D3DRENDERSTATETYPE RenderStateType, DWORD *Value) { IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; HRESULT hr; @@ -2383,18 +2379,8 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - { - union - { - DWORD d; - float f; - } wined3d_value; - - hr = wined3d_device_get_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, &wined3d_value.d); - if (SUCCEEDED(hr)) - *Value = wined3d_value.f / zbias_factor; + hr = wined3d_device_get_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, Value); break; - } default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 @@ -2703,16 +2689,8 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - { - union - { - DWORD d; - float f; - } wined3d_value; - wined3d_value.f = Value * zbias_factor; - hr = wined3d_device_set_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, wined3d_value.d); + hr = wined3d_device_set_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, Value); break; - } default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bb2b292..ab6a7d7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1706,7 +1706,8 @@ static void state_depthbias(DWORD state, struct wined3d_stateblock *stateblock, if (stateblock->state.render_states[WINED3DRS_SLOPESCALEDEPTHBIAS] || stateblock->state.render_states[WINED3DRS_DEPTHBIAS]) { - struct wined3d_surface *depth = stateblock->device->fb.depth_stencil; + const struct wined3d_device *device = stateblock->device; + const struct wined3d_surface *depth = device->fb.depth_stencil; float scale; union @@ -1721,23 +1722,34 @@ static void state_depthbias(DWORD state, struct wined3d_stateblock *stateblock, glEnable(GL_POLYGON_OFFSET_FILL); checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - if (depth) + if (device->wined3d->flags & WINED3D_LEGACY_DEPTH_BIAS) { - const struct wined3d_format *fmt = depth->resource.format; - scale = powf(2, fmt->depth_size) - 1; - TRACE("Depth format %s, using depthbias scale of %f\n", - debug_d3dformat(fmt->id), scale); + float bias = -(float)const_bias.d; + glPolygonOffset(bias, bias); + checkGLcall("glPolygonOffset"); } else { - /* The context manager will reapply this state on a depth stencil change */ - TRACE("No depth stencil, using depthbias scale of 0.0\n"); - scale = 0; - } + if (depth) + { + const struct wined3d_format *fmt = depth->resource.format; + scale = powf(2, fmt->depth_size) - 1; + TRACE("Depth format %s, using depthbias scale of %.8e.\n", + debug_d3dformat(fmt->id), scale); + } + else + { + /* The context manager will reapply this state on a depth stencil change */ + TRACE("No depth stencil, using depthbias scale of 0.0.\n"); + scale = 0.0f; + } - glPolygonOffset(scale_bias.f, const_bias.f * scale); - checkGLcall("glPolygonOffset(...)"); - } else { + glPolygonOffset(scale_bias.f, const_bias.f * scale); + checkGLcall("glPolygonOffset(...)"); + } + } + else + { glDisable(GL_POLYGON_OFFSET_FILL); checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6a01f87..544feae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1236,6 +1236,7 @@ enum wined3d_sysval_semantic #define WINED3DDEVCAPS_NPATCHES 0x01000000 #define WINED3D_PALETTE_PER_SURFACE 0x00000001 +#define WINED3D_LEGACY_DEPTH_BIAS 0x00000002 /* dwDDFX */ /* arithmetic stretching along y axis */

1 0

Henri Verbeet : wined3d: Introduce a separate function for loading the SFLAG_INTEXTURE and SFLAG_INSRGBTEX surface locations .
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 1c3b691f10f20da2504d987411c98c8b73733917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3b691f10f20da2504d98741… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 4 21:39:38 2011 +0200 wined3d: Introduce a separate function for loading the SFLAG_INTEXTURE and SFLAG_INSRGBTEX surface locations. --- dlls/wined3d/surface.c | 286 +++++++++++++++++++++++++---------------------- 1 files changed, 152 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c3b691f10f20da2504d9…

1 0

André Hentschel : winedev: A hint for patch separation .
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: docs Branch: master Commit: 785929d918ce23baee3baaf1ce06400d13753b3e URL: http://source.winehq.org/git/docs.git/?a=commit;h=785929d918ce23baee3baaf1c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 4 22:09:11 2011 +0200 winedev: A hint for patch separation. As suggested by Jerome Leclanche. --- en/winedev-coding.sgml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 469642f..430e602 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -211,6 +211,10 @@ code is your friend! </para> <para> + Patches must not break building Wine or cause test failures. + Adding dead code should also be avoided. + </para> + <para> Save yourself some embarrassment and run your patched code against more than just your current test example. Experience will tell you how much effort to apply here. If there are

1 0

André Hentschel : winedev: Update code columns limit.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: docs Branch: master Commit: c6baf0c7ed9cf2aef5ae390a137e0a0388315ff5 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c6baf0c7ed9cf2aef5ae390a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 4 22:08:01 2011 +0200 winedev: Update code columns limit. --- en/winedev-coding.sgml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index ded337a..469642f 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -132,8 +132,7 @@ code </listitem> <listitem> <para> - Code is usually limited to 80 columns. This helps prevent - mailers mangling patches by line wrap. Also it generally + Code is usually limited to 100 columns. It generally makes code easier to read. </para> </listitem>

1 0

André Hentschel : winedev: Update git usage for patch creation.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: docs Branch: master Commit: 202921eaeb4935069b98352ac786930154006d38 URL: http://source.winehq.org/git/docs.git/?a=commit;h=202921eaeb4935069b98352ac… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 4 22:08:14 2011 +0200 winedev: Update git usage for patch creation. --- en/winedev-coding.sgml | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 430e602..2dc12a6 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -46,19 +46,16 @@ To generate a patch using Git, first commit it to your local tree. </para> <para> - Each file that you change needs to be updated with - <command> git update </command>. If you are adding or removing - a file, use <command> git update --add </command> or - <command>git update --remove</command> respectively. - After updating the index, commit the change using - <command> git commit </command>. The commit message will be - sent with your patch, and recored in the ChangeLog. + If you are adding a file, use <command>git add</command>. + Commit the change using <command>git commit</command>. The + commit message will be sent with your patch, and recorded in + the commit log. </para> <para> After committing the patch, you can extract it using <command>git format-patch</command> and send it to wine-patches using <command>git imap-send</command> or simply attaching it - to you mail manually. + to your mail manually. </para> </sect1>

1 0

Gerald Pfeifer : strmbase: Mark TransformFilter_QualityControlImpl_Notify static.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 8bdcf75b0956fcf5840aa712f2272a9fe4d8c9e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bdcf75b0956fcf5840aa712f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 3 17:32:25 2011 +0200 strmbase: Mark TransformFilter_QualityControlImpl_Notify static. --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 791d27e..ccdef39 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -560,7 +560,7 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BasePinImpl_NewSegment }; -HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { +static HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { QualityControlImpl *qc = (QualityControlImpl*)iface; TransformFilter *This = (TransformFilter *)qc->self;

1 0

Jay Yang : explorer: Add a path combobox to explorer.
by Alexandre Julliard July 4, 2011

July 4, 2011

1 0

Lucas Fialho Zawacki : dinput: SetActionMap and queue_event setting mapped data.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 39684c7e3ab64dcd1feba0300ec969027c5f8eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39684c7e3ab64dcd1feba0300… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:07:15 2011 -0300 dinput: SetActionMap and queue_event setting mapped data. --- dlls/dinput/device.c | 19 +++++++++++++++++++ dlls/dinput/device_private.h | 7 +++++++ dlls/dinput/keyboard.c | 4 ++++ dlls/dinput/mouse.c | 6 +++++- dlls/dinput8/tests/device.c | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 16326b4..5d81227 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -604,6 +604,22 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim This->data_queue[This->queue_head].dwData = data; This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; + + /* Set uAppData by means of action mapping */ + if (This->num_actions > 0) + { + int i; + for (i=0; i < This->num_actions; i++) + { + if (This->action_map[i].offset == ofs) + { + TRACE("Offset %d mapped to uAppData %lu\n", ofs, This->action_map[i].uAppData); + This->data_queue[This->queue_head].uAppData = This->action_map[i].uAppData; + break; + } + } + } + This->queue_head = next_pos; /* Send event if asked */ } @@ -783,6 +799,9 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) HeapFree(GetProcessHeap(), 0, This->data_format.wine_df); release_DataFormat(&This->data_format); + /* Free action mapping */ + HeapFree(GetProcessHeap(), 0, This->action_map); + EnterCriticalSection( &This->dinput->crit ); list_remove( &This->entry ); LeaveCriticalSection( &This->dinput->crit ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1bbc281..503698a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -47,6 +47,12 @@ typedef struct LPDIDATAFORMAT user_df; /* user defined data format */ } DataFormat; +typedef struct +{ + unsigned int offset; + UINT_PTR uAppData; +} ActionMap; + /* Device implementation */ typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl; struct IDirectInputDeviceImpl @@ -74,6 +80,7 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ + ActionMap *action_map; /* array of mappings */ }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 690a91d..3c93bcd 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -609,6 +609,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + for (i = 0; i < lpdiaf->dwNumActions; i++) { if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) @@ -616,6 +618,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, int instance = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); memcpy(&obj_df[action], &c_dfDIKeyboard.rgodf[instance], c_dfDIKeyboard.dwObjSize); + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = action; obj_df[action].dwOfs = action; action++; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4783cf6..fb724d5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -834,6 +834,7 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, DIDATAFORMAT data_format; DIOBJECTDATAFORMAT *obj_df = NULL; int i, action = 0, num_actions = 0; + unsigned int offset = 0; if (This->base.acquired) return DIERR_ACQUIRED; @@ -856,15 +857,18 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + for (i = 0; i < lpdiaf->dwNumActions; i++) { - unsigned int offset = 0; if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) { int instance = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); memcpy(&obj_df[action], &c_dfDIMouse.rgodf[instance], c_dfDIMouse.dwObjSize); + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = offset; obj_df[action].dwOfs = offset; offset += (obj_df[action].dwType & DIDFT_BUTTON) ? 1 : 4; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 479ae34..84a499f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -89,7 +89,7 @@ static void test_device_input( return; } - todo_wine ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); } static void test_build_action_map(

1 0

Lucas Fialho Zawacki : dinput: SetActionMap constructing a dataformat for keyboard and mouse.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: b590090a4887a03c414cc21ff1a26c6d8db5c0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b590090a4887a03c414cc21ff… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:06:54 2011 -0300 dinput: SetActionMap constructing a dataformat for keyboard and mouse. --- dlls/dinput/device.c | 3 -- dlls/dinput/device_private.h | 3 ++ dlls/dinput/keyboard.c | 73 ++++++++++++++++++++++++++++++++++++++- dlls/dinput/mouse.c | 77 ++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 8 ++-- 5 files changed, 153 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b590090a4887a03c414cc…

1 0

Lucas Fialho Zawacki : dinput8/tests: BuildActionMap and input tests for mouse.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 542a2849c01a97638c48a98463a2f49158607bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542a2849c01a97638c48a9846… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:06:01 2011 -0300 dinput8/tests: BuildActionMap and input tests for mouse. --- dlls/dinput8/tests/device.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 4841a1f..f351fb4 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -43,6 +43,7 @@ enum { DITEST_BUTTON, DITEST_KEYBOARDSPACE, DITEST_MOUSEBUTTON0, + DITEST_YAXIS }; static DIACTION actionMapping[]= @@ -54,12 +55,15 @@ static DIACTION actionMapping[]= /* keyboard key */ { 2, DIKEYBOARD_SPACE , 0, { "Missile" } }, /* mouse button */ - { 3, DIMOUSE_BUTTON0 , 0, { "Select" } } + { 3, DIMOUSE_BUTTON0, 0, { "Select" } }, + /* mouse axis */ + { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } }; -static void test_keyboard_input( +static void test_device_input( LPDIRECTINPUTDEVICE8 lpdid, - DWORD key, + DWORD event_type, + DWORD event, DWORD expected ) { @@ -70,7 +74,11 @@ static void test_keyboard_input( hr = IDirectInputDevice8_Acquire(lpdid); todo_wine ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); - keybd_event( key, 0, 0, 0); + if (event_type == INPUT_KEYBOARD) + keybd_event( event, 0, 0, 0); + + if (event_type == INPUT_MOUSE) + mouse_event( event, 0, 0, 0, 0); IDirectInputDevice8_Poll(lpdid); hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); @@ -81,7 +89,6 @@ static void test_keyboard_input( return; } - ok (data_size == 1, "GetDeviceData did not read any event\n"); todo_wine ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); } @@ -89,12 +96,13 @@ static void test_build_action_map( LPDIRECTINPUTDEVICE8 lpdid, LPDIACTIONFORMAT lpdiaf, int action_index, - DWORD obj_expected + DWORD expected_type, + DWORD expected_inst ) { HRESULT hr; DIACTION *actions; - DWORD obj_instance, how; + DWORD instance, type, how; GUID assigned_to; DIDEVICEINSTANCEA ddi; @@ -105,12 +113,14 @@ static void test_build_action_map( ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); actions = lpdiaf->rgoAction; - obj_instance = DIDFT_GETINSTANCE(actions[action_index].dwObjID); + instance = DIDFT_GETINSTANCE(actions[action_index].dwObjID); + type = DIDFT_GETTYPE(actions[action_index].dwObjID); how = actions[action_index].dwHow; assigned_to = actions[action_index].guidInstance; todo_wine ok (how == DIAH_USERCONFIG || how == DIAH_DEFAULT, "Action was not set dwHow=%08x\n", how); - todo_wine ok (obj_instance == obj_expected, "Action not mapped correctly instance=%08x expected=%08x\n", obj_instance, obj_expected); + todo_wine ok (instance == expected_inst, "Action not mapped correctly instance=%08x expected=%08x\n", instance, expected_inst); + todo_wine ok (type == expected_type, "Action type not mapped correctly type=%08x expected=%08x\n", type, expected_type); todo_wine ok (IsEqualGUID(&assigned_to, &ddi.guidInstance), "Action and device GUID do not match action=%d\n", action_index); } @@ -226,9 +236,9 @@ static void test_action_mapping(void) if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */ - test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIK_SPACE); + test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIDFT_PSHBUTTON, DIK_SPACE); /* Test keyboard input */ - test_keyboard_input(data.keyboard, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); /* Test BuildActionMap with no suitable actions for a device */ IDirectInputDevice_Unacquire(data.keyboard); @@ -245,6 +255,15 @@ static void test_action_mapping(void) af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); } + if (data.mouse != NULL) + { + /* Test mouse BuildActionMap */ + test_build_action_map(data.mouse, data.lpdiaf, DITEST_MOUSEBUTTON0, DIDFT_PSHBUTTON, 0x03); + test_build_action_map(data.mouse, data.lpdiaf, DITEST_YAXIS, DIDFT_RELAXIS, 0x01); + + test_device_input(data.mouse, INPUT_MOUSE, MOUSEEVENTF_LEFTDOWN, 3); + } + /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID)); hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, 0, 0);

1 0