November 2010 - Wine-commits

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

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

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

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

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

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

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

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

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

Andrew Eikum : shell32/tests: Make SHChangeNotify tests more easily extendible.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 71fad7d18d9657e132cb125af8a95ba2cdf9a2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fad7d18d9657e132cb125af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 12 15:32:49 2010 -0600 shell32/tests: Make SHChangeNotify tests more easily extendible. --- dlls/shell32/tests/shlfolder.c | 141 ++++++++++++++++++++-------------------- 1 files changed, 71 insertions(+), 70 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6294c5d..43b721d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -71,6 +71,26 @@ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static WCHAR *make_wstr(const char *str) +{ + WCHAR *ret; + int len; + + if(!str || strlen(str) == 0) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if(!len || len < 0) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!ret) + return NULL; + + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -4189,13 +4209,19 @@ static void test_ParseDisplayNamePBC(void) static const CHAR testwindow_class[] = "testwindow"; #define WM_USER_NOTIFY (WM_APP+1) -static struct { - const char *id; - BOOL exp_notify; +struct ChNotifyTest { + const char id[256]; + const UINT notify_count; + UINT missing_events; UINT signal; - const WCHAR *path_1; - const WCHAR *path_2; -} exp_data; + const char path_1[256]; + const char path_2[256]; +} chnotify_tests[] = { + {"MKDIR", 1, 0, SHCNE_MKDIR, "C:\\shell32_cn_test\\test", ""}, + {"RMDIR", 1, 0, SHCNE_RMDIR, "C:\\shell32_cn_test\\test", ""}, +}; + +struct ChNotifyTest *exp_data; static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -4203,20 +4229,25 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L switch(msg){ case WM_USER_NOTIFY: - if(exp_data.exp_notify){ + if(exp_data->missing_events > 0){ + WCHAR *path1, *path2; LPCITEMIDLIST *pidls = (LPCITEMIDLIST*)wparam; - ok(exp_data.signal == signal, + ok(exp_data->signal == signal, "%s: expected notification type %x, got: %x\n", - exp_data.id, exp_data.signal, signal); + exp_data->id, exp_data->signal, signal); - trace("verifying pidls for: %s\n", exp_data.id); - verify_pidl(pidls[0], exp_data.path_1); - verify_pidl(pidls[1], exp_data.path_2); + trace("verifying pidls for: %s\n", exp_data->id); + path1 = make_wstr(exp_data->path_1); + path2 = make_wstr(exp_data->path_2); + verify_pidl(pidls[0], path1); + verify_pidl(pidls[1], path2); + HeapFree(GetProcessHeap(), 0, path1); + HeapFree(GetProcessHeap(), 0, path2); - exp_data.exp_notify = FALSE; + exp_data->missing_events--; }else - ok(exp_data.exp_notify, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); + ok(0, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); return 0; } return DefWindowProc(hwnd, msg, wparam, lparam); @@ -4244,37 +4275,31 @@ static void register_testwindow_class(void) static void do_events(void) { int c = 0; - while (exp_data.exp_notify && (c++ < 10)){ + while (exp_data->missing_events && (c++ < 10)){ MSG msg; while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ TranslateMessage(&msg); DispatchMessageA(&msg); } - if(exp_data.exp_notify) + if(exp_data->missing_events) Sleep(500); } - trace("%s: took %d tries\n", exp_data.id, c); + trace("%s: took %d tries\n", exp_data->id, c); } static void test_SHChangeNotify(void) { HWND wnd; - ULONG notifyID; + ULONG notifyID, i; HRESULT hr; BOOL br, has_unicode; SHChangeNotifyEntry entries[1]; const CHAR root_dirA[] = "C:\\shell32_cn_test"; const WCHAR root_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t',0}; - const CHAR test_dirA[] = "C:\\shell32_cn_test\\test"; - const WCHAR test_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','\\','t','e','s','t',0}; CreateDirectoryW(NULL, NULL); has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); - /* set up the root directory & window */ - br = CreateDirectoryA(root_dirA, NULL); - ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); - register_testwindow_class(); wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, @@ -4282,6 +4307,9 @@ static void test_SHChangeNotify(void) NULL, NULL, GetModuleHandleA(NULL), 0); ok(wnd != NULL, "Failed to make a window\n"); + br = CreateDirectoryA(root_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + entries[0].pidl = NULL; if(has_unicode) hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); @@ -4294,55 +4322,28 @@ static void test_SHChangeNotify(void) SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); - /* MKDIR */ - br = CreateDirectoryA(test_dirA, NULL); - ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + for(i = 0; i < sizeof(chnotify_tests) / sizeof(*chnotify_tests); ++i){ + exp_data = chnotify_tests + i; - if(has_unicode){ - exp_data.id = "MKDIR PATHW"; - exp_data.signal = SHCNE_MKDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + exp_data->missing_events = exp_data->notify_count; + SHChangeNotify(exp_data->signal, SHCNF_PATHA | SHCNF_FLUSH, + strlen(exp_data->path_1) > 0 ? exp_data->path_1 : NULL, + strlen(exp_data->path_2) > 0 ? exp_data->path_2 : NULL); do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - }else - win_skip("skipping WCHAR tests\n"); - - exp_data.id = "MKDIR PATHA"; - exp_data.signal = SHCNE_MKDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - - /* RMDIR */ - br = RemoveDirectoryA(test_dirA); - ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); + ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); - if(has_unicode){ - exp_data.id = "RMDIR PATHW"; - exp_data.signal = SHCNE_RMDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); - }else - win_skip("skipping WCHAR tests\n"); - - exp_data.id = "RMDIR PATHA"; - exp_data.signal = SHCNE_RMDIR; - exp_data.exp_notify = TRUE; - exp_data.path_1 = test_dirW; - exp_data.path_2 = NULL; - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); - do_events(); - ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + if(has_unicode){ + WCHAR *path1, *path2; + + path1 = make_wstr(exp_data->path_1); + path2 = make_wstr(exp_data->path_2); + + exp_data->missing_events = exp_data->notify_count; + SHChangeNotify(exp_data->signal, SHCNF_PATHW | SHCNF_FLUSH, path1, path2); + do_events(); + ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); + } + } SHChangeNotifyDeregister(notifyID); DestroyWindow(wnd);

1 0