December 2012 - Wine-Commits

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetSamplers().
by Alexandre Julliard Dec. 7, 2012

Dec. 7, 2012

Module: wine Branch: master Commit: 2c01e11ecab701c27c499c63859cb4b737b2f700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c01e11ecab701c27c499c638… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:08 2012 +0100 d3d10core: Implement d3d10_device_GSGetSamplers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0aa5f47..138f3e4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -822,8 +822,27 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler_impl; + struct wined3d_sampler *wined3d_sampler; + + if (!(wined3d_sampler = wined3d_device_get_gs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D10SamplerState_iface; + ID3D10SamplerState_AddRef(samplers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed243cc..f9cd280 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3288,6 +3288,19 @@ void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx wined3d_sampler_decref(prev); } +struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.gs_sampler[idx]; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1ac4bf5..8c58563 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -67,6 +67,7 @@ @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) +@ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index eb48ceb..0e955ce 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2129,6 +2129,7 @@ void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); +struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0

Piotr Caban : msvcr80: Copy _encode_pointer and _decode_pointer functions from msvcp90.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 718959e854508f4541e0df72b51f91711da84ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718959e854508f4541e0df72b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:23:56 2012 +0100 msvcr80: Copy _encode_pointer and _decode_pointer functions from msvcp90. --- dlls/msvcr80/msvcr80.c | 10 ++++++++++ dlls/msvcr80/msvcr80.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.c b/dlls/msvcr80/msvcr80.c index 3953e0e..89a665b 100644 --- a/dlls/msvcr80/msvcr80.c +++ b/dlls/msvcr80/msvcr80.c @@ -37,3 +37,13 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +void * CDECL MSVCR80__decode_pointer(void * ptr) +{ + return DecodePointer(ptr); +} + +void * CDECL MSVCR80__encode_pointer(void * ptr) +{ + return EncodePointer(ptr); +} diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 84c0f0d..e9274f5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -415,7 +415,7 @@ @ varargs _cwscanf_s(wstr) msvcrt._cwscanf_s @ varargs _cwscanf_s_l(wstr ptr) msvcrt._cwscanf_s_l @ extern _daylight msvcrt._daylight -@ cdecl _decode_pointer(ptr) msvcr90._decode_pointer +@ cdecl _decode_pointer(ptr) MSVCR80__decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -425,7 +425,7 @@ @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s -@ cdecl _encode_pointer(ptr) msvcr90._encode_pointer +@ cdecl _encode_pointer(ptr) MSVCR80__encode_pointer @ cdecl _encoded_null() msvcr100._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex

1 0

André Hentschel : wintrust/tests: Unify test message in case of a FALSE return.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: aa80d16768de0ae3b17c247bd23cf98092680125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa80d16768de0ae3b17c247bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 12:55:53 2012 +0100 wintrust/tests: Unify test message in case of a FALSE return. --- dlls/wintrust/tests/crypt.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index bee89cb..8534ce1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -203,7 +203,7 @@ static void test_context(void) /* NULL GUID */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* All NULL */ @@ -273,23 +273,23 @@ static void test_context(void) } ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Correct context handle and GUID */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Flags not equal to 0 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); } /* TODO: Check whether SHA-1 is the algorithm that's always used */ @@ -340,7 +340,7 @@ static void test_calchash(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -354,7 +354,7 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); @@ -376,7 +376,7 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && @@ -766,7 +766,7 @@ static void test_create_catalog_file(void) ret = pCryptCATCDFClose(catcdf); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); }

1 0

Jacek Caban : mshtml: Properly handle NULL value in set_nsstyle_attr.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 10a832cc042075b828322ea94a58af14720954f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a832cc042075b828322ea94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:14 2012 +0100 mshtml: Properly handle NULL value in set_nsstyle_attr. --- dlls/mshtml/htmlstyle.c | 12 +++++++----- dlls/mshtml/tests/style.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6427bee..95d7a88 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -351,16 +351,18 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCWSTR value, DWORD flags) +HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; nsresult nsres; - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - if(flags & ATTR_FIX_URL) - val = fix_url_value(value); + if(value) { + if(flags & ATTR_FIX_PX) + val = fix_px_value(value); + if(flags & ATTR_FIX_URL) + val = fix_url_value(value); + } nsAString_InitDepend(&str_name, style_tbl[sid].name); nsAString_InitDepend(&str_value, val ? val : value); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index fd0f78e..08b3a3c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1052,6 +1052,19 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hres = IHTMLStyle_put_height(style, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_height(style, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + V_VT(&v) = VT_I4; V_I4(&v) = 64; hres = IHTMLStyle_put_height(style, v);

1 0

Jacek Caban : mshtml: Added SID_SContainerDispatch support.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 36a47dd0f2493ce5e0fcc594ace17933c1dbf3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a47dd0f2493ce5e0fcc594a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:02 2012 +0100 mshtml: Added SID_SContainerDispatch support. --- dlls/mshtml/script.c | 9 +++++++++ dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 90f9ba0..82a230d 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -649,6 +649,15 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE riid, ppv); } + if(IsEqualGUID(&SID_SContainerDispatch, guidService)) { + TRACE("(%p)->(SID_SContainerDispatch)\n", This); + + if(!This->window || !This->window->doc) + return E_NOINTERFACE; + + return IHTMLDocument2_QueryInterface(&This->window->doc->basedoc.IHTMLDocument2_iface, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2f8b8ec..af1103d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2104,6 +2104,22 @@ static void test_ui(void) IActiveScriptSiteUIControl_Release(ui_control); } +static void test_sp(void) +{ + IServiceProvider *sp; + IUnknown *unk; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IHTMLDocument, (void**)&unk); + ok(hres == S_OK, "Could not get SID_SContainerDispatch service: %08x\n", hres); + IUnknown_Release(unk); + + IServiceProvider_Release(sp); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2329,6 +2345,7 @@ static void test_script_run(void) test_security(); test_ui(); + test_sp(); } static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface,

1 0

Piotr Caban : tools: Update make_specfiles script.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 9228d9794c0c31f030d605281e2f2fa759771172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9228d9794c0c31f030d605281… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:23:23 2012 +0100 tools: Update make_specfiles script. --- tools/make_specfiles | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index fdba89d..93f5ff1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -28,9 +28,9 @@ my @dll_groups = ( [ "msvcrt", - "msvcr90", - "msvcirt", "msvcr100", + "msvcirt", + "msvcr90", "msvcr80", "msvcr71", "msvcr70",

1 0

Nikolay Sivov : xmllite: Fix reported node type for attributes.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 201b1c2aba3832fe45c03f04378e6fe2c3db266d URL: http://source.winehq.org/git/wine.git/?a=commit;h=201b1c2aba3832fe45c03f043… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 16:18:28 2012 +0400 xmllite: Fix reported node type for attributes. --- dlls/xmllite/reader.c | 6 +++++- dlls/xmllite/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ec7fe37..8ec2eae 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -937,7 +937,11 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)->(%p)\n", This, node_type); - *node_type = This->nodetype; + + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 099c8fb..852f3d4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -642,6 +642,12 @@ todo_wine /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, -1, 55, TRUE); /* try to move from last attribute */ @@ -652,6 +658,11 @@ todo_wine hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); @@ -672,6 +683,11 @@ todo_wine { hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Stefan Dösinger : d3d9/tests: Give the texture transform test a defined colorop.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: b11e499c0b7ab6fef70fb53bddabdc596df08555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11e499c0b7ab6fef70fb53bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:07 2012 +0100 d3d9/tests: Give the texture transform test a defined colorop. --- dlls/d3d9/tests/visual.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1c43e17..c468697 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4063,6 +4063,10 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState(D3DSAMP_ADDRESSV) returned %08x\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSW, D3DTADDRESS_CLAMP); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState(D3DSAMP_ADDRESSW) returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLOROP) returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLORARG1) returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState(D3DRS_LIGHTING) returned %08x\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0);

1 0

Stefan Dösinger : d3d9/tests: Skip some texture transform tests if shaders are unsupported.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 320b33e57b65d3f6d8159ecbc06d0e679b87e5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=320b33e57b65d3f6d8159ecbc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:06 2012 +0100 d3d9/tests: Skip some texture transform tests if shaders are unsupported. --- dlls/d3d9/tests/visual.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5bb50f7..1c43e17 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3878,12 +3878,25 @@ static void projected_textures_test(IDirect3DDevice9 *device, }; IDirect3DVertexShader9 *vs = NULL; IDirect3DPixelShader9 *ps = NULL; + IDirect3D9 *d3d; + D3DCAPS9 caps; HRESULT hr; - hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader, &vs); - ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader, &ps); - ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + IDirect3DDevice9_GetDirect3D(device, &d3d); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed (%08x)\n", hr); + IDirect3D9_Release(d3d); + + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader, &vs); + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 3)) + { + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader, &ps); + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff203040, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); @@ -3920,12 +3933,26 @@ static void projected_textures_test(IDirect3DDevice9 *device, }; if (tests[i].vs) + { + if (!vs) + { + skip("Vertex shaders not supported, skipping\n"); + continue; + } hr = IDirect3DDevice9_SetVertexShader(device, vs); + } else hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); if (tests[i].ps) + { + if (!ps) + { + skip("Pixel shaders not supported, skipping\n"); + continue; + } hr = IDirect3DDevice9_SetPixelShader(device, ps); + } else hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); @@ -3949,11 +3976,14 @@ static void projected_textures_test(IDirect3DDevice9 *device, hr = IDirect3DDevice9_SetVertexShader(device, NULL); hr = IDirect3DDevice9_SetPixelShader(device, NULL); - IDirect3DVertexShader9_Release(vs); - IDirect3DPixelShader9_Release(ps); + if (vs) IDirect3DVertexShader9_Release(vs); + if (ps) IDirect3DPixelShader9_Release(ps); for (i = 0; i < 4; ++i) - check_rect(device, tests[i].rect, tests[i].message); + { + if ((!tests[i].vs || vs) && (!tests[i].ps || ps)) + check_rect(device, tests[i].rect, tests[i].message); + } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr);

1 0

Stefan Dösinger : d3d9/tests: Move the clipplane + shader test inside the capability check.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: aeee527ebd4a23201c0c40bd64969ea1953408fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeee527ebd4a23201c0c40bd6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:08 2012 +0100 d3d9/tests: Move the clipplane + shader test inside the capability check. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c468697..a9c5c44 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14132,6 +14132,7 @@ START_TEST(visual) loop_index_test(device_ptr); sincos_test(device_ptr); sgn_test(device_ptr); + clip_planes_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); test_vshader_float16(device_ptr); @@ -14188,7 +14189,6 @@ START_TEST(visual) fp_special_test(device_ptr); depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); - clip_planes_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr);

1 0