March 2011 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Add get_output() implementation for processor.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: a22096c90c2ac8191b14a17f8496e83ab6d96138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22096c90c2ac8191b14a17f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 23:39:15 2011 +0300 msxml3: Add get_output() implementation for processor. --- dlls/msxml3/stylesheet.c | 42 +++++++++++++++++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 00ba3ca..cf24a9b 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -57,7 +57,9 @@ typedef struct _xslprocessor xsltemplate *stylesheet; IXMLDOMNode *input; + IStream *output; + BSTR outstr; } xslprocessor; static HRESULT XSLProcessor_create(xsltemplate*, IXSLProcessor**); @@ -292,6 +294,7 @@ static HRESULT WINAPI xslprocessor_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -315,6 +318,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { if (This->input) IXMLDOMNode_Release(This->input); if (This->output) IStream_Release(This->output); + SysFreeString(This->outstr); IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); heap_free( This ); } @@ -518,8 +522,25 @@ static HRESULT WINAPI xslprocessor_get_output( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%p): stub\n", This, output); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, output); + + if (!output) return E_INVALIDARG; + + if (This->output) + { + V_VT(output) = VT_UNKNOWN; + V_UNKNOWN(output) = (IUnknown*)This->output; + IStream_AddRef(This->output); + } + else if (This->outstr) + { + V_VT(output) = VT_BSTR; + V_BSTR(output) = SysAllocString(This->outstr); + } + else + V_VT(output) = VT_EMPTY; + + return S_OK; } static HRESULT WINAPI xslprocessor_transform( @@ -528,21 +549,23 @@ static HRESULT WINAPI xslprocessor_transform( { xslprocessor *This = impl_from_IXSLProcessor( iface ); HRESULT hr; - BSTR p; TRACE("(%p)->(%p)\n", This, ret); if (!ret) return E_INVALIDARG; - hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &p); + SysFreeString(This->outstr); + hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &This->outstr); if (hr == S_OK) { - ULONG len = 0; + if (This->output) + { + ULONG len = 0; - /* output to stream */ - hr = IStream_Write(This->output, p, SysStringByteLen(p), &len); - *ret = len == SysStringByteLen(p) ? VARIANT_TRUE : VARIANT_FALSE; - SysFreeString(p); + /* output to stream */ + hr = IStream_Write(This->output, This->outstr, SysStringByteLen(This->outstr), &len); + *ret = len == SysStringByteLen(This->outstr) ? VARIANT_TRUE : VARIANT_FALSE; + } } else *ret = VARIANT_FALSE; @@ -642,6 +665,7 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) This->ref = 1; This->input = NULL; This->output = NULL; + This->outstr = NULL; This->stylesheet = template; IXSLTemplate_AddRef(&template->IXSLTemplate_iface); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 552e52b..c852933 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7865,7 +7865,7 @@ static void test_xsltemplate(void) { IXSLTemplate *template; IXSLProcessor *processor; - IXMLDOMDocument *doc; + IXMLDOMDocument *doc, *doc2; IStream *stream; VARIANT_BOOL b; HRESULT hr; @@ -7947,6 +7947,9 @@ todo_wine { ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); } + hr = IXSLProcessor_get_output(processor, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* reset before it was set */ V_VT(&v) = VT_EMPTY; hr = IXSLProcessor_put_output(processor, v); @@ -7967,6 +7970,17 @@ todo_wine { IStream_Release(stream); todo_wine ok(ref == 4, "got %d\n", ref); + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_get_output(processor, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "got type %d\n", V_VT(&v)); + ok(V_UNKNOWN(&v) == (IUnknown*)stream, "got %p\n", V_UNKNOWN(&v)); + + ref = IStream_AddRef(stream); + IStream_Release(stream); + todo_wine ok(ref == 5, "got %d\n", ref); + VariantClear(&v); + hr = IXSLProcessor_transform(processor, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -7980,6 +7994,31 @@ todo_wine { ok(ref == 2, "got %d\n", ref); IStream_Release(stream); + + /* no output interface set, check output */ + doc2 = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc2, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc2; + hr = IXSLProcessor_put_input(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXSLProcessor_transform(processor, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_get_output(processor, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + /* we currently output one '\n' instead of empty string */ + todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + IXMLDOMDocument_Release(doc2); + IXSLProcessor_Release(processor); /* drop reference */ @@ -7991,6 +8030,7 @@ todo_wine { IXMLDOMDocument_Release(doc); IXSLTemplate_Release(template); + free_bstrs(); } START_TEST(domdoc)

1 0

Nikolay Sivov : msxml3: Always set out pointer to null on failed QueryInterface.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 37ce949745d3e31d6b4923c57259b86799876f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ce949745d3e31d6b4923c57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 22:28:53 2011 +0300 msxml3: Always set out pointer to null on failed QueryInterface. --- dlls/msxml3/attribute.c | 1 + dlls/msxml3/bsc.c | 1 + dlls/msxml3/cdata.c | 7 +------ dlls/msxml3/comment.c | 1 + dlls/msxml3/docfrag.c | 1 + dlls/msxml3/doctype.c | 1 + dlls/msxml3/domimpl.c | 1 + dlls/msxml3/element.c | 1 + dlls/msxml3/entityref.c | 1 + dlls/msxml3/factory.c | 1 + dlls/msxml3/nodemap.c | 1 + dlls/msxml3/parseerror.c | 1 + dlls/msxml3/pi.c | 1 + dlls/msxml3/schema.c | 1 + dlls/msxml3/stylesheet.c | 1 + dlls/msxml3/text.c | 8 +------- dlls/msxml3/xmldoc.c | 1 + dlls/msxml3/xmlelem.c | 1 + 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 60af5a4..170f632 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -77,6 +77,7 @@ static HRESULT WINAPI domattr_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index b57e2b1..9a8be97 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -74,6 +74,7 @@ static HRESULT WINAPI bsc_QueryInterface( } TRACE("interface %s not implemented\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 16c2df2..cdcebb0 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -70,12 +70,6 @@ static HRESULT WINAPI domcdata_QueryInterface( { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || - IsEqualGUID( riid, &IID_IXMLDOMElement ) ) - { - TRACE("Unsupported interface\n"); - return E_NOINTERFACE; - } else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -83,6 +77,7 @@ static HRESULT WINAPI domcdata_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 435c4af..433cca9 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -77,6 +77,7 @@ static HRESULT WINAPI domcomment_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5862b6f..89b82a9 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -76,6 +76,7 @@ static HRESULT WINAPI domfrag_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index ff939fc..9ebe1f0 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -78,6 +78,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 2e35d98..54936bb 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -70,6 +70,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 9573de9..b1de8df 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -86,6 +86,7 @@ static HRESULT WINAPI domelem_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 1c3bd7d..add4d8a 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -76,6 +76,7 @@ static HRESULT WINAPI entityref_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 5cce95b..027506c 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -80,6 +80,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface( } FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index b05192b..6df1028 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -82,6 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index a3f400a..3f5c59f 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -71,6 +71,7 @@ static HRESULT WINAPI parseError_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6c5361a..335b584 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -76,6 +76,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e43aeb4..e2bf8b3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -948,6 +948,7 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5bde047..00ba3ca 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -96,6 +96,7 @@ static HRESULT WINAPI xsltemplate_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 8036d32..b17d1d4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -75,16 +75,10 @@ static HRESULT WINAPI domtext_QueryInterface( { return *ppvObject ? S_OK : E_NOINTERFACE; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || - IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) - { - /* IXMLDOMText is known to be correct in not implementing these */ - TRACE("Unsupported interface\n"); - return E_NOINTERFACE; - } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index b833ba2..a9d1dd8 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -95,6 +95,7 @@ static HRESULT WINAPI xmldoc_QueryInterface(IXMLDocument *iface, REFIID riid, vo else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 19e8194..9e08cc2 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -75,6 +75,7 @@ static HRESULT WINAPI xmlelem_QueryInterface(IXMLElement *iface, REFIID riid, vo else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Austin English : ntprint/tests: Remove win9x hacks.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 9b9181923dd49486710a6e287e710b9df69fb44e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9181923dd49486710a6e287… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 13:29:38 2011 -0800 ntprint/tests: Remove win9x hacks. --- dlls/ntprint/tests/ntprint.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index fca7b8d..cf9853d 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -214,14 +214,7 @@ static void test_PSetupEnumMonitor(VOID) START_TEST(ntprint) { - LPCSTR ptr; - - /* ntprint.dll does not exist on win9x */ - ptr = load_functions(); - if (ptr) { - skip("%s not found\n", ptr); - return; - } + load_functions(); test_PSetupCreateMonitorInfo(); test_PSetupDestroyMonitorInfo();

1 0

Rico Schüller : d3dcompiler: Use defines for shader target masks.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: f7571743c9fb63a3b27a8cee39997ab61070c82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7571743c9fb63a3b27a8cee3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:37 2011 +0100 d3dcompiler: Use defines for shader target masks. --- dlls/d3dcompiler_43/reflection.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 130c1e4..e97512f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,9 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +#define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 + static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; @@ -1108,7 +1111,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &member_offset); TRACE("Member Offset %u\n", member_offset); - if ((type->reflection->target & 0xffff) >= 0x500) + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); if (desc->Members) @@ -1247,7 +1250,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ goto err_out; } - if ((cb->reflection->target & 0xffff) >= 0x500) + if ((cb->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); } @@ -1306,7 +1309,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Creator: %s.\n", debugstr_a(creator)); /* todo: Parse RD11 */ - if ((r->target & 0x0000ffff) >= 0x500) + if ((r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) { skip_dword_unknown(&ptr, 8); } @@ -1516,7 +1519,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * d[i].Mask = mask & 0xff; /* pixel shaders have a special handling for SystemValueType in the output signature */ - if (((target & 0xffff0000) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) + if (((target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) { TRACE("Pixelshader output signature fixup.\n");

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex().
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 3ca651cce149d3c2d178a1c5ae3cf86e005b3415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca651cce149d3c2d178a1c5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:28 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex(). --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c063b9..7381957 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -801,9 +801,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( ID3D11ShaderReflectionType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->desc.Members) + { + WARN("Invalid index specified\n"); + return &null_type.ID3D11ShaderReflectionType_iface; + } + + return &This->members[index].type->ID3D11ShaderReflectionType_iface; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName(

1 0

Henri Verbeet : wined3d: Pass const resources to some resource functions.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 1674ca1ebdda0038155d449e9521849d1b50c5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1674ca1ebdda0038155d449e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:55 2011 +0100 wined3d: Pass const resources to some resource functions. --- dlls/wined3d/resource.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2f18550..d43cdfa 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -131,7 +131,7 @@ void resource_unload(IWineD3DResourceImpl *resource) resource, resource->resource.resourceType); } -static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) +static struct private_data *resource_find_private_data(const struct IWineD3DResourceImpl *This, REFGUID tag) { struct private_data *data; struct list *entry; @@ -193,7 +193,7 @@ HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID return WINED3D_OK; } -HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) +HRESULT resource_get_private_data(const struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) { const struct private_data *d; @@ -260,13 +260,13 @@ DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priorit return prev; } -DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) +DWORD resource_get_priority(const struct IWineD3DResourceImpl *resource) { TRACE("resource %p, returning %u.\n", resource, resource->resource.priority); return resource->resource.priority; } -WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) +WINED3DRESOURCETYPE resource_get_type(const struct IWineD3DResourceImpl *resource) { TRACE("resource %p, returning %#x.\n", resource, resource->resource.resourceType); return resource->resource.resourceType; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7db1ec..0cc9aaf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1830,14 +1830,14 @@ typedef struct IWineD3DResourceImpl void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; -DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; -HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, +DWORD resource_get_priority(const struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; +HRESULT resource_get_private_data(const struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; -WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; +WINED3DRESOURCETYPE resource_get_type(const struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;

1 0

Peter Urbanec : comctl32: Add a check for setting number of parts in the statusbar to zero.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 93b5bcc6eb50ac31509865c3c0ab77ee4e4e222a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5bcc6eb50ac31509865c3c… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Mar 1 12:01:42 2011 +1100 comctl32: Add a check for setting number of parts in the statusbar to zero. --- dlls/comctl32/status.c | 2 ++ dlls/comctl32/tests/status.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index d670370..427fb76 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -665,6 +665,8 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) TRACE("(%d,%p)\n", count, parts); + if(!count) return FALSE; + oldNumParts = infoPtr->numParts; infoPtr->numParts = count; if (oldNumParts > infoPtr->numParts) { diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index c46b614..8509674 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -382,6 +382,12 @@ static void test_status_control(void) /* Reset number of parts */ r = SendMessage(hWndStatus, SB_SETPARTS, 2, (LPARAM)nParts); expect(TRUE,r); + r = SendMessage(hWndStatus, SB_GETPARTS, 0, 0); + ok(r == 2, "Expected 2, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETPARTS, 0, 0); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_GETPARTS, 0, 0); + ok(r == 2, "Expected 2, got %d\n", r); /* Set the minimum height and get rectangle information again */ SendMessage(hWndStatus, SB_SETMINHEIGHT, 50, 0);

1 0

Austin English : shlwapi/tests: Remove win9x hacks.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: a4cc8bc63c7aa4c3db998c6b3c6de3a69993953b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cc8bc63c7aa4c3db998c6b3… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 14:28:29 2011 -0800 shlwapi/tests: Remove win9x hacks. --- dlls/shlwapi/tests/string.c | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 00a4469..3628f86 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -567,11 +567,7 @@ static void test_StrFormatKBSizeW(void) pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(0,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),0,0); - /* shlwapi on Win98 SE does not appear to apply delimiters to the output - * and does not correctly handle extremely large values. */ - ok(!strcmp(result->kb_size, szBuff) || - (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), - "Formatted %x%08x wrong: got %s, expected %s\n", + ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); result++; } @@ -786,15 +782,6 @@ static void test_StrRStrI(void) LPWSTR retW; LPSTR retA; - /* StrCpyNXA was chosen simply because it doesn't appear to be available on - * Win9x machines where StrRStrI crashes. Despite StrRStrI being exported - * by name, all StrRStrI tests appear to crash for unknown reasons. */ - if (!pStrCpyNXA) - { - win_skip("StrRStrI crashes on older Win9x platforms\n"); - return; - } - check_strrstri(A, szTest, 4, "A", szTest+1); check_strrstri(A, szTest, 4, "aX", szTest+1); check_strrstri(A, szTest, 4, "Ay", NULL); @@ -909,15 +896,10 @@ if (0) expect_eq(wbuf[0], 0, WCHAR, "%x"); expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); - if (pStrCpyNXA) - { - memset(wbuf, 0xbf, sizeof(wbuf)); - expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); - expect_eq(wbuf[0], 0, WCHAR, "%x"); - expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); - } - else - win_skip("StrCpyNW test crashes on older Win9x platforms\n"); + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], 0, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, 0, 0), wbuf, PWCHAR, "%p"); @@ -1012,7 +994,7 @@ static void test_StrStrA(void) LPSTR ret; int i; - /* Tests crash on Win9x/Win2k. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrA(NULL, NULL); @@ -1066,7 +1048,7 @@ static void test_StrStrW(void) LPWSTR ret; int i; - /* Tests crash on Win9x. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrW(NULL, NULL); @@ -1114,7 +1096,7 @@ static void test_StrStrIA(void) LPSTR ret; int i; - /* Tests crash on Win9x/Win2k. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrIA(NULL, NULL); @@ -1170,7 +1152,7 @@ static void test_StrStrIW(void) LPWSTR ret; int i; - /* Tests crash on Win9x/Win2k */ + /* Tests crash on Win2k */ if (0) { ret = StrStrIW(NULL, NULL);

1 0

Austin English : setupapi/tests: Remove win9x hacks.
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: 270298191ddda6dafa8d2a76c77e5345d895c8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270298191ddda6dafa8d2a76c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 13:06:23 2011 -0800 setupapi/tests: Remove win9x hacks. --- dlls/setupapi/tests/devinst.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f1d3965..1905406 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1530,21 +1530,7 @@ static void testSetupDiGetINFClassA(void) START_TEST(devinst) { - HDEVINFO set; - - init_function_pointers(); - - /* Win9x/WinMe does things totally different so we skip all the tests - * - * We don't want to exclude NT4 so hence this check. - */ - SetLastError(0xdeadbeef); - set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); - if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Win9x/WinMe has totally different behavior\n"); - return; - } + init_function_pointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeName().
by Alexandre Julliard March 1, 2011

March 1, 2011

Module: wine Branch: master Commit: f9696983cf64587e702f0cb72e671acd46ef33bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9696983cf64587e702f0cb72… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:34 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeName(). --- dlls/d3dcompiler_43/reflection.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index c0ade43..130c1e4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -847,9 +847,23 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( ID3D11ShaderReflectionType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (This == &null_type) + { + WARN("Null type specified\n"); + return "$Invalid"; + } + + if (index >= This->desc.Members) + { + WARN("Invalid index specified\n"); + return NULL; + } + + return This->members[index].name; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual(

1 0