November 2017 - Wine-Commits

Hugh McMaster : regedit: Do not abort if the /m switch is used.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 4339f4015451a1c642b7f189e11f9f247c30acac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4339f4015451a1c642b7f189e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Nov 23 12:13:10 2017 +0000 regedit: Do not abort if the /m switch is used. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2d724f9..fe0163c 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -209,6 +209,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; case 'C': case 'L': + case 'M': case 'R': /* unhandled */; break;

1 0

Hugh McMaster : reg/tests: Properly escape the backslashes in an export test.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 7fb9cdf60ff9dfc507bcc949d263e4638af61a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb9cdf60ff9dfc507bcc949d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Nov 23 12:13:08 2017 +0000 reg/tests: Properly escape the backslashes in an export test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e0ff5f0..0bab8bc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4391,7 +4391,7 @@ static void test_export(void) run_reg_exe("reg export /?", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r);

1 0

David Collett : kernel32: Adjust data directories in UpdateResource API.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: ea640e1aa7033a694eb8474c8cb69ecbbc160671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea640e1aa7033a694eb8474c8… Author: David Collett <david.collett(a)gmail.com> Date: Thu Nov 23 16:02:55 2017 +1100 kernel32: Adjust data directories in UpdateResource API. When adding resources to a PE file using the UpdateResource API and the resource section is not the last section (i.e. we had to move existing sections), ensure any data directory entries pointing into moved sections is adjusted. Signed-off-by: David Collett <david.collett(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c88c921..73f3cca 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1435,7 +1435,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) { static const WCHAR prefix[] = { 'r','e','s','u',0 }; WCHAR tempdir[MAX_PATH], tempfile[MAX_PATH]; - DWORD section_size; + DWORD i, section_size; BOOL ret = FALSE; IMAGE_SECTION_HEADER *sec; IMAGE_NT_HEADERS32 *nt; @@ -1619,11 +1619,19 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } else { nt->OptionalHeader.SizeOfImage += rva_delta; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } }

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3:: compareDocumentPosition implementation.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 664e861cdafbf3e6b34a1dab9428d2c234a9eb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664e861cdafbf3e6b34a1dab9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:37:03 2017 +0100 mshtml: Added IHTMLDOMNode3::compareDocumentPosition implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 70b8758..0aad491 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1341,8 +1341,25 @@ static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface, IHTMLDOMNode *otherNode, USHORT *flags) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + HTMLDOMNode *other; + UINT16 position; + nsresult nsres; + + TRACE("(%p)->()\n", This); + + other = get_node_obj(otherNode); + if(!other) + return E_INVALIDARG; + + nsres = nsIDOMNode_CompareDocumentPosition(This->nsnode, other->nsnode, &position); + IHTMLDOMNode_Release(&other->IHTMLDOMNode_iface); + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + return E_FAIL; + } + + *flags = position; + return S_OK; } static HRESULT WINAPI HTMLDOMNode3_isSupported(IHTMLDOMNode3 *iface, BSTR feature, VARIANT version, VARIANT_BOOL *pfisSupported) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 3912e9a..6e193ee 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -148,11 +148,36 @@ function test_query_selector() { next_test(); } +function test_compare_position() { + document.body.innerHTML = '<div><div></div><div></div></div>'; + + var parent = document.body.firstChild; + var child1 = parent.firstChild; + var child2 = child1.nextSibling; + var elem = document.createElement("div"); + + function compare_position(node1, node2, expected_result, ignore_mask) { + var cmp = node1.compareDocumentPosition(node2); + ok((cmp & ~ignore_mask) == expected_result, + "compareDocumentPosition returned " + cmp + " expected " + expected_result); + } + + compare_position(child1, child2, 4); + compare_position(child2, child1, 2); + compare_position(parent, child1, 0x14); + compare_position(parent, child2, 0x14); + compare_position(parent, elem, 0x21, 6); + compare_position(elem, parent, 0x21, 6); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, test_getElementsByClassName, test_head, - test_query_selector + test_query_selector, + test_compare_position ];

1 0

Jacek Caban : mshtml: Removed no longer needed flush_pending_tasks.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: deee158c00155b406d56e4a8f323b9eee2ea1333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deee158c00155b406d56e4a8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:36:44 2017 +0100 mshtml: Removed no longer needed flush_pending_tasks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/task.c | 19 ------------------- 3 files changed, 22 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cd8017b..ea81fde 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1144,7 +1144,6 @@ HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 8edf177..f0819d6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -270,8 +270,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event DOMEvent *load_event; HRESULT hres; - flush_pending_tasks(doc->basedoc.task_magic); - hres = create_document_event(doc, EVENTID_LOAD, &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->node.event_target, load_event); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 07f6875..f1fb30a 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -102,25 +102,6 @@ static void release_task_timer(HWND thread_hwnd, task_timer_t *timer) heap_free(timer); } -void flush_pending_tasks(LONG target) -{ - thread_data_t *thread_data = get_thread_data(FALSE); - struct list *liter, *ltmp; - task_t *task; - - if(!thread_data) - return; - - LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->task_list) { - task = LIST_ENTRY(liter, task_t, entry); - if(task->target_magic == target) { - list_remove(&task->entry); - task->proc(task); - task->destr(task); - } - } -} - void remove_target_tasks(LONG target) { thread_data_t *thread_data = get_thread_data(FALSE);

1 0

Jacek Caban : mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 52a5acaefbc106ece88299f74519fee29cce3314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a5acaefbc106ece88299f74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:36:51 2017 +0100 mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 14 ++++---------- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/persist.c | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b64b35a..8323a77 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1291,7 +1291,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) if(doc->basedoc.window->mon) { /* FIXME: We should find nicer way to do this */ - remove_target_tasks(doc->basedoc.task_magic); + remove_target_tasks(doc->task_magic); mon = doc->basedoc.window->mon; IMoniker_AddRef(mon); diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5899b84..c9f21fa 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4858,7 +4858,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->outer_unk = outer; doc->dispex = dispex; - doc->task_magic = get_task_target_magic(); HTMLDocument_Persist_Init(doc); HTMLDocument_OleCmd_Init(doc); @@ -4869,13 +4868,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocument_cpc); } -static void destroy_htmldoc(HTMLDocument *This) -{ - remove_target_tasks(This->task_magic); - - ConnectionPointContainer_Destroy(&This->cp_container); -} - static inline HTMLDocumentNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLDocumentNode, node); @@ -4925,7 +4917,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) } heap_free(This->event_vector); - destroy_htmldoc(&This->basedoc); + ConnectionPointContainer_Destroy(&This->basedoc.cp_container); } static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -5298,7 +5290,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) DestroyWindow(This->hwnd); heap_free(This->mime); - destroy_htmldoc(&This->basedoc); + remove_target_tasks(This->task_magic); + ConnectionPointContainer_Destroy(&This->basedoc.cp_container); release_dispex(&This->dispex); if(This->nscontainer) @@ -5429,6 +5422,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->is_mhtml = is_mhtml; doc->usermode = UNKNOWN_USERMODE; + doc->task_magic = get_task_target_magic(); init_binding_ui(doc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ea81fde..69fe90c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -602,8 +602,6 @@ struct HTMLDocument { HTMLOuterWindow *window; - LONG task_magic; - ConnectionPointContainer cp_container; }; @@ -672,6 +670,7 @@ struct HTMLDocumentObj { LPWSTR mime; DWORD update; + LONG task_magic; }; typedef struct nsWeakReference nsWeakReference; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a34ff51..25767ef 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -424,7 +424,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind task = heap_alloc(sizeof(docobj_task_t)); task->doc = doc_obj; - hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->basedoc.task_magic); + hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->task_magic); if(FAILED(hres)) { CoTaskMemFree(url); return hres; @@ -435,7 +435,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind download_task->doc = doc_obj; download_task->set_download = set_download; download_task->url = url; - return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->basedoc.task_magic); + return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->task_magic); } return S_OK;

1 0

Nikolay Sivov : mshtml: Make sure actual host length matches returned BSTR length.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 0592537862c3b3abfcc187bf9f6e2ec9aa09b10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0592537862c3b3abfcc187bf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 22 17:55:07 2017 +0300 mshtml: Make sure actual host length matches returned BSTR length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 7 +++++-- dlls/mshtml/tests/htmllocation.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5..59b20f6 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ee241e7..458960a 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -168,10 +168,15 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_host(loc, &str); ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); - if(hres == S_OK) + if(hres == S_OK){ + int len = test->host ? strlen(test->host) : 0; ok(str_eq_wa(str, test->host), "%s: expected retrieved host to be L\"%s\", was: %s\n", test->name, test->host, wine_dbgstr_w(str)); + ok(SysStringLen(str) == len, "%s: unexpected string length %u, expected %u\n", + test->name, SysStringLen(str), len); + } + SysFreeString(str); }

1 0

Jacek Caban : mshtml: Get rid of unneeded parent from NSContainer.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 0f487987bc104d20b89f879eea27ea9ca6ff8085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f487987bc104d20b89f879ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 22 16:16:00 2017 +0100 mshtml: Get rid of unneeded parent from NSContainer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 91685e2..cd8017b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -697,7 +697,6 @@ struct NSContainer { nsWeakReference *weak_reference; - NSContainer *parent; HTMLDocumentObj *doc; nsIURIContentListener *content_listener; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a72a587..4db61dc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1336,8 +1336,6 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->parent) - nsIWebBrowserChrome_Release(&This->parent->nsIWebBrowserChrome_iface); if(This->weak_reference) { This->weak_reference->nscontainer = NULL; nsIWeakReference_Release(&This->weak_reference->nsIWeakReference_iface);

1 0

Jacek Caban : mshtml: Store IOleAdviseHolder in HTMLDocumentObj instead of HTMLDocument.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 4a13190da433dc94af43898c7dcbed3268900c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a13190da433dc94af43898c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 22 16:15:38 2017 +0100 mshtml: Store IOleAdviseHolder in HTMLDocumentObj instead of HTMLDocument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/oleobj.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1a11ffd..5899b84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5274,8 +5274,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.window->doc_obj = NULL; IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); } - if(This->basedoc.advise_holder) - IOleAdviseHolder_Release(This->basedoc.advise_holder); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); if(This->view_sink) IAdviseSink_Release(This->view_sink); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 39c9efe..1cf43f5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -605,7 +605,6 @@ struct HTMLDocument { LONG task_magic; ConnectionPointContainer cp_container; - IOleAdviseHolder *advise_holder; }; static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) @@ -648,6 +647,7 @@ struct HTMLDocumentObj { IUnknown *webbrowser; ITravelLog *travel_log; IUnknown *browser_service; + IOleAdviseHolder *advise_holder; DOCHOSTUIINFO hostinfo; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index c782729..bb54ead 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -490,8 +490,8 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) HTMLDocument_LockContainer(This->doc_obj, FALSE); - if(This->advise_holder) - IOleAdviseHolder_SendOnClose(This->advise_holder); + if(This->doc_obj->advise_holder) + IOleAdviseHolder_SendOnClose(This->doc_obj->advise_holder); return S_OK; } @@ -632,13 +632,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, return E_INVALIDARG; } - if(!This->advise_holder) { - CreateOleAdviseHolder(&This->advise_holder); - if(!This->advise_holder) + if(!This->doc_obj->advise_holder) { + CreateOleAdviseHolder(&This->doc_obj->advise_holder); + if(!This->doc_obj->advise_holder) return E_OUTOFMEMORY; } - return IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + return IOleAdviseHolder_Advise(This->doc_obj->advise_holder, pAdvSink, pdwConnection); } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) @@ -646,22 +646,22 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) HTMLDocument *This = impl_from_IOleObject(iface); TRACE("(%p)->(%d)\n", This, dwConnection); - if(!This->advise_holder) + if(!This->doc_obj->advise_holder) return OLE_E_NOCONNECTION; - return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); + return IOleAdviseHolder_Unadvise(This->doc_obj->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { HTMLDocument *This = impl_from_IOleObject(iface); - if(!This->advise_holder) { + if(!This->doc_obj->advise_holder) { *ppenumAdvise = NULL; return S_OK; } - return IOleAdviseHolder_EnumAdvise(This->advise_holder, ppenumAdvise); + return IOleAdviseHolder_EnumAdvise(This->doc_obj->advise_holder, ppenumAdvise); } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)

1 0

Jactry Zeng : wintrust: Update version to 6.1.7601.23769.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 567ad03310314b3eee4a8cfdf11919b539109ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567ad03310314b3eee4a8cfdf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Nov 22 16:45:27 2017 +0800 wintrust: Update version to 6.1.7601.23769. Installer of Google drive will check wintrust's version to make sure Windows security update was installed. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/version.rc b/dlls/wintrust/version.rc index bcff809..773f00e 100644 --- a/dlls/wintrust/version.rc +++ b/dlls/wintrust/version.rc @@ -19,9 +19,9 @@ */ #define WINE_FILENAME_STR "wintrust.dll" -#define WINE_FILEVERSION 5,131,2195,6824 -#define WINE_FILEVERSION_STR "5.131.2195.6824" -#define WINE_PRODUCTVERSION 5,131,2195,6824 -#define WINE_PRODUCTVERSION_STR "5.131.2195.6824" +#define WINE_FILEVERSION 6,1,7601,23769 +#define WINE_FILEVERSION_STR "6.1.7601.23769" +#define WINE_PRODUCTVERSION 6,1,7601,23769 +#define WINE_PRODUCTVERSION_STR "6.1.7601.23769" #include "wine/wine_common_ver.rc"

1 0