May 2022 - Wine-commits - list.winehq.org

Roman Pišl : tapi32: Add lineGetCallInfoW stub.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 5f3a0156d1e0ed014fca355cf1ec50120d6f8fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f3a0156d1e0ed014fca355c… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat May 28 13:18:01 2022 +0200 tapi32: Add lineGetCallInfoW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 75bfe837f3d..2dbca2aba3e 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -296,6 +296,15 @@ DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo) return 0; } +/*********************************************************************** + * lineGetCallInfoW (TAPI32.@) + */ +DWORD WINAPI lineGetCallInfoW(HCALL hCall, LPLINECALLINFO lpCallInfo) +{ + FIXME("(%p, %p): stub.\n", hCall, lpCallInfo); + return 0; +} + /*********************************************************************** * lineGetCallStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6c01a870479..757e387c8d2 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -39,6 +39,7 @@ @ stdcall lineGetAppPriorityA(str long ptr long ptr ptr) @ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA @ stdcall lineGetCallInfoA(long ptr) +@ stdcall lineGetCallInfoW(long ptr) @ stdcall lineGetCallStatus(long ptr) @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA

1 0

Hugh McMaster : conhost: Don't prompt the user to save their app-specific settings.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 25f012edcba62a58797079b60286ee0f9f7fb124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f012edcba62a58797079b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 27 19:57:36 2022 +1000 conhost: Don't prompt the user to save their app-specific settings. On Windows, app-specific console settings are always saved to the registry unless the user cancels the console properties dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 75 ++++++++++++++++++------------------------- po/ast.po | 75 ++++++++++++++++++------------------------- po/bg.po | 76 ++++++++++++++++++-------------------------- po/ca.po | 75 ++++++++++++++++++------------------------- po/cs.po | 75 ++++++++++++++++++------------------------- po/da.po | 75 ++++++++++++++++++------------------------- po/de.po | 75 ++++++++++++++++++------------------------- po/el.po | 76 ++++++++++++++++++-------------------------- po/en.po | 75 ++++++++++++++++++------------------------- po/en_US.po | 75 ++++++++++++++++++------------------------- po/eo.po | 75 ++++++++++++++++++------------------------- po/es.po | 75 ++++++++++++++++++------------------------- po/fa.po | 75 ++++++++++++++++++------------------------- po/fi.po | 75 ++++++++++++++++++------------------------- po/fr.po | 75 ++++++++++++++++++------------------------- po/he.po | 75 ++++++++++++++++++------------------------- po/hi.po | 75 ++++++++++++++++++------------------------- po/hr.po | 75 ++++++++++++++++++------------------------- po/hu.po | 75 ++++++++++++++++++------------------------- po/it.po | 75 ++++++++++++++++++------------------------- po/ja.po | 75 ++++++++++++++++++------------------------- po/ko.po | 75 ++++++++++++++++++------------------------- po/lt.po | 75 ++++++++++++++++++------------------------- po/ml.po | 75 ++++++++++++++++++------------------------- po/nb_NO.po | 75 ++++++++++++++++++------------------------- po/nl.po | 75 ++++++++++++++++++------------------------- po/or.po | 75 ++++++++++++++++++------------------------- po/pa.po | 75 ++++++++++++++++++------------------------- po/pl.po | 75 ++++++++++++++++++------------------------- po/pt_BR.po | 75 ++++++++++++++++++------------------------- po/pt_PT.po | 75 ++++++++++++++++++------------------------- po/rm.po | 75 ++++++++++++++++++------------------------- po/ro.po | 75 ++++++++++++++++++------------------------- po/ru.po | 75 ++++++++++++++++++------------------------- po/si.po | 75 ++++++++++++++++++------------------------- po/sk.po | 75 ++++++++++++++++++------------------------- po/sl.po | 75 ++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 77 ++++++++++++++++++--------------------------- po/sr_RS(a)latin.po | 77 ++++++++++++++++++--------------------------- po/sv.po | 75 ++++++++++++++++++------------------------- po/ta.po | 75 ++++++++++++++++++------------------------- po/te.po | 75 ++++++++++++++++++------------------------- po/th.po | 75 ++++++++++++++++++------------------------- po/tr.po | 75 ++++++++++++++++++------------------------- po/uk.po | 75 ++++++++++++++++++------------------------- po/wa.po | 75 ++++++++++++++++++------------------------- po/wine.pot | 75 ++++++++++++++++++------------------------- po/zh_CN.po | 75 ++++++++++++++++++------------------------- po/zh_TW.po | 75 ++++++++++++++++++------------------------- programs/conhost/conhost.h | 4 --- programs/conhost/conhost.rc | 12 ------- programs/conhost/window.c | 69 ++++++---------------------------------- 52 files changed, 1528 insertions(+), 2238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25f012edcba62a587970…

1 0

Hans Leidekker : mshtml: Implement HTMLStorage_getItem().
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: b810aec3cd5954d3f1e789918814df9cd543b1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b810aec3cd5954d3f1e78991… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 10:29:46 2022 +0200 mshtml: Implement HTMLStorage_getItem(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 269 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 267 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b810aec3cd5954d3f1e7…

1 0

Hans Leidekker : mshtml: Implement HTMLStorage_setItem().
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 076281c016fdf5bc2955f62cff6090475c992bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=076281c016fdf5bc2955f62c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 10:29:47 2022 +0200 mshtml: Implement HTMLStorage_setItem(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 113 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 8ef92453b95..f7b92114622 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -338,11 +338,120 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return hres; } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + SysFreeString(str); + return hres; +} + +static HRESULT save_document(IXMLDOMDocument *doc, const WCHAR *filename) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(const WCHAR *filename, BSTR key, BSTR value) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_document(doc, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = set_item(This->filename, bstrKey, bstrValue); + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey)

1 0

Hans Leidekker : mshtml: Implement HTMLStorage_removeItem().
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 617ea8b930b7223af87111a24b0fad552b24874f URL: https://source.winehq.org/git/wine.git/?a=commit;h=617ea8b930b7223af87111a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 10:29:48 2022 +0200 mshtml: Implement HTMLStorage_removeItem(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index f7b92114622..1983d87a296 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -454,11 +454,63 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return hres; } +static HRESULT remove_item(const WCHAR *filename, BSTR key) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_document(doc, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = remove_item(This->filename, bstrKey); + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface)

1 0

Hans Leidekker : mshtml/tests: Add HTMLStorage tests.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 18d4d5a51c1e3461d93bf132a8b8283f386497a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d4d5a51c1e3461d93bf132… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 10:29:49 2022 +0200 mshtml/tests: Add HTMLStorage tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..410d24884ee 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); }

1 0

Zhiyi Zhang : win32u: Create a dummy bitmap for display device contexts.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 546cbdc2508acdc2672b13e1ce838a54feb4db47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=546cbdc2508acdc2672b13e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 18 15:42:41 2022 +0800 win32u: Create a dummy bitmap for display device contexts. On Windows 7 and older versions of Windows, calling GetCurrentObject(hdc, OBJ_BITMAP) for a display device context will return a valid handle. However, this handle will fail for GetObject(). On newer versions of Windows, GetCurrentObject(hdc, OBJ_BITMAP) for display device contexts returns a bitmap of virtual screen size and its size changes after display mode changes. This behavior is tested in the _check_display_dc() function in user32/tests/monitor.c. The screen shot function of WeChat depends on GetObject() to either return failure or a valid size for the bitmap from display device contexts. Since Wine currently report Windows 7 as default and to save memory, the Windows 7 behavior is implemented. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 1 - dlls/win32u/dc.c | 13 +++++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 18d1e8f6c28..d3074286ee6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2789,7 +2789,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); - todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 94cb7e60382..4b774037508 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2164,7 +2164,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#lx.\n", GetLastError()); ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); /* GetObjectA fails on Win7 and older */ - ok_(__FILE__, line)(ret || broken(!ret), "GetObjectA failed, error %ld.\n", GetLastError()); if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index b684e198c05..95dd2651929 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -274,7 +274,13 @@ void free_dc_ptr( DC *dc ) GDI_dec_ref_count( dc->hPen ); GDI_dec_ref_count( dc->hBrush ); GDI_dec_ref_count( dc->hFont ); - if (dc->hBitmap) GDI_dec_ref_count( dc->hBitmap ); + if (dc->hBitmap) + { + if (dc->is_display) + NtGdiDeleteClientObj( dc->hBitmap ); + else + GDI_dec_ref_count( dc->hBitmap ); + } free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } @@ -724,7 +730,10 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD if (!(dc = alloc_dc_ptr( NTGDI_OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (is_display) + dc->hBitmap = NtGdiCreateClientObj( NTGDI_OBJ_SURF ); + else + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(device=%s, output=%s): returning %p\n", debugstr_us(device), debugstr_us(output), dc->hSelf );

1 0

Jinoh Kang : include: Mark IShellItem::BindToHandler's pbc parameter as [unique].
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 6efdef2290f3bf4e0bb697a32c69b3c3d7ebbe6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6efdef2290f3bf4e0bb697a3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 30 19:20:34 2022 +0900 include: Mark IShellItem::BindToHandler's pbc parameter as [unique]. The Windows SDK headers makes it clear that the IBindCtx parameter of BindToHandler is optional. Bring Wine's definition in sync with those. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 8113d9a7ff6..867af3898b5 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -381,7 +381,7 @@ interface IShellItem : IUnknown typedef DWORD SICHINTF; HRESULT BindToHandler( - [in] IBindCtx *pbc, + [in, unique] IBindCtx *pbc, [in] REFGUID rbhid, [in] REFIID riid, [out, iid_is(riid)] void **ppvOut);

1 0

Jinoh Kang : include: Mark IPersistFolder3::InitializeEx's optional parameters as [unique].
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 93dcb935737189964f9c8a49dffe021a5f61090e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93dcb935737189964f9c8a49… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 30 19:37:31 2022 +0900 include: Mark IPersistFolder3::InitializeEx's optional parameters as [unique]. The Windows SDK headers makes it clear that the IBindCtx and ppfti parameters of InitializeEx are optional. Bring Wine's definition in sync with those. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/shobjidl.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 867af3898b5..065e0c8c528 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1395,9 +1395,9 @@ interface IPersistFolder3 : IPersistFolder2 } PERSIST_FOLDER_TARGET_INFO; HRESULT InitializeEx( - [in] IBindCtx *pbc, + [in, unique] IBindCtx *pbc, [in] LPCITEMIDLIST pidlRoot, - [in] const PERSIST_FOLDER_TARGET_INFO *ppfti); + [in, unique] const PERSIST_FOLDER_TARGET_INFO *ppfti); HRESULT GetFolderTargetInfo( [out] PERSIST_FOLDER_TARGET_INFO *ppfti ); }

1 0

Alex Henrie : ntoskrnl: Add ExNotifyCallback stub.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 942eb6008d81673990ede01a1dd64e1f1958dc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942eb6008d81673990ede01a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 15:39:29 2022 -0600 ntoskrnl: Add ExNotifyCallback stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53051 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f8e1c24bb49..0994af447f9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2250,6 +2250,14 @@ void WINAPI ExUnregisterCallback(void *callback_registration) FIXME("callback_registration %p stub.\n", callback_registration); } +/*********************************************************************** + * ExNotifyCallback (NTOSKRNL.EXE.@) + */ +void WINAPI ExNotifyCallback(void *obj, void *arg1, void *arg2) +{ + FIXME("(%p, %p, %p): stub\n", obj, arg1, arg2); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a5557..4df6b1ae472 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -175,7 +175,7 @@ @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) @ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime -@ stub ExNotifyCallback +@ stdcall ExNotifyCallback(ptr ptr ptr) @ stub ExQueryPoolBlockSize @ stub ExQueueWorkItem @ stub ExRaiseAccessViolation

1 0