September 2017 - Wine-commits

Jacek Caban : mshtml: Expose IHTMLDocument7 interface to scripts.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 2936f1135184e5e65304f560a5ec7b1cc19d197d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2936f1135184e5e65304f560a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:23 2017 +0200 mshtml: Expose IHTMLDocument7 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 357dbcf..db6ee57 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4939,6 +4939,9 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t { HTMLDOMNode_init_dispex_info(info, mode); + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDocument7_tid, NULL); + /* Depending on compatibility version, we add interfaces in different order * so that the right getElementById implementation is used. */ if(mode < COMPAT_MODE_IE8) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f10a793..ecd72b8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -146,6 +146,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDocument4) \ XIID(IHTMLDocument5) \ XIID(IHTMLDocument6) \ + XIID(IHTMLDocument7) \ XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMAttribute2) \ XIID(IHTMLDOMChildrenCollection) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9453bdc..20b5882 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -51,6 +51,11 @@ function test_doc_props() { test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); + test_exposed("defaultView", v >= 9); + test_exposed("head", v >= 9); + + test_exposed("parentWindow", true); + if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); next_test(); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument7::head property implementation.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: b244182bae54d7c46e7a4f46a2868c6983c4b9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b244182bae54d7c46e7a4f46a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:37 2017 +0200 mshtml: Added IHTMLDocument7::head property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 34 ++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 11 ++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index db6ee57..413b0bd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4038,8 +4038,38 @@ static HRESULT WINAPI HTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLHeadElement *nshead; + nsIDOMElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("No document\n"); + return E_FAIL; + } + + nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &nshead); + assert(nsres == NS_OK); + + if(!nshead) { + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLHeadElement_QueryInterface(nshead, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMHTMLHeadElement_Release(nshead); + assert(nsres == NS_OK); + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index ac1e2d0..56c4e2f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -96,8 +96,17 @@ function test_ElementTraversal() { next_test(); } +function test_head() { + var h = document.head; + ok(h.tagName === "HEAD", "h.tagName = " + h.tagName); + ok(h === document.getElementsByTagName("head")[0], "unexpected head element"); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, - test_ElementTraversal + test_ElementTraversal, + test_head ];

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: getElementsByClassName implementation.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 68b8b7b4bacf46a8c652a3084eba323d38c841e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b8b7b4bacf46a8c652a3084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:48 2017 +0200 mshtml: Added IHTMLDocument7::getElementsByClassName implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/elements.js | 26 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 413b0bd..0a2d243 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3347,11 +3347,32 @@ static HRESULT WINAPI HTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR return IHTMLDocument5_createAttribute(&This->IHTMLDocument5_iface, bstrAttrName, ppAttribute); } -static HRESULT WINAPI HTMLDocument7_getElementByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) +static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMNodeList *nslist; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc not supported\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_GetElementsByClassName(This->doc_node->nsdoc, &nsstr, &nslist); + nsAString_Finish(&nsstr); + if(FAILED(nsres)) { + ERR("GetElementByClassName failed: %08x\n", nsres); + return E_FAIL; + } + + + *pel = create_collection_from_nodelist(This->doc_node, nslist); + nsIDOMNodeList_Release(nslist); + return S_OK; } static HRESULT WINAPI HTMLDocument7_createProcessingInstruction(IHTMLDocument7 *iface, BSTR target, @@ -4091,7 +4112,7 @@ static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { HTMLDocument7_get_characterSet, HTMLDocument7_createElement, HTMLDocument7_createAttribute, - HTMLDocument7_getElementByClassName, + HTMLDocument7_getElementsByClassName, HTMLDocument7_createProcessingInstruction, HTMLDocument7_adoptNode, HTMLDocument7_put_onmssitemodejumplistitemremoved, diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 56c4e2f..f0498d5 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -104,9 +104,35 @@ function test_head() { next_test(); } +function test_getElementsByClassName() { + var elems; + + document.body.innerHTML = '<div class="class1">' + + '<div class="class1"></div>' + + '<a id="class1" class="class2"></a>' + + '</div>' + + '<script class="class1"></script>'; + + elems = document.getElementsByClassName("class1"); + ok(elems.length === 3, "elems.length = " + elems.length); + ok(elems[0].tagName === "DIV", "elems[0].tagName = " + elems[0].tagName); + ok(elems[1].tagName === "DIV", "elems[1].tagName = " + elems[1].tagName); + ok(elems[2].tagName === "SCRIPT", "elems[2].tagName = " + elems[2].tagName); + + elems = document.getElementsByClassName("class2"); + ok(elems.length === 1, "elems.length = " + elems.length); + ok(elems[0].tagName === "A", "elems[0].tagName = " + elems[0].tagName); + + elems = document.getElementsByClassName("classnotfound"); + ok(elems.length == 0, "elems.length = " + elems.length); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, + test_getElementsByClassName, test_head ];

1 0

Nikolay Sivov : usp10/tests: Remove special itemization failure test that doesn't happen.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 9e9f5aad84a00f8859fbc107d7bc735497db981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9f5aad84a00f8859fbc107d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 20:15:31 2017 +0300 usp10/tests: Remove special itemization failure test that doesn't happen. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f0eb500..54d7ba7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -992,14 +992,6 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_ok(SUCCEEDED(hr), "Failed to get script properties, hr %#x.\n", hr); hr = pScriptItemizeOpenType(string, cchString, 15, Control, State, outpItems, tags, &outnItems); - if (hr == USP_E_SCRIPT_NOT_IN_FONT) - { - if (valid > 0) - winetest_win_skip("Select font does not support script\n"); - else - winetest_trace("Select font does not support script\n"); - return; - } if (valid > 0) winetest_ok(hr == S_OK, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); else if (hr != S_OK)

1 0

Alexandre Julliard : ntdll: Avoid accessing builtin views outside of the critical section.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 8dc8b3e9c06008c646e822d38d3458853254620c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc8b3e9c06008c646e822d38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 19:50:30 2017 +0200 ntdll: Avoid accessing builtin views outside of the critical section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0505617..6065b79 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1634,25 +1634,25 @@ NTSTATUS virtual_create_builtin_view( void *module ) server_enter_uninterrupted_section( &csVirtual, &sigset ); status = create_view( &view, base, size, SEC_IMAGE | SEC_FILE | VPROT_SYSTEM | VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); - if (!status) TRACE( "created %p-%p\n", base, (char *)base + size ); - server_leave_uninterrupted_section( &csVirtual, &sigset ); - - if (status) return status; + if (!status) + { + TRACE( "created %p-%p\n", base, (char *)base + size ); - /* The PE header is always read-only, no write, no execute. */ - set_page_vprot( view->base, page_size, VPROT_COMMITTED | VPROT_READ ); + /* The PE header is always read-only, no write, no execute. */ + set_page_vprot( base, page_size, VPROT_COMMITTED | VPROT_READ ); - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - BYTE flags = VPROT_COMMITTED; + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + BYTE flags = VPROT_COMMITTED; - if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; - if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ; - if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; - set_page_vprot( (char *)view->base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); + if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; + if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ; + if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; + set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); + } } - + server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; }

1 0

Alexandre Julliard : ntdll: Trace views once they are properly initialized.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 78ab8aa46af48cb2189715537297068dc0199dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ab8aa46af48cb2189715537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 19:51:43 2017 +0200 ntdll: Trace views once they are properly initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6065b79..bcd9680 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -312,13 +312,15 @@ static void VIRTUAL_DumpView( struct file_view *view ) TRACE( "View: %p - %p", addr, addr + view->size - 1 ); if (view->protect & VPROT_SYSTEM) - TRACE( " (system)\n" ); - else if (view->protect & VPROT_VALLOC) - TRACE( " (valloc)\n" ); - else if (view->mapping) - TRACE( " %p\n", view->mapping ); + TRACE( " (builtin image)\n" ); + else if (view->protect & SEC_IMAGE) + TRACE( " (image) %p\n", view->mapping ); + else if (view->protect & SEC_FILE) + TRACE( " (file) %p\n", view->mapping ); + else if (view->protect & (SEC_RESERVE | SEC_COMMIT)) + TRACE( " (anonymous) %p\n", view->mapping ); else - TRACE( " (anonymous)\n"); + TRACE( " (valloc)\n"); for (count = i = 1; i < view->size >> page_shift; i++, count++) { @@ -711,7 +713,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz wine_rb_put( &views_tree, view->base, &view->entry ); *view_ret = view; - VIRTUAL_DEBUG_DUMP_VIEW( view ); if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { @@ -849,15 +850,11 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { int unix_prot = VIRTUAL_GetUnixProt(vprot); - TRACE("%p-%p %s\n", - base, (char *)base + size - 1, VIRTUAL_GetProtStr( vprot ) ); - if (view->protect & VPROT_WRITEWATCH) { /* each page may need different protections depending on write watch flag */ set_page_vprot_bits( base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH ); mprotect_range( view, base, size, 0, 0 ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -869,7 +866,6 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { set_page_vprot( base, size, vprot ); mprotect( base, size, unix_prot ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -877,7 +873,6 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ return FALSE; set_page_vprot( base, size, vprot ); - VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -1482,6 +1477,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz done: view->mapping = dup_mapping; view->map_protect = map_vprot; + VIRTUAL_DEBUG_DUMP_VIEW( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; @@ -1651,6 +1647,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); } + VIRTUAL_DEBUG_DUMP_VIEW( view ); } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; @@ -1692,6 +1689,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi VIRTUAL_SetProt( view, view->base, page_size, VPROT_COMMITTED ); VIRTUAL_SetProt( view, (char *)view->base + page_size, page_size, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); + VIRTUAL_DEBUG_DUMP_VIEW( view ); /* note: limit is lower than base since the stack grows down */ teb->DeallocationStack = view->base; @@ -2119,6 +2117,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ status = allocate_dos_memory( &view, vprot ); if (status == STATUS_SUCCESS) { + VIRTUAL_DEBUG_DUMP_VIEW( view ); *ret = view->base; *size_ptr = view->size; } @@ -2180,6 +2179,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ } } + if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (use_locks) server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS) @@ -2378,6 +2379,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T } else status = STATUS_INVALID_PARAMETER; + if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view ); + server_leave_uninterrupted_section( &csVirtual, &sigset ); if (status == STATUS_SUCCESS) @@ -2891,6 +2894,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p view->mapping = dup_mapping; view->map_protect = map_vprot; dup_mapping = 0; /* don't close it */ + VIRTUAL_DEBUG_DUMP_VIEW( view ); } else {

1 0

Daniel Lehman : msvcrt: Use exception base to create copy constructor pointer.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 3ea70fa1e2c37df94c6c89e15d8f8fc06bbb22e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea70fa1e2c37df94c6c89e15… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 8 10:32:07 2017 -0700 msvcrt: Use exception base to create copy constructor pointer. The exception base (exc_base) from the ExceptionRecord is used in find_caught_type to find the type info for the exception. All related type information is relative to this base, including the offset for the copy constructor. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7e9c38d..0820aad 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -248,7 +248,7 @@ static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info *catchblock, - const cxx_type_info *type) + const cxx_type_info *type, ULONG64 exc_base) { const type_info *catch_ti = rva_to_ptr(catchblock->type_info, dispatch->ImageBase); void **dest = rva_to_ptr(catchblock->offset, frame); @@ -273,13 +273,13 @@ static inline void copy_exception(void *object, ULONG64 frame, if (type->flags & CLASS_HAS_VIRTUAL_BASE_CLASS) { void (__cdecl *copy_ctor)(void*, void*, int) = - rva_to_ptr(type->copy_ctor, dispatch->ImageBase); + rva_to_ptr(type->copy_ctor, exc_base); copy_ctor(dest, get_this_pointer(&type->offsets, object), 1); } else { void (__cdecl *copy_ctor)(void*, void*) = - rva_to_ptr(type->copy_ctor, dispatch->ImageBase); + rva_to_ptr(type->copy_ctor, exc_base); copy_ctor(dest, get_this_pointer(&type->offsets, object)); } } @@ -462,7 +462,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, EXCEPTION_RECORD *unt /* copy the exception to its destination on the stack */ copy_exception((void*)rec->ExceptionInformation[1], - orig_frame, dispatch, catchblock, type); + orig_frame, dispatch, catchblock, type, exc_base); } else {

1 0

Vincent Povirk : loader/wine.inf: Put 32-bit .ds fakedlls in windows/ twain_32.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 72e5f1af3d4a3a8230081d74fff52f0dacb6be9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e5f1af3d4a3a8230081d74f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 12:44:48 2017 -0500 loader/wine.inf: Put 32-bit .ds fakedlls in windows/twain_32. Some programs search for TWAIN devices by listing this directory. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0b3c940..d22137f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2517,6 +2517,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,rundll.exe,rundll.exe16 10,,twain.dll,twain.dll16 10,,twain_32.dll +10,twain_32,sane.ds +10,twain_32,gphoto2.ds 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe

1 0

Vincent Povirk : sane.ds: Add support for word list options.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 31a4a58f81caf2aa6ee7a1e0540917b1b8ad7e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a4a58f81caf2aa6ee7a1e05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 13:47:55 2017 -0500 sane.ds: Add support for word list options. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/ui.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 5574c5a..9a9bcb0 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -716,6 +716,23 @@ static BOOL UpdateSaneBoolOption(int index, BOOL position) return FALSE; } +static BOOL UpdateSaneIntOption(int index, SANE_Int value) +{ + SANE_Status rc = SANE_STATUS_GOOD; + SANE_Int result = 0; + + rc = psane_control_option (activeDS.deviceHandle,index, + SANE_ACTION_SET_VALUE, &value, &result); + + if(rc == SANE_STATUS_GOOD) + { + if (result & SANE_INFO_RELOAD_OPTIONS || + result & SANE_INFO_RELOAD_PARAMS || result & SANE_INFO_INEXACT) + return TRUE; + } + return FALSE; +} + static BOOL UpdateSaneStringOption(int index, SANE_String value) { SANE_Status rc = SANE_STATUS_GOOD; @@ -791,6 +808,21 @@ static INT_PTR InitializeDialog(HWND hwnd) SendMessageA(control,BM_SETCHECK,BST_CHECKED,0); } + else if (opt->type == SANE_TYPE_INT && + opt->constraint_type == SANE_CONSTRAINT_WORD_LIST) + { + int j, count = opt->constraint.word_list[0]; + CHAR buffer[16]; + SANE_Int val; + for (j=1; j<=count; j++) + { + sprintf(buffer, "%d", opt->constraint.word_list[j]); + SendMessageA(control, CB_ADDSTRING, 0, (LPARAM)buffer); + } + psane_control_option(activeDS.deviceHandle, i, SANE_ACTION_GET_VALUE, &val, NULL); + sprintf(buffer, "%d", val); + SendMessageA(control,CB_SELECTSTRING,0,(LPARAM)buffer); + } else if (opt->constraint_type == SANE_CONSTRAINT_RANGE) { if (opt->type == SANE_TYPE_INT) @@ -977,6 +1009,11 @@ static void ComboChanged(HWND hwnd, INT id, HWND control) if (UpdateSaneStringOption(index, value)) InitializeDialog(hwnd); } + else if (opt->type == SANE_TYPE_INT) + { + if (UpdateSaneIntOption(index, atoi(value))) + InitializeDialog(hwnd); + } }

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateStreamDescriptor.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 32ff8ea63e70593f23552b61a3f88d12a82367d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ff8ea63e70593f23552b61a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 8 11:00:12 2017 +0000 mfplat: Implement MFCreateStreamDescriptor. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 2 + 3 files changed, 414 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ff8ea63e70593f23552…

1 0