April 2019 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Add ISVGSVGElement stub implementation.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 07ee5cb3415870b46117da4e16948851712d132d URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ee5cb3415870b46117da4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:25 2019 +0200 mshtml: Add ISVGSVGElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/svg.c | 558 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 562 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07ee5cb3415870b46117…

1 0

Jacek Caban : mshtml: Add ISVGCircleElement stub implementation.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 56f03488b41e96cc8ec1fca5508aa55b1ed3f44b URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f03488b41e96cc8ec1fca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:34 2019 +0200 mshtml: Add ISVGCircleElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/svg.c | 172 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 175 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7560215..18b0310 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -131,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLW3CComputedStyle) \ XDIID(DispHTMLWindow2) \ XDIID(DispHTMLXMLHttpRequest) \ + XDIID(DispSVGCircleElement) \ XDIID(DispSVGSVGElement) \ XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ @@ -248,6 +249,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ + XIID(ISVGCircleElement) \ XIID(ISVGElement) \ XIID(ISVGSVGElement) diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index f30c7ab..d145c83 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -761,7 +761,177 @@ static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement * return S_OK; } +struct SVGCircleElement { + SVGElement svg_element; + ISVGCircleElement ISVGCircleElement_iface; +}; + +static inline SVGCircleElement *impl_from_ISVGCircleElement(ISVGCircleElement *iface) +{ + return CONTAINING_RECORD(iface, SVGCircleElement, ISVGCircleElement_iface); +} + +static HRESULT WINAPI SVGCircleElement_QueryInterface(ISVGCircleElement *iface, + REFIID riid, void **ppv) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_QueryInterface(&This->svg_element.element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI SVGCircleElement_AddRef(ISVGCircleElement *iface) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_AddRef(&This->svg_element.element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI SVGCircleElement_Release(ISVGCircleElement *iface) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_Release(&This->svg_element.element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI SVGCircleElement_GetTypeInfoCount(ISVGCircleElement *iface, UINT *pctinfo) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetTypeInfoCount(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI SVGCircleElement_GetTypeInfo(ISVGCircleElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetTypeInfo(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI SVGCircleElement_GetIDsOfNames(ISVGCircleElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetIDsOfNames(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI SVGCircleElement_Invoke(ISVGCircleElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_Invoke(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI SVGCircleElement_putref_cx(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_cx(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_putref_cy(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_cy(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_putref_r(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_r(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const ISVGCircleElementVtbl SVGCircleElementVtbl = { + SVGCircleElement_QueryInterface, + SVGCircleElement_AddRef, + SVGCircleElement_Release, + SVGCircleElement_GetTypeInfoCount, + SVGCircleElement_GetTypeInfo, + SVGCircleElement_GetIDsOfNames, + SVGCircleElement_Invoke, + SVGCircleElement_putref_cx, + SVGCircleElement_get_cx, + SVGCircleElement_putref_cy, + SVGCircleElement_get_cy, + SVGCircleElement_putref_r, + SVGCircleElement_get_r +}; + +static inline SVGCircleElement *SVGCircleElement_from_HTMLDOMNode(HTMLDOMNode *iface) +{ + return CONTAINING_RECORD(iface, SVGCircleElement, svg_element.element.node); +} + +static HRESULT SVGCircleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + SVGCircleElement *This = SVGCircleElement_from_HTMLDOMNode(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_ISVGCircleElement, riid)) + *ppv = &This->ISVGCircleElement_iface; + else + return SVGElement_QI(&This->svg_element.element.node, riid, ppv); + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static const NodeImplVtbl SVGCircleElementImplVtbl = { + &CLSID_SVGCircleElement, + SVGCircleElement_QI, + HTMLElement_destructor, + HTMLElement_cpc, + HTMLElement_clone, + NULL, + HTMLElement_get_attr_col, +}; + +static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) +{ + SVGCircleElement *ret; + + ret = heap_alloc_zero(sizeof(SVGCircleElement)); + if(!ret) + return E_OUTOFMEMORY; + + ret->ISVGCircleElement_iface.lpVtbl = &SVGCircleElementVtbl; + ret->svg_element.element.node.vtbl = &SVGCircleElementImplVtbl; + + init_svg_element(&ret->svg_element, doc, nselem); + + *elem = &ret->svg_element.element; + return S_OK; +} + +static const WCHAR circleW[] = {'c','i','r','c','l','e',0}; static const WCHAR svgW[] = {'s','v','g',0}; HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, const WCHAR *tag_name, HTMLElement **elem) @@ -772,6 +942,8 @@ HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, if(!strcmpW(tag_name, svgW)) return create_viewport_element(doc, dom_element, elem); + if(!strcmpW(tag_name, circleW)) + return create_circle_element(doc, dom_element, elem); svg_element = heap_alloc_zero(sizeof(*svg_element)); if(!svg_element) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 77ba7f9..51ed940 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -452,6 +452,7 @@ static const IID * const svg_iids[] = { static const IID * const circle_iids[] = { ELEM_IFACES, &IID_ISVGElement, + &IID_ISVGCircleElement, NULL };

1 0

Jacek Caban : mshtml: Add ISVGTSpanElement stub implementation.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: c06af48420ff499647c69165a26a744d90315adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06af48420ff499647c69165… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:44 2019 +0200 mshtml: Add ISVGTSpanElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 245 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 21 +++- 3 files changed, 267 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c06af48420ff499647c6…

1 0

Jacek Caban : mshtml: Use DispHTMLDOMImplementation for IDispatchEx implementation.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: e0408dd802862474f79364e0e3bba7c4b275aa71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0408dd802862474f79364e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:56 2019 +0200 mshtml: Use DispHTMLDOMImplementation for IDispatchEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 53462c6..fadea6b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -95,6 +95,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLCurrentStyle) \ XDIID(DispHTMLDocument) \ XDIID(DispHTMLDOMAttribute) \ + XDIID(DispHTMLDOMImplementation) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -171,6 +172,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMAttribute2) \ XIID(IHTMLDOMChildrenCollection) \ XIID(IHTMLDOMImplementation) \ + XIID(IHTMLDOMImplementation2) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index cc4ea5a..c036c3c 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -306,7 +306,7 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = { }; static dispex_static_data_t HTMLDOMImplementation_dispex = { NULL, - IHTMLDOMImplementation_tid, + DispHTMLDOMImplementation_tid, HTMLDOMImplementation_iface_tids }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02ce914..a51e09a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7010,6 +7010,8 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLWindow2 *window; IDispatch *disp; + test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); + str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); ok(hres == S_OK, "createHTMLDocument failed: %08x\n", hres);

1 0

Zebediah Figura : msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 3d9363446fad694b6e534d84fce63bfc9dbbf4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9363446fad694b6e534d84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 14 11:53:59 2019 -0500 msi: Fix handling of architecture in MSIREG_{Open, Delete}UninstallKey(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47009 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 46 ++++++++---------- dlls/msi/tests/action.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 29 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index efc7272..8b90254 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -164,11 +164,6 @@ static const WCHAR szUninstall[] = { 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'U','n','i','n','s','t','a','l','l','\\',0}; -static const WCHAR szUninstall_32node[] = { - 'S','o','f','t','w','a','r','e','\\','W','o','w','6','4','3','2','N','o','d','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','U','n','i','n','s','t','a','l','l','\\',0}; - static const WCHAR szUserComponents[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s','\\',0}; @@ -452,41 +447,38 @@ static WCHAR *get_user_sid(void) UINT MSIREG_OpenUninstallKey(const WCHAR *product, enum platform platform, HKEY *key, BOOL create) { + REGSAM access = KEY_ALL_ACCESS; WCHAR keypath[0x200]; TRACE("%s\n", debugstr_w(product)); - if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); - return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS, key); + access |= KEY_WOW64_64KEY; + strcpyW(keypath, szUninstall); + strcatW(keypath, product); + if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); + return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } UINT MSIREG_DeleteUninstallKey(const WCHAR *product, enum platform platform) { - WCHAR keypath[0x200]; + REGSAM access = KEY_ALL_ACCESS; + HKEY parent; + LONG r; TRACE("%s\n", debugstr_w(product)); - if (is_64bit && platform == PLATFORM_INTEL) - { - strcpyW(keypath, szUninstall_32node); - strcatW(keypath, product); - } + if (platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - { - strcpyW(keypath, szUninstall); - strcatW(keypath, product); - } - return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); + access |= KEY_WOW64_64KEY; + if ((r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szUninstall, 0, access, &parent))) + return r; + r = RegDeleteTreeW(parent, product); + RegCloseKey(parent); + return r; } UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7750351..60ae92e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -441,8 +441,8 @@ static const char pp_install_exec_seq_dat[] = "ru_immediate\tREGISTER_USER AND ALLUSERS\t6001\n" "ru_deferred\tREGISTER_USER AND ALLUSERS\t6002\n" "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\n" - "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS\t6101\n" - "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS\t6102\n" + "rp_immediate\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6101\n" + "rp_deferred\tREGISTER_PRODUCT AND ALLUSERS AND NOT RP_TEST64\t6102\n" "PublishFeatures\tPUBLISH_FEATURES=1 Or FULL=1\t6300\n" "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" @@ -2877,6 +2877,123 @@ todo_wine ok(!res, "got %d\n", res); RegCloseKey(hkey); + if (is_wow64 || is_64bit) + { + DeleteFileA(msifile); + create_database_template(msifile, pp_tables, ARRAY_SIZE(pp_tables), 200, "x64;1033"); + + r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1 RP_TEST64=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(hkey, "InstallDate", date); + CHECK_DEL_REG_STR(hkey, "InstallSource", temp); + CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); + CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(hkey, "Comments", NULL); + CHECK_DEL_REG_STR(hkey, "Contact", NULL); + CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); + CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); + CHECK_DEL_REG_STR(hkey, "Readme", NULL); + CHECK_DEL_REG_STR(hkey, "Size", NULL); + CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(hkey, "Language", 1033); + CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + sprintf(keypath, userdata, "S-1-5-18"); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(path); + RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); + DeleteFileA(path); + RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(props, "InstallDate", date); + CHECK_DEL_REG_STR(props, "InstallSource", temp); + CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "Publisher", "Wine"); + CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(props, "Comments", NULL); + CHECK_DEL_REG_STR(props, "Contact", NULL); + CHECK_DEL_REG_STR(props, "HelpLink", NULL); + CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(props, "InstallLocation", NULL); + CHECK_DEL_REG_DWORD(props, "NoModify", 1); + CHECK_DEL_REG_STR(props, "Readme", NULL); + CHECK_DEL_REG_STR(props, "Size", NULL); + CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(props, "Language", 1033); + CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); + todo_wine + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); + + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); + RegCloseKey(props); + + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + res = RegDeleteKeyA(usage, ""); + todo_wine + ok(!res, "got %d\n", res); + RegCloseKey(usage); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); + + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); + RegCloseKey(hkey); + } + else + skip("64-bit RegisterProduct tests\n"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus");

1 0

Alistair Leslie-Hughes : include: Remove duplicate extern C from d3dx10core.idl.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: e2eff6743e23426a1baba6ce4b927d535defc7b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2eff6743e23426a1baba6ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 15 22:49:27 2019 +0000 include: Remove duplicate extern C from d3dx10core.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index afd77e9..c99ab82 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -65,9 +65,6 @@ interface ID3DX10ThreadPump : IUnknown HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); } -cpp_quote("#ifdef __cplusplus") -cpp_quote("extern \"C\" {") -cpp_quote("#endif") cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") @@ -75,6 +72,3 @@ cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Remove duplicate extern C from mimeole.idl.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 8fadb2cf4e9629470de2b72a4de3b01cbb480af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fadb2cf4e9629470de2b72a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 15 22:49:29 2019 +0000 include: Remove duplicate extern C from mimeole.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 29bead2..cc80c12 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1447,10 +1447,6 @@ cpp_quote("#endif") } } -cpp_quote("#ifdef __cplusplus") -cpp_quote(" extern \"C\" {") -cpp_quote("#endif") - cpp_quote("") cpp_quote("HRESULT WINAPI MimeOleSetCompatMode(DWORD);") cpp_quote("HRESULT WINAPI MimeOleContentTypeFromUrl(LPCSTR,LPCSTR,LPSTR*);") @@ -1538,6 +1534,3 @@ cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") cpp_quote("HRESULT WINAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Remove duplicate extern C from vsbackup.idl.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 0042744b5b4226f15018a56e4d41eb9630e83b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0042744b5b4226f15018a56e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 15 22:49:30 2019 +0000 include: Remove duplicate extern C from vsbackup.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vsbackup.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/vsbackup.idl b/include/vsbackup.idl index d2d8795..8cc7aa3 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -25,13 +25,7 @@ interface IVssEnumObject; interface IVssExamineWriterMetadata; interface IVssWriterComponentsExt; -cpp_quote("#ifdef _cplusplus") -cpp_quote("extern \"C\" {") -cpp_quote("#endif") cpp_quote("HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup);") -cpp_quote("#ifdef _cplusplus") -cpp_quote("}") -cpp_quote("#endif") cpp_quote("static inline HRESULT CreateVssBackupComponents(IVssBackupComponents **backup)") cpp_quote(" { return CreateVssBackupComponentsInternal(backup); }")

1 0

Zebediah Figura : winecfg: Use GetSysColorBrush().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: f05fa1b99d558ad233c0f2640620389725e8c03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05fa1b99d558ad233c0f264… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 20:16:18 2019 -0500 winecfg: Use GetSysColorBrush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index a2b4022..879693e 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -172,7 +172,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); - return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); } break; }

1 0

Zebediah Figura : winecfg: Also set the text color for the license and version controls.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 35afdf0f797e86c69d3ac90bba11b6249cb92fcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=35afdf0f797e86c69d3ac90b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 20:16:19 2019 -0500 winecfg: Also set the text color for the license and version controls. Otherwise they will default to black and not respect theming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/about.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index 879693e..e9f833c 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -168,9 +168,12 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ABT_TITLE_TEXT: /* set the title to a wine color */ SetTextColor((HDC)wParam, 0x0000007F); + SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: + SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT)); SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); }

1 0