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

Rico Schüller : d3d10: Add a stub ID3D10ReflectShader implementation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 0d18e35b28a44a0796c9e90b28922f8aaadd77e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d18e35b28a44a0796c9e90b2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 21 20:44:59 2010 +0200 d3d10: Add a stub ID3D10ReflectShader implementation. --- dlls/d3d10/Makefile.in | 1 + dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 23 ++++++++ dlls/d3d10/d3d10_private.h | 8 +++ dlls/d3d10/shader.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ include/d3d10shader.h | 2 + 6 files changed, 170 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index c872984..79b2bbc 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = dxguid uuid d3d10core dxgi C_SRCS = \ d3d10_main.c \ effect.c \ + shader.c \ utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 86e1236..97ac7a9 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -17,7 +17,7 @@ @ stub D3D10GetVersion @ stdcall D3D10GetVertexShaderProfile(ptr) @ stub D3D10PreprocessShader -@ stub D3D10ReflectShader +@ stdcall D3D10ReflectShader(ptr long ptr) @ stub D3D10RegisterLayers @ stub D3D10StateBlockMaskDifference @ stub D3D10StateBlockMaskDisableAll diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 65ce1e0..2c07bb3 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -262,3 +262,26 @@ LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device) return "ps_4_0"; } + +HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) +{ + struct d3d10_shader_reflection *object; + + FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 shader reflection object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_shader_reflection_vtbl; + object->refcount = 1; + + *reflector = (ID3D10ShaderReflection *)object; + + TRACE("Created ID3D10ShaderReflection %p\n", object); + + return S_OK; +} diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 2e31f29..77a3529 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -212,6 +212,14 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; +/* ID3D10ShaderReflection */ +extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; +struct d3d10_shader_reflection +{ + const struct ID3D10ShaderReflectionVtbl *vtbl; + LONG refcount; +}; + HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; /* D3D10Core */ diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c new file mode 100644 index 0000000..d5d9e16 --- /dev/null +++ b/dlls/d3d10/shader.c @@ -0,0 +1,135 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2010 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_QueryInterface(ID3D10ShaderReflection *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10ShaderReflection) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflection *iface) +{ + struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) +{ + struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10ShaderReflection methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderReflection *iface, D3D10_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_shader_reflection_GetConstantBufferByIndex( + ID3D10ShaderReflection *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_shader_reflection_GetConstantBufferByName( + ID3D10ShaderReflection *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( + ID3D10ShaderReflection *iface, UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) +{ + FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc( + ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) +{ + FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc( + ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) +{ + FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + + return E_NOTIMPL; +} + +const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = +{ + /* IUnknown methods */ + d3d10_shader_reflection_QueryInterface, + d3d10_shader_reflection_AddRef, + d3d10_shader_reflection_Release, + /* ID3D10Effect methods */ + d3d10_shader_reflection_GetDesc, + d3d10_shader_reflection_GetConstantBufferByIndex, + d3d10_shader_reflection_GetConstantBufferByName, + d3d10_shader_reflection_GetResourceBindingDesc, + d3d10_shader_reflection_GetInputParameterDesc, + d3d10_shader_reflection_GetOutputParameterDesc, +}; diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 728028c..7885bbd 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -277,4 +277,6 @@ LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device); +HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector); + #endif /* __WINE_D3D10SHADER_H */

1 0

Rico Schüller : d3d10: Add the ID3D10ShaderReflectionVariable interface.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 5daf7fef9679fd52d5c815049cc23fe5169a0aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf7fef9679fd52d5c815049… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 21 20:44:43 2010 +0200 d3d10: Add the ID3D10ShaderReflectionVariable interface. --- include/d3d10shader.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 3fc1b6b..862810f 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,6 +130,15 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +typedef struct _D3D10_SHADER_VARIABLE_DESC +{ + LPCSTR Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + LPVOID DefaultValue; +} D3D10_SHADER_VARIABLE_DESC; + typedef struct _D3D10_SHADER_TYPE_DESC { D3D10_SHADER_VARIABLE_CLASS Class; @@ -153,6 +162,16 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionType) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, 0x1bf63c95, 0x2650, 0x405d, 0x99, 0xc1, 0x36, 0x36, 0xbd, 0x1d, 0xa0, 0xa1); + +#define INTERFACE ID3D10ShaderReflectionVariable +DECLARE_INTERFACE(ID3D10ShaderReflectionVariable) +{ + STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetType)(THIS) PURE; +}; +#undef INTERFACE + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Michael Stefaniuc : oleaut32/tests: Use IsEqualIID instead of memcmp to compare REFIIDs.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: bd132fed1e64bf77857f7d358268a346787e550b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd132fed1e64bf77857f7d358… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 23 11:30:10 2010 +0200 oleaut32/tests: Use IsEqualIID instead of memcmp to compare REFIIDs. --- dlls/oleaut32/tests/olepicture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 2259437..f00055e 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -939,11 +939,11 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) + if (IsEqualIID(&IID_IUnknown, riid)) { *ppvObject = This; } - else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) + else if (IsEqualIID(&IID_IStream, riid)) { *ppvObject = This; }

1 0

Henri Verbeet : wined3d: Clear all render targets in an MRT setup.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: d374d85055490c37665bc68032dacb1de3e705d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d374d85055490c37665bc6803… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:03 2010 +0200 wined3d: Clear all render targets in an MRT setup. --- dlls/wined3d/context.c | 58 +++++- dlls/wined3d/device.c | 444 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 7 +- dlls/wined3d/wined3d_private.h | 7 +- 4 files changed, 280 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d374d85055490c37665bc…

1 0

Rico Schüller : d3d10: Add the ID3D10ShaderReflectionType interface.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 63d52a3811aba6cdb2ea0a631d167254f3f3e943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d52a3811aba6cdb2ea0a631… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 21 20:44:32 2010 +0200 d3d10: Add the ID3D10ShaderReflectionType interface. --- include/d3d10shader.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 582a1c9..3fc1b6b 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,6 +130,29 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +typedef struct _D3D10_SHADER_TYPE_DESC +{ + D3D10_SHADER_VARIABLE_CLASS Class; + D3D10_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; +} D3D10_SHADER_TYPE_DESC; + +DEFINE_GUID(IID_ID3D10ShaderReflectionType, 0xc530ad7d, 0x9b16, 0x4395, 0xa9, 0x79, 0xba, 0x2e, 0xcf, 0xf8, 0x3a, 0xdd); + +#define INTERFACE ID3D10ShaderReflectionType +DECLARE_INTERFACE(ID3D10ShaderReflectionType) +{ + STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE; +}; +#undef INTERFACE + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Henri Verbeet : wined3d: Avoid loading the destination surface in stretch_rect_fbo() if it will be completely overwritten.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 2f028f034044c80e69f59b67ca1bc76e40119690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f028f034044c80e69f59b67c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:05 2010 +0200 wined3d: Avoid loading the destination surface in stretch_rect_fbo() if it will be completely overwritten. --- dlls/wined3d/device.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17a4b83..df9e1d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5743,6 +5743,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } } +static BOOL surface_is_full_rect(IWineD3DSurfaceImpl *surface, const RECT *r) +{ + if ((r->left && r->right) || abs(r->right - r->left) != surface->currentDesc.Width) + return FALSE; + if ((r->top && r->bottom) || abs(r->bottom - r->top) != surface->currentDesc.Height) + return FALSE; + return TRUE; +} + void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect_in, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, const WINED3DTEXTUREFILTERTYPE filter) { @@ -5772,11 +5781,13 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa break; } - /* Make sure the drawables are up-to-date. Note that loading the - * destination surface isn't strictly required if we overwrite the - * entire surface. */ + /* Make sure the drawables are up-to-date. Loading the destination + * surface isn't required if the entire surface is overwritten. (And is + * in fact harmful if we're being called by surface_load_location() with + * the purpose of loading the destination surface.) */ surface_load_location(src_surface, SFLAG_INDRAWABLE, NULL); - surface_load_location(dst_surface, SFLAG_INDRAWABLE, NULL); + if (!surface_is_full_rect(dst_surface, &dst_rect)) + surface_load_location(dst_surface, SFLAG_INDRAWABLE, NULL); if (!surface_is_offscreen(src_surface)) context = context_acquire(device, src_surface); else if (!surface_is_offscreen(dst_surface)) context = context_acquire(device, dst_surface);

1 0

Henri Verbeet : d3d9/tests: Add a test for clearing render targets in an MRT.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 0b630e1430e346f77b82ae17a326538a90af2110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b630e1430e346f77b82ae17a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:04 2010 +0200 d3d9/tests: Add a test for clearing render targets in an MRT. --- dlls/d3d9/tests/visual.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c8c8962..8afe67f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9043,7 +9043,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DVertexShader9 *vs; IDirect3DPixelShader9 *ps; IDirect3DTexture9 *tex1, *tex2; - IDirect3DSurface9 *surf1, *surf2, *backbuf; + IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; D3DCAPS9 caps; DWORD color; float quad[] = { @@ -9075,9 +9075,15 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex1, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 16, 16, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex1, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); @@ -9102,6 +9108,32 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0x000000ff, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0x000000ff, got 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); if(SUCCEEDED(hr)) { @@ -9149,6 +9181,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surf1); IDirect3DSurface9_Release(surf2); IDirect3DSurface9_Release(backbuf); + IDirect3DSurface9_Release(readback); } struct formats {

1 0

Henri Verbeet : d3d9/tests: Introduce a vertex shader to the MRT test.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 74015090ae09ca8c79f8bb10a1d3f530a24e72a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74015090ae09ca8c79f8bb10a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 23 11:31:02 2010 +0200 d3d9/tests: Introduce a vertex shader to the MRT test. --- dlls/d3d9/tests/visual.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6ecd624..c8c8962 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9021,20 +9021,31 @@ static void pointsize_test(IDirect3DDevice9 *device) static void multiple_rendertargets_test(IDirect3DDevice9 *device) { + static const DWORD vshader_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD pshader_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ + 0x05000051, 0xa00f0001, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c1, 0.0, 0.0, 1.0, 0.0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ + 0x0000ffff /* end */ + }; + HRESULT hr; + IDirect3DVertexShader9 *vs; IDirect3DPixelShader9 *ps; IDirect3DTexture9 *tex1, *tex2; IDirect3DSurface9 *surf1, *surf2, *backbuf; D3DCAPS9 caps; DWORD color; - DWORD shader_code[] = { - 0xffff0300, /* ps_3_0 */ - 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0, 1, 0, 0 */ - 0x05000051, 0xa00f0001, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c1, 0, 0, 1, 0 */ - 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ - 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ - 0x0000ffff /* END */ - }; float quad[] = { -1.0, -1.0, 0.1, 1.0, -1.0, 0.1, @@ -9068,7 +9079,9 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &ps); + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); + ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &ps); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); @@ -9078,6 +9091,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex2, 0, &surf2); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); @@ -9093,6 +9108,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuf); @@ -9126,6 +9143,7 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); IDirect3DPixelShader9_Release(ps); + IDirect3DVertexShader9_Release(vs); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2); IDirect3DSurface9_Release(surf1);

1 0

Hans Leidekker : msi: Warn if a transform file cannot be opened.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: bdda3b950c145eafffc3a53c5467fc842048c041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdda3b950c145eafffc3a53c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:43:11 2010 +0200 msi: Warn if a transform file cannot be opened. --- dlls/msi/msiquery.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index f2723af..df81a74 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -733,7 +733,10 @@ UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, r = StgOpenStorage( szTransformFile, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); if ( FAILED(r) ) + { + WARN("failed to open transform 0x%08x\n", r); return ret; + } r = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); if ( FAILED( r ) )

1 0

Michael Stefaniuc : ole32: Use IsEqualIID instead of memcmp to compare REFIIDs.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: ffac31da0947cd600629930b119ff662cd935cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffac31da0947cd600629930b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 23 11:30:00 2010 +0200 ole32: Use IsEqualIID instead of memcmp to compare REFIIDs. --- dlls/ole32/datacache.c | 3 +-- dlls/ole32/oleobj.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 1c7be2b..2f26363 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2284,8 +2284,7 @@ HRESULT WINAPI CreateDataCache( * This is necessary because it's the only time the non-delegating * IUnknown pointer can be returned to the outside. */ - if ( (pUnkOuter!=NULL) && - (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) != 0) ) + if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) ) return CLASS_E_NOAGGREGATION; /* diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 584e796..7e131ae 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -615,8 +615,8 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface( /* * Compare the riid with the interface IDs implemented by this object. */ - if ( (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) || - (memcmp(&IID_IDataAdviseHolder, riid, sizeof(IID_IDataAdviseHolder)) == 0) ) + if ( IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDataAdviseHolder, riid) ) { *ppvObject = iface; }

1 0