Skip to content

W
wine-winehq
Commit 35483da6 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

include: Fix typos in WICPersistOptions enumeration names.

Signed-off-by: 's avatarSebastian Lackner <sebastian@fds-team.de> Signed-off-by: 's avatarVincent Povirk <vincent@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c78c8459
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
dlls/windowscodecs/gifformat.c
View file @ 35483da6
...@@ -564,7 +564,7 @@ static HRESULT create_metadata_reader(const void *data, int data_size, ...@@ -564,7 +564,7 @@ static HRESULT create_metadata_reader(const void *data, int data_size,
} }
stream = create_stream(data, data_size); stream = create_stream(data, data_size);
IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionDefault);
IStream_Release(stream); IStream_Release(stream);
IWICPersistStream_Release(persist); IWICPersistStream_Release(persist);
...@@ -934,7 +934,7 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead ...@@ -934,7 +934,7 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead
} }
stream = create_stream(&IMD_data, sizeof(IMD_data)); stream = create_stream(&IMD_data, sizeof(IMD_data));
IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionDefault);
IStream_Release(stream); IStream_Release(stream);
IWICPersistStream_Release(persist); IWICPersistStream_Release(persist);
......
dlls/windowscodecs/imgfactory.c
View file @ 35483da6
...@@ -1016,7 +1016,7 @@ start: ...@@ -1016,7 +1016,7 @@ start:
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = IWICPersistStream_LoadEx(wicpersiststream, hr = IWICPersistStream_LoadEx(wicpersiststream,
stream, vendor, options & WICPersistOptionsMask); stream, vendor, options & WICPersistOptionMask);
IWICPersistStream_Release(wicpersiststream); IWICPersistStream_Release(wicpersiststream);
} }
...@@ -1060,7 +1060,7 @@ start: ...@@ -1060,7 +1060,7 @@ start:
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = IWICPersistStream_LoadEx(wicpersiststream, stream, NULL, options & WICPersistOptionsMask); hr = IWICPersistStream_LoadEx(wicpersiststream, stream, NULL, options & WICPersistOptionMask);
IWICPersistStream_Release(wicpersiststream); IWICPersistStream_Release(wicpersiststream);
} }
......
dlls/windowscodecs/metadatahandler.c
View file @ 35483da6
...@@ -390,7 +390,7 @@ static HRESULT WINAPI MetadataHandler_Load(IWICPersistStream *iface, ...@@ -390,7 +390,7 @@ static HRESULT WINAPI MetadataHandler_Load(IWICPersistStream *iface,
{ {
MetadataHandler *This = impl_from_IWICPersistStream(iface); MetadataHandler *This = impl_from_IWICPersistStream(iface);
TRACE("(%p,%p)\n", iface, pStm); TRACE("(%p,%p)\n", iface, pStm);
return IWICPersistStream_LoadEx(&This->IWICPersistStream_iface, pStm, NULL, WICPersistOptionsDefault); return IWICPersistStream_LoadEx(&This->IWICPersistStream_iface, pStm, NULL, WICPersistOptionDefault);
} }
static HRESULT WINAPI MetadataHandler_Save(IWICPersistStream *iface, static HRESULT WINAPI MetadataHandler_Save(IWICPersistStream *iface,
...@@ -1066,9 +1066,9 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, ...@@ -1066,9 +1066,9 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor,
TRACE("\n"); TRACE("\n");
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
if (persist_options & WICPersistOptionsLittleEndian) if (persist_options & WICPersistOptionLittleEndian)
#else #else
if (persist_options & WICPersistOptionsBigEndian) if (persist_options & WICPersistOptionBigEndian)
#endif #endif
native_byte_order = FALSE; native_byte_order = FALSE;
......
dlls/windowscodecs/tests/metadata.c
View file @ 35483da6
...@@ -262,7 +262,7 @@ static void test_metadata_unknown(void) ...@@ -262,7 +262,7 @@ static void test_metadata_unknown(void)
ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr);
if (FAILED(hr)) return; if (FAILED(hr)) return;
load_stream((IUnknown*)reader, metadata_unknown, sizeof(metadata_unknown), WICPersistOptionsDefault); load_stream((IUnknown*)reader, metadata_unknown, sizeof(metadata_unknown), WICPersistOptionDefault);
hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); hr = IWICMetadataReader_GetEnumerator(reader, &enumerator);
ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr);
...@@ -329,7 +329,7 @@ static void test_metadata_tEXt(void) ...@@ -329,7 +329,7 @@ static void test_metadata_tEXt(void)
ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
ok(count == 0, "unexpected count %i\n", count); ok(count == 0, "unexpected count %i\n", count);
load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt), WICPersistOptionsDefault); load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt), WICPersistOptionDefault);
hr = IWICMetadataReader_GetCount(reader, &count); hr = IWICMetadataReader_GetCount(reader, &count);
ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
...@@ -440,7 +440,7 @@ static void test_metadata_gAMA(void) ...@@ -440,7 +440,7 @@ static void test_metadata_gAMA(void)
ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr);
if (FAILED(hr)) return; if (FAILED(hr)) return;
load_stream((IUnknown*)reader, metadata_gAMA, sizeof(metadata_gAMA), WICPersistOptionsDefault); load_stream((IUnknown*)reader, metadata_gAMA, sizeof(metadata_gAMA), WICPersistOptionDefault);
hr = IWICMetadataReader_GetMetadataFormat(reader, &format); hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
...@@ -498,7 +498,7 @@ static void test_metadata_cHRM(void) ...@@ -498,7 +498,7 @@ static void test_metadata_cHRM(void)
ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr);
if (FAILED(hr)) return; if (FAILED(hr)) return;
load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionDefault);
hr = IWICMetadataReader_GetMetadataFormat(reader, &format); hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
...@@ -792,9 +792,9 @@ static void test_metadata_IFD(void) ...@@ -792,9 +792,9 @@ static void test_metadata_IFD(void)
GUID format; GUID format;
char *IFD_data_swapped; char *IFD_data_swapped;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
DWORD persist_options = WICPersistOptionsBigEndian; DWORD persist_options = WICPersistOptionBigEndian;
#else #else
DWORD persist_options = WICPersistOptionsLittleEndian; DWORD persist_options = WICPersistOptionLittleEndian;
#endif #endif
hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER,
...@@ -817,10 +817,10 @@ static void test_metadata_IFD(void) ...@@ -817,10 +817,10 @@ static void test_metadata_IFD(void)
compare_metadata(reader, td, count); compare_metadata(reader, td, count);
/* test IFD data with different endianness */ /* test IFD data with different endianness */
if (persist_options == WICPersistOptionsLittleEndian) if (persist_options == WICPersistOptionLittleEndian)
persist_options = WICPersistOptionsBigEndian; persist_options = WICPersistOptionBigEndian;
else else
persist_options = WICPersistOptionsLittleEndian; persist_options = WICPersistOptionLittleEndian;
IFD_data_swapped = HeapAlloc(GetProcessHeap(), 0, sizeof(IFD_data)); IFD_data_swapped = HeapAlloc(GetProcessHeap(), 0, sizeof(IFD_data));
memcpy(IFD_data_swapped, &IFD_data, sizeof(IFD_data)); memcpy(IFD_data_swapped, &IFD_data, sizeof(IFD_data));
...@@ -964,22 +964,22 @@ static void test_create_reader(void) ...@@ -964,22 +964,22 @@ static void test_create_reader(void)
stream = create_stream(metadata_tEXt, sizeof(metadata_tEXt)); stream = create_stream(metadata_tEXt, sizeof(metadata_tEXt));
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
NULL, NULL, WICPersistOptionsDefault, NULL, NULL, WICPersistOptionDefault,
stream, &reader); stream, &reader);
ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr);
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, &GUID_ContainerFormatPng, NULL, WICPersistOptionDefault,
NULL, &reader); NULL, &reader);
ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr);
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, &GUID_ContainerFormatPng, NULL, WICPersistOptionDefault,
stream, NULL); stream, NULL);
ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr);
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, &GUID_ContainerFormatPng, NULL, WICPersistOptionDefault,
stream, &reader); stream, &reader);
ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr);
...@@ -997,7 +997,7 @@ static void test_create_reader(void) ...@@ -997,7 +997,7 @@ static void test_create_reader(void)
} }
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, &GUID_ContainerFormatWmp, NULL, WICPersistOptionDefault,
stream, &reader); stream, &reader);
ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr);
......
dlls/windowscodecs/tiffformat.c
View file @ 35483da6
...@@ -1301,11 +1301,11 @@ static HRESULT create_metadata_reader(TiffFrameDecode *This, IWICMetadataReader ...@@ -1301,11 +1301,11 @@ static HRESULT create_metadata_reader(TiffFrameDecode *This, IWICMetadataReader
{ {
BOOL byte_swapped = pTIFFIsByteSwapped(This->parent->tiff); BOOL byte_swapped = pTIFFIsByteSwapped(This->parent->tiff);
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
DWORD persist_options = byte_swapped ? WICPersistOptionsLittleEndian : WICPersistOptionsBigEndian; DWORD persist_options = byte_swapped ? WICPersistOptionLittleEndian : WICPersistOptionBigEndian;
#else #else
DWORD persist_options = byte_swapped ? WICPersistOptionsBigEndian : WICPersistOptionsLittleEndian; DWORD persist_options = byte_swapped ? WICPersistOptionBigEndian : WICPersistOptionLittleEndian;
#endif #endif
persist_options |= WICPersistOptionsNoCacheStream; persist_options |= WICPersistOptionNoCacheStream;
hr = IWICPersistStream_LoadEx(persist, This->parent->stream, NULL, persist_options); hr = IWICPersistStream_LoadEx(persist, This->parent->stream, NULL, persist_options);
if (FAILED(hr)) if (FAILED(hr))
ERR("IWICPersistStream_LoadEx error %#x\n", hr); ERR("IWICPersistStream_LoadEx error %#x\n", hr);
......
include/wincodecsdk.idl
View file @ 35483da6
...@@ -20,13 +20,13 @@ import "wtypes.idl"; ...@@ -20,13 +20,13 @@ import "wtypes.idl";
import "wincodec.idl"; import "wincodec.idl";
typedef enum WICPersistOptions { typedef enum WICPersistOptions {
WICPersistOptionsDefault = 0x00000000, WICPersistOptionDefault = 0x00000000,
WICPersistOptionsLittleEndian = 0x00000000, WICPersistOptionLittleEndian = 0x00000000,
WICPersistOptionsBigEndian = 0x00000001, WICPersistOptionBigEndian = 0x00000001,
WICPersistOptionsStrictFormat = 0x00000002, WICPersistOptionStrictFormat = 0x00000002,
WICPersistOptionsNoCacheStream = 0x00000004, WICPersistOptionNoCacheStream = 0x00000004,
WICPersistOptionPreferUTF8 = 0x00000008, WICPersistOptionPreferUTF8 = 0x00000008,
WICPersistOptionsMask = 0x0000FFFF WICPersistOptionMask = 0x0000FFFF
} WICPersistOptions; } WICPersistOptions;
typedef enum WICMetadataCreationOptions { typedef enum WICMetadataCreationOptions {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment