November 2010 - Wine-commits

André Hentschel : include: Define SIO_SET_COMPATIBILITY_MODE.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b45454c155a1a35caa987f08188a1f8069f7e7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45454c155a1a35caa987f081… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 14 20:40:33 2010 +0100 include: Define SIO_SET_COMPATIBILITY_MODE. --- include/mswsock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 322ab20..1447a8d 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -84,8 +84,10 @@ extern "C" { #ifndef USE_WS_PREFIX #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) +#define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Jacek Caban : ole32: Skip more tests on win9x.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 0c6f2a6d2ab2c66138429a6665b814437f889562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6f2a6d2ab2c66138429a666… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 13:39:11 2010 +0100 ole32: Skip more tests on win9x. --- dlls/ole32/tests/marshal.c | 22 ++++++++-------------- dlls/ole32/tests/moniker.c | 5 +++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef101ae..3d0ab16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1437,14 +1437,8 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); - /* this statement causes Win9x DCOM to crash during CoUninitialize of - * other apartment, so don't test this on Win9x (signified by NT-only - * export of CoRegisterSurrogateEx) */ - if (GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) - /* now be really bad and release the proxy from the wrong apartment */ - IUnknown_Release(cf); - else - skip("skipping test for releasing proxy from wrong apartment that will succeed, but cause a crash during CoUninitialize\n"); + /* now be really bad and release the proxy from the wrong apartment */ + IUnknown_Release(cf); CoUninitialize(); @@ -3060,7 +3054,12 @@ START_TEST(marshal) int argc; char **argv; - if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) goto no_test; + if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + + pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) @@ -3127,9 +3126,4 @@ START_TEST(marshal) test_channel_hook(); CoUninitialize(); - return; - -no_test: - trace("You need DCOM95 installed to run this test\n"); - return; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 876d034..33edde1 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1998,6 +1998,11 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { + if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT();

1 0

Piotr Caban : shell32: Added SHPropStg* stubs.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 14b13f77afac82e6a6e5da99f1ba267c38e13944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b13f77afac82e6a6e5da99f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:57:52 2010 +0100 shell32: Added SHPropStg* stubs. --- dlls/shell32/shell32.spec | 4 ++++ dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index d4f526f..b5debf1 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -253,6 +253,10 @@ 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() + 685 stdcall SHPropStgCreate(ptr ptr ptr long long long ptr ptr) + 688 stdcall SHPropStgReadMultiple(ptr long long ptr ptr) + 689 stdcall SHPropStgWriteMultiple(ptr ptr long ptr ptr long) + 704 stdcall -noname GUIDFromStringW(wstr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 6d284b5..1161ff4 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -657,3 +657,34 @@ end: GlobalUnlock(hDrop); return i; } + +/************************************************************************* + * SHPropStgCreate [SHELL32.685] + */ +HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, + const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, + DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgReadMultiple [SHELL32.688] + */ +HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgWriteMultiple [SHELL32.689] + */ +HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) +{ + FIXME("stub\n"); + return E_NOTIMPL; +}

1 0

Piotr Caban : shell32: Added SHPropStgCreate implementation.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: bfaae9bf7da649033d2ff948910d9130c92faf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaae9bf7da649033d2ff9489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:03 2010 +0100 shell32: Added SHPropStgCreate implementation. --- dlls/shell32/shellole.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 1161ff4..0949647 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -26,6 +26,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -665,8 +666,47 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) { - FIXME("stub\n"); - return E_NOTIMPL; + PROPSPEC prop; + PROPVARIANT ret; + HRESULT hres; + + TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), + grfFlags, grfMode, dwDisposition, ppstg, puCodePage); + + hres = IPropertySetStorage_Open(psstg, fmtid, grfMode, ppstg); + + switch(dwDisposition) { + case CREATE_ALWAYS: + if(SUCCEEDED(hres)) { + IPropertyStorage_Release(*ppstg); + hres = IPropertySetStorage_Delete(psstg, fmtid); + if(FAILED(hres)) + return hres; + hres = E_FAIL; + } + + case OPEN_ALWAYS: + case CREATE_NEW: + if(FAILED(hres)) + hres = IPropertySetStorage_Create(psstg, fmtid, pclsid, + grfFlags, grfMode, ppstg); + + case OPEN_EXISTING: + if(FAILED(hres)) + return hres; + + if(puCodePage) { + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(*ppstg, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + *puCodePage = 0; + else + *puCodePage = ret.u.iVal; + } + } + + return S_OK; } /*************************************************************************

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgReadMultiple.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: c148c0419d3acd481cb84172412a2226909c9f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c148c0419d3acd481cb841724… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:13 2010 +0100 shell32: Added partial implementation of SHPropStgReadMultiple. --- dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 0949647..5168e38 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -715,8 +715,35 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + HRESULT hres; + + FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); + + memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); + hres = IPropertyStorage_ReadMultiple(pps, cpspec, rgpspec, rgvar); + if(FAILED(hres)) + return hres; + + if(!uCodePage) { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + return S_OK; + + uCodePage = ret.u.iVal; + } + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return S_OK; + + /* TODO: do something with codepage and stat */ + return S_OK; } /*************************************************************************

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgWriteMultiple.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b490803b37c8e0ef781914ee2c448ae05ba20154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b490803b37c8e0ef781914ee2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:22 2010 +0100 shell32: Added partial implementation of SHPropStgWriteMultiple. --- dlls/shell32/shellole.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 5168e38..d678276 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -752,6 +752,37 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + UINT codepage; + HRESULT hres; + + FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return hres; + + if(uCodePage && *uCodePage) + codepage = *uCodePage; + else { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres)) + return hres; + if(ret.vt!=VT_I2 || !ret.u.iVal) + return E_FAIL; + + codepage = ret.u.iVal; + if(uCodePage) + *uCodePage = codepage; + } + + /* TODO: do something with codepage and stat */ + + hres = IPropertyStorage_WriteMultiple(pps, cpspec, rgpspec, rgvar, propidNameFirst); + return hres; }

1 0

Piotr Caban : shell32/tests: Added SHPropStg* tests.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b1c1ace81ac29260700b0f936d19b30a6584f6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c1ace81ac29260700b0f936… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 15:49:47 2010 +0100 shell32/tests: Added SHPropStg* tests. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/shellole.c | 437 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 438 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1c1ace81ac29260700b0…

1 0

Adam Martinson : msxml3: Add XDR datatypes enum and string table.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 4ec6da6ef195a339939e8aedbdcb3f458ebb2143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec6da6ef195a339939e8aedb… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:16:10 2010 -0600 msxml3: Add XDR datatypes enum and string table. --- dlls/msxml3/msxml_private.h | 48 +++++++++ dlls/msxml3/schema.c | 240 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f6d8355..15c8b94 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -68,6 +68,51 @@ typedef enum tid_t { LAST_tid } tid_t; +/* The XDR datatypes (urn:schemas-microsoft-com:datatypes) + * These are actually valid for XSD schemas as well + * See datatypes.xsd + */ +typedef enum _XDR_DT { + DT_INVALID = -1, + DT_BIN_BASE64, + DT_BIN_HEX, + DT_BOOLEAN, + DT_CHAR, + DT_DATE, + DT_DATE_TZ, + DT_DATETIME, + DT_DATETIME_TZ, + DT_ENTITY, + DT_ENTITIES, + DT_ENUMERATION, + DT_FIXED_14_4, + DT_FLOAT, + DT_I1, + DT_I2, + DT_I4, + DT_I8, + DT_ID, + DT_IDREF, + DT_IDREFS, + DT_INT, + DT_NMTOKEN, + DT_NMTOKENS, + DT_NOTATION, + DT_NUMBER, + DT_R4, + DT_R8, + DT_STRING, + DT_TIME, + DT_TIME_TZ, + DT_UI1, + DT_UI2, + DT_UI4, + DT_UI8, + DT_URI, + DT_UUID +} XDR_DT; +#define DT__N_TYPES (DT_UUID+1) + extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); extern void release_typelib(void); @@ -222,6 +267,9 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); +extern XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */); +extern xmlChar const* dt_get_str(XDR_DT dt); + extern BSTR EnsureCorrectEOL(BSTR); static inline BSTR bstr_from_xmlChar(const xmlChar *str) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index f3fd7a9..b931295 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -101,6 +101,246 @@ typedef struct _cache_index_data BSTR* out; } cache_index_data; +/* datatypes lookup stuff + * generated with help from gperf */ +#define DT_MIN_STR_LEN 2 +#define DT_MAX_STR_LEN 11 +#define DT_MIN_HASH_VALUE 2 +#define DT_MAX_HASH_VALUE 115 + +static const xmlChar DT_bin_base64[] = "bin.base64"; +static const xmlChar DT_bin_hex[] = "bin.hex"; +static const xmlChar DT_boolean[] = "boolean"; +static const xmlChar DT_char[] = "char"; +static const xmlChar DT_date[] = "date"; +static const xmlChar DT_date_tz[] = "date.tz"; +static const xmlChar DT_dateTime[] = "dateTime"; +static const xmlChar DT_dateTime_tz[] = "dateTime.tz"; +static const xmlChar DT_entity[] = "entity"; +static const xmlChar DT_entities[] = "entities"; +static const xmlChar DT_enumeration[] = "enumeration"; +static const xmlChar DT_fixed_14_4[] = "fixed.14.4"; +static const xmlChar DT_float[] = "float"; +static const xmlChar DT_i1[] = "i1"; +static const xmlChar DT_i2[] = "i2"; +static const xmlChar DT_i4[] = "i4"; +static const xmlChar DT_i8[] = "i8"; +static const xmlChar DT_id[] = "id"; +static const xmlChar DT_idref[] = "idref"; +static const xmlChar DT_idrefs[] = "idrefs"; +static const xmlChar DT_int[] = "int"; +static const xmlChar DT_nmtoken[] = "nmtoken"; +static const xmlChar DT_nmtokens[] = "nmtokens"; +static const xmlChar DT_notation[] = "notation"; +static const xmlChar DT_number[] = "number"; +static const xmlChar DT_r4[] = "r4"; +static const xmlChar DT_r8[] = "r8"; +static const xmlChar DT_string[] = "string"; +static const xmlChar DT_time[] = "time"; +static const xmlChar DT_time_tz[] = "time.tz"; +static const xmlChar DT_ui1[] = "ui1"; +static const xmlChar DT_ui2[] = "ui2"; +static const xmlChar DT_ui4[] = "ui4"; +static const xmlChar DT_ui8[] = "ui8"; +static const xmlChar DT_uri[] = "uri"; +static const xmlChar DT_uuid[] = "uuid"; + +static DWORD dt_hash( xmlChar const* str, int len /* calculated if -1 */) +{ + static const BYTE assoc_values[] = + { + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 10, 116, 116, 55, + 45, 116, 5, 116, 0, 116, 0, 116, 116, 116, + 116, 116, 116, 116, 116, 5, 0, 0, 20, 0, + 0, 10, 0, 0, 116, 0, 0, 0, 15, 5, + 116, 116, 10, 0, 0, 0, 116, 116, 0, 0, + 10, 116, 116, 116, 116, 116, 116, 5, 0, 0, + 20, 0, 0, 10, 0, 0, 116, 0, 0, 0, + 15, 5, 116, 116, 10, 0, 0, 0, 116, 116, + 0, 0, 10, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116 + }; + DWORD hval = (len == -1)? xmlStrlen(str) : len; + + switch (hval) + { + default: + hval += assoc_values[str[10]]; + /*FALLTHROUGH*/ + case 10: + hval += assoc_values[str[9]]; + /*FALLTHROUGH*/ + case 9: + hval += assoc_values[str[8]]; + /*FALLTHROUGH*/ + case 8: + hval += assoc_values[str[7]]; + /*FALLTHROUGH*/ + case 7: + hval += assoc_values[str[6]]; + /*FALLTHROUGH*/ + case 6: + hval += assoc_values[str[5]]; + /*FALLTHROUGH*/ + case 5: + hval += assoc_values[str[4]]; + /*FALLTHROUGH*/ + case 4: + hval += assoc_values[str[3]]; + /*FALLTHROUGH*/ + case 3: + hval += assoc_values[str[2]]; + /*FALLTHROUGH*/ + case 2: + hval += assoc_values[str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += assoc_values[str[0]]; + break; + } + return hval; +} + +static const xmlChar const* DT_string_table[DT__N_TYPES] = +{ + DT_bin_base64, + DT_bin_hex, + DT_boolean, + DT_char, + DT_date, + DT_date_tz, + DT_dateTime, + DT_dateTime_tz, + DT_entity, + DT_entities, + DT_enumeration, + DT_fixed_14_4, + DT_float, + DT_i1, + DT_i2, + DT_i4, + DT_i8, + DT_id, + DT_idref, + DT_idrefs, + DT_int, + DT_nmtoken, + DT_nmtokens, + DT_notation, + DT_number, + DT_r4, + DT_r8, + DT_string, + DT_time, + DT_time_tz, + DT_ui1, + DT_ui2, + DT_ui4, + DT_ui8, + DT_uri, + DT_uuid +}; + +static const XDR_DT DT_lookup_table[] = +{ + -1, -1, + DT_I8, + DT_UI8, + DT_TIME, + -1, -1, + DT_I4, + DT_UI4, + -1, -1, -1, + DT_R8, + DT_URI, + -1, + DT_FLOAT, + -1, + DT_R4, + DT_INT, + DT_CHAR, + -1, + DT_ENTITY, + DT_ID, + DT_ENTITIES, + DT_UUID, + -1, -1, + DT_TIME_TZ, + -1, + DT_DATE, + -1, + DT_NUMBER, + DT_BIN_HEX, + DT_DATETIME, + -1, + DT_IDREF, + DT_IDREFS, + DT_BOOLEAN, + -1, -1, -1, + DT_STRING, + DT_NMTOKEN, + DT_NMTOKENS, + -1, + DT_BIN_BASE64, + -1, + DT_I2, + DT_UI2, + -1, -1, -1, + DT_DATE_TZ, + DT_NOTATION, + -1, -1, + DT_DATETIME_TZ, + DT_I1, + DT_UI1, + -1, -1, + DT_ENUMERATION, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + DT_FIXED_14_4 +}; + +XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */) +{ + DWORD hash = dt_hash(str, len); + XDR_DT dt = DT_INVALID; + + if (hash <= DT_MAX_HASH_VALUE) + dt = DT_lookup_table[hash]; + + if (dt != DT_INVALID && xmlStrcasecmp(str, DT_string_table[dt]) == 0) + return dt; + + return DT_INVALID; +} + +xmlChar const* dt_get_str(XDR_DT dt) +{ + if (dt == DT_INVALID) + return NULL; + + return DT_string_table[dt]; +} + xmlExternalEntityLoader _external_entity_loader = NULL; static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID,

1 0

Gerald Pfeifer : msxml3: Remove practically unused variable from XDR_to_XSD_doc.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 7fe77b63695604238fe8853da5fbaa89dda0f1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe77b63695604238fe8853da… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 16 02:18:54 2010 +0100 msxml3: Remove practically unused variable from XDR_to_XSD_doc. --- dlls/msxml3/xdr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index c7f012b..3f1bad5 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -820,11 +820,10 @@ static xmlNodePtr XDR_E_Schema(xmlNodePtr xdr, xmlNodePtr parent, xmlChar const* xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI) { xmlDocPtr xsd_doc = xmlNewDoc(NULL); - xmlNodePtr root; TRACE("(%p)\n", xdr_doc); - root = XDR_E_Schema(get_schema((xmlNodePtr)xdr_doc), (xmlNodePtr)xsd_doc, nsURI); + XDR_E_Schema(get_schema((xmlNodePtr)xdr_doc), (xmlNodePtr)xsd_doc, nsURI); return xsd_doc; }

1 0

Adam Martinson : msxml3: Add functions to get the dt:dt of a node.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: a1d69fcba798d5d3bbcf0870d3aceff583b6b995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d69fcba798d5d3bbcf0870d… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:16:51 2010 -0600 msxml3: Add functions to get the dt:dt of a node. --- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 102 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 87 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 15c8b94..9980fdd 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -266,6 +266,7 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); +extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node); extern XDR_DT dt_get_type(xmlChar const* str, int len /* calculated if -1 */); extern xmlChar const* dt_get_str(XDR_DT dt); diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index b931295..ec31719 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -341,6 +341,23 @@ xmlChar const* dt_get_str(XDR_DT dt) return DT_string_table[dt]; } +static inline xmlChar const* get_node_nsURI(xmlNodePtr node) +{ + return (node->ns != NULL)? node->ns->href : NULL; +} + +static inline cache_entry* get_entry(schema_cache* This, xmlChar const* nsURI) +{ + return (!nsURI)? xmlHashLookup(This->cache, BAD_CAST "") : + xmlHashLookup(This->cache, nsURI); +} + +static inline xmlSchemaPtr get_node_schema(schema_cache* This, xmlNodePtr node) +{ + cache_entry* entry = get_entry(This, get_node_nsURI(node)); + return (!entry)? NULL : entry->schema; +} + xmlExternalEntityLoader _external_entity_loader = NULL; static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, @@ -981,6 +998,40 @@ static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = schema_cache_getDeclaration }; +static xmlSchemaElementPtr lookup_schema_elemDecl(xmlSchemaPtr schema, xmlNodePtr node) +{ + xmlSchemaElementPtr decl = NULL; + xmlChar const* nsURI = get_node_nsURI(node); + + TRACE("(%p, %p)\n", schema, node); + + if (xmlStrEqual(nsURI, schema->targetNamespace)) + decl = xmlHashLookup(schema->elemDecl, node->name); + + if (!decl && xmlHashSize(schema->schemasImports) > 1) + { + FIXME("declaration not found in main schema - need to check schema imports!\n"); + /*xmlSchemaImportPtr import; + if (nsURI == NULL) + import = xmlHashLookup(schema->schemasImports, XML_SCHEMAS_NO_NAMESPACE); + else + import = xmlHashLookup(schema->schemasImports, node->ns->href); + + if (import != NULL) + decl = xmlHashLookup(import->schema->elemDecl, node->name);*/ + } + + return decl; +} + +static inline xmlNodePtr lookup_schema_element(xmlSchemaPtr schema, xmlNodePtr node) +{ + xmlSchemaElementPtr decl = lookup_schema_elemDecl(schema, node); + while (decl != NULL && decl->refDecl != NULL) + decl = decl->refDecl; + return (decl != NULL)? decl->node : NULL; +} + static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) { va_list ap; @@ -1007,35 +1058,26 @@ static void validate_serror(void* ctx, xmlErrorPtr err) HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - cache_entry* entry; - xmlChar const* ns = NULL; + xmlSchemaPtr schema; + TRACE("(%p, %p)\n", This, tree); if (!tree) return E_POINTER; - if ((xmlNodePtr)tree->doc == tree) - { - xmlNodePtr root = xmlDocGetRootElement(tree->doc); - if (root && root->ns) - ns = root->ns->href; - } - else if (tree->ns) - { - ns = tree->ns->href; - } + if (tree->type == XML_DOCUMENT_NODE) + tree = xmlDocGetRootElement(tree->doc); - entry = (ns != NULL)? xmlHashLookup(This->cache, ns) : - xmlHashLookup(This->cache, BAD_CAST ""); + schema = get_node_schema(This, tree); /* TODO: if the ns is not in the cache, and it's a URL, * do we try to load from that? */ - if (entry) + if (schema) { xmlSchemaValidCtxtPtr svctx; int err; /* TODO: if validateOnLoad property is false, * we probably need to validate the schema here. */ - svctx = xmlSchemaNewValidCtxt(entry->schema); + svctx = xmlSchemaNewValidCtxt(schema); xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); #ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); @@ -1053,6 +1095,34 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr return E_FAIL; } +XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node) +{ + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + xmlSchemaPtr schema = get_node_schema(This, node); + XDR_DT dt = DT_INVALID; + + TRACE("(%p, %p)\n", This, node); + + if (node->ns && xmlStrEqual(node->ns->href, DT_nsURI)) + { + dt = dt_get_type(node->name, -1); + } + else if (schema) + { + xmlChar* str; + xmlNodePtr schema_node = lookup_schema_element(schema, node); + + str = xmlGetNsProp(schema_node, BAD_CAST "dt", DT_nsURI); + if (str) + { + dt = dt_get_type(str, -1); + xmlFree(str); + } + } + + return dt; +} + HRESULT SchemaCache_create(IUnknown* pUnkOuter, void** ppObj) { schema_cache* This = heap_alloc(sizeof(schema_cache));

1 0