September 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Calculate transparent color index for global GIF palette.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: a457978489dc1bc31321aceb75385c92a265e052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a457978489dc1bc31321aceb7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:23:18 2012 +0900 windowscodecs: Calculate transparent color index for global GIF palette. --- dlls/windowscodecs/gifformat.c | 22 ++++++++++++++++++++-- dlls/windowscodecs/tests/gifformat.c | 3 --- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index b27b3ad..0594a86 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -582,6 +582,7 @@ typedef struct { LONG ref; BOOL initialized; GifFileType *gif; + UINT current_frame; CRITICAL_SECTION lock; } GifDecoder; @@ -1170,7 +1171,8 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet GifDecoder *This = impl_from_IWICBitmapDecoder(iface); WICColor colors[256]; ColorMapObject *cm; - int i; + int i, trans; + ExtensionBlock *eb; TRACE("(%p,%p)\n", iface, palette); @@ -1191,7 +1193,21 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet cm->Colors[i].Blue; } - /* FIXME: transparent color? */ + /* look for the transparent color extension */ + for (i = 0; i < This->gif->SavedImages[This->current_frame].Extensions.ExtensionBlockCount; i++) + { + eb = This->gif->SavedImages[This->current_frame].Extensions.ExtensionBlocks + i; + if (eb->Function == GRAPHICS_EXT_FUNC_CODE && eb->ByteCount == 8) + { + if (eb->Bytes[3] & 1) + { + trans = (unsigned char)eb->Bytes[6]; + colors[trans] &= 0xffffff; /* set alpha to 0 */ + break; + } + } + } + return IWICPalette_InitializeCustom(palette, colors, cm->ColorCount); } @@ -1258,6 +1274,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, result->frame = &This->gif->SavedImages[index]; IWICBitmapDecoder_AddRef(iface); result->parent = This; + This->current_frame = index; *ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface; @@ -1396,6 +1413,7 @@ HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->initialized = FALSE; This->gif = NULL; + This->current_frame = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": GifDecoder.lock"); diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 549cf2b..9ff1d90 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -127,7 +127,6 @@ static void test_global_gif_palette(void) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); @@ -193,7 +192,6 @@ static void test_global_gif_palette_2frames(void) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); @@ -238,7 +236,6 @@ todo_wine ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); ok(color[1] == 0xff040506 || broken(color[1] == 0x00040506) /* XP */, "expected 0xff040506, got %#x\n", color[1]); -todo_wine ok(color[2] == 0x00070809 || broken(color[2] == 0xff070809) /* XP */, "expected 0x00070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]);

1 0

Dmitry Timoshkov : windowscodecs: Take into account return value of IWICPalette_InitializeCustom().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 36560f462bb5233ae798df83c70ec8cf1d9247c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36560f462bb5233ae798df83c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:23:32 2012 +0900 windowscodecs: Take into account return value of IWICPalette_InitializeCustom(). --- dlls/windowscodecs/gifformat.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 0594a86..78371b0 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -739,9 +739,7 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, } } - IWICPalette_InitializeCustom(pIPalette, colors, cm->ColorCount); - - return S_OK; + return IWICPalette_InitializeCustom(pIPalette, colors, cm->ColorCount); } static HRESULT copy_interlaced_pixels(const BYTE *srcbuffer,

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: ae3a919ba00cb9a13835a557533b931f4533addc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3a919ba00cb9a13835a5575… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:02:31 2012 +0200 d3dx9_36/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/d3dx9_36/tests/shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index ad092ab..32fab94 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -643,9 +643,9 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); /* Clear registers */ memset(out, 0, sizeof(out)); @@ -699,9 +699,9 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTranspose, got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "f4", &mvp); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x\n", res); @@ -719,20 +719,20 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " "got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f4", matrix_pointer, 1); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._12 && out[2] == U(S(mvp))._13 && out[3] == U(S(mvp))._14, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._12 && out[2] == S(U(mvp))._13 && out[3] == S(U(mvp))._14, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], - U(S(mvp))._11, U(S(mvp))._12, U(S(mvp))._13, U(S(mvp))._14); + S(U(mvp))._11, S(U(mvp))._12, S(U(mvp))._13, S(U(mvp))._14); memset(out, 0, sizeof(out)); IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); @@ -740,20 +740,20 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " "got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "f4", matrix_pointer, 1); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._21 && out[2] == U(S(mvp))._31 && out[3] == U(S(mvp))._41, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], - U(S(mvp))._11, U(S(mvp))._21, U(S(mvp))._31, U(S(mvp))._41); + S(U(mvp))._11, S(U(mvp))._21, S(U(mvp))._31, S(U(mvp))._41); refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt);

1 0

Francois Gouget : windowscodecs: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: fe6451e2ababbe6b4a7ee9c6fbd0f41b45c2e103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6451e2ababbe6b4a7ee9c6f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:03:10 2012 +0200 windowscodecs: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/pngformat.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3eae4b7..d0977b4 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -25,6 +25,7 @@ #include <png.h> #endif +#define NONAMELESSUNION #define COBJMACROS #include "windef.h" @@ -129,9 +130,9 @@ static HRESULT LoadTextMetadata(IStream *stream, const GUID *preferred_vendor, value[value_len] = 0; result[0].id.vt = VT_LPSTR; - result[0].id.pszVal = name; + result[0].id.u.pszVal = name; result[0].value.vt = VT_LPSTR; - result[0].value.pszVal = value; + result[0].value.u.pszVal = value; *items = result; *item_count = 1;

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 085b1ba3f50e2f1d8af51c6a760d19389ee3cf67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085b1ba3f50e2f1d8af51c6a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:03:29 2012 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 94bbf7e..c7b46db 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3375,10 +3375,10 @@ static void test_VarRound(void) i, S(U(V_DECIMAL(&vDst))).sign, ptr->ret.sign); ok(V_DECIMAL(&vDst).Hi32 == ptr->ret.Hi32, "%d: got Hi32 %d, expected %d\n", i, V_DECIMAL(&vDst).Hi32, ptr->ret.Hi32); - ok(S(U(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", - i, S(U(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); - ok(S(U(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", - i, S(U(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); + ok(S1(U1(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", + i, S1(U1(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); + ok(S1(U1(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", + i, S1(U1(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); } }

1 0

Francois Gouget : regedit: Fix the spelling of multi-string.
by Alexandre Julliard 24 Sep '12

24 Sep '12

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 90df33f0b3be029c442da4125ba9579aa4c0939f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df33f0b3be029c442da4125… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:45 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0d8bd0e..902bf5a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5641,9 +5641,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_GEOMETRYSHADER) + { + WARN("Shader is not a geometry shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.gs)) + ID3D10GeometryShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader(

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetPixelShader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 1dcc63c170742d813f8685f4c3e850c9b1058ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcc63c170742d813f8685f4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:46 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetPixelShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 902bf5a..edb216b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5665,9 +5665,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_PIXELSHADER) + { + WARN("Shader is not a pixel shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.ps)) + ID3D10PixelShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureElementDesc(

1 0

Henri Verbeet : wined3d: wined3d_device_set_vertex_shader() never fails.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: b97ec7ae0c603eb9a4e54778eb643f4adce90aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97ec7ae0c603eb9a4e54778e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:47 2012 +0200 wined3d: wined3d_device_set_vertex_shader() never fails. --- dlls/d3d8/device.c | 7 ++----- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 22 ++++++++-------------- include/wine/wined3d.h | 2 +- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index baa8b63..5325a6d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2110,7 +2110,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertex_shader *shader_impl; - HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2140,12 +2139,10 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD wined3d_device_set_vertex_declaration(device->wined3d_device, shader_impl->vertex_declaration->wined3d_vertex_declaration); - hr = wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); - TRACE("Returning hr %#x\n", hr); - - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetVertexShader(IDirect3DDevice8 *iface, DWORD *shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b1b7b80..5a17943 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2266,16 +2266,15 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexshader *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - hr = wined3d_device_set_vertex_shader(device->wined3d_device, + wined3d_device_set_vertex_shader(device->wined3d_device, shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b63104..2cf0f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2449,39 +2449,33 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( return device->stateBlock->state.vertex_declaration; } -HRESULT CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) +void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->updateStateBlock->state.vertex_shader; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (prev) + wined3d_shader_decref(prev); + device->updateStateBlock->state.vertex_shader = shader; device->updateStateBlock->changed.vertexShader = TRUE; if (device->isRecordingState) { - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (shader == prev) { TRACE("Application is setting the old shader over, nothing to do.\n"); - return WINED3D_OK; + return; } - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - device_invalidate_state(device, STATE_VSHADER); - - return WINED3D_OK; } struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bf16b55..3a87b25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2236,7 +2236,7 @@ void __cdecl wined3d_device_set_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration); -HRESULT __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count);

1 0

Henri Verbeet : wined3d: Just return the shader from wined3d_device_get_vertex_shader().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6909b5143be25cfc4f29e1436d2049addeb1f86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6909b5143be25cfc4f29e1436… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:48 2012 +0200 wined3d: Just return the shader from wined3d_device_get_vertex_shader(). --- dlls/d3d8/device.c | 10 +++------- dlls/d3d9/device.c | 4 +--- dlls/wined3d/device.c | 9 +-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5325a6d..709ac52 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2174,7 +2174,6 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertex_shader *shader_impl; - struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2187,12 +2186,9 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW return D3DERR_INVALIDCALL; } - if ((cur = wined3d_device_get_vertex_shader(device->wined3d_device))) - { - if (cur == shader_impl->wined3d_shader) - IDirect3DDevice8_SetVertexShader(iface, 0); - wined3d_shader_decref(cur); - } + if (shader_impl->wined3d_shader + && wined3d_device_get_vertex_shader(device->wined3d_device) == shader_impl->wined3d_shader) + IDirect3DDevice8_SetVertexShader(iface, 0); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a17943..0418d69 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2286,13 +2286,11 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device); - if (wined3d_shader) + if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; IDirect3DVertexShader9_AddRef(*shader); - wined3d_shader_decref(wined3d_shader); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2cf0f85..664f1bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2480,16 +2480,9 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { - struct wined3d_shader *shader; - TRACE("device %p.\n", device); - shader = device->stateBlock->state.vertex_shader; - if (shader) - wined3d_shader_incref(shader); - - TRACE("Returning %p.\n", shader); - return shader; + return device->stateBlock->state.vertex_shader; } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,

1 0