November 2008 - Wine-commits

Henri Verbeet : wined3d: vertexshader should never be NULL in generate_param_reorder_function() ( LLVM/Clang).
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: dfde4c91e006fa3a66c89597afe516cee6b238c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfde4c91e006fa3a66c89597a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 31 16:21:22 2008 +0100 wined3d: vertexshader should never be NULL in generate_param_reorder_function() (LLVM/Clang). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc57329..22176e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3043,7 +3043,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) vertexshader; IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) pixelshader; IWineD3DDeviceImpl *device; - DWORD vs_major = vs ? WINED3DSHADER_VERSION_MAJOR(vs->baseShader.hex_version) : 0; + DWORD vs_major = WINED3DSHADER_VERSION_MAJOR(vs->baseShader.hex_version); DWORD ps_major = ps ? WINED3DSHADER_VERSION_MAJOR(ps->baseShader.hex_version) : 0; unsigned int i; SHADER_BUFFER buffer;

1 0

Henri Verbeet : d3d9: Don't ignore the GetCursorInfo() return value (LLVM/ Clang).
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: eb0c0b3f25d7440e6a6f6cd6d941c220c11131b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0c0b3f25d7440e6a6f6cd6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 31 16:21:22 2008 +0100 d3d9: Don't ignore the GetCursorInfo() return value (LLVM/Clang). --- dlls/d3d9/tests/device.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 88394cf..b90d005 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -645,7 +645,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = GetCursorInfo(&info); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); @@ -688,8 +688,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = GetCursorInfo(&info); - ok(hr != 0, "GetCursorInfo returned %08x\n", hr); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ @@ -704,8 +703,7 @@ static void test_cursor(void) /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = GetCursorInfo(&info); - ok(hr != 0, "GetCursorInfo returned %08x\n", hr); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */

1 0

Henri Verbeet : d3d8: Don't ignore the GetCursorInfo() return value (LLVM/ Clang).
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 30a504bab804473649e42c4b75848484a56df5d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a504bab804473649e42c4b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 31 16:21:22 2008 +0100 d3d8: Don't ignore the GetCursorInfo() return value (LLVM/Clang). --- dlls/d3d8/tests/device.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 439267d..cb60d7c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -629,7 +629,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = pGetCursorInfo(&info); + ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); @@ -674,8 +674,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = pGetCursorInfo(&info); - ok(hr != 0, "GetCursorInfo returned %#08x\n", hr); + ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ @@ -690,8 +689,7 @@ static void test_cursor(void) /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - hr = pGetCursorInfo(&info); - ok(hr != 0, "GetCursorInfo returned %#08x\n", hr); + ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */

1 0

Henri Verbeet : wined3d: Remove a FIXME that doesn't apply anymore.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 373a43442d75907fbfe8e197b94cf81de174418c URL: http://source.winehq.org/git/wine.git/?a=commit;h=373a43442d75907fbfe8e197b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 31 16:21:22 2008 +0100 wined3d: Remove a FIXME that doesn't apply anymore. --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f5db127..77654d9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1911,8 +1911,6 @@ static void shader_arb_select_depth_blt(IWineD3DDevice *iface, enum tex_types te GLuint *blt_fprogram = &priv->depth_blt_fprogram_id[tex_type]; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - if (tex_type != tex_2d) FIXME("Unsupported tex_type %#x\n", tex_type); - if (!priv->depth_blt_vprogram_id) priv->depth_blt_vprogram_id = create_arb_blt_vertex_program(gl_info); GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->depth_blt_vprogram_id)); glEnable(GL_VERTEX_PROGRAM_ARB);

1 0