winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
866 discussions
Start a n
N
ew thread
Jacek Caban : shdocvw: Get rid of remaining WebBrowser object' s *_THIS macros.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 12be1988155b9d83c959196d3fc67345a52919fd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=12be1988155b9d83c959196d3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:47:44 2010 +0100 shdocvw: Get rid of remaining WebBrowser object's *_THIS macros. --- dlls/shdocvw/classinfo.c | 19 +++++----- dlls/shdocvw/persist.c | 81 ++++++++++++++++++++++++-------------------- dlls/shdocvw/shdocvw.h | 20 +++-------- dlls/shdocvw/view.c | 68 ++++++++++++++++++------------------- dlls/shdocvw/webbrowser.c | 19 +++++----- 5 files changed, 102 insertions(+), 105 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=12be1988155b9d83c9591…
1
0
0
0
Jacek Caban : shdocvw: Get rid of more *_THIS macros.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 7149f04b4eb945725f4b664ec1f319bab6a3b3c0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7149f04b4eb945725f4b664ec…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:47:31 2010 +0100 shdocvw: Get rid of more *_THIS macros. --- dlls/shdocvw/oleobject.c | 165 +++++++++++++++++++++++---------------------- dlls/shdocvw/shdocvw.h | 18 ++--- dlls/shdocvw/webbrowser.c | 51 +++++++------- 3 files changed, 118 insertions(+), 116 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7149f04b4eb945725f4b6…
1
0
0
0
Jacek Caban : shdocvw: Get rid of WEBBROWSER_THIS macro and InternetExplorer to IWebBowser2 casts .
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 8767356d126dbe2edb50c678a961d9546f53c0b1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8767356d126dbe2edb50c678a…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:47:19 2010 +0100 shdocvw: Get rid of WEBBROWSER_THIS macro and InternetExplorer to IWebBowser2 casts. --- dlls/shdocvw/ie.c | 161 ++++++++++++++++++++++++----------------------- dlls/shdocvw/iexplore.c | 16 +++--- dlls/shdocvw/shdocvw.h | 4 +- 3 files changed, 91 insertions(+), 90 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=8767356d126dbe2edb50c…
1
0
0
0
Jacek Caban : shdocvw: Get rid of WEBBROWSER_THIS macro and WebBrowser to IWebBowser2 casts.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 878c5d043e6892d06e34b20d1ac5d051d513cd09 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=878c5d043e6892d06e34b20d1…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:47:05 2010 +0100 shdocvw: Get rid of WEBBROWSER_THIS macro and WebBrowser to IWebBowser2 casts. --- dlls/shdocvw/classinfo.c | 6 +- dlls/shdocvw/oleobject.c | 34 ++++---- dlls/shdocvw/persist.c | 18 ++-- dlls/shdocvw/shdocvw.h | 4 +- dlls/shdocvw/view.c | 12 ++-- dlls/shdocvw/webbrowser.c | 204 ++++++++++++++++++++------------------------- 6 files changed, 127 insertions(+), 151 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=878c5d043e6892d06e34b…
1
0
0
0
Adam Martinson : msxml3: Use built-in urn:schemas-microsoft-com: datatypes schema for validation.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 2c451f869a631c0ea6a5cb0bd5b1e2ed705f4670 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c451f869a631c0ea6a5cb0bd…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Nov 12 08:33:17 2010 -0600 msxml3: Use built-in urn:schemas-microsoft-com:datatypes schema for validation. --- dlls/msxml3/main.c | 2 + dlls/msxml3/msxml_private.h | 8 ++- dlls/msxml3/schema.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 8 ++-- dlls/msxml3/tests/schema.c | 50 ++++++++++---------- 5 files changed, 144 insertions(+), 31 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c451f869a631c0ea6a5c…
1
0
0
0
Adam Martinson : msxml3: XDR schema support.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 5fc439a7f8b4da9de84db1b57ba7ce96996087a7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5fc439a7f8b4da9de84db1b57…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Nov 12 08:31:45 2010 -0600 msxml3: XDR schema support. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/schema.c | 87 +++-- dlls/msxml3/tests/domdoc.c | 12 +- dlls/msxml3/tests/schema.c | 50 ++-- dlls/msxml3/xdr.c | 832 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 916 insertions(+), 66 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc439a7f8b4da9de84db…
1
0
0
0
Adam Martinson : msxml3/tests: XDR schema tests.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 2a4c07a7e2afafa2baad0af029df1eb4a21e8bad URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2a4c07a7e2afafa2baad0af02…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Nov 12 00:43:27 2010 -0600 msxml3/tests: XDR schema tests. --- dlls/msxml3/tests/domdoc.c | 163 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f86026d..b650b69 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -794,6 +794,28 @@ static const CHAR szDatatypeXML[] = " </Property>\n" "</Properties>"; +static const CHAR szOpenSeqXDR[] = +"<Schema xmlns='urn:schemas-microsoft-com:xml-data'>\n" +" <ElementType name='w' content='empty' model='closed'/>\n" +" <ElementType name='x' content='empty' model='closed'/>\n" +" <ElementType name='y' content='empty' model='closed'/>\n" +" <ElementType name='z' content='empty' model='closed'/>\n" +" <ElementType name='test' content='eltOnly' model='open' order='seq'>\n" +" <element type='x'/>\n" +" <group order='seq'>\n" +" <element type='x'/>\n" +" <element type='y'/>\n" +" <element type='z'/>\n" +" </group>\n" +" <element type='z'/>\n" +" </ElementType>\n" +"</Schema>"; + +static const CHAR szOpenSeqXML1[] = "<test><x/><x/><y/><z/><z/></test>"; +static const CHAR szOpenSeqXML2[] = "<test><x/><x/><y/><z/><z/><w/></test>"; +static const CHAR szOpenSeqXML3[] = "<test><w/><x/><x/><y/><z/><z/></test>"; +static const CHAR szOpenSeqXML4[] = "<test><x/><x/><y/><z/><z/><v/></test>"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -7460,6 +7482,145 @@ static void test_setAttributeNode(void) free_bstrs(); } +static void test_XDR_schemas(void) +{ + IXMLDOMDocument2 *doc, *schema; + IXMLDOMSchemaCollection* cache; + IXMLDOMParseError* err; + VARIANT_BOOL b; + VARIANT v; + BSTR bstr; + + doc = create_document(&IID_IXMLDOMDocument2); + schema = create_document(&IID_IXMLDOMDocument2); + cache = create_cache(&IID_IXMLDOMSchemaCollection); + + if (!doc || !schema || !cache) + { + if (doc) IXMLDOMDocument2_Release(doc); + if (schema) IXMLDOMDocument2_Release(schema); + if (cache) IXMLDOMSchemaCollection_Release(cache); + + return; + } + + VariantInit(&v); + + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szOpenSeqXML1), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema, _bstr_(szOpenSeqXDR), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* load the schema */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMDocument2_QueryInterface(schema, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(""), v)); + VariantClear(&v); + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * only declared elements in the declared order + * this is fine */ + err = NULL; + bstr = NULL; + todo_wine ole_check(IXMLDOMDocument2_validate(doc, &err)); + ok(err != NULL, "domdoc_validate() should always set err\n"); + ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); + ok(IXMLDOMParseError_get_reason(err, &bstr) == S_FALSE, "got error: %s\n", wine_dbgstr_w(bstr)); + if (bstr) SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + /* load the next doc */ + IXMLDOMDocument2_Release(doc); + doc = create_document(&IID_IXMLDOMDocument2); + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szOpenSeqXML2), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * declared elements in the declared order, with an extra declared element at the end + * this is fine */ + err = NULL; + bstr = NULL; + todo_wine ole_check(IXMLDOMDocument2_validate(doc, &err)); + ok(err != NULL, "domdoc_validate() should always set err\n"); + ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); + ok(IXMLDOMParseError_get_reason(err, &bstr) == S_FALSE, "got error: %s\n", wine_dbgstr_w(bstr)); + if (bstr) SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + /* load the next doc */ + IXMLDOMDocument2_Release(doc); + doc = create_document(&IID_IXMLDOMDocument2); + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szOpenSeqXML3), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * fails, extra elements are only allowed at the end */ + err = NULL; + bstr = NULL; + ole_expect(IXMLDOMDocument2_validate(doc, &err), S_FALSE); + ok(err != NULL, "domdoc_validate() should always set err\n"); + todo_wine ok(IXMLDOMParseError_get_reason(err, &bstr) == S_OK, "got error: %s\n", wine_dbgstr_w(bstr)); + if (bstr) SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + /* load the next doc */ + IXMLDOMDocument2_Release(doc); + doc = create_document(&IID_IXMLDOMDocument2); + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szOpenSeqXML4), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * fails, undeclared elements are not allowed */ + err = NULL; + bstr = NULL; + ole_expect(IXMLDOMDocument2_validate(doc, &err), S_FALSE); + ok(err != NULL, "domdoc_validate() should always set err\n"); + todo_wine ok(IXMLDOMParseError_get_reason(err, &bstr) == S_OK, "got error: %s\n", wine_dbgstr_w(bstr)); + if (bstr) SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + IXMLDOMDocument2_Release(doc); + IXMLDOMDocument2_Release(schema); + IXMLDOMSchemaCollection_Release(cache); + + free_bstrs(); +} + static void test_get_dataType(void) { IXMLDOMDocument2 *doc, *schema; @@ -7805,6 +7966,7 @@ static void test_get_dataType(void) ole_expect(IXMLDOMParseError_get_errorCode(err, &l), S_FALSE); ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); ok(l == 0, "got %08x : %s\n", l, wine_dbgstr_w(bstr)); + if (bstr) SysFreeString(bstr); IXMLDOMParseError_Release(err); /* check the data types again */ @@ -8539,6 +8701,7 @@ START_TEST(domdoc) test_removeQualifiedItem(); test_get_ownerDocument(); test_setAttributeNode(); + test_XDR_schemas(); test_get_dataType(); test_put_dataType(); test_createNode();
1
0
0
0
Adam Martinson : msxml3: Add urn:schemas-microsoft-com:datatypes schema.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 89679f904affcee4bb62bcd97625467a038af71b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89679f904affcee4bb62bcd97…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Nov 11 23:29:58 2010 -0600 msxml3: Add urn:schemas-microsoft-com:datatypes schema. --- dlls/msxml3/Makefile.in | 4 +- dlls/msxml3/datatypes.xsd | 591 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/schemas.rc | 20 ++ 3 files changed, 614 insertions(+), 1 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=89679f904affcee4bb62b…
1
0
0
0
Adam Martinson : msxml3: Add our own xmlFirstElementChild() for older libxml2 versions.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 82f73c8652cd35281dca15796be70f418984eced URL:
http://source.winehq.org/git/wine.git/?a=commit;h=82f73c8652cd35281dca15796…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Nov 11 15:16:24 2010 -0600 msxml3: Add our own xmlFirstElementChild() for older libxml2 versions. --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ dlls/msxml3/msxml_private.h | 12 ++++++++++++ include/config.h.in | 3 +++ 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7a3e52f..7c5035a 100755 --- a/configure +++ b/configure @@ -9244,6 +9244,48 @@ $as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in -lxml2" >&5 +$as_echo_n "checking for xmlFirstElementChild in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlFirstElementChild+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlFirstElementChild (); +int +main () +{ +return xmlFirstElementChild (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlFirstElementChild=yes +else + ac_cv_lib_xml2_xmlFirstElementChild=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlFirstElementChild" >&5 +$as_echo "$ac_cv_lib_xml2_xmlFirstElementChild" >&6; } +if test "x$ac_cv_lib_xml2_xmlFirstElementChild" = x""yes; then : + +$as_echo "#define HAVE_XMLFIRSTELEMENTCHILD 1" >>confdefs.h + +fi + ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h> " if test "x$ac_cv_type_xmlDocProperties" = x""yes; then : diff --git a/configure.ac b/configure.ac index d4430be..598673d 100644 --- a/configure.ac +++ b/configure.ac @@ -1121,6 +1121,8 @@ then [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlFirstElementChild, + [AC_DEFINE(HAVE_XMLFIRSTELEMENTCHILD,1,[Define if libxml2 has the xmlFirstElementChild function])],,$ac_xml_libs) AC_CHECK_TYPE([xmlDocProperties], [AC_DEFINE(HAVE_XMLDOC_PROPERTIES,1,[Define if libxml2 has the xmlDocProperties enum])],,[[#include <libxml/tree.h>]]) ]) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 183f97c..e7a143e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -112,6 +112,18 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); #include <libxml/xmlerror.h> +#ifndef HAVE_XMLFIRSTELEMENTCHILD +static inline xmlNodePtr xmlFirstElementChild(xmlNodePtr parent) +{ + xmlNodePtr child; + for (child = parent->children; child != NULL; child = child->next) + if (child->type == XML_ELEMENT_NODE) + break; + + return child; +} +#endif + /* constructors */ extern IUnknown *create_domdoc( xmlNodePtr document ); extern IUnknown *create_xmldoc( void ); diff --git a/include/config.h.in b/include/config.h.in index 46adad8..3117f69 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1108,6 +1108,9 @@ /* Define if libxml2 has the xmlDocProperties enum */ #undef HAVE_XMLDOC_PROPERTIES +/* Define if libxml2 has the xmlFirstElementChild function */ +#undef HAVE_XMLFIRSTELEMENTCHILD + /* Define if libxml2 has the xmlNewDocPI function */ #undef HAVE_XMLNEWDOCPI
1
0
0
0
Adam Martinson : msxml3: Store the DLL instance handle.
by Alexandre Julliard
15 Nov '10
15 Nov '10
Module: wine Branch: master Commit: 865995cf1f35c332a92f0a1ad4c651ae70fcb55d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=865995cf1f35c332a92f0a1ad…
Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Nov 9 21:40:34 2010 -0600 msxml3: Store the DLL instance handle. --- dlls/msxml3/main.c | 4 ++++ dlls/msxml3/msxml_private.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 133a914..8e612b7 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +HINSTANCE MSXML_hInstance = NULL; + #ifdef HAVE_LIBXML2 void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) @@ -190,6 +192,8 @@ static void init_libxslt(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { + MSXML_hInstance = hInstDLL; + switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index c2f80a0..183f97c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -98,6 +98,8 @@ typedef struct { dispex_dynamic_data_t *dynamic_data; } DispatchEx; +extern HINSTANCE MSXML_hInstance; + void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
1
0
0
0
← Newer
1
...
35
36
37
38
39
40
41
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200