wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : winhttp: Use SSL_pending in netconn_query_data_available.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 8b64a2f13cc5cb0d0289039a41de84d5bf21128e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b64a2f13cc5cb0d0289039a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:36:02 2012 +0200 winhttp: Use SSL_pending in netconn_query_data_available. --- dlls/winhttp/net.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7e8c211..5ec4e1a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_pending ); MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); @@ -459,6 +460,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_pending ); LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); @@ -834,7 +836,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) if (conn->secure) { #ifdef SONAME_LIBSSL - if (conn->peek_msg) *available = conn->peek_len; + *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len; #endif return TRUE; }

1 0

Jacek Caban : winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 9a82f6a812ab4c781a77b6627523e8af6b77fccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82f6a812ab4c781a77b6627… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:35:47 2012 +0200 winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c5d3e94..7e8c211 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -809,7 +809,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd } else memcpy( conn->peek_msg, buf, ret ); } - *recvd = ret; + *recvd += ret; return TRUE; #else return FALSE;

1 0

Daniel Lehman : oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: cc37abb6589a1aa9862624c77a45b32c9a36dca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc37abb6589a1aa9862624c77… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 18 13:01:56 2012 -0700 oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate. --- dlls/oleaut32/tests/vartest.c | 5 ++++- dlls/oleaut32/variant.c | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a79481a..770ea5f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1742,7 +1742,10 @@ static void test_SystemTimeToVariantTime(void) ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); ST2DT(0,1,1980,0,0,0,0,TRUE,29220.0); /* Rolls back to 31 Dec 1899 */ ST2DT(1,13,1980,0,0,0,0,FALSE,29587.0); /* Fails on invalid month */ - ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* year < 100 is 1900+year! */ + ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,30,0,0,0,0,TRUE,10959.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,29,0,0,0,0,TRUE,47119.0); /* 0 <= year < 30 is 2000+year */ + ST2DT(1,1,0,0,0,0,0,TRUE,36526.0); /* 0 <= year < 30 is 2000+year */ } static void test_dt2st(int line, double dt, INT r, WORD d, WORD m, WORD y, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 0d1f2cc..2d6e2ce 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1143,8 +1143,11 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 9999 || iYear < -9999) return E_INVALIDARG; /* Invalid value */ - /* Years < 100 are treated as 1900 + year */ - if (iYear > 0 && iYear < 100) + /* Year 0 to 29 are treated as 2000 + year */ + if (iYear >= 0 && iYear < 30) + iYear += 2000; + /* Remaining years < 100 are treated as 1900 + year */ + else if (iYear >= 30 && iYear < 100) iYear += 1900; iMinute += iSecond / 60;

1 0

Daniel Lehman : msvcrt: Add declarations to stdlib. h for _strtoui64 and _strtoi64.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 5afde5f37832aaff99276c6e9926cf510797886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afde5f37832aaff99276c6e9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 13 15:58:48 2012 -0800 msvcrt: Add declarations to stdlib.h for _strtoui64 and _strtoi64. --- include/msvcrt/stdlib.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c972156..5010949 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -201,6 +201,10 @@ void __cdecl srand(unsigned int); double __cdecl strtod(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); +__int64 __cdecl _strtoi64(const char*,char**,int); +__int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl _strtoui64(const char*,char**,int); +unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); int __cdecl system(const char*); void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*)); void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*));

1 0

Dmitry Timoshkov : advapi32: Add named pipe access tests.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 3bb0462165a89b72e4cdc65e8ba03bbce1611f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb0462165a89b72e4cdc65e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:30:04 2012 +0900 advapi32: Add named pipe access tests. --- dlls/advapi32/tests/security.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 40691ad..3fc9930 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4053,7 +4053,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4164,6 +4164,36 @@ static void test_event_security(HANDLE token) CloseHandle(event); } +#define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" +static void test_named_pipe_security(HANDLE token) +{ + HANDLE pipe, file; + GENERIC_MAPPING mapping = { FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + pipe = CreateNamedPipe(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, + 0, 0, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe error %d\n", GetLastError()); + + test_default_handle_security(token, pipe, &mapping); + + SetLastError(0xdeadbeef); + file = CreateFile(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); + + CloseHandle(pipe); + + SetLastError(0xdeadbeef); + file = CreateFile("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4236,6 +4266,7 @@ static void test_kernel_objects_security(void) test_mutex_security(token); test_event_security(token); + test_named_pipe_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 27a3c43bb00fe69c4652b89cf723b5cb9e9fbec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a3c43bb00fe69c4652b89cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:46 2012 +0900 advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects. --- dlls/advapi32/tests/security.c | 49 +++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9db84a4..40691ad 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -38,6 +38,10 @@ /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#ifndef EVENT_QUERY_STATE +#define EVENT_QUERY_STATE 0x0001 +#endif + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -3992,6 +3996,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) ACL *acl; void *sid; + ret = IsValidSecurityDescriptor(sd); + ok(ret, "security descriptor is not valid\n"); + present = -1; defaulted = -1; acl = (void *)0xdeadbeef; @@ -4041,12 +4048,12 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA length = needed; sd = HeapAlloc(GetProcessHeap(), 0, length); - needed = 0; + needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return required buffer length\n"); + ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4058,7 +4065,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA todo_wine { ok(ret, "AccessCheck error %d\n", GetLastError()); ok(status == 1, "expected 1, got %d\n", status); - ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); + ok(granted == mapping->GenericAll, "expected all access %#x, got %#x\n", mapping->GenericAll, granted); } priv_set_len = sizeof(priv_set); granted = 0xdeadbeef; @@ -4080,13 +4087,44 @@ todo_wine { ok(status == 0, "expected 0, got %d\n", status); ok(granted == 0, "expected 0, got %#x\n", granted); } + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericRead, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericRead, "expected read access %#x, got %#x\n", mapping->GenericRead, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericWrite, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericWrite, "expected write access %#x, got %#x\n", mapping->GenericWrite, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericExecute, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericExecute, "expected execute access %#x, got %#x\n", mapping->GenericExecute, granted); +} HeapFree(GetProcessHeap(), 0, sd); } static void test_mutex_security(HANDLE token) { HANDLE mutex; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; @@ -4107,7 +4145,8 @@ static void test_mutex_security(HANDLE token) static void test_event_security(HANDLE token) { HANDLE event; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS };

1 0

Nikolay Sivov : msxml3: Make failing Locator QI a warning.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 1554cbc4d75c3d6e1eb5c51ce8b50b4a8c0553ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1554cbc4d75c3d6e1eb5c51ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:55:17 2012 +0400 msxml3: Make failing Locator QI a warning. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 936f583..eb66899 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1941,7 +1941,7 @@ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Nikolay Sivov : msxml3: Fix handling of feature values.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 54df4811c61cfd22787f46ea7ea2d6f555e74ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=54df4811c61cfd22787f46ea7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:53:15 2012 +0400 msxml3: Fix handling of feature values. --- dlls/msxml3/saxreader.c | 6 ++++++ dlls/msxml3/tests/saxreader.c | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e9ab841..936f583 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -288,6 +288,12 @@ static const WCHAR PropertyXMLDeclVersionW[] = { static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value) { + /* handling of non-VARIANT_* values is version dependent */ + if ((reader->version < MSXML4) && (value != VARIANT_TRUE)) + value = VARIANT_FALSE; + if ((reader->version >= MSXML4) && (value != VARIANT_FALSE)) + value = VARIANT_TRUE; + if (value == VARIANT_TRUE) reader->features |= feature; else diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0c107af..5c768f4 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2198,12 +2198,7 @@ static void test_saxreader_features(void) value = 0xd; hr = ISAXXMLReader_getFeature(reader, _bstr_(*name), &value); EXPECT_HR(hr, S_OK); - if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || - IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60)) - todo_wine - ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); - else - ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); + ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); hr = ISAXXMLReader_putFeature(reader, _bstr_(*name), VARIANT_FALSE); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Respect 'namespaces' feature calling content handler callbacks.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: f27159a59f11c835ae219fb837c342612cc083c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27159a59f11c835ae219fb83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:46:03 2012 +0400 msxml3: Respect 'namespaces' feature calling content handler callbacks. --- dlls/msxml3/saxreader.c | 97 +++++++++++++++---------- dlls/msxml3/tests/saxreader.c | 160 ++++++++++++++++++++++++++++++++++------- 2 files changed, 193 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f27159a59f11c835ae219…

1 0

Nikolay Sivov : msxml3: Use lookup table for feature names.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 137a21d04c99dca4dc843ef1ef42c04aa0b01353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137a21d04c99dca4dc843ef1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 18 22:39:38 2012 +0400 msxml3: Use lookup table for feature names. --- dlls/msxml3/saxreader.c | 153 +++++++++++++++++++++++++++++------------------ 1 files changed, 95 insertions(+), 58 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d95550f..8205c99 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef enum { + FeatureUnknown = 0, ExhaustiveErrors = 1 << 1, ExternalGeneralEntities = 1 << 2, ExternalParameterEntities = 1 << 3, @@ -67,7 +68,77 @@ typedef enum UseInlineSchema = 1 << 13, UseSchemaLocation = 1 << 14, LexicalHandlerParEntities = 1 << 15 -} saxreader_features; +} saxreader_feature; + +/* feature names */ +static const WCHAR FeatureExternalGeneralEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', + 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', + '-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureExternalParameterEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureProhibitDTDW[] = { + 'p','r','o','h','i','b','i','t','-','d','t','d',0 +}; + +static const WCHAR FeatureNamespacesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','s',0 +}; + +static const WCHAR FeatureNamespacePrefixesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 +}; + +struct saxreader_feature_pair +{ + saxreader_feature feature; + const WCHAR *name; +}; + +static const struct saxreader_feature_pair saxreader_feature_map[] = { + { ExternalGeneralEntities, FeatureExternalGeneralEntitiesW }, + { ExternalParameterEntities, FeatureExternalParameterEntitiesW }, + { LexicalHandlerParEntities, FeatureLexicalHandlerParEntitiesW }, + { NamespacePrefixes, FeatureNamespacePrefixesW }, + { Namespaces, FeatureNamespacesW }, + { ProhibitDTD, FeatureProhibitDTDW } +}; + +static saxreader_feature get_saxreader_feature(const WCHAR *name) +{ + int min, max, n, c; + + min = 0; + max = sizeof(saxreader_feature_map)/sizeof(struct saxreader_feature_pair) - 1; + + while (min <= max) + { + n = (min+max)/2; + + c = strcmpW(saxreader_feature_map[n].name, name); + if (!c) + return saxreader_feature_map[n].feature; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return FeatureUnknown; +} struct bstrpool { @@ -109,7 +180,7 @@ typedef struct xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; - saxreader_features features; + saxreader_feature features; MSXML_VERSION version; } saxreader; @@ -215,38 +286,7 @@ static const WCHAR PropertyXMLDeclVersionW[] = { 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; -/* feature names */ -static const WCHAR FeatureExternalGeneralEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', - 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', - '-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureExternalParameterEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureProhibitDTDW[] = { - 'p','r','o','h','i','b','i','t','-','d','t','d',0 -}; - -static const WCHAR FeatureNamespacesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','n','a','m','e','s','p','a','c','e','s',0 -}; - -static const WCHAR FeatureNamespacePrefixesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 -}; - -static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) +static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) reader->features |= feature; @@ -256,7 +296,7 @@ static inline HRESULT set_feature_value(saxreader *reader, saxreader_features fe return S_OK; } -static inline HRESULT get_feature_value(const saxreader *reader, saxreader_features feature, VARIANT_BOOL *value) +static inline HRESULT get_feature_value(const saxreader *reader, saxreader_feature feature, VARIANT_BOOL *value) { *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; @@ -2749,52 +2789,49 @@ static HRESULT WINAPI saxxmlreader_Invoke( /*** IVBSAXXMLReader methods ***/ static HRESULT WINAPI saxxmlreader_getFeature( IVBSAXXMLReader* iface, - const WCHAR *feature, + const WCHAR *feature_name, VARIANT_BOOL *value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); + saxreader_feature feature; - if (!strcmpW(FeatureNamespacesW, feature)) - return get_feature_value(This, Namespaces, value); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(feature_name), value); - if (!strcmpW(FeatureNamespacePrefixesW, feature)) - return get_feature_value(This, NamespacePrefixes, value); + feature = get_saxreader_feature(feature_name); + if (feature == Namespaces || feature == NamespacePrefixes) + return get_feature_value(This, feature, value); - FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature_name), value); return E_NOTIMPL; } static HRESULT WINAPI saxxmlreader_putFeature( IVBSAXXMLReader* iface, - const WCHAR *feature, + const WCHAR *feature_name, VARIANT_BOOL value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); + saxreader_feature feature; - TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature), value); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature_name), value); - if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) - return set_feature_value(This, ExternalGeneralEntities, value); + feature = get_saxreader_feature(feature_name); - if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) - return set_feature_value(This, ExternalParameterEntities, value); - - if (!strcmpW(FeatureLexicalHandlerParEntitiesW, feature)) + /* accepted cases */ + if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || + (feature == ExternalParameterEntities && value == VARIANT_FALSE) || + (feature == Namespaces && value == VARIANT_TRUE )) { - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); - return set_feature_value(This, LexicalHandlerParEntities, value); + return set_feature_value(This, feature, value); } - if (!strcmpW(FeatureProhibitDTDW, feature)) + if (feature == LexicalHandlerParEntities || feature == ProhibitDTD) { - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); - return set_feature_value(This, ProhibitDTD, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); + return set_feature_value(This, feature, value); } - if (!strcmpW(FeatureNamespacesW, feature) && value == VARIANT_TRUE) - return set_feature_value(This, Namespaces, value); - - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); return E_NOTIMPL; }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012