November 2011 - Wine-commits

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

16 Nov '11

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

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

16 Nov '11

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

Vincent Povirk : include: Define IWICPersistStream.
by Alexandre Julliard 16 Nov '11

16 Nov '11

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

Vincent Povirk : windowscodecs: Add tests for IWICMetadataReader.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: b2fa99851c9d739d7f94eff1b5c54fe3b779087a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fa99851c9d739d7f94eff1b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 15 15:09:31 2011 -0600 windowscodecs: Add tests for IWICMetadataReader. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/bmpformat.c | 1 + dlls/windowscodecs/tests/metadata.c | 192 ++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 8 ++ 4 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 51b54d4..048fc29 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ converter.c \ icoformat.c \ info.c \ + metadata.c \ palette.c \ stream.c diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 378c375..f264533 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -25,6 +25,7 @@ #include "initguid.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wine/test.h" static const char testbmp_24bpp[] = { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c new file mode 100644 index 0000000..d9008a4 --- /dev/null +++ b/dlls/windowscodecs/tests/metadata.c @@ -0,0 +1,192 @@ +/* + * Copyright 2011 Vincent Povirk for CodeWeavers + * + * 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 <stdarg.h> +#include <math.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wincodecsdk.h" +#include "wine/test.h" + +#define expect_blob(propvar, data, length) do { \ + ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ + if ((propvar).vt == VT_BLOB) { \ + ok((propvar).blob.cbSize == (length), "expected size %i, got %i\n", (length), (propvar).blob.cbSize); \ + if ((propvar).blob.cbSize == (length)) { \ + ok(!memcmp((propvar).blob.pBlobData, (data), (length)), "unexpected data\n"); \ + } \ + } \ +} while (0) + +static const char metadata_unknown[] = "lalala"; + +static const char metadata_tEXt[] = { + 0,0,0,14, /* chunk length */ + 't','E','X','t', /* chunk type */ + 'w','i','n','e','t','e','s','t',0, /* keyword */ + 'v','a','l','u','e', /* text */ + 0x3f,0x64,0x19,0xf3 /* chunk CRC */ +}; + +static void load_stream(IUnknown *reader, 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; + + locked_data = GlobalLock(hdata); + memcpy(locked_data, data, data_size); + GlobalUnlock(hdata); + + hr = CreateStreamOnHGlobal(hdata, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void**)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + + IWICPersistStream_Release(persist); + } + + IStream_Release(stream); +} + +static void test_metadata_unknown(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned; + + hr = CoCreateInstance(&CLSID_WICUnknownMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_unknown, sizeof(metadata_unknown)); + + 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); + + if (hr == S_OK && items_returned == 1) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_EMPTY, "unexpected vt: %i\n", id.vt); + expect_blob(value, metadata_unknown, sizeof(metadata_unknown)); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next failed, hr=%x\n", hr); + ok(items_returned == 0, "unexpected item count %i\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + } + + IWICMetadataReader_Release(reader); +} + +static void test_metadata_tEXt(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned; + + 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; + + load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt)); + + 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); + + if (hr == S_OK && items_returned == 1) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next failed, hr=%x\n", hr); + ok(items_returned == 0, "unexpected item count %i\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + } + + IWICMetadataReader_Release(reader); +} + +START_TEST(metadata) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_metadata_unknown(); + test_metadata_tEXt(); + + CoUninitialize(); +} diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index ed00cfb..e32971c 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -34,6 +34,14 @@ typedef enum WICMetadataCreationOptions { WICMetadataCreationMask = 0xFFFF0000 } WICMetadataCreationOptions; +cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") + +cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") +cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") +cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") + [ object, uuid(aba958bf-c672-44d1-8d61-ce6df2e682c2)

1 0

Vincent Povirk : windowscodecs: Add test for CreateMetadataReaderFromContainer.
by Alexandre Julliard 16 Nov '11

16 Nov '11

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

Vincent Povirk : windowscodecs: Flesh out IWICMetadataReader test.
by Alexandre Julliard 16 Nov '11

16 Nov '11

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

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

16 Nov '11

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

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

16 Nov '11

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

Francois Gouget : rpcrt4: The offset to the complex pointer' s description is signed.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 97ba7aa521c30867ca09906e8e40f0036a28349a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ba7aa521c30867ca09906e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 23:57:44 2011 +0100 rpcrt4: The offset to the complex pointer's description is signed. --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 5eb699e..fdde3a4 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -156,7 +156,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = sizeof(void *); break; } - size = calc_arg_size(pStubMsg, &pFormat[2] + *(WORD *)&pFormat[2]); + size = calc_arg_size(pStubMsg, &pFormat[2] + *(const SHORT*)&pFormat[2]); break; case RPC_FC_STRUCT: case RPC_FC_PSTRUCT:

1 0

Hans Leidekker : winhttp: Clean up properly in request_send.
by Alexandre Julliard 16 Nov '11

16 Nov '11

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