wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Andrey Gusev : include: Add D3DX10_FILTER_FLAG type declaration.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: ddf84783119623507f544a2042aaeddb6b705104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf84783119623507f544a204… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 00:00:48 2016 +0200 include: Add D3DX10_FILTER_FLAG type declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10tex.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index d44edf2..9142c82 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -19,6 +19,27 @@ #ifndef __D3DX10TEX_H__ #define __D3DX10TEX_H__ +typedef enum D3DX10_FILTER_FLAG +{ + D3DX10_FILTER_NONE = 0x00000001, + D3DX10_FILTER_POINT = 0x00000002, + D3DX10_FILTER_LINEAR = 0x00000003, + D3DX10_FILTER_TRIANGLE = 0x00000004, + D3DX10_FILTER_BOX = 0x00000005, + + D3DX10_FILTER_MIRROR_U = 0x00010000, + D3DX10_FILTER_MIRROR_V = 0x00020000, + D3DX10_FILTER_MIRROR_W = 0x00040000, + D3DX10_FILTER_MIRROR = 0x00070000, + + D3DX10_FILTER_DITHER = 0x00080000, + D3DX10_FILTER_DITHER_DIFFUSION = 0x00100000, + + D3DX10_FILTER_SRGB_IN = 0x00200000, + D3DX10_FILTER_SRGB_OUT = 0x00400000, + D3DX10_FILTER_SRGB = 0x00600000, +} D3DX10_FILTER_FLAG; + typedef enum D3DX10_IMAGE_FILE_FORMAT { D3DX10_IFF_BMP = 0,

1 0

Austin English : kernel32: Implement GetLargePageMinimum.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 4d313e6475383e5aa1ebd8c0917f1f11f5c81f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d313e6475383e5aa1ebd8c09… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 15 23:43:46 2016 +0200 kernel32: Implement GetLargePageMinimum. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/cpu.c | 12 ++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 5d3eb13..959e65d 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -3,7 +3,7 @@ @ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW @ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile -@ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index f48fcf0..3a7a5e8 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -291,3 +291,15 @@ err: } return TRUE; } + +/*********************************************************************** + * GetLargePageMinimum (KERNEL32.@) + */ +SIZE_T WINAPI GetLargePageMinimum(void) +{ +#if defined(__i386___) || defined(__x86_64__) + return 2 * 1024 * 1024; +#endif + FIXME("Not implemented on your platform/architecture.\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec7155b6e..0fc4dcb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -696,7 +696,7 @@ @ stdcall GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget @ stub -i386 GetLSCallbackTemplate -# @ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() @ stub GetLinguistLangSize diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 61dcdc2..ad7885c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -88,6 +88,7 @@ static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static SIZE_T (WINAPI *pGetLargePageMinimum)(void); /* ############################### */ static char base[MAX_PATH]; @@ -252,6 +253,7 @@ static BOOL init(void) pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); return TRUE; } @@ -3138,6 +3140,19 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_largepages(void) +{ + SIZE_T size; + + if (!pGetLargePageMinimum) { + skip("No GetLargePageMinimum support.\n"); + return; + } + size = pGetLargePageMinimum(); + + ok((size == 0) || (size == 2*1024*1024) || (size == 4*1024*1024), "GetLargePageMinimum reports %ld size\n", size); +} + START_TEST(process) { HANDLE job; @@ -3210,6 +3225,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_largepages(); /* things that can be tested: * lookup: check the way program to be executed is searched

1 0

Ken Thomases : kernel32: Overhaul the locale determination on the Mac.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: d90f29d817517b7c7bd6737f268598f0ccd5295a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f29d817517b7c7bd6737f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 15 14:34:04 2016 -0500 kernel32: Overhaul the locale determination on the Mac. The C library locale is inadequate for conveying the Mac user settings between LOCALE_Init() and setup_unix_locales(). The set of locales supported by the C library can't express the combinations allowed in user settings. Setting LANG to a user-settings-derived locale when there's no corresponding C library locale is actually worse than leaving it unset. It will prevent the C library from honoring the LC_* variables (other than LC_ALL). That's why Terminal.app won't set LANG in that case, it just sets LC_CTYPE=UTF-8. This commit makes Wine follow similar logic in not setting LANG if the C library doesn't support the Mac user settings. Rather, it uses a wrapper around setlocale() to query the locale. That wrapper returns a value representing the Mac user settings if the C library comes up empty. It also has logic to handle Terminal's setting LC_CTYPE=UTF-8, since parse_locale_name() can't handle that properly. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 206 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 150 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d90f29d817517b7c7bd67…

1 0

Vincent Povirk : gdiplus: Add support for reading png cHRM chunks.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: bf4a2ba26405aacddd93a1cef16d0eda331f3c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4a2ba26405aacddd93a1cef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:41 2016 -0500 gdiplus: Add support for reading png cHRM chunks. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d1a5593..1681099 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3483,7 +3483,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { "Source", PropertyTagEquipModel }, { "Comment", PropertyTagExifUserComment }, }; - BOOL seen_gamma=FALSE; + BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE; hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); if (hr != S_OK) return; @@ -3552,6 +3552,57 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI } } } + else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkcHRM, &format)) + { + PropertyItem* item; + + if (!seen_whitepoint) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 4); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 4; + item->type = PropertyTagTypeRational; + item->id = PropertyTagWhitePoint; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 0); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 1); + rational[3] = 100000; + add_property(bitmap, item); + seen_whitepoint = TRUE; + GdipFree(item); + } + } + if (!seen_chrm) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 12); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 12; + item->type = PropertyTagTypeRational; + item->id = PropertyTagPrimaryChromaticities; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 2); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 3); + rational[3] = 100000; + rational[4] = get_ulong_by_index(reader, 4); + rational[5] = 100000; + rational[6] = get_ulong_by_index(reader, 5); + rational[7] = 100000; + rational[8] = get_ulong_by_index(reader, 6); + rational[9] = 100000; + rational[10] = get_ulong_by_index(reader, 7); + rational[11] = 100000; + add_property(bitmap, item); + seen_chrm = TRUE; + GdipFree(item); + } + } + } IWICMetadataReader_Release(reader); }

1 0

Vincent Povirk : windowscodecs: Implement png cHRM metadata reader.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 2e16630a61c1ac581ba2a2ee84f20aa2c7d0f9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e16630a61c1ac581ba2a2ee8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:40 2016 -0500 windowscodecs: Implement png cHRM metadata reader. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 78 +++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 +++++++++ dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 +++ 6 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index d4c524a..77eeedc 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -59,6 +59,7 @@ static const classinfo wic_classes[] = { {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, + {&CLSID_WICPngChrmMetadataReader, PngChrmReader_CreateInstance}, {&CLSID_WICPngGamaMetadataReader, PngGamaReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3eb4d0e..bb2aef9 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -220,6 +220,84 @@ HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) return MetadataReader_Create(&GamaReader_Vtbl, iid, ppv); } +static HRESULT LoadChrmMetadata(IStream *stream, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + HRESULT hr; + BYTE type[4]; + BYTE *data; + ULONG data_size; + static const WCHAR names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + LPWSTR dyn_names[8] = {0}; + MetadataItem *result; + int i; + + hr = read_png_chunk(stream, type, &data, &data_size); + if (FAILED(hr)) return hr; + + if (data_size < 32) + { + HeapFree(GetProcessHeap(), 0, data); + return E_FAIL; + } + + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)*8); + for (i=0; i<8; i++) + { + dyn_names[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(lstrlenW(names[i])+1)); + if (!dyn_names[i]) break; + } + if (!result || i < 8) + { + HeapFree(GetProcessHeap(), 0, result); + for (i=0; i<8; i++) + HeapFree(GetProcessHeap(), 0, dyn_names[i]); + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + for (i=0; i<8; i++) + { + PropVariantInit(&result[i].schema); + + PropVariantInit(&result[i].id); + result[i].id.vt = VT_LPWSTR; + result[i].id.u.pwszVal = dyn_names[i]; + lstrcpyW(dyn_names[i], names[i]); + + PropVariantInit(&result[i].value); + result[i].value.vt = VT_UI4; + result[i].value.u.ulVal = read_ulong_be(&data[i*4]); + } + + *items = result; + *item_count = 8; + + HeapFree(GetProcessHeap(), 0, data); + + return S_OK; +} + +static const MetadataHandlerVtbl ChrmReader_Vtbl = { + 0, + &CLSID_WICPngChrmMetadataReader, + LoadChrmMetadata +}; + +HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) +{ + return MetadataReader_Create(&ChrmReader_Vtbl, iid, ppv); +} + #ifdef SONAME_LIBPNG static void *libpng_handle; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9c4062e..ff499e5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1515,6 +1515,21 @@ static const struct reader_containers pnggama_containers[] = { { NULL } /* list terminator */ }; +static const BYTE cHRM[] = "cHRM"; + +static const struct metadata_pattern pngchrm_metadata_pattern[] = { + { 4, 4, cHRM, mask_all, 4 }, + { 0 } +}; + +static const struct reader_containers pngchrm_containers[] = { + { + &GUID_ContainerFormatPng, + pngchrm_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static const struct metadata_pattern lsd_metadata_patterns[] = { { 0, 6, gif87a_magic, mask_all, 0 }, { 0, 6, gif89a_magic, mask_all, 0 }, @@ -1610,6 +1625,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 1, 1, 0, ifd_containers }, + { &CLSID_WICPngChrmMetadataReader, + "The Wine Project", + "Chunk cHRM Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatChunkcHRM, + 0, 0, 0, + pngchrm_containers + }, { &CLSID_WICPngGamaMetadataReader, "The Wine Project", "Chunk gAMA Reader", diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c44cf9f..3912209 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -495,7 +495,7 @@ static void test_metadata_cHRM(void) hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine 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; load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f54403c..a8af0d6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -154,6 +154,7 @@ extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, REFIID i extern HRESULT UnknownMetadataReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IfdMetadataReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngTextReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT LSDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 089bb39..fd7ff01 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -140,6 +140,13 @@ coclass WICUnknownMetadataReader { interface IWICMetadataReader; } coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; } [ + helpstring("WIC Png cHRM Metadata Reader"), + threading(both), + uuid(f90b5f36-367b-402a-9dd1-bc0fd59d8f62) +] +coclass WICPngChrmMetadataReader { interface IWICMetadataReader; } + +[ helpstring("WIC Png gAMA Metadata Reader"), threading(both), uuid(3692ca39-e082-4350-9e1f-3704cb083cd5)

1 0

Vincent Povirk : windowscodecs: Add test for png cHRM metadata.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 9b27a178a941a2c1fdd60fa4cb6c25ae18933884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b27a178a941a2c1fdd60fa4c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:39 2016 -0500 windowscodecs: Add test for png cHRM metadata. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 72 +++++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 ++ 2 files changed, 74 insertions(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index aa096f0..c44cf9f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -144,6 +144,16 @@ static const char metadata_gAMA[] = { 0xff,0xff,0xff,0xff /* chunk CRC */ }; +static const char metadata_cHRM[] = { + 0,0,0,32, /* chunk length */ + 'c','H','R','M', /* chunk type */ + 0,0,122,38, 0,0,128,132, /* white point */ + 0,0,250,0, 0,0,128,232, /* red */ + 0,0,117,48, 0,0,234,96, /* green */ + 0,0,58,152, 0,0,23,112, /* blue */ + 0xff,0xff,0xff,0xff /* chunk CRC */ +}; + static const char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, @@ -457,6 +467,67 @@ static void test_metadata_gAMA(void) IWICMetadataReader_Release(reader); } +static void test_metadata_cHRM(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT schema, id, value; + ULONG count; + GUID format; + int i; + static const WCHAR expected_names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + static const ULONG expected_vals[8] = { + 31270,32900, 64000,33000, 30000,60000, 15000,6000 + }; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunkcHRM), "unexpected format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 8, "unexpected count %i\n", count); + + for (i=0; i<8; i++) + { + hr = IWICMetadataReader_GetValueByIndex(reader, i, &schema, &id, &value); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + PropVariantClear(&schema); + + ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt); + ok(!lstrcmpW(U(id).pwszVal, expected_names[i]), "got %s, expected %s\n", wine_dbgstr_w(U(id).pwszVal), wine_dbgstr_w(expected_names[i])); + PropVariantClear(&id); + + ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); + ok(U(value).ulVal == expected_vals[i], "got %u, expected %u\n", U(value).ulVal, expected_vals[i]); + PropVariantClear(&value); + } + + IWICMetadataReader_Release(reader); +} + static inline USHORT ushort_bswap(USHORT s) { return (s >> 8) | (s << 8); @@ -1896,6 +1967,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); + test_metadata_cHRM(); test_metadata_IFD(); test_metadata_Exif(); test_create_reader(); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 7fc07b8..9ce3f30 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,6 +37,7 @@ typedef enum WICMetadataCreationOptions { } WICMetadataCreationOptions; cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkcHRM, 0x9db3655b,0x2842,0x44b3,0x80,0x67,0x12,0xe9,0xb3,0x75,0x55,0x6a);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkgAMA, 0xf00935a5,0x1d5d,0x4cd1,0x81,0xb2,0x93,0x24,0xd7,0xec,0xa7,0x81);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") @@ -52,6 +53,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatGifComment, 0xc4b6e0e0,0xcfb4,0x4ad3,0 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_WICPngChrmMetadataReader, 0xf90b5f36,0x367b,0x402a,0x9d,0xd1,0xbc,0x0f,0xd5,0x9d,0x8f,0x62);") cpp_quote("DEFINE_GUID(CLSID_WICPngGamaMetadataReader, 0x3692ca39,0xe082,0x4350,0x9e,0x1f,0x37,0x04,0xcb,0x08,0x3c,0xd5);") 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);")

1 0

Jacek Caban : jscript: Allow Function.apply() to be called on non-jscript objects.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: db6b86cbbd725bb42d2124c24a00bfa68451853a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6b86cbbd725bb42d2124c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 18:37:13 2016 +0200 jscript: Allow Function.apply() to be called on non-jscript objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 23 +++++++++++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1e8d563..6817aa7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -426,7 +426,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) return throw_type_error(ctx, JS_E_FUNCTION_EXPECTED, NULL); if(argc) { @@ -458,8 +458,20 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } } - if(SUCCEEDED(hres)) - hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + if(SUCCEEDED(hres)) { + if(function) { + hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + }else { + jsval_t res; + hres = disp_call_value(ctx, jsthis->u.disp, this_obj, DISPATCH_METHOD, cnt, args, &res); + if(SUCCEEDED(hres)) { + if(r) + *r = res; + else + jsval_release(res); + } + } + } if(this_obj) IDispatch_Release(this_obj); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 85f7e1c..0101f15 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -483,11 +483,15 @@ static HRESULT WINAPI dispexFunc_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(pei != NULL, "pei == NULL\n"); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); - ok(!V_BOOL(pdp->rgvarg+1), "V_BOOL(pdp->rgvarg+1) = %x\n", V_BOOL(pdp->rgvarg+1)); + + if(V_BOOL(pdp->rgvarg+1)) + /* NOTE: If called by Function.apply(), native doesn't set DISPATCH_PROPERTYGET flag. */ + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_DISPATCH(pdp->rgvarg) != NULL, "V_DISPATCH(pdp->rgvarg) == NULL\n"); @@ -567,12 +571,15 @@ static HRESULT WINAPI pureDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, R ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(ei != NULL, "ei == NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); - ok(!V_BOOL(pdp->rgvarg), "V_BOOL(pdp->rgvarg) = %x\n", V_BOOL(pdp->rgvarg)); + + if(V_BOOL(pdp->rgvarg)) + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); if(res) V_VT(res) = VT_NULL; @@ -2501,6 +2508,14 @@ static BOOL run_tests(void) parse_script_a("var t = {func: dispexFunc}; t = t.func(false);"); CHECK_CALLED(dispexfunc_value); + SET_EXPECT(dispexfunc_value); + parse_script_a("Function.prototype.apply.call(dispexFunc, testObj, [true]);"); + CHECK_CALLED(dispexfunc_value); + + SET_EXPECT(puredisp_value); + parse_script_a("Function.prototype.apply.call(pureDisp, testObj, [true]);"); + CHECK_CALLED(puredisp_value); + parse_script_a("(function reportSuccess() {})()"); parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");");

1 0

Jacek Caban : mshtml: Added IDocumentSelector:: querySelectorAll implementation.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 92300cc4dc029fb291e9d363df31cbf475f65a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92300cc4dc029fb291e9d363d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 17:44:11 2016 +0200 mshtml: Added IDocumentSelector::querySelectorAll implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 +++++++++++-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 66 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1bf3323..eadb90b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4063,8 +4063,23 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLDocument *This = impl_from_IDocumentSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMNodeList *node_list; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *pel = create_child_collection(This->doc_node, node_list); + nsIDOMNodeList_Release(node_list); + return *pel ? S_OK : E_OUTOFMEMORY; } static const IDocumentSelectorVtbl DocumentSelectorVtbl = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2e07c0b..19909ae 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -440,7 +440,7 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMChildrenCollection_iface_tids }; -static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) { HTMLDOMChildrenCollection *ret; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c1816bf..d378bdd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1026,6 +1026,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7a39d34..47c8827 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -147,6 +147,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, @@ -162,6 +163,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, @@ -2696,6 +2698,20 @@ static void _test_doc_all(unsigned line, IHTMLDocument2 *doc, const elem_type_t IHTMLElementCollection_Release(col); } +#define test_children_collection_length(a,b) _test_children_collection_length(__LINE__,a,b) +static LONG _test_children_collection_length(unsigned line, IHTMLDOMChildrenCollection *collection, LONG exlen) +{ + LONG length; + HRESULT hres; + + hres = IHTMLDOMChildrenCollection_get_length(collection, &length); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + if(exlen != -1) + ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); + + return length; +} + #define test_elem_getelembytag(a,b,c,d) _test_elem_getelembytag(__LINE__,a,b,c,d) static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen, IHTMLElement **ret) { @@ -2791,12 +2807,10 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch col = _get_child_nodes(line, (IUnknown*)elem); ok(col != NULL, "col == NULL\n"); if(col) { - LONG length = 0, type; + LONG type; IHTMLDOMNode *node; - hres = IHTMLDOMChildrenCollection_get_length(col, &length); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(length == 1, "length = %d\n", length); + _test_children_collection_length(line, col, 1); node = _get_child_item(line, col, 0); ok(node != NULL, "node == NULL\n"); @@ -7892,6 +7906,41 @@ static void test_enum_children(IUnknown *unk, unsigned len) IEnumVARIANT_Release(enum_var); } +static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) +{ + IHTMLDOMChildrenCollection *collection; + IDocumentSelector *doc_selector; + BSTR str; + HRESULT hres; + + test_elem_set_innerhtml((IUnknown*)div, "<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentSelector, (void**)&doc_selector); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDocumentSelector iface: %08x\n", hres); + if(FAILED(hres)) { + win_skip("IDocumentSelector tests skipped.\n"); + return; + } + + collection = NULL; + str = a2bstr("nomatch"); + hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 0); + IHTMLDOMChildrenCollection_Release(collection); + + collection = NULL; + str = a2bstr(".cl1"); + hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 2); + IHTMLDOMChildrenCollection_Release(collection); + + IDocumentSelector_Release(doc_selector); +} + static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; @@ -8418,13 +8467,10 @@ static void test_elems(IHTMLDocument2 *doc) ok(child_col != NULL, "child_coll == NULL\n"); if(child_col) { IUnknown *enum_unk; - LONG length = 0; + LONG length; test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection, "[object]"); - - hres = IHTMLDOMChildrenCollection_get_length(child_col, &length); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(length, "length=0\n"); + length = test_children_collection_length(child_col, -1); node2 = NULL; node = get_child_item(child_col, 0); @@ -8959,6 +9005,8 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } + test_doc_selector(doc, div); + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); elem = get_elem_by_id(doc, "elemid", TRUE); if(elem) {

1 0

Jacek Caban : mshtml: Added IDocumentSelector stub implementation.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 5dddf32c2039bc1b2e6b4c10f20e007b97873548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dddf32c2039bc1b2e6b4c10f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 17:44:00 2016 +0200 mshtml: Added IDocumentSelector stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 84 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 04e5280..1bf3323 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4001,6 +4001,84 @@ static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { HTMLDocument7_get_head }; +static inline HTMLDocument *impl_from_IDocumentSelector(IDocumentSelector *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentSelector_iface); +} + +static HRESULT WINAPI DocumentSelector_QueryInterface(IDocumentSelector *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentSelector_AddRef(IDocumentSelector *iface) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentSelector_Release(IDocumentSelector *iface) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentSelector_GetTypeInfoCount(IDocumentSelector *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentSelector_GetTypeInfo(IDocumentSelector *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentSelector_GetIDsOfNames(IDocumentSelector *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentSelector_Invoke(IDocumentSelector *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, BSTR v, IHTMLElement **pel) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static const IDocumentSelectorVtbl DocumentSelectorVtbl = { + DocumentSelector_QueryInterface, + DocumentSelector_AddRef, + DocumentSelector_Release, + DocumentSelector_GetTypeInfoCount, + DocumentSelector_GetTypeInfo, + DocumentSelector_GetIDsOfNames, + DocumentSelector_Invoke, + DocumentSelector_querySelector, + DocumentSelector_querySelectorAll +}; + static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) { HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); @@ -4326,6 +4404,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument6_iface; else if(IsEqualGUID(&IID_IHTMLDocument7, riid)) *ppv = &This->IHTMLDocument7_iface; + else if(IsEqualGUID(&IID_IDocumentSelector, riid)) + *ppv = &This->IDocumentSelector_iface; else if(IsEqualGUID(&IID_IPersist, riid)) *ppv = &This->IPersistFile_iface; else if(IsEqualGUID(&IID_IPersistMoniker, riid)) @@ -4426,6 +4506,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->IHTMLDocument6_iface.lpVtbl = &HTMLDocument6Vtbl; doc->IHTMLDocument7_iface.lpVtbl = &HTMLDocument7Vtbl; doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; + doc->IDocumentSelector_iface.lpVtbl = &DocumentSelectorVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; @@ -4644,6 +4725,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IDocumentSelector_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 095b9dc..c1816bf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -124,6 +124,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLXMLHttpRequest) \ XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ + XIID(IDocumentSelector) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -530,6 +531,7 @@ struct HTMLDocument { IHTMLDocument5 IHTMLDocument5_iface; IHTMLDocument6 IHTMLDocument6_iface; IHTMLDocument7 IHTMLDocument7_iface; + IDocumentSelector IDocumentSelector_iface; IPersistMoniker IPersistMoniker_iface; IPersistFile IPersistFile_iface; IPersistHistory IPersistHistory_iface;

1 0

David Lawrie : winejoystick.drv: Ignore feature elements.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: fe88161a2a464672f3e27d4da42a68e411f0acd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe88161a2a464672f3e27d4da… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:52 2016 -0700 winejoystick.drv: Ignore feature elements. "Describes input and output elements not intended for consumption by the end user." Ignore, as otherwise, comes up as a FIXME in Trace logs. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index ad82dd7..12ccff7 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -514,6 +514,9 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll } break; } + case kIOHIDElementTypeFeature: + /* Describes input and output elements not intended for consumption by the end user. Ignoring. */ + break; default: FIXME("Unhandled type %i\n",type); break;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016