March 2012 - Wine-commits - list.winehq.org

Hans Leidekker : sxs/tests: Add tests for CreateAssemblyNameObject.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 456961548e5f4e6920d50fc0b19ea3678969e98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=456961548e5f4e6920d50fc0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:33:44 2012 +0200 sxs/tests: Add tests for CreateAssemblyNameObject. --- configure | 3 +- configure.ac | 3 +- dlls/sxs/Makefile.in | 1 + dlls/sxs/tests/Makefile.in | 7 ++ dlls/sxs/tests/name.c | 228 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=456961548e5f4e6920d50…

1 0

Hans Leidekker : msi: Also set the Intel property on 64-bit processors.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: d351a9999e33bfedbaf8160007ad6ebbc33cb038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d351a9999e33bfedbaf816000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:06 2012 +0200 msi: Also set the Intel property on 64-bit processors. --- dlls/msi/package.c | 3 +-- dlls/msi/tests/package.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 43c6ff9..834467f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) GetNativeSystemInfo( &sys_info ); sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); + msi_set_property( package->db, szIntel, bufstr ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - msi_set_property( package->db, szIntel, bufstr ); - GetSystemDirectoryW( pth, MAX_PATH ); PathAddBackslashW( pth ); msi_set_property( package->db, szSystemFolder, pth ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5a2ce9e..6c53827 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10181,6 +10181,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(buf[0], "property not set\n"); @@ -10251,6 +10257,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(!buf[0], "property set\n"); @@ -10313,6 +10325,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(buf[0], "property not set\n");

1 0

Hans Leidekker : msi: Clear the cert pointer in MsiGetFileSignatureInformation.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 3f1e3008ea9027d3982fb3d0175f119bc32154f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1e3008ea9027d3982fb3d01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:26 2012 +0200 msi: Clear the cert pointer in MsiGetFileSignatureInformation. --- dlls/msi/msi.c | 1 + dlls/msi/tests/msi.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4022b3a..53ae641 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2580,6 +2580,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER data.dwProvFlags = 0; data.dwUIContext = WTD_UICONTEXT_INSTALL; hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); + *cert = NULL; if (FAILED(hr)) goto done; if (!(signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 ))) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 59f996a..aaf1f42 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11794,8 +11794,10 @@ static void test_MsiGetFileSignatureInformation(void) hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len ); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + cert = (const CERT_CONTEXT *)0xdeadbeef; hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FUNCTION_FAILED), "got 0x%08x\n", hr); + ok(cert == NULL, "got %p\n", cert); DeleteFileA( "signature.bin" ); }

1 0

Hans Leidekker : msi/tests: Reduce code duplication in the feature/ component state tests.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: ccad8e9d804bada5740ba742da7e572da96910bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad8e9d804bada5740ba742d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:41 2012 +0200 msi/tests: Reduce code duplication in the feature/component state tests. --- dlls/msi/tests/package.c | 5134 +++------------------------------------------- 1 files changed, 302 insertions(+), 4832 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccad8e9d804bada5740ba…

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmltable.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: f51ceff7e8ed095064e1938eb98766389e67ae97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51ceff7e8ed095064e1938eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:20 2012 +0200 mshtml: Improved VARIANT debug traces in htmltable.c. --- dlls/mshtml/htmltable.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 7490d98..975e53c 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -128,7 +128,7 @@ static HRESULT WINAPI HTMLTable_get_cols(IHTMLTable *iface, LONG *p) static HRESULT WINAPI HTMLTable_put_border(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -170,7 +170,7 @@ static HRESULT WINAPI HTMLTable_get_rules(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_cellSpacing(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI HTMLTable_get_cellSpacing(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_cellPadding(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -212,7 +212,7 @@ static HRESULT WINAPI HTMLTable_get_background(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_bgColor(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -226,7 +226,7 @@ static HRESULT WINAPI HTMLTable_get_bgColor(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_borderColor(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -240,7 +240,7 @@ static HRESULT WINAPI HTMLTable_get_borderColor(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_borderColorLight(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI HTMLTable_get_borderColorLight(IHTMLTable *iface, VARIANT static HRESULT WINAPI HTMLTable_put_borderColorDark(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -310,7 +310,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -324,7 +324,7 @@ static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -457,7 +457,7 @@ static HRESULT WINAPI HTMLTable_get_readyState(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_onreadystatechange(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmldoc.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 6e3d322cce54619909779c2a97de86341ef74b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3d322cce54619909779c2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:34 2012 +0200 mshtml: Improved VARIANT debug traces in htmldoc.c. --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 46838d6..32b54ec 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -494,7 +494,7 @@ static HRESULT WINAPI HTMLDocument_get_plugins(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_alinkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -508,7 +508,7 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -522,7 +522,7 @@ static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -536,7 +536,7 @@ static HRESULT WINAPI HTMLDocument_get_fgColor(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_linkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -550,7 +550,7 @@ static HRESULT WINAPI HTMLDocument_get_linkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_vlinkColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -821,7 +821,7 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) if(NS_FAILED(nsres)) ERR("Write failed: %08x\n", nsres); }else { - FIXME("vt=%d\n", V_VT(var+i)); + FIXME("unsupported arg[%d] = %s\n", i, debugstr_variant(var+i)); } } @@ -973,7 +973,7 @@ static HRESULT WINAPI HTMLDocument_execCommand(IHTMLDocument2 *iface, BSTR cmdID VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(cmdID), showUI, pfRet); + FIXME("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); return E_NOTIMPL; } @@ -1012,7 +1012,7 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa static HRESULT WINAPI HTMLDocument_put_onhelp(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1044,7 +1044,7 @@ static HRESULT WINAPI HTMLDocument_get_onclick(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_ondblclick(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1094,7 +1094,7 @@ static HRESULT WINAPI HTMLDocument_get_onkeydown(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onkeypress(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1127,7 +1127,7 @@ static HRESULT WINAPI HTMLDocument_put_onmousedown(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEDOWN, &v); } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI HTMLDocument_put_onmousemove(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEMOVE, &v); } @@ -1181,7 +1181,7 @@ static HRESULT WINAPI HTMLDocument_put_onmouseover(IHTMLDocument2 *iface, VARIAN { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - TRACE("(%p)\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_doc_event(This, EVENTID_MOUSEOVER, &v); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI HTMLDocument_get_onreadystatechange(IHTMLDocument2 *iface, static HRESULT WINAPI HTMLDocument_put_onafterupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1230,7 +1230,7 @@ static HRESULT WINAPI HTMLDocument_get_onafterupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_put_onrowexit(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1244,7 +1244,7 @@ static HRESULT WINAPI HTMLDocument_get_onrowexit(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onrowenter(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1363,7 +1363,7 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, static HRESULT WINAPI HTMLDocument_put_onbeforeupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1377,7 +1377,7 @@ static HRESULT WINAPI HTMLDocument_get_onbeforeupdate(IHTMLDocument2 *iface, VAR static HRESULT WINAPI HTMLDocument_put_onerrorupdate(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlelem.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 3f9c706606de825eca5b8710bd8a82a770eb0e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9c706606de825eca5b8710b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:48 2012 +0200 mshtml: Improved VARIANT debug traces in htmlelem.c. --- dlls/mshtml/htmlelem.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b82c4df..5f33f96 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -523,7 +523,7 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) static HRESULT WINAPI HTMLElement_put_onhelp(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -538,7 +538,7 @@ static HRESULT WINAPI HTMLElement_put_onclick(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_CLICK, &v); } @@ -592,7 +592,7 @@ static HRESULT WINAPI HTMLElement_put_onkeyup(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_KEYUP, &v); } @@ -607,7 +607,7 @@ static HRESULT WINAPI HTMLElement_get_onkeyup(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onkeypress(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -640,7 +640,7 @@ static HRESULT WINAPI HTMLElement_put_onmouseover(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEOVER, &v); } @@ -658,7 +658,7 @@ static HRESULT WINAPI HTMLElement_put_onmousemove(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEMOVE, &v); } @@ -676,7 +676,7 @@ static HRESULT WINAPI HTMLElement_put_onmousedown(IHTMLElement *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEDOWN, &v); } @@ -833,7 +833,7 @@ static HRESULT WINAPI HTMLElement_get_onselectstart(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_scrollIntoView(IHTMLElement *iface, VARIANT varargStart) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&varargStart)); return E_NOTIMPL; } @@ -1323,7 +1323,7 @@ static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, static HRESULT WINAPI HTMLElement_put_ondragstart(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1344,7 +1344,7 @@ static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String) static HRESULT WINAPI HTMLElement_put_onbeforeupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1358,7 +1358,7 @@ static HRESULT WINAPI HTMLElement_get_onbeforeupdate(IHTMLElement *iface, VARIAN static HRESULT WINAPI HTMLElement_put_onafterupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1372,7 +1372,7 @@ static HRESULT WINAPI HTMLElement_get_onafterupdate(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_put_onerrorupdate(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1386,7 +1386,7 @@ static HRESULT WINAPI HTMLElement_get_onerrorupdate(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_put_onrowexit(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1400,7 +1400,7 @@ static HRESULT WINAPI HTMLElement_get_onrowexit(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onrowenter(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1414,7 +1414,7 @@ static HRESULT WINAPI HTMLElement_get_onrowenter(IHTMLElement *iface, VARIANT *p static HRESULT WINAPI HTMLElement_put_ondatasetchanged(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1428,7 +1428,7 @@ static HRESULT WINAPI HTMLElement_get_ondatasetchanged(IHTMLElement *iface, VARI static HRESULT WINAPI HTMLElement_put_ondataavailable(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1442,7 +1442,7 @@ static HRESULT WINAPI HTMLElement_get_ondataavailable(IHTMLElement *iface, VARIA static HRESULT WINAPI HTMLElement_put_ondatasetcomplete(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1456,7 +1456,7 @@ static HRESULT WINAPI HTMLElement_get_ondatasetcomplete(IHTMLElement *iface, VAR static HRESULT WINAPI HTMLElement_put_onfilterchange(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -2294,7 +2294,7 @@ static HRESULT WINAPI HTMLAttributeCollection_item(IHTMLAttributeCollection *ifa hres = get_attr_dispid_by_name(This, V_BSTR(name), &id); break; default: - FIXME("unsupported vt %x\n", V_VT(name)); + FIXME("unsupported name %s\n", debugstr_variant(name)); hres = E_NOTIMPL; } if(hres == DISP_E_UNKNOWNNAME)

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlbody.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 706ec7a10d7c7edf7370de3b5348384915bb1641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706ec7a10d7c7edf7370de3b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:57 2012 +0200 mshtml: Improved VARIANT debug traces in htmlbody.c. --- dlls/mshtml/htmlbody.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index bb3e85b..26f5574 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -171,7 +171,7 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } default: - FIXME("invalid vt=%d\n", V_VT(v)); + FIXME("invalid color %s\n", debugstr_variant(v)); } return FALSE; @@ -313,7 +313,7 @@ static HRESULT WINAPI HTMLBodyElement_get_bgProperties(IHTMLBodyElement *iface, static HRESULT WINAPI HTMLBodyElement_put_leftMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -327,7 +327,7 @@ static HRESULT WINAPI HTMLBodyElement_get_leftMargin(IHTMLBodyElement *iface, VA static HRESULT WINAPI HTMLBodyElement_put_topMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -341,7 +341,7 @@ static HRESULT WINAPI HTMLBodyElement_get_topMargin(IHTMLBodyElement *iface, VAR static HRESULT WINAPI HTMLBodyElement_put_rightMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -355,7 +355,7 @@ static HRESULT WINAPI HTMLBodyElement_get_rightMargin(IHTMLBodyElement *iface, V static HRESULT WINAPI HTMLBodyElement_put_bottomMargin(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -386,7 +386,7 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA nsAString strColor; nsresult nsres; - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &strColor)) return S_OK; @@ -431,7 +431,7 @@ static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT nsAString text; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &text)) return S_OK; @@ -479,7 +479,7 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT nsAString link_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &link_str)) return S_OK; @@ -517,7 +517,7 @@ static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT nsAString vlink_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &vlink_str)) return S_OK; @@ -555,7 +555,7 @@ static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT nsAString alink_str; nsresult nsres; - TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); if(!variant_to_nscolor(&v, &alink_str)) return S_OK; @@ -590,7 +590,7 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -604,7 +604,7 @@ static HRESULT WINAPI HTMLBodyElement_get_onload(IHTMLBodyElement *iface, VARIAN static HRESULT WINAPI HTMLBodyElement_put_onunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -632,7 +632,7 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -646,7 +646,7 @@ static HRESULT WINAPI HTMLBodyElement_get_onselect(IHTMLBodyElement *iface, VARI static HRESULT WINAPI HTMLBodyElement_put_onbeforeunload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmldoc*.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 1dd2010f31dcbf034457d2c094bc8aaa066e29f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd2010f31dcbf034457d2c09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:27:07 2012 +0200 mshtml: Improved VARIANT debug traces in htmldoc*.c. --- dlls/mshtml/htmldoc3.c | 4 ++-- dlls/mshtml/htmldoc5.c | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4153871..2541145 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -717,7 +717,7 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -784,7 +784,7 @@ static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BST static HRESULT WINAPI HTMLDocument4_put_oncontrolselect(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index f283041..587d75b 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -91,7 +91,7 @@ static HRESULT WINAPI HTMLDocument5_Invoke(IHTMLDocument5 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument5_put_onmousewheel(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -162,7 +162,7 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs static HRESULT WINAPI HTMLDocument5_put_onfocusin(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -176,7 +176,7 @@ static HRESULT WINAPI HTMLDocument5_get_onfocusin(IHTMLDocument5 *iface, VARIANT static HRESULT WINAPI HTMLDocument5_put_onfocusout(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -190,7 +190,7 @@ static HRESULT WINAPI HTMLDocument5_get_onfocusout(IHTMLDocument5 *iface, VARIAN static HRESULT WINAPI HTMLDocument5_put_onactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI HTMLDocument5_get_onactivate(IHTMLDocument5 *iface, VARIAN static HRESULT WINAPI HTMLDocument5_put_ondeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -218,7 +218,7 @@ static HRESULT WINAPI HTMLDocument5_get_ondeactivate(IHTMLDocument5 *iface, VARI static HRESULT WINAPI HTMLDocument5_put_onbeforeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforeactivate(IHTMLDocument5 *iface, static HRESULT WINAPI HTMLDocument5_put_onbeforedeactivate(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -373,11 +373,10 @@ static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, - VARIANT p) +static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -389,11 +388,10 @@ static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, - VARIANT p) +static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(v)\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Improved more VARIANT debug traces.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 21f5ef2808f77e381c2f3ec8bc6a481c1a872b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f5ef2808f77e381c2f3ec8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:27:20 2012 +0200 mshtml: Improved more VARIANT debug traces. --- dlls/mshtml/editor.c | 10 +++++----- dlls/mshtml/htmlelem3.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 8 +++----- dlls/mshtml/htmloption.c | 8 ++++---- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstylesheet.c | 4 ++-- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/oleobj.c | 8 ++++---- dlls/mshtml/persist.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21f5ef2808f77e381c2f3…

1 0