November 2011 - Wine-Commits

Eric Pouech : winhlp32: Fix hlpfile content decompression in phrase40 mode.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: a494cbb63b6f9bbba11f3da8ffec1e506656f103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a494cbb63b6f9bbba11f3da8f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 15 22:08:38 2011 +0100 winhlp32: Fix hlpfile content decompression in phrase40 mode. --- programs/winhlp32/hlpfile.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index fcdca60..add53e6 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -2358,14 +2358,14 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) INT dec_size, cpr_size; BYTE *buf_idx, *end_idx; BYTE *buf_phs, *end_phs; - LONG* ptr, mask = 0; + ULONG* ptr, mask = 0; unsigned int i; unsigned short bc, n; if (!HLPFILE_FindSubFile(hlpfile, "|PhrIndex", &buf_idx, &end_idx) || !HLPFILE_FindSubFile(hlpfile, "|PhrImage", &buf_phs, &end_phs)) return FALSE; - ptr = (LONG*)(buf_idx + 9 + 28); + ptr = (ULONG*)(buf_idx + 9 + 28); bc = GET_USHORT(buf_idx, 9 + 24) & 0x0F; num = hlpfile->num_phrases = GET_USHORT(buf_idx, 9 + 4); @@ -2400,9 +2400,10 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) return FALSE; } -#define getbit() (ptr += (mask < 0), mask = mask*2 + (mask<=0), (*ptr & mask) != 0) +#define getbit() ((mask <<= 1) ? (*ptr & mask) != 0: (*++ptr & (mask=1)) != 0) hlpfile->phrases_offsets[0] = 0; + ptr--; /* as we'll first increment ptr because mask is 0 on first getbit() call */ for (i = 0; i < num; i++) { for (n = 1; getbit(); n += 1 << bc);

1 0

Vincent Povirk : windowscodecs: Flesh out IWICMetadataReader test.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 065470ed625d81ae6c396ac9a11ab9fb0e0d2a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065470ed625d81ae6c396ac9a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 15 16:17:19 2011 -0600 windowscodecs: Flesh out IWICMetadataReader test. --- dlls/windowscodecs/tests/metadata.c | 77 ++++++++++++++++++++++++++++++++-- include/wincodec.idl | 1 + 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 715c9e7..8495e4d 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -163,24 +163,39 @@ static void test_metadata_tEXt(void) IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; - ULONG items_returned; + ULONG items_returned, count; + GUID format; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); hr = CoCreateInstance(&CLSID_WICPngTextMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; + hr = IWICMetadataReader_GetCount(reader, NULL); + ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 0, "unexpected count %i\n", count); + load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt)); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %i\n", count); + + hr = IWICMetadataReader_GetEnumerator(reader, NULL); + ok(hr == E_INVALIDARG, "GetEnumerator failed, hr=%x\n", hr); + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - PropVariantInit(&schema); - PropVariantInit(&id); - PropVariantInit(&value); - hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); ok(hr == S_OK, "Next failed, hr=%x\n", hr); ok(items_returned == 1, "unexpected item count %i\n", items_returned); @@ -205,6 +220,58 @@ static void test_metadata_tEXt(void) IWICEnumMetadataItem_Release(enumerator); } + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataFormat(reader, NULL); + ok(hr == E_INVALIDARG, "GetMetadataFormat failed, hr=%x\n", hr); + + id.vt = VT_LPSTR; + id.pszVal = CoTaskMemAlloc(strlen("winetest") + 1); + strcpy(id.pszVal, "winetest"); + + hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, &schema, NULL, &value); + ok(hr == E_INVALIDARG, "GetValue failed, hr=%x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + PropVariantClear(&value); + + strcpy(id.pszVal, "test"); + + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "GetValue failed, hr=%x\n", hr); + + PropVariantClear(&id); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, &schema, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &id, NULL); + ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); + ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal); + PropVariantClear(&id); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); + ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + PropVariantClear(&value); + + hr = IWICMetadataReader_GetValueByIndex(reader, 1, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "GetValueByIndex failed, hr=%x\n", hr); + IWICMetadataReader_Release(reader); } diff --git a/include/wincodec.idl b/include/wincodec.idl index 8228bd8..4c46cf4 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -192,6 +192,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05") cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") +cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50")

1 0

Andrew Talbot : kernel32: Remove unused file-static variables.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: d1136d4acaca5dc08a030450b3bf02c32ac30835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1136d4acaca5dc08a030450b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 15 21:57:24 2011 +0000 kernel32: Remove unused file-static variables. --- dlls/kernel32/format_msg.c | 1 - dlls/kernel32/locale.c | 6 ------ 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index b1befb3..d6d19ff 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -68,7 +68,6 @@ struct format_args * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 }; static const WCHAR FMTWSTR[] = { '%','s',0 }; /********************************************************************** diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 725855d..2c3760c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,12 +62,6 @@ static const union cptable *oem_cptable; static const union cptable *mac_cptable; static const union cptable *unix_cptable; /* NULL if UTF8 */ -static const WCHAR szNlsKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','N','l','s','\0' -}; - static const WCHAR szLocaleKeyName[] = { 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',

1 0

Nikolay Sivov : msxml3: Properly return node prefix from get_prefix().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 588f27dae9b90ed7e735f73498face3ea68b9fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=588f27dae9b90ed7e735f7349… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:19:28 2011 +0300 msxml3: Properly return node prefix from get_prefix(). --- dlls/msxml3/entityref.c | 4 +- dlls/msxml3/node.c | 9 +--- dlls/msxml3/tests/domdoc.c | 99 ++++++++++++++++++++++++++++++++------------ 3 files changed, 77 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 79b53be..091b3d7 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -531,8 +531,8 @@ static HRESULT WINAPI entityref_get_prefix( BSTR* prefix) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - TRACE("(%p)->(%p)\n", This, prefix); - return node_get_prefix( &This->node, prefix ); + FIXME("(%p)->(%p): stub\n", This, prefix); + return return_null_bstr( prefix ); } static HRESULT WINAPI entityref_get_baseName( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3a104cd..923a0c2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1074,17 +1074,14 @@ HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) HRESULT node_get_prefix(xmlnode *This, BSTR *prefix) { - xmlNsPtr *ns; + xmlNsPtr ns = This->node->ns; if (!prefix) return E_INVALIDARG; *prefix = NULL; - if ((ns = xmlGetNsList(This->node->doc, This->node))) - { - if (ns[0]->prefix) *prefix = bstr_from_xmlChar( ns[0]->prefix ); - xmlFree(ns); - } + if (ns && ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); TRACE("prefix: %s\n", debugstr_w(*prefix)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eb1270d..bad088f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6960,21 +6960,21 @@ static void test_testTransforms(void) free_bstrs(); } -static void test_Namespaces(void) +static void test_namespaces(void) { - static const CHAR szNamespacesXML[] = + static const CHAR namespaces_xmlA[] = "<?xml version=\"1.0\"?>\n" "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" " <XMI.content>" - " <Model:Package name=\"WinePackage\" />" + " <Model:Package name=\"WinePackage\" Model:name2=\"name2 attr\" />" " </XMI.content>" "</XMI>"; IXMLDOMDocument *doc; IXMLDOMElement *elem; IXMLDOMNode *node; - IXMLDOMNode *pNode2 = NULL; - VARIANT_BOOL bSucc; + + VARIANT_BOOL b; VARIANT var; HRESULT hr; BSTR str; @@ -6982,44 +6982,66 @@ static void test_Namespaces(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; - hr = IXMLDOMDocument_loadXML(doc, _bstr_(szNamespacesXML), &bSucc); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(namespaces_xmlA), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); - ok(hr == S_OK, "ret %08x\n", hr ); + EXPECT_HR(hr, S_OK); if(hr == S_OK) { - hr = IXMLDOMNode_get_firstChild( node, &pNode2 ); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( pNode2 != NULL, "pNode2 == NULL\n"); + IXMLDOMAttribute *attr; + IXMLDOMNode *node2; + + hr = IXMLDOMNode_get_firstChild(node, &node2); + EXPECT_HR(hr, S_OK); + ok(node2 != NULL, "got %p\n", node2); /* Test get_prefix */ - hr = IXMLDOMNode_get_prefix(pNode2, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + hr = IXMLDOMNode_get_prefix(node2, NULL); + EXPECT_HR(hr, E_INVALIDARG); /* NOTE: Need to test that arg2 gets cleared on Error. */ - hr = IXMLDOMNode_get_prefix(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("Model")), "incorrect prefix string\n"); + hr = IXMLDOMNode_get_prefix(node2, &str); + EXPECT_HR(hr, S_OK); + ok( !lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - hr = IXMLDOMNode_get_nodeName(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - todo_wine ok( !lstrcmpW( str, _bstr_("Model:Package")), "incorrect nodeName string\n"); + hr = IXMLDOMNode_get_nodeName(node2, &str); + EXPECT_HR(hr, S_OK); + todo_wine ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test get_namespaceURI */ - hr = IXMLDOMNode_get_namespaceURI(pNode2, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + hr = IXMLDOMNode_get_namespaceURI(node2, NULL); + EXPECT_HR(hr, E_INVALIDARG); /* NOTE: Need to test that arg2 gets cleared on Error. */ - hr = IXMLDOMNode_get_namespaceURI(pNode2, &str); - ok( hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "incorrect namespaceURI string\n"); + hr = IXMLDOMNode_get_namespaceURI(node2, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("Model:name2"), &attr); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMAttribute_get_nodeName(attr, &str); + EXPECT_HR(hr, S_OK); + todo_wine ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - IXMLDOMNode_Release(pNode2); + hr = IXMLDOMAttribute_get_prefix(attr, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMAttribute_Release(attr); + IXMLDOMElement_Release(elem); + + IXMLDOMNode_Release(node2); IXMLDOMNode_Release(node); } @@ -8579,6 +8601,10 @@ todo_wine { free_bstrs(); } +static const char get_prefix_doc[] = + "<?xml version=\"1.0\" ?>" + "<a xmlns:ns1=\"ns1 href\" />"; + static void test_get_prefix(void) { IXMLDOMDocumentFragment *fragment; @@ -8586,6 +8612,7 @@ static void test_get_prefix(void) IXMLDOMElement *element; IXMLDOMComment *comment; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; BSTR str; @@ -8672,6 +8699,24 @@ static void test_get_prefix(void) IXMLDOMElement_Release(element); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(get_prefix_doc), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + EXPECT_HR(hr, S_OK); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %p\n", str); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_namespaceURI(element, &str); +todo_wine { + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); +} + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -10741,7 +10786,7 @@ START_TEST(domdoc) test_nodeTypeTests(); test_save(); test_testTransforms(); - test_Namespaces(); + test_namespaces(); test_FormattingXML(); test_nodeTypedValue(); test_TransformWithLoadingLocalFile();

1 0

Thomas Faber : advapi32/tests: Use already existing static string instead of literal.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 087ff0644fc5535aa5843c8b4dcc4ccc7f643e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=087ff0644fc5535aa5843c8b4… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Nov 15 20:28:06 2011 +0100 advapi32/tests: Use already existing static string instead of literal. --- dlls/advapi32/tests/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5bb40eb..9aa249c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -144,7 +144,7 @@ static void test_open_svc(void) /* Proper SCM handle but different access rights */ scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); SetLastError(0xdeadbeef); - svc_handle = OpenServiceA(scm_handle, "Spooler", GENERIC_WRITE); + svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_WRITE); if (!svc_handle && (GetLastError() == ERROR_ACCESS_DENIED)) skip("Not enough rights to get a handle to the service\n"); else

1 0

Vincent Povirk : windowscodecs: Add test for CreateMetadataReaderFromContainer.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 318c4e6788b474dfd4b30004b859d3843be24807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318c4e6788b474dfd4b30004b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 15 15:53:28 2011 -0600 windowscodecs: Add test for CreateMetadataReaderFromContainer. --- dlls/windowscodecs/tests/metadata.c | 93 +++++++++++++++++++++++++++++++++-- 1 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index d9008a4..715c9e7 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <stdarg.h> #include <math.h> @@ -47,17 +48,31 @@ static const char metadata_tEXt[] = { 0x3f,0x64,0x19,0xf3 /* chunk CRC */ }; -static void load_stream(IUnknown *reader, const char *data, int data_size) +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + +static IStream *create_stream(const char *data, int data_size) { HRESULT hr; - IWICPersistStream *persist; IStream *stream; HGLOBAL hdata; void *locked_data; hdata = GlobalAlloc(GMEM_MOVEABLE, data_size); ok(hdata != 0, "GlobalAlloc failed\n"); - if (!hdata) return; + if (!hdata) return NULL; locked_data = GlobalLock(hdata); memcpy(locked_data, data, data_size); @@ -65,7 +80,19 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) hr = CreateStreamOnHGlobal(hdata, TRUE, &stream); ok(hr == S_OK, "CreateStreamOnHGlobal failed, hr=%x\n", hr); - if (FAILED(hr)) return; + + return stream; +} + +static void load_stream(IUnknown *reader, const char *data, int data_size) +{ + HRESULT hr; + IWICPersistStream *persist; + IStream *stream; + + stream = create_stream(data, data_size); + if (!stream) + return; hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void**)&persist); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); @@ -181,12 +208,70 @@ static void test_metadata_tEXt(void) IWICMetadataReader_Release(reader); } +static void test_create_reader(void) +{ + HRESULT hr; + IWICComponentFactory *factory; + IStream *stream; + IWICMetadataReader *reader; + UINT count=0; + GUID format; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void**)&factory); + todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + stream = create_stream(metadata_tEXt, sizeof(metadata_tEXt)); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, + stream, &reader); + ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %i\n", count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected format %s\n", debugstr_guid(&format)); + + IWICMetadataReader_Release(reader); + } + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, + stream, &reader); + ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %i\n", count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "unexpected format %s\n", debugstr_guid(&format)); + + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); + + IWICComponentFactory_Release(factory); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_metadata_unknown(); test_metadata_tEXt(); + test_create_reader(); CoUninitialize(); }

1 0

Andrew Talbot : mshtml: Remove unused file-static variable.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 952f97647c9f2301d8c4b92e10e56774d9870d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952f97647c9f2301d8c4b92e1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 15 21:57:27 2011 +0000 mshtml: Remove unused file-static variable. --- dlls/mshtml/nsio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e16c25e..81dfab7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -50,8 +50,6 @@ static const IID IID_nsWineURI = static nsIIOService *nsio = NULL; static nsINetUtil *net_util; -static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - static const char *request_method_strings[] = {"GET", "PUT", "POST"}; struct nsWineURI {

1 0

Hans Leidekker : winhttp: Clean up properly in request_send.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 2621e98d04b91ce21d36ac880ace323bd3c6360f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2621e98d04b91ce21d36ac880… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 09:41:47 2011 +0100 winhttp: Clean up properly in request_send. --- dlls/winhttp/request.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e86cdf1..257fc97 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2925,14 +2925,18 @@ static HRESULT request_send( struct winhttp_request *request ) if (!(ret = WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 ))) { err = get_last_error(); + goto error; } - if (!sa) heap_free( ptr ); - else if ((hr = SafeArrayUnaccessData( sa )) != S_OK) return hr; - if (!ret) return HRESULT_FROM_WIN32( err ); - if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); - + if ((err = wait_for_completion( request ))) goto error; + if (sa) SafeArrayUnaccessData( sa ); + else heap_free( ptr ); request->state = REQUEST_STATE_SENT; return S_OK; + +error: + if (sa) SafeArrayUnaccessData( sa ); + else heap_free( ptr ); + return HRESULT_FROM_WIN32( err ); } static HRESULT request_send_and_receive( struct winhttp_request *request )

1 0

Thomas Faber : advapi32/tests: Do not assume the test is called with an absolute path.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: c432514b3997ce48d6bccb92c6eb986fcf8f28dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c432514b3997ce48d6bccb92c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Nov 15 23:37:17 2011 +0100 advapi32/tests: Do not assume the test is called with an absolute path. --- dlls/advapi32/tests/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9aa249c..c5dea2f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -33,7 +33,7 @@ #include "wine/test.h" static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ -static const CHAR* selfname; +static CHAR selfname[MAX_PATH]; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, @@ -2315,7 +2315,7 @@ START_TEST(service) char** myARGV; myARGC = winetest_get_mainargs(&myARGV); - selfname = myARGV[0]; + GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { if (strcmp(myARGV[2], "sleep") == 0)

1 0

Vincent Povirk : include: Define IWICPersistStream.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: bb42f29092d5faac2d34a707fc793f23fbf9cf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb42f29092d5faac2d34a707f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 15 12:53:06 2011 -0600 include: Define IWICPersistStream. --- include/wincodecsdk.idl | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index d83349c..ed00cfb 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -169,6 +169,23 @@ interface IWICMetadataBlockWriter : IWICMetadataBlockReader [ object, + uuid(00675040-6908-45f8-86a3-49c7dfd6d9ad) +] +interface IWICPersistStream : IPersistStream +{ + HRESULT LoadEx( + [in, unique] IStream *pIStream, + [in, unique] const GUID *pguidPreferredVendor, + [in] DWORD dwPersistOptions); + + HRESULT SaveEx( + [in] IStream *pIStream, + [in] DWORD dwPersistOptions, + [in] BOOL fClearDirty); +} + +[ + object, uuid(412d0c3a-9650-44fa-af5b-dd2a06c8e8fb) ] interface IWICComponentFactory : IWICImagingFactory

1 0