February 2014 - Wine-commits

Jeremy Newman : fix author parsing
by Jeremy Newman 14 Feb '14

14 Feb '14

Module: website Branch: master Commit: 62e764e9c24d4cfc86a89bab1e830ddc45b8f825 URL: http://source.winehq.org/git/website.git/?a=commit;h=62e764e9c24d4cfc86a89b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 14 17:46:28 2014 -0600 fix author parsing --- include/wwn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wwn.php b/include/wwn.php index f4eb3a1..1d81e7c 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -559,7 +559,7 @@ class wwn case "TITLE": break; case "AUTHOR": - $this->author = $data; + $this->author .= $data; break; default: $this->body .= $data;

1 0

Dmitry Timoshkov : advapi32/tests: Fix test failures under Windows 2000 and some XP versions.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: 8ac05cf48e191deec12d0dca20fcd634e2d2cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac05cf48e191deec12d0dca2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 21:19:09 2014 +0900 advapi32/tests: Fix test failures under Windows 2000 and some XP versions. --- dlls/advapi32/tests/security.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e2e9cd5..f993c08 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4978,6 +4978,7 @@ static void test_filemap_security(void) { if (!mapping) { + /* NT4 and win2k don't support EXEC on file mappings */ if (prot_map[i].prot == PAGE_EXECUTE_READ || prot_map[i].prot == PAGE_EXECUTE_READWRITE || prot_map[i].prot == PAGE_EXECUTE_WRITECOPY) { win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); @@ -5001,6 +5002,14 @@ static void test_filemap_security(void) SetLastError(0xdeadbeef); mapping = CreateFileMappingW(file, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + if (!mapping) + { + /* NT4 and win2k don't support EXEC on file mappings */ + win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); + CloseHandle(file); + DeleteFileA(file_name); + return; + } ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); access = get_obj_access(mapping);

1 0

Dmitry Timoshkov : xmllite: Don't fail if encoding declaration is missing.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: 376eff51e0e48b931536f02859666e2a17d7373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=376eff51e0e48b931536f0285… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:50:30 2014 +0900 xmllite: Don't fail if encoding declaration is missing. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9fe48bd..35c3e31 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1096,7 +1096,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) strval name, val; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, encodingW)) return S_FALSE; name.str = reader_get_ptr(reader);

1 0

Dmitry Timoshkov : xmllite: Don' t fail if standalone declaration is missing.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: 09f371920fbc130ee88f7a3c7241f923278d9d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f371920fbc130ee88f7a3c7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:51:21 2014 +0900 xmllite: Don't fail if standalone declaration is missing. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 35c3e31..a0e95b4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1134,7 +1134,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) UINT start; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, standaloneW)) return S_FALSE; reader_init_strvalue(reader_get_cur(reader), 10, &name); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f4ad466..9faf243 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -760,16 +760,13 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); ok_pos(reader, 1, 3, 1, 21, TRUE); test_read_state(reader, XmlReadState_Interactive, -1, TRUE); hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */

1 0

Dmitry Timoshkov : xmllite/tests: Add a test for names and values parsed from an XML declaration.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: 493e406bbca13d4d59e2b56eb821f95ddb173196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493e406bbca13d4d59e2b56eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 12 16:57:00 2014 +0900 xmllite/tests: Add a test for names and values parsed from an XML declaration. --- dlls/xmllite/tests/reader.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9faf243..ad9b3a2 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -644,11 +644,21 @@ if (0) static void test_read_xmldeclaration(void) { + static const struct + { + WCHAR name[12]; + WCHAR val[12]; + } name_val[] = + { + { {'v','e','r','s','i','o','n',0}, {'1','.','0',0} }, + { {'e','n','c','o','d','i','n','g',0}, {'U','T','F','-','8',0} }, + { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } + }; IXmlReader *reader; IStream *stream; HRESULT hr; XmlNodeType type; - UINT count = 0; + UINT count = 0, len, i; const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); @@ -730,6 +740,28 @@ static void test_read_xmldeclaration(void) ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); + for (i = 0; i < count; i++) + { + len = 0; + hr = IXmlReader_GetLocalName(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len); + ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val)); + + len = 0; + hr = IXmlReader_GetValue(reader, &val, &len); + ok(hr == S_OK, "got %08x\n", hr); + ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); + if (i == 1) +todo_wine + ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); + else + ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == (i < count - 1) ? S_OK : S_FALSE, "got %08x\n", hr); + } + hr = IXmlReader_GetDepth(reader, &count); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(count == 1, "Expected 1, got %d\n", count);

1 0

Dmitry Timoshkov : xmllite: Reader should set starting string offsets when encoding is being parsed.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: f78b4f305d2d158c4857282bbd54c94ebc4c9207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78b4f305d2d158c4857282bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 12 16:58:06 2014 +0900 xmllite: Reader should set starting string offsets when encoding is being parsed. --- dlls/xmllite/reader.c | 3 +++ dlls/xmllite/tests/reader.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a0e95b4..6d20324 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1071,6 +1071,8 @@ static HRESULT reader_parse_encname(xmlreader *reader, strval *val) if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) return WC_E_ENCNAME; + val->start = reader_get_cur(reader); + ptr = start; while (is_wchar_encname(*++ptr)) ; @@ -1100,6 +1102,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) if (reader_cmp(reader, encodingW)) return S_FALSE; name.str = reader_get_ptr(reader); + name.start = reader_get_cur(reader); name.len = 8; /* skip 'encoding' */ reader_skipn(reader, 8); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ad9b3a2..312516b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -752,10 +752,6 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_GetValue(reader, &val, &len); ok(hr == S_OK, "got %08x\n", hr); ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); - if (i == 1) -todo_wine - ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); - else ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader);

1 0

Alexandre Julliard : ntdll: Trace missing exception info on ARM.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: 183c184565f941ac9d99f179912829eaf390c1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=183c184565f941ac9d99f1799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 14 13:51:19 2014 +0100 ntdll: Trace missing exception info on ARM. --- dlls/ntdll/signal_arm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index a681986..0eb7ce0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -521,6 +521,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f { DWORD c; + TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + context->Pc, GetCurrentThreadId() ); for (c = 0; c < rec->NumberParameters; c++) TRACE( " info[%d]=%08lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB)

1 0

Jacek Caban : mshtml.idl: Added IHTMLDocument7 and related interfaces declarations.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: a2002082f213eb55a80af0ab80beed3def51b2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2002082f213eb55a80af0ab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 16:50:52 2014 +0100 mshtml.idl: Added IHTMLDocument7 and related interfaces declarations. --- include/mshtmdid.h | 137 ++++++++++++ include/mshtml.idl | 619 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 756 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2002082f213eb55a80af…

1 0

Jacek Caban : mshtml: Use IWebBrowserPriv2IE9 instead of IWebBrowserPriv2IE8 in tests on IE9+.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: aa22a3c4b2e772636163ea50e7245dba01fe7b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa22a3c4b2e772636163ea50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 16:45:00 2014 +0100 mshtml: Use IWebBrowserPriv2IE9 instead of IWebBrowserPriv2IE8 in tests on IE9+. --- dlls/mshtml/tests/htmldoc.c | 90 +++++++++++++++++++++++++++++++++---------- include/mshtml.idl | 15 ++++++++ 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 95b8814..ed72685 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -204,6 +204,7 @@ DEFINE_EXPECT(EnumConnections_Next); DEFINE_EXPECT(WindowClosing); DEFINE_EXPECT(NavigateWithBindCtx); +static BOOL is_ie9plus; static IUnknown *doc_unk; static IMoniker *doc_mon; static BOOL expect_LockContainer_fLock; @@ -4259,6 +4260,19 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; +static void test_NavigateWithBindCtx(BSTR uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment) +{ + ok(!strcmp_wa(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri)); + ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); + ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); + ok(!target_frame, "target_frame != NULL\n"); + ok(!post_data, "post_data != NULL\n"); + ok(!headers, "headers != NULL\n"); + ok(bind_ctx != NULL, "bind_ctx == NULL\n"); + ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); +} + static HRESULT wb_qi(REFIID riid, void **ppv); static HRESULT WINAPI WebBrowserPriv_QueryInterface(IWebBrowserPriv *iface, REFIID riid, void **ppv) @@ -4284,15 +4298,7 @@ static HRESULT WINAPI WebBrowserPriv_NavigateWithBindCtx(IWebBrowserPriv *iface, CHECK_EXPECT(NavigateWithBindCtx); ok(V_VT(uri) == VT_BSTR, "V_VT(uri) = %d\n", V_VT(uri)); - ok(!strcmp_wa(V_BSTR(uri), nav_url), "V_BSTR(uri) = %s\n", wine_dbgstr_w(V_BSTR(uri))); - ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); - ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); - ok(!target_frame, "target_frame != NULL\n"); - ok(!post_data, "post_data != NULL\n"); - ok(!headers, "headers != NULL\n"); - ok(bind_ctx != NULL, "bind_ctx == NULL\n"); - ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); - + test_NavigateWithBindCtx(V_BSTR(uri), flags, target_frame, post_data, headers, bind_ctx, url_fragment); return S_OK; } @@ -4333,23 +4339,14 @@ static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE BSTR str; HRESULT hres; - trace("NavigateWithBindCtx2\n"); + trace("IE8: NavigateWithBindCtx2\n"); CHECK_EXPECT(NavigateWithBindCtx); hres = IUri_GetDisplayUri(uri, &str); ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); - ok(!strcmp_wa(str, nav_url), "V_BSTR(uri) = %s\n", wine_dbgstr_w(str)); + test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); SysFreeString(str); - - ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); - ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); - ok(!target_frame, "target_frame != NULL\n"); - ok(!post_data, "post_data != NULL\n"); - ok(!headers, "headers != NULL\n"); - ok(bind_ctx != NULL, "bind_ctx == NULL\n"); - ok(!url_fragment, "url_dragment = %s\n", wine_dbgstr_w(url_fragment)); - return S_OK; } @@ -4418,6 +4415,47 @@ static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = { static IWebBrowserPriv2IE8 WebBrowserPriv2IE8 = { &WebBrowserPriv2IE8Vtbl }; +static HRESULT WINAPI WebBrowserPriv2IE9_QueryInterface(IWebBrowserPriv2IE9 *iface, REFIID riid, void **ppv) +{ + return wb_qi(riid, ppv); +} + +static ULONG WINAPI WebBrowserPriv2IE9_AddRef(IWebBrowserPriv2IE9 *iface) +{ + return 2; +} + +static ULONG WINAPI WebBrowserPriv2IE9_Release(IWebBrowserPriv2IE9 *iface) +{ + return 1; +} + +static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE9 *iface, IUri *uri, VARIANT *flags, + VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unknown) +{ + BSTR str; + HRESULT hres; + + trace("IE9: NavigateWithBindCtx2\n"); + + CHECK_EXPECT(NavigateWithBindCtx); + + hres = IUri_GetDisplayUri(uri, &str); + ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); + test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); + SysFreeString(str); + return S_OK; +} + +static const IWebBrowserPriv2IE9Vtbl WebBrowserPriv2IE9Vtbl = { + WebBrowserPriv2IE9_QueryInterface, + WebBrowserPriv2IE9_AddRef, + WebBrowserPriv2IE9_Release, + WebBrowserPriv2IE9_NavigateWithBindCtx2 +}; + +static IWebBrowserPriv2IE9 WebBrowserPriv2IE9 = { &WebBrowserPriv2IE9Vtbl }; + static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv) { return wb_qi(riid, ppv); @@ -4956,7 +4994,8 @@ static HRESULT wb_qi(REFIID riid, void **ppv) } if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8)) { - *ppv = &WebBrowserPriv2IE8; + /* IE8 and IE9 versions use the same IID, but have different declarations. */ + *ppv = is_ie9plus ? (void*)&WebBrowserPriv2IE9 : (void*)&WebBrowserPriv2IE8; return S_OK; } @@ -8316,12 +8355,21 @@ static BOOL check_ie(void) { IHTMLDocument2 *doc; IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; HRESULT hres; doc = create_document(); if(!doc) return FALSE; + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(SUCCEEDED(hres)) IHTMLDocument5_Release(doc5); diff --git a/include/mshtml.idl b/include/mshtml.idl index 3e1424c..0c5a874 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19172,3 +19172,18 @@ interface IWebBrowserPriv2IE8 : IUnknown HRESULT GetSearchTerm(BSTR *term); HRESULT GetCurrentDocument(IDispatch** doc); } + +/***************************************************************************** + * IWebBrowserPriv2IE9 interface + */ +[ + object, + uuid(3ed72303-6ffc-4214-ba90-faf1862dec8a), + local +] +interface IWebBrowserPriv2IE9 : IUnknown +{ + HRESULT NavigateWithBindCtx2(IUri *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unused); + /* Probably more */ +}

1 0

Nikolay Sivov : msxml3: Pass XSL processor parameters to libxml2.
by Alexandre Julliard 14 Feb '14

14 Feb '14

Module: wine Branch: master Commit: ff847e8cb3a2f13e18adf8e844a61ad10a0550c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff847e8cb3a2f13e18adf8e84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 09:52:56 2014 +0400 msxml3: Pass XSL processor parameters to libxml2. --- dlls/msxml3/dispex.c | 1 - dlls/msxml3/domdoc.c | 1 - dlls/msxml3/httprequest.c | 1 - dlls/msxml3/main.c | 9 ++++++++ dlls/msxml3/msxml_private.h | 16 ++++++++++++++ dlls/msxml3/mxnamespace.c | 1 - dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/saxreader.c | 1 - dlls/msxml3/stylesheet.c | 22 +++++++------------ 9 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 3c84e09..272f302 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -38,7 +38,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" #include "msxml_private.h" diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b094b58..e981b94 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -49,7 +49,6 @@ #include "objsafe.h" #include "wine/debug.h" -#include "wine/list.h" #include "msxml_private.h" diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0fe36ed..cf53db4 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -47,7 +47,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index ae93ec9..1381904 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -36,6 +36,7 @@ # include <libxslt/transform.h> # endif # include <libxslt/xsltutils.h> +# include <libxslt/variables.h> # include <libxslt/xsltInternals.h> # endif #endif @@ -165,9 +166,13 @@ void* libxslt_handle = NULL; #ifdef SONAME_LIBXSLT # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL DECL_FUNCPTR(xsltApplyStylesheet); +DECL_FUNCPTR(xsltApplyStylesheetUser); DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltFreeStylesheet); +DECL_FUNCPTR(xsltFreeTransformContext); +DECL_FUNCPTR(xsltNewTransformContext); DECL_FUNCPTR(xsltParseStylesheetDoc); +DECL_FUNCPTR(xsltQuoteUserParams); # undef DECL_FUNCPTR #endif @@ -185,9 +190,13 @@ static void init_libxslt(void) if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } LOAD_FUNCPTR(xsltInit, 0); LOAD_FUNCPTR(xsltApplyStylesheet, 1); + LOAD_FUNCPTR(xsltApplyStylesheetUser, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1); LOAD_FUNCPTR(xsltFreeStylesheet, 1); + LOAD_FUNCPTR(xsltFreeTransformContext, 1); + LOAD_FUNCPTR(xsltNewTransformContext, 1); LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); + LOAD_FUNCPTR(xsltQuoteUserParams, 1); #undef LOAD_FUNCPTR if (pxsltInit) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e584d99..5d2010f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/unicode.h" +#include "wine/list.h" #ifndef __WINE_CONFIG_H # error You must include config.h to use this header @@ -217,6 +218,20 @@ static inline LPSTR heap_strdupWtoA(LPCWSTR str) return ret; } +/* XSLProcessor parameter list */ +struct xslprocessor_par +{ + struct list entry; + BSTR name; + BSTR value; +}; + +struct xslprocessor_params +{ + struct list list; + unsigned int count; +}; + #ifdef HAVE_LIBXML2 extern void schemasInit(void) DECLSPEC_HIDDEN; @@ -354,6 +369,7 @@ extern HRESULT node_get_text(const xmlnode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**) DECLSPEC_HIDDEN; extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_transform_node(const xmlnode*,IXMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; +extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,const struct xslprocessor_params*) DECLSPEC_HIDDEN; extern HRESULT node_create_supporterrorinfo(const tid_t*,void**) DECLSPEC_HIDDEN; extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index c2d9cc3..14dfdd7 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -39,7 +39,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4c03571..8b067b6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -35,6 +35,7 @@ # ifdef HAVE_LIBXSLT_TRANSFORM_H # include <libxslt/transform.h> # endif +# include <libxslt/variables.h> # include <libxslt/xsltutils.h> # include <libxslt/xsltInternals.h> # endif @@ -59,9 +60,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); extern void* libxslt_handle; # define MAKE_FUNCPTR(f) extern typeof(f) * p##f MAKE_FUNCPTR(xsltApplyStylesheet); +MAKE_FUNCPTR(xsltApplyStylesheetUser); MAKE_FUNCPTR(xsltCleanupGlobals); MAKE_FUNCPTR(xsltFreeStylesheet); +MAKE_FUNCPTR(xsltFreeTransformContext); +MAKE_FUNCPTR(xsltNewTransformContext); MAKE_FUNCPTR(xsltParseStylesheetDoc); +MAKE_FUNCPTR(xsltQuoteUserParams); # undef MAKE_FUNCPTR #endif @@ -996,7 +1001,8 @@ static const xmlChar *get_output_buffer_content(xmlOutputBufferPtr output) #endif } -HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) +HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, + const struct xslprocessor_params *params) { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; @@ -1013,7 +1019,41 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xsltSS = pxsltParseStylesheetDoc(sheet->node->doc); if(xsltSS) { - xmlDocPtr result = pxsltApplyStylesheet(xsltSS, This->node->doc, NULL); + const char **xslparams = NULL; + xmlDocPtr result; + unsigned int i; + + /* convert our parameter list to libxml2 format */ + if (params && params->count) + { + struct xslprocessor_par *par; + + i = 0; + xslparams = heap_alloc((params->count*2 + 1)*sizeof(char*)); + LIST_FOR_EACH_ENTRY(par, &params->list, struct xslprocessor_par, entry) + { + xslparams[i++] = (char*)xmlchar_from_wchar(par->name); + xslparams[i++] = (char*)xmlchar_from_wchar(par->value); + } + xslparams[i] = NULL; + } + + if (xslparams) + { + xsltTransformContextPtr ctxt = pxsltNewTransformContext(xsltSS, This->node->doc); + + /* push parameters to user context */ + pxsltQuoteUserParams(ctxt, xslparams); + result = pxsltApplyStylesheetUser(xsltSS, This->node->doc, NULL, NULL, NULL, ctxt); + pxsltFreeTransformContext(ctxt); + + for (i = 0; i < params->count*2; i++) + heap_free((char*)xslparams[i]); + heap_free(xslparams); + } + else + result = pxsltApplyStylesheet(xsltSS, This->node->doc, NULL); + if(result) { const xmlChar *content; @@ -1060,6 +1100,11 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * #endif } +HRESULT node_transform_node(const xmlnode *node, IXMLDOMNode *stylesheet, BSTR *p) +{ + return node_transform_node_params(node, stylesheet, p, NULL); +} + HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) { xmlChar* str; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8c407bd..baabdd4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/list.h" #include "msxml_private.h" diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index f0fa299..8073dde 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -37,7 +37,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -50,19 +49,6 @@ typedef struct IXMLDOMNode *node; } xsltemplate; -struct xslprocessor_par -{ - struct list entry; - BSTR name; - BSTR value; -}; - -struct xslprocessor_params -{ - struct list list; - unsigned int count; -}; - typedef struct { DispatchEx dispex; @@ -534,6 +520,7 @@ static HRESULT WINAPI xslprocessor_transform( IXSLProcessor *iface, VARIANT_BOOL *ret) { +#ifdef HAVE_LIBXML2 xslprocessor *This = impl_from_IXSLProcessor( iface ); HRESULT hr; @@ -542,7 +529,8 @@ static HRESULT WINAPI xslprocessor_transform( if (!ret) return E_INVALIDARG; SysFreeString(This->outstr); - hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &This->outstr); + + hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, &This->params); if (hr == S_OK) { if (This->output) @@ -558,6 +546,10 @@ static HRESULT WINAPI xslprocessor_transform( *ret = VARIANT_FALSE; return hr; +#else + FIXME("libxml2 is required but wasn't present at compile time\n"); + return E_NOTIMPL; +#endif } static HRESULT WINAPI xslprocessor_reset( IXSLProcessor *iface )

1 0