November 2014 - Wine-Commits

Sebastian Lackner : ntdll: Implement Rtl[Add|Remove] VectoredContinueHandler semi-stubs.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 275ee4b376177f260693541a0f89f4e0c8c71847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275ee4b376177f260693541a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 00:12:07 2014 +0100 ntdll: Implement Rtl[Add|Remove]VectoredContinueHandler semi-stubs. --- dlls/ntdll/exception.c | 85 +++++++++++++++++++++++++------------------- dlls/ntdll/tests/exception.c | 5 --- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 37edc77..5b4abb6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -47,7 +47,8 @@ typedef struct ULONG count; } VECTORED_HANDLER; -static struct list vectored_handlers = LIST_INIT(vectored_handlers); +static struct list vectored_exception_handlers = LIST_INIT(vectored_exception_handlers); +static struct list vectored_continue_handlers = LIST_INIT(vectored_continue_handlers); static RTL_CRITICAL_SECTION vectored_handlers_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -58,6 +59,47 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, + PVECTORED_EXCEPTION_HANDLER func ) +{ + VECTORED_HANDLER *handler = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handler) ); + if (handler) + { + handler->func = RtlEncodePointer( func ); + handler->count = 1; + RtlEnterCriticalSection( &vectored_handlers_section ); + if (first) list_add_head( handler_list, &handler->entry ); + else list_add_tail( handler_list, &handler->entry ); + RtlLeaveCriticalSection( &vectored_handlers_section ); + } + return handler; +} + + +static ULONG remove_vectored_handler( struct list *handler_list, VECTORED_HANDLER *handler ) +{ + struct list *ptr; + ULONG ret = FALSE; + + RtlEnterCriticalSection( &vectored_handlers_section ); + LIST_FOR_EACH( ptr, handler_list ) + { + VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + if (curr_handler == handler) + { + if (!--curr_handler->count) list_remove( ptr ); + else handler = NULL; /* don't free it yet */ + ret = TRUE; + break; + } + } + RtlLeaveCriticalSection( &vectored_handlers_section ); + if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); + return ret; +} + + /********************************************************************** * wait_suspend * @@ -165,7 +207,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) except_ptrs.ContextRecord = context; RtlEnterCriticalSection( &vectored_handlers_section ); - ptr = list_head( &vectored_handlers ); + ptr = list_head( &vectored_exception_handlers ); while (ptr) { handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -181,7 +223,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "handler at %p returned %x\n", func, ret ); RtlEnterCriticalSection( &vectored_handlers_section ); - ptr = list_next( &vectored_handlers, ptr ); + ptr = list_next( &vectored_exception_handlers, ptr ); if (!--handler->count) /* removed during execution */ { list_remove( &handler->entry ); @@ -228,8 +270,7 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) */ PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { - FIXME("%u %p stub\n", first, func); - return NULL; + return add_vectored_handler( &vectored_continue_handlers, first, func ); } @@ -238,8 +279,7 @@ PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HAN */ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) { - FIXME("%p stub\n", handler); - return FALSE; + return remove_vectored_handler( &vectored_continue_handlers, handler ); } @@ -248,17 +288,7 @@ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) */ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { - VECTORED_HANDLER *handler = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handler) ); - if (handler) - { - handler->func = RtlEncodePointer( func ); - handler->count = 1; - RtlEnterCriticalSection( &vectored_handlers_section ); - if (first) list_add_head( &vectored_handlers, &handler->entry ); - else list_add_tail( &vectored_handlers, &handler->entry ); - RtlLeaveCriticalSection( &vectored_handlers_section ); - } - return handler; + return add_vectored_handler( &vectored_exception_handlers, first, func ); } @@ -267,24 +297,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA */ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) { - struct list *ptr; - ULONG ret = FALSE; - - RtlEnterCriticalSection( &vectored_handlers_section ); - LIST_FOR_EACH( ptr, &vectored_handlers ) - { - VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); - if (curr_handler == handler) - { - if (!--curr_handler->count) list_remove( ptr ); - else handler = NULL; /* don't free it yet */ - ret = TRUE; - break; - } - } - RtlLeaveCriticalSection( &vectored_handlers_section ); - if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); - return ret; + return remove_vectored_handler( &vectored_exception_handlers, handler ); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 451e497..5cbab71 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1803,13 +1803,10 @@ static void test_vectored_continue_handler(void) } handler1 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); - todo_wine ok(handler1 != 0, "RtlAddVectoredContinueHandler failed\n"); handler2 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); - todo_wine ok(handler2 != 0, "RtlAddVectoredContinueHandler failed\n"); - todo_wine ok(handler1 != handler2, "RtlAddVectoredContinueHandler returned same handler\n"); if (pRtlRemoveVectoredExceptionHandler) @@ -1819,11 +1816,9 @@ static void test_vectored_continue_handler(void) } ret = pRtlRemoveVectoredContinueHandler(handler1); - todo_wine ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); ret = pRtlRemoveVectoredContinueHandler(handler2); - todo_wine ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); ret = pRtlRemoveVectoredContinueHandler(handler1);

1 0

Vincent Povirk : windowscodecs: Implement ComponentFactory_CreateMetadataReaderFromContainer.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 1dee37340d981b98a51c5d44b6b09f538f73e4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dee37340d981b98a51c5d44b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 15:51:09 2014 -0600 windowscodecs: Implement ComponentFactory_CreateMetadataReaderFromContainer. --- dlls/windowscodecs/imgfactory.c | 101 +++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 25 +++++---- 2 files changed, 115 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e7095dd..444f2e4 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -956,9 +956,106 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICComponentFactory *iface, REFGUID format, const GUID *vendor, DWORD options, IStream *stream, IWICMetadataReader **reader) { - FIXME("%p,%s,%s,%x,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), + HRESULT hr; + IEnumUnknown *enumreaders; + IUnknown *unkreaderinfo; + IWICMetadataReaderInfo *readerinfo; + IWICPersistStream *wicpersiststream; + ULONG num_fetched; + GUID decoder_vendor; + BOOL matches; + LARGE_INTEGER zero; + + TRACE("%p,%s,%s,%x,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, stream, reader); - return E_NOTIMPL; + + if (!format || !stream || !reader) + return E_INVALIDARG; + + zero.QuadPart = 0; + + hr = CreateComponentEnumerator(WICMetadataReader, WICComponentEnumerateDefault, &enumreaders); + if (FAILED(hr)) return hr; + + *reader = NULL; + +start: + while (!*reader) + { + hr = IEnumUnknown_Next(enumreaders, 1, &unkreaderinfo, &num_fetched); + + if (hr == S_OK) + { + hr = IUnknown_QueryInterface(unkreaderinfo, &IID_IWICMetadataReaderInfo, (void**)&readerinfo); + + if (SUCCEEDED(hr)) + { + if (vendor) + { + hr = IWICMetadataReaderInfo_GetVendorGUID(readerinfo, &decoder_vendor); + + if (FAILED(hr) || !IsEqualIID(vendor, &decoder_vendor)) + { + IWICMetadataReaderInfo_Release(readerinfo); + IUnknown_Release(unkreaderinfo); + continue; + } + } + + hr = IWICMetadataReaderInfo_MatchesPattern(readerinfo, format, stream, &matches); + + if (SUCCEEDED(hr) && matches) + { + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = IWICMetadataReaderInfo_CreateInstance(readerinfo, reader); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_QueryInterface(*reader, &IID_IWICPersistStream, (void**)&wicpersiststream); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(wicpersiststream, + stream, vendor, options & WICPersistOptionsMask); + + IWICPersistStream_Release(wicpersiststream); + } + + if (FAILED(hr)) + { + IWICMetadataReader_Release(*reader); + *reader = NULL; + } + } + } + + IUnknown_Release(readerinfo); + } + + IUnknown_Release(unkreaderinfo); + } + else + break; + } + + if (!*reader && vendor) + { + vendor = NULL; + IEnumUnknown_Reset(enumreaders); + goto start; + } + + IEnumUnknown_Release(enumreaders); + + if (!*reader && !(options & WICMetadataCreationFailUnknown)) + FIXME("create unknown metadata reader\n"); + + if (*reader) + return S_OK; + else + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e9ab77c..2dc6049 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -841,17 +841,24 @@ static void test_create_reader(void) stream = create_stream(metadata_tEXt, sizeof(metadata_tEXt)); hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + NULL, NULL, WICPersistOptionsDefault, + stream, &reader); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, + NULL, &reader); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, + stream, NULL); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, stream, &reader); -todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - /* NOTE: removed once Wine is fixed */ - if (FAILED(hr)) - { - IStream_Release(stream); - IWICComponentFactory_Release(factory); - return; - } if (SUCCEEDED(hr)) { @@ -869,7 +876,7 @@ todo_wine hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, stream, &reader); - ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Vincent Povirk : windowscodecs: Don' t check undefined memory in tests on Wine.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 8d96b22dd7bdb3a6134820cd374ffec4bd7b207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d96b22dd7bdb3a6134820cd3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 15:52:38 2014 -0600 windowscodecs: Don't check undefined memory in tests on Wine. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e42b474..e9ab77c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -907,7 +907,7 @@ static void test_metadata_png(void) IWICMetadataReader *reader; GUID containerformat; HRESULT hr; - UINT count; + UINT count=0xdeadbeef; hr = CoCreateInstance(&CLSID_WICPngDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder);

1 0

Sebastian Lackner : ntdll/tests: Add basic tests for Rtl[Add|Remove] VectoredContinueHandler.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 009b6a25bbf458726cae2155647ea021e2ac7eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=009b6a25bbf458726cae21556… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 00:11:12 2014 +0100 ntdll/tests: Add basic tests for Rtl[Add|Remove]VectoredContinueHandler. --- dlls/ntdll/tests/exception.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a94ed3a..451e497 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -46,6 +46,8 @@ static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); +static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); +static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -1788,6 +1790,48 @@ static void test_ripevent(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } + +static void test_vectored_continue_handler(void) +{ + PVOID handler1, handler2; + ULONG ret; + + if (!pRtlAddVectoredContinueHandler || !pRtlRemoveVectoredContinueHandler) + { + skip("RtlAddVectoredContinueHandler or RtlRemoveVectoredContinueHandler not found\n"); + return; + } + + handler1 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); + todo_wine + ok(handler1 != 0, "RtlAddVectoredContinueHandler failed\n"); + + handler2 = pRtlAddVectoredContinueHandler(TRUE, (void *)0xdeadbeef); + todo_wine + ok(handler2 != 0, "RtlAddVectoredContinueHandler failed\n"); + todo_wine + ok(handler1 != handler2, "RtlAddVectoredContinueHandler returned same handler\n"); + + if (pRtlRemoveVectoredExceptionHandler) + { + ret = pRtlRemoveVectoredExceptionHandler(handler1); + ok(!ret, "RtlRemoveVectoredExceptionHandler succeeded\n"); + } + + ret = pRtlRemoveVectoredContinueHandler(handler1); + todo_wine + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); + + ret = pRtlRemoveVectoredContinueHandler(handler2); + todo_wine + ok(ret, "RtlRemoveVectoredContinueHandler failed\n"); + + ret = pRtlRemoveVectoredContinueHandler(handler1); + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); + + ret = pRtlRemoveVectoredContinueHandler((void *)0x11223344); + ok(!ret, "RtlRemoveVectoredContinueHandler succeeded\n"); +} #endif /* defined(__i386__) || defined(__x86_64__) */ START_TEST(exception) @@ -1811,6 +1855,10 @@ START_TEST(exception) "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); + pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, + "RtlAddVectoredContinueHandler" ); + pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, + "RtlRemoveVectoredContinueHandler" ); pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, "NtQueryInformationProcess" ); pNtSetInformationProcess = (void*)GetProcAddress( hntdll, @@ -1880,6 +1928,7 @@ START_TEST(exception) test_rtlraiseexception(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1898,6 +1947,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); + test_vectored_continue_handler(); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Vincent Povirk : ole32: Add support for pasting CF_BITMAP.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: bab4c36d47285f5127544edda8e08f9193870eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab4c36d47285f5127544edda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 13 15:50:42 2014 -0600 ole32: Add support for pasting CF_BITMAP. --- dlls/ole32/clipboard.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a7308c2..6404f36 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1133,6 +1133,8 @@ static DWORD get_tymed_from_nonole_cf(UINT cf) return TYMED_ENHMF; case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_BITMAP: + return TYMED_GDI; default: FIXME("returning TYMED_NULL for cf %04x\n", cf); return TYMED_NULL; @@ -1310,6 +1312,27 @@ static HRESULT get_stgmed_for_emf(HENHMETAFILE hemf, STGMEDIUM *med) return S_OK; } +/************************************************************************ + * get_stgmed_for_bitmap + * + * Returns a stg medium with a bitmap based on the handle + */ +static HRESULT get_stgmed_for_bitmap(HBITMAP hbmp, STGMEDIUM *med) +{ + HRESULT hr; + + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + hr = dup_bitmap(hbmp, &med->u.hBitmap); + + if (FAILED(hr)) + return hr; + + med->tymed = TYMED_GDI; + return S_OK; +} + static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) { const WCHAR *str1, *str2; @@ -1401,6 +1424,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, hr = get_stgmed_for_stream(h, med); else if(mask & TYMED_ENHMF) hr = get_stgmed_for_emf((HENHMETAFILE)h, med); + else if(mask & TYMED_GDI) + hr = get_stgmed_for_bitmap((HBITMAP)h, med); else { FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed);

1 0

Vincent Povirk : windowscodecs: Treat missing GUID list keys as empty.
by Alexandre Julliard Nov. 13, 2014

Nov. 13, 2014

Module: wine Branch: master Commit: e53e798aa7d9b4d31e9df922ecabf8614f467458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53e798aa7d9b4d31e9df922e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 6 16:07:17 2014 -0600 windowscodecs: Treat missing GUID list keys as empty. --- dlls/windowscodecs/info.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 5f42994..d42d726 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -151,7 +151,12 @@ static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, return E_INVALIDARG; ret = RegOpenKeyExW(classkey, subkeyname, 0, KEY_READ, &subkey); - if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); + if (ret == ERROR_FILE_NOT_FOUND) + { + *actual_size = 0; + return S_OK; + } + else if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); if (buffer) {

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::pasteHTML implementation.
by Alexandre Julliard Nov. 13, 2014

Nov. 13, 2014

Module: wine Branch: master Commit: e567f309bf94b0218010b99f2598caf1cf26bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e567f309bf94b0218010b99f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:31 2014 +0100 mshtml: Added IHTMLTxtRange::pasteHTML implementation. --- dlls/mshtml/tests/dom.c | 27 +++++++++++++++++++++++++++ dlls/mshtml/txtrange.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c7adc9..39c3a7d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2148,6 +2148,17 @@ static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa } } +#define test_range_paste_html(a,b) _test_range_paste_html(__LINE__,a,b) +static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const char *html) +{ + BSTR str = a2bstr(html); + HRESULT hres; + + hres = IHTMLTxtRange_pasteHTML(range, str); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + SysFreeString(str); +} + #define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t type) { @@ -5050,6 +5061,22 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "abc xyz abc 123\r\nit's text"); test_range_parent(range, ET_BODY); + test_range_move(range, wordW, 1, 1); + test_range_moveend(range, characterW, 12, 12); + test_range_text(range, "xyz abc 123"); + + test_range_collapse(range, VARIANT_TRUE); + test_range_paste_html(range, "<br>paste<br>"); + test_range_text(range, NULL); + + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "xyz"); + + hres = IHTMLTxtRange_moveToElementText(range, body); + ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + + test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); + IHTMLElement_Release(body); IHTMLTxtRange_Release(range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 886f596..43c9f1a 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1572,8 +1573,33 @@ static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface) static HRESULT WINAPI HTMLTxtRange_pasteHTML(IHTMLTxtRange *iface, BSTR html) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(html)); - return E_NOTIMPL; + nsIDOMDocumentFragment *doc_frag; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(html)); + + nsres = nsIDOMRange_Collapse(This->nsrange, TRUE); + assert(nsres == NS_OK); + + nsAString_InitDepend(&nsstr, html); + nsres = nsIDOMRange_CreateContextualFragment(This->nsrange, &nsstr, &doc_frag); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("CreateContextualFragment failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)doc_frag); + nsIDOMDocumentFragment_Release(doc_frag); + if(NS_FAILED(nsres)) { + ERR("InsertNode failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_Collapse(This->nsrange, FALSE); + assert(nsres == NS_OK); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_moveToElementText(IHTMLTxtRange *iface, IHTMLElement *element)

1 0

Jacek Caban : mshtml: Moved IHTMLElement2 implementation to htmlelem.c.
by Alexandre Julliard Nov. 13, 2014

Nov. 13, 2014

Module: wine Branch: master Commit: 1e4cd8f53367e9302f3de09d5547be6fab5fcd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4cd8f53367e9302f3de09d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:20 2014 +0100 mshtml: Moved IHTMLElement2 implementation to htmlelem.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlelem.c | 1351 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelem2.c | 1387 ------------------------------------------ dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 1349 insertions(+), 1391 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e4cd8f53367e9302f3de…

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange:: moveToElementText implementation.
by Alexandre Julliard Nov. 13, 2014

Nov. 13, 2014

Module: wine Branch: master Commit: 41e3de93c3459c6c61820c2f81ad90605faea456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e3de93c3459c6c61820c2f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 12 16:25:13 2014 +0100 mshtml: Added IHTMLTxtRange::moveToElementText implementation. --- dlls/mshtml/tests/dom.c | 11 +++++++++++ dlls/mshtml/txtrange.c | 18 ++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5dc0c4c..a4bc01f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4823,6 +4823,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange *body_range, *range, *range2; IHTMLSelectionObject *selection; IDispatch *disp_range; + IHTMLElement *body; HRESULT hres; body_range = test_create_body_range(doc); @@ -5008,6 +5009,16 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_moveend(range, characterW, 2, 2); test_range_text(range, "ab"); + body = doc_get_body(doc); + + hres = IHTMLTxtRange_moveToElementText(range, body); + ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + + test_range_text(range, "abc xyz abc 123\r\nit's text"); + test_range_parent(range, ET_BODY); + + IHTMLElement_Release(body); + IHTMLTxtRange_Release(range); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 6b57eb2..886f596 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1579,8 +1579,22 @@ static HRESULT WINAPI HTMLTxtRange_pasteHTML(IHTMLTxtRange *iface, BSTR html) static HRESULT WINAPI HTMLTxtRange_moveToElementText(IHTMLTxtRange *iface, IHTMLElement *element) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%p)\n", This, element); - return E_NOTIMPL; + HTMLElement *elem; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, element); + + elem = unsafe_impl_from_IHTMLElement(element); + if(!elem) + return E_INVALIDARG; + + nsres = nsIDOMRange_SelectNodeContents(This->nsrange, elem->node.nsnode); + if(NS_FAILED(nsres)) { + ERR("SelectNodeContents failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how,

1 0

Yifu Wang : msvcp120: Added VS2013 CPP runtime dll.
by Alexandre Julliard Nov. 13, 2014

Nov. 13, 2014

Module: wine Branch: master Commit: c68e8243102d735907abd3299a294bd2393add4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68e8243102d735907abd3299… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Nov 11 09:35:39 2014 -0800 msvcp120: Added VS2013 CPP runtime dll. --- configure | 2 + configure.ac | 1 + dlls/msvcp120/Makefile.in | 14 + dlls/msvcp120/msvcp120.spec | 3846 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 3864 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68e8243102d735907abd…

1 0