December 2008 - Wine-Commits

Henri Verbeet : wined3d: D3DRS_POINTSIZE_MIN is initially 0.0f for d3d8.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: 29b826b39eb3b5ebc051d063e632c8c840f8181e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b826b39eb3b5ebc051d063e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 09:14:29 2008 +0100 wined3d: D3DRS_POINTSIZE_MIN is initially 0.0f for d3d8. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 27a4d50..f89759b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1107,7 +1107,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE, tmpfloat.d); - tmpfloat.f = 1.0f; + tmpfloat.f = ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion < 9 ? 0.0f : 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE_MIN, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSPRITEENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALEENABLE, FALSE);

1 0

Henri Verbeet : d3d9: Use a HAL device for the stateblock tests.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: 1d9c8a2df7f261487bfc2d128c260d242c88f59e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9c8a2df7f261487bfc2d128… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 09:14:29 2008 +0100 d3d9: Use a HAL device for the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index b5680aa..42e3bdf 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -63,7 +63,7 @@ static HRESULT init_d3d9( device_pparams->hDeviceWindow = window; device_pparams->SwapEffect = D3DSWAPEFFECT_DISCARD; - hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, window, + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, device_pparams, device); ok(hres == D3D_OK || hres == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: 0x%x\n", hres);

1 0

Henri Verbeet : wined3d: The initial value for D3DRS_POINTSIZE_MAX depends on the pointsize limit.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: de494ffe3c371110201f3d8a71fcd81f33b90760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de494ffe3c371110201f3d8a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 09:14:29 2008 +0100 wined3d: The initial value for D3DRS_POINTSIZE_MAX depends on the pointsize limit. --- dlls/d3d9/tests/stateblock.c | 16 ++++++++-------- dlls/wined3d/stateblock.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index baec5c6..b5680aa 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1073,6 +1073,7 @@ typedef struct render_state_data { typedef struct render_state_arg { D3DPRESENT_PARAMETERS* device_pparams; + float pointsize_max; } render_state_arg; typedef struct render_state_context { @@ -1123,14 +1124,12 @@ static inline DWORD to_dword(float fl) { return *((DWORD*) &fl); } -static void render_state_default_data_init( - D3DPRESENT_PARAMETERS* device_pparams, - render_state_data* data) { - +static void render_state_default_data_init(const struct render_state_arg *rsarg, struct render_state_data *data) +{ + DWORD zenable = rsarg->device_pparams->EnableAutoDepthStencil ? D3DZB_TRUE : D3DZB_FALSE; unsigned int idx = 0; - data->states[idx++] = device_pparams->EnableAutoDepthStencil? - D3DZB_TRUE : D3DZB_FALSE; /* ZENABLE */ + data->states[idx++] = zenable; /* ZENABLE */ data->states[idx++] = D3DFILL_SOLID; /* FILLMODE */ data->states[idx++] = D3DSHADE_GOURAUD; /* SHADEMODE */ data->states[idx++] = TRUE; /* ZWRITEENABLE */ @@ -1195,7 +1194,7 @@ static void render_state_default_data_init( data->states[idx++] = 0xFFFFFFFF; /* MULTISAMPLEMASK */ data->states[idx++] = D3DPATCHEDGE_DISCRETE; /* PATCHEDGESTYLE */ data->states[idx++] = 0xbaadcafe; /* DEBUGMONITORTOKEN */ - data->states[idx++] = to_dword(64.0f); /* POINTSIZE_MAX */ + data->states[idx++] = to_dword(rsarg->pointsize_max); /* POINTSIZE_MAX */ data->states[idx++] = FALSE; /* INDEXEDVERTEXBLENDENABLE */ data->states[idx++] = 0x0000000F; /* COLORWRITEENABLE */ data->states[idx++] = to_dword(0.0f); /* TWEENFACTOR */ @@ -1372,7 +1371,7 @@ static HRESULT render_state_setup_handler( test->test_data_out = &ctx->test_data_buffer; test->poison_data = &ctx->poison_data_buffer; - render_state_default_data_init(rsarg->device_pparams, &ctx->default_data_buffer); + render_state_default_data_init(rsarg, &ctx->default_data_buffer); render_state_test_data_init(&ctx->test_data_buffer); render_state_poison_data_init(&ctx->poison_data_buffer); @@ -1454,6 +1453,7 @@ static void test_state_management( tcount++; render_state_arg.device_pparams = device_pparams; + render_state_arg.pointsize_max = caps.MaxPointSize; render_states_queue_test(&tests[tcount], &render_state_arg); tcount++; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e1d4627..27a4d50 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1123,7 +1123,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_PATCHSEGMENTS, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_DEBUGMONITORTOKEN, 0xbaadcafe); - tmpfloat.f = 64.0f; + tmpfloat.f = GL_LIMITS(pointsize); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE_MAX, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_INDEXEDVERTEXBLENDENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE, 0x0000000F);

1 0

Henri Verbeet : d3d9: Release the vertex declaration once we' re done with it.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: a394dbec139d9b68842ec2803fe93576ec022e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a394dbec139d9b68842ec2803… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 09:14:28 2008 +0100 d3d9: Release the vertex declaration once we're done with it. --- dlls/d3d9/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d8c6e58..9133fad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1333,7 +1333,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9EX iface, DWO return hr; } - *pFVF = decl ? ((IDirect3DVertexDeclaration9Impl *)decl)->convFVF : 0; + if (decl) + { + *pFVF = ((IDirect3DVertexDeclaration9Impl *)decl)->convFVF; + IDirect3DVertexDeclaration9_Release(decl); + } + else + { + *pFVF = 0; + } + TRACE("Returning FVF %#x\n", *pFVF); return hr;

1 0

Dan Kegel : winmm: Don't crash on PlaySound(... SND_ALIAS_ID).
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: a7a50e03152bb13ad8d07daf2533c3d73cb1e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a50e03152bb13ad8d07daf2… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Dec 28 16:02:29 2008 -0800 winmm: Don't crash on PlaySound(... SND_ALIAS_ID). --- dlls/winmm/playsound.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 2979d77..1ca0728 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -446,6 +446,11 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) return FALSE; + if ((fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { + FIXME("SND_ALIAS_ID not supported\n"); + return FALSE; + } + /* alloc internal structure, if we need to play something */ if (pszSound && !(fdwSound & SND_PURGE)) {

1 0

Andrew Fenn : xinput: Added stub for XInputEnable.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: cdced5b850a4b2a54bed59846f0888410b7623b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdced5b850a4b2a54bed59846… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Dec 29 01:01:24 2008 +0700 xinput: Added stub for XInputEnable. --- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_3/xinput1_3_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 92d45e9..e8e176e 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,4 +1,4 @@ -@ stub XInputEnable #(long) +@ stdcall XInputEnable(long) @ stub XInputSetState #(long ptr) @ stdcall XInputGetState(long ptr) @ stub XInputGetKeystroke #(long long ptr) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index c25c0d7..15ee4e3 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -46,6 +46,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } +void WINAPI XInputEnable(BOOL enable) +{ + /* Setting to false will stop messages from XInputSetState being sent + to the controllers. Setting to true will send the last vibration + value (sent to XInputSetState) to the controller and allow messages to + be sent */ + FIXME("(%d) Stub!\n", enable); +} + DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { FIXME("(%u %p)\n", dwUserIndex, pState);

1 0

Henri Verbeet : d3d: Make sure the device is properly released when exiting the tests.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: 664b58dc6f247eec29e0a7c1c17c4067d9f98795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664b58dc6f247eec29e0a7c1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 09:14:29 2008 +0100 d3d: Make sure the device is properly released when exiting the tests. --- dlls/d3d8/tests/surface.c | 4 ++++ dlls/d3d8/tests/texture.c | 4 ++++ dlls/d3d8/tests/visual.c | 5 ++++- dlls/d3d8/tests/volume.c | 4 ++++ dlls/d3d9/tests/shader.c | 10 ++++++++++ dlls/d3d9/tests/stateblock.c | 7 ++++++- dlls/d3d9/tests/surface.c | 4 ++++ dlls/d3d9/tests/texture.c | 5 +++++ dlls/d3d9/tests/vertexdeclaration.c | 7 +++++++ dlls/d3d9/tests/volume.c | 4 ++++ 10 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index e1e65b0..4cb2350 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -324,6 +324,7 @@ START_TEST(surface) { HMODULE d3d8_handle; IDirect3DDevice8 *device_ptr; + ULONG refcount; d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) @@ -339,4 +340,7 @@ START_TEST(surface) test_surface_get_container(device_ptr); test_lockrect_invalid(device_ptr); test_private_data(device_ptr); + + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index fd97eac..1475de1 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -135,6 +135,7 @@ START_TEST(texture) D3DCAPS8 caps; HMODULE d3d8_handle; IDirect3DDevice8 *device_ptr; + ULONG refcount; d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) @@ -150,4 +151,7 @@ START_TEST(texture) test_texture_stage_states(device_ptr, caps.MaxTextureBlendStages); test_cube_textures(device_ptr, caps.TextureCaps); + + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 8f853c1..9b2b968 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1345,8 +1345,11 @@ START_TEST(visual) cleanup: if(device_ptr) { D3DDEVICE_CREATION_PARAMETERS creation_parameters; + ULONG refcount; + IDirect3DDevice8_GetCreationParameters(device_ptr, &creation_parameters); - IDirect3DDevice8_Release(device_ptr); + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); DestroyWindow(creation_parameters.hFocusWindow); } } diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index ee43140..f294892 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -128,6 +128,7 @@ START_TEST(volume) { HMODULE d3d8_handle; IDirect3DDevice8 *device_ptr; + ULONG refcount; D3DCAPS8 caps; d3d8_handle = LoadLibraryA("d3d8.dll"); @@ -147,4 +148,7 @@ START_TEST(volume) } test_volume_get_container(device_ptr); + + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 3d80883..e1ad9bb 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -110,6 +110,9 @@ static void test_get_set_vertex_shader(IDirect3DDevice9 *device_ptr) ok(hret == D3D_OK && shader_refcount == i && current_shader_ptr == shader_ptr, "GetVertexShader returned: hret 0x%x, current_shader_ptr %p refcount %d. " "Expected hret 0x%x, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); + IDirect3DVertexShader9_Release(current_shader_ptr); + + IDirect3DVertexShader9_Release(shader_ptr); } static void test_vertex_shader_constant(IDirect3DDevice9 *device_ptr, DWORD consts) @@ -174,6 +177,9 @@ static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) ok(hret == D3D_OK && shader_refcount == i && current_shader_ptr == shader_ptr, "GetPixelShader returned: hret 0x%x, current_shader_ptr %p refcount %d. " "Expected hret 0x%x, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); + IDirect3DPixelShader9_Release(current_shader_ptr); + + IDirect3DPixelShader9_Release(shader_ptr); } static void test_pixel_shader_constant(IDirect3DDevice9 *device_ptr) @@ -207,6 +213,7 @@ START_TEST(shader) { D3DCAPS9 caps; IDirect3DDevice9 *device_ptr; + ULONG refcount; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -234,4 +241,7 @@ START_TEST(shader) test_pixel_shader_constant(device_ptr); } else skip("No pixel shader support\n"); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f8ee57d..baec5c6 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -91,6 +91,7 @@ static void test_begin_end_state_block(IDirect3DDevice9 *device_ptr) ok(hret == D3D_OK && state_block_ptr != 0 && state_block_ptr != (IDirect3DStateBlock9 *)0xdeadbeef, "EndStateBlock returned: hret 0x%x, state_block_ptr %p. " "Expected hret 0x%x, state_block_ptr != %p, state_block_ptr != 0xdeadbeef.\n", hret, state_block_ptr, D3D_OK, NULL); + IDirect3DStateBlock9_Release(state_block_ptr); /* Calling EndStateBlock while not recording should return D3DERR_INVALIDCALL. state_block_ptr should not be touched. */ state_block_ptr = (IDirect3DStateBlock9 *)0xdeadbeef; @@ -1583,5 +1584,9 @@ START_TEST(stateblock) test_state_management(device_ptr, &device_pparams); test_shader_constant_apply(device_ptr); - if (device_ptr) IUnknown_Release(device_ptr); + if (device_ptr) + { + ULONG refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); + } } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index eed45c3..ea9c0c1 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -382,6 +382,7 @@ START_TEST(surface) { HMODULE d3d9_handle; IDirect3DDevice9 *device_ptr; + ULONG refcount; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -398,4 +399,7 @@ START_TEST(surface) test_lockrect_offset(device_ptr); test_lockrect_invalid(device_ptr); test_private_data(device_ptr); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index ede9467..86132b7 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -321,6 +321,7 @@ static void test_filter(IDirect3DDevice9 *device) { } hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + IDirect3DTexture9_Release(texture); out: IDirect3D9_Release(d3d9); @@ -342,6 +343,7 @@ START_TEST(texture) D3DCAPS9 caps; HMODULE d3d9_handle; IDirect3DDevice9 *device_ptr; + ULONG refcount; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -360,4 +362,7 @@ START_TEST(texture) test_mipmap_gen(device_ptr); test_filter(device_ptr); test_gettexture(device_ptr); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 1ec8840..4207cbe 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -183,6 +183,7 @@ static void test_get_set_vertex_declaration(IDirect3DDevice9 *device_ptr, IDirec ok(hret == D3D_OK && decl_refcount == i && current_decl_ptr == decl_ptr, "GetVertexDeclaration returned: hret 0x%x, current_decl_ptr %p refcount %d. " "Expected hret 0x%x, current_decl_ptr %p, refcount %d.\n", hret, current_decl_ptr, decl_refcount, D3D_OK, decl_ptr, i); + IDirect3DVertexDeclaration9_Release(current_decl_ptr); } static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTEXELEMENT9 *vertex_decl, UINT expected_num_elements) @@ -852,6 +853,7 @@ START_TEST(vertexdeclaration) UINT simple_decl_num_elements = sizeof(simple_decl) / sizeof(*simple_decl); IDirect3DDevice9 *device_ptr = 0; IDirect3DVertexDeclaration9 *decl_ptr = 0; + ULONG refcount; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -880,4 +882,9 @@ START_TEST(vertexdeclaration) test_fvf_decl_management(device_ptr); test_vertex_declaration_alignment(device_ptr); test_unused_type(device_ptr); + + IDirect3DVertexDeclaration9_Release(decl_ptr); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); } diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 8b07072..38ea501 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -125,6 +125,7 @@ START_TEST(volume) { HMODULE d3d9_handle; IDirect3DDevice9 *device_ptr; + ULONG refcount; D3DCAPS9 caps; memset(&caps, 0, sizeof(caps)); @@ -145,4 +146,7 @@ START_TEST(volume) } test_volume_get_container(device_ptr); + + refcount = IDirect3DDevice9_Release(device_ptr); + ok(!refcount, "Device has %u references left\n", refcount); }

1 0

Andrew Fenn : xinput: Added prototypes to header file.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: 7a09033ce62a546201d0aee7f76c66f7de5cd819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a09033ce62a546201d0aee7f… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Mon Dec 29 00:50:13 2008 +0700 xinput: Added prototypes to header file. --- include/xinput.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/xinput.h b/include/xinput.h index 46fd0ac..24fbdb3 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -202,4 +202,38 @@ typedef struct _XINPUT_CAPABILITIES { XINPUT_VIBRATION Vibration; } XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; +/* + * Defines the structure for a joystick input event which is + * retrieved using the function XInputGetKeystroke + */ +typedef struct _XINPUT_KEYSTROKE { + WORD VirtualKey; + WCHAR Unicode; + WORD Flags; + BYTE UserIndex; + BYTE HidCode; +} XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE; + +typedef struct _XINPUT_BATTERY_INFORMATION +{ + BYTE BatteryType; + BYTE BatteryLevel; +} XINPUT_BATTERY_INFORMATION, *PXINPUT_BATTERY_INFORMATION; + +#ifdef __cplusplus +extern "C" { +#endif + +void WINAPI XInputEnable(BOOL); +DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*); +DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*); +DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE); +DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); +DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); +DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); + +#ifdef __cplusplus +} +#endif + #endif /* __WINE_XINPUT_H */

1 0

Chris Robinson : d3d9: Use the correct size for D3DFVF_XYZW.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: 0bdab5f80cdf9807f659699ff62e813d1b0ebb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdab5f80cdf9807f659699ff… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Dec 28 09:57:13 2008 -0800 d3d9: Use the correct size for D3DFVF_XYZW. --- dlls/d3d9/tests/vertexdeclaration.c | 5 +++++ dlls/d3d9/vertexdeclaration.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 36d22b4..1ec8840 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -454,6 +454,11 @@ static void test_fvf_decl_conversion(IDirect3DDevice9 *pDevice) } { CONST D3DVERTEXELEMENT9 test_buffer[] = + { { 0, 0, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_POSITION, 0 }, D3DDECL_END() }; + VDECL_CHECK(test_fvf_to_decl(pDevice, default_decl, D3DFVF_XYZW, test_buffer, 1)); + } + { + CONST D3DVERTEXELEMENT9 test_buffer[] = { { 0, 0, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_POSITIONT, 0 }, D3DDECL_END() }; VDECL_CHECK(test_fvf_to_decl(pDevice, default_decl, D3DFVF_XYZRHW, test_buffer, 1)); } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 4631248..86403fd 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -96,6 +96,10 @@ HRESULT vdecl_convert_fvf( elements[idx].Type = D3DDECLTYPE_FLOAT4; elements[idx].Usage = D3DDECLUSAGE_POSITIONT; } + else if (!has_blend && (fvf & D3DFVF_XYZW) == D3DFVF_XYZW) { + elements[idx].Type = D3DDECLTYPE_FLOAT4; + elements[idx].Usage = D3DDECLUSAGE_POSITION; + } else { elements[idx].Type = D3DDECLTYPE_FLOAT3; elements[idx].Usage = D3DDECLUSAGE_POSITION;

1 0

Ge van Geldorp : kernel32/tests: Use shared Windows directory on TS to find regedit.exe.
by Alexandre Julliard Dec. 29, 2008

Dec. 29, 2008

Module: wine Branch: master Commit: c7905ffebce8cd72625b4b5f707fac876a9a9a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7905ffebce8cd72625b4b5f7… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sun Dec 28 17:26:41 2008 +0100 kernel32/tests: Use shared Windows directory on TS to find regedit.exe. --- dlls/kernel32/tests/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 338ba46..e8e5c8f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -35,6 +35,7 @@ static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); +static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -58,6 +59,7 @@ static void InitFunctionPointers(void) pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); + pGetSystemWindowsDirectoryA=(void*)GetProcAddress(hkernel32, "GetSystemWindowsDirectoryA"); } static void test__hread( void ) @@ -1752,7 +1754,10 @@ static void test_OpenFile(void) UINT length; /* Check for existing file */ - length = GetWindowsDirectoryA(buff, MAX_PATH); + if (!pGetSystemWindowsDirectoryA) + length = GetWindowsDirectoryA(buff, MAX_PATH); + else + length = pGetSystemWindowsDirectoryA(buff, MAX_PATH); if (length + sizeof(file) < MAX_PATH) {

1 0