October 2010 - Wine-Commits

Juan Lang : crypt32: Improve error checking for the base policy.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 966d722752b659a12ffa355a1e559f94907cd66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=966d722752b659a12ffa355a1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 4 18:16:16 2010 -0700 crypt32: Improve error checking for the base policy. --- dlls/crypt32/chain.c | 42 ++++++++++++++++++++++++++++++++---------- dlls/crypt32/tests/chain.c | 13 ++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4b6fdba..266e6ab 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2904,7 +2904,12 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { + DWORD checks = 0; + + if (pPolicyPara) + checks = pPolicyPara->dwFlags; pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + pPolicyStatus->dwError = NO_ERROR; if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID) { @@ -2913,14 +2918,6 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, CERT_TRUST_IS_NOT_SIGNATURE_VALID, &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); } - else if (pChainContext->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) - { - pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; - find_element_with_error(pChainContext, - CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, - &pPolicyStatus->lElementIndex); - } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_CYCLIC) { pPolicyStatus->dwError = CERT_E_CHAINING; @@ -2929,8 +2926,33 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, /* For a cyclic chain, which element is a cycle isn't meaningful */ pPolicyStatus->lElementIndex = -1; } - else - pPolicyStatus->dwError = NO_ERROR; + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT && + !(checks & CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG)) + { + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + { + pPolicyStatus->dwError = CERT_E_EXPIRED; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_TIME_VALID, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE && + !(checks & CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG)) + { + pPolicyStatus->dwError = CERT_E_WRONG_USAGE; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_VALID_FOR_USAGE, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } return TRUE; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5ee5050..9fe24b6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3745,11 +3745,6 @@ static const ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; -static const ChainPolicyCheck ignoredUnknownCABasePolicyCheck = { - { sizeof(chain0) / sizeof(chain0[0]), chain0 }, - { 0, CERT_E_EXPIRED, 0, 0, NULL }, NULL, TODO_ERROR -}; - /* Windows NT 4 has a different error code when the validity period doesn't * nest. (It's arguably more correct than other Windows versions, but since * others do not emulate its behavior, we mark its behavior broken.) @@ -3759,12 +3754,12 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ERROR + { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { @@ -3774,7 +3769,7 @@ static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { static const ChainPolicyCheck invalidUsageBasePolicyCheck = { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, - { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, TODO_ERROR + { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, 0 }; static const ChainPolicyCheck sslPolicyCheck[] = { @@ -4083,7 +4078,7 @@ static void check_base_policy(void) policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, - &ignoredUnknownCABasePolicyCheck, 0, &oct2007, &policyPara); + &ignoredUnknownCAPolicyCheck, 0, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL,

1 0

Juan Lang : crypt32/tests: Add more tests of verifying the base policy, including flags to ignore certain errors.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: c4c70b608c569396c0a846ccd2c5cc99b470915b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c70b608c569396c0a846ccd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 4 17:43:09 2010 -0700 crypt32/tests: Add more tests of verifying the base policy, including flags to ignore certain errors. --- dlls/crypt32/tests/chain.c | 70 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b3fd1c4..5ee5050 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3745,6 +3745,38 @@ static const ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; +static const ChainPolicyCheck ignoredUnknownCABasePolicyCheck = { + { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { 0, CERT_E_EXPIRED, 0, 0, NULL }, NULL, TODO_ERROR +}; + +/* Windows NT 4 has a different error code when the validity period doesn't + * nest. (It's arguably more correct than other Windows versions, but since + * others do not emulate its behavior, we mark its behavior broken.) + */ +static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = + { 0, CERT_E_VALIDITYPERIODNESTING, 0, 0, NULL }; + +static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { + { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ERROR +}; + +static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { + { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { + { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck invalidUsageBasePolicyCheck = { + { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, TODO_ERROR +}; + static const ChainPolicyCheck sslPolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -4039,6 +4071,39 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, } } +static void check_base_policy(void) +{ + DWORD i; + CERT_CHAIN_POLICY_PARA policyPara = { 0 }; + + for (i = 0; + i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &basePolicyCheck[i], i, &oct2007, NULL); + policyPara.cbSize = sizeof(policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredUnknownCABasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredBadDateNestingBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredInvalidDateBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredInvalidUsageBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &invalidUsageBasePolicyCheck, 0, &oct2007, &policyPara); +} + static void check_ssl_policy(void) { DWORD i; @@ -4288,10 +4353,7 @@ static void testVerifyCertChainPolicy(void) pCertFreeCertificateChain(chain); CertFreeCertificateContext(cert); - for (i = 0; - i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, - &basePolicyCheck[i], i, &oct2007, NULL); + check_base_policy(); check_ssl_policy(); /* The authenticode policy doesn't seem to check anything beyond the base * policy. It might check for chains signed by the MS test cert, but none

1 0

Juan Lang : include: Define a few missing CERT_TRUST error and info flags.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: b6a5772a0c2cb023590e5781ca85ea7cea79a4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a5772a0c2cb023590e5781c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 13:38:35 2010 -0700 include: Define a few missing CERT_TRUST error and info flags. --- include/wincrypt.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 39c098a..bdd68ea 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -867,6 +867,8 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT 0x00008000 #define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000 #define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000 +#define CERT_TRUST_IS_EXPLICIT_DISTRUST 0x04000000 +#define CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT 0x08000000 #define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 #define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 @@ -881,6 +883,8 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_HAS_PREFERRED_ISSUER 0x00000100 #define CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY 0x00000200 #define CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS 0x00000400 +#define CERT_TRUST_IS_PEER_TRUSTED 0x00000800 +#define CERT_TRUST_HAS_CRL_VALIDITY_EXTENDED 0x00001000 #define CERT_TRUST_IS_COMPLEX_CHAIN 0x00010000

1 0

Nikolay Sivov : msxml3: Implement ready state change callback.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 58bce9422e769706f4d6bd99b1d6368a630a2fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bce9422e769706f4d6bd99b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 04:44:00 2010 +0400 msxml3: Implement ready state change callback. --- dlls/msxml3/httprequest.c | 24 ++++++- dlls/msxml3/tests/domdoc.c | 139 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f1a93f6..7deae26 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -60,6 +60,7 @@ typedef struct LONG ref; READYSTATE state; + IDispatch *sink; /* request */ BINDVERB verb; @@ -415,10 +416,17 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * return hr; } -/* TODO: process OnChange callback */ static void httprequest_setreadystate(httprequest *This, READYSTATE state) { This->state = state; + + if (This->sink) + { + DISPPARAMS params; + + memset(&params, 0, sizeof(params)); + IDispatch_Invoke(This->sink, 0, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, 0, 0, 0); + } } static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID riid, void **ppvObject) @@ -477,6 +485,8 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) /* detach callback object */ BindStatusCallback_Detach(This->bsc); + if (This->sink) IDispatch_Release(This->sink); + heap_free( This ); } @@ -768,13 +778,16 @@ static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *s return S_OK; } -static HRESULT WINAPI httprequest_put_onreadystatechange(IXMLHTTPRequest *iface, IDispatch *pReadyStateSink) +static HRESULT WINAPI httprequest_put_onreadystatechange(IXMLHTTPRequest *iface, IDispatch *sink) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, pReadyStateSink); + TRACE("(%p)->(%p)\n", This, sink); - return E_NOTIMPL; + if (This->sink) IDispatch_Release(This->sink); + if ((This->sink = sink)) IDispatch_AddRef(This->sink); + + return S_OK; } static const struct IXMLHTTPRequestVtbl dimimpl_vtbl = @@ -819,7 +832,10 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->async = FALSE; req->verb = -1; req->url = req->user = req->password = NULL; + req->state = READYSTATE_UNINITIALIZED; + req->sink = NULL; + req->bsc = NULL; req->status = 0; req->reqheader_size = 0; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2c261fe..bcc9842 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -40,6 +40,117 @@ DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); DEFINE_GUID(CLSID_DOMDocument60, 0x88d96a05, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +static int g_unexpectedcall, g_expectedcall; + +typedef struct +{ + const struct IDispatchVtbl *lpVtbl; + LONG ref; +} dispevent; + +static inline dispevent *impl_from_IDispatch( IDispatch *iface ) +{ + return (dispevent *)((char*)iface - FIELD_OFFSET(dispevent, lpVtbl)); +} + +static HRESULT WINAPI dispevent_QueryInterface(IDispatch *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if ( IsEqualGUID( riid, &IID_IDispatch) || + IsEqualGUID( riid, &IID_IUnknown) ) + { + *ppvObject = iface; + } + else + return E_NOINTERFACE; + + IDispatch_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI dispevent_AddRef(IDispatch *iface) +{ + dispevent *This = impl_from_IDispatch( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI dispevent_Release(IDispatch *iface) +{ + dispevent *This = impl_from_IDispatch( iface ); + ULONG ref = InterlockedDecrement( &This->ref ); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI dispevent_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + g_unexpectedcall++; + *pctinfo = 0; + return S_OK; +} + +static HRESULT WINAPI dispevent_GetTypeInfo(IDispatch *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + g_unexpectedcall++; + return S_OK; +} + +static HRESULT WINAPI dispevent_GetIDsOfNames(IDispatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + g_unexpectedcall++; + return S_OK; +} + +static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, + EXCEPINFO *excepInfo, UINT *argErr) +{ + ok(member == 0, "expected 0 member, got %d\n", member); + ok(lcid == LOCALE_SYSTEM_DEFAULT, "expected LOCALE_SYSTEM_DEFAULT, got lcid %x\n", lcid); + ok(flags == DISPATCH_METHOD, "expected DISPATCH_METHOD, got %d\n", flags); + + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + + ok(result == NULL, "got %p\n", result); + ok(excepInfo == NULL, "got %p\n", excepInfo); + ok(argErr == NULL, "got %p\n", argErr); + + g_expectedcall++; + return E_FAIL; +} + +static const IDispatchVtbl dispeventVtbl = +{ + dispevent_QueryInterface, + dispevent_AddRef, + dispevent_Release, + dispevent_GetTypeInfoCount, + dispevent_GetTypeInfo, + dispevent_GetIDsOfNames, + dispevent_Invoke +}; + +static IDispatch* create_dispevent(void) +{ + dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event)); + + event->lpVtbl = &dispeventVtbl; + event->ref = 1; + + return (IDispatch*)&event->lpVtbl; +} + + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -3082,7 +3193,8 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; - LONG state, status; + LONG state, status, ref; + IDispatch *event; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void **)&pXMLHttpRequest); @@ -3104,6 +3216,13 @@ static void test_XMLHTTP(void) method = SysAllocString(wszPOST); url = SysAllocString(wszUrl); +if (0) +{ + /* crashes on win98 */ + hr = IXMLHttpRequest_put_onreadystatechange(pXMLHttpRequest, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + /* send before open */ hr = IXMLHttpRequest_send(pXMLHttpRequest, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); @@ -3147,9 +3266,26 @@ static void test_XMLHTTP(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(state == 0, "got %d, expected 0\n", state); + event = create_dispevent(); + ref = IDispatch_AddRef(event); + ok(ref == 2, "got %d\n", ref); + IDispatch_Release(event); + + hr = IXMLHttpRequest_put_onreadystatechange(pXMLHttpRequest, event); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref = IDispatch_AddRef(event); + ok(ref == 3, "got %d\n", ref); + IDispatch_Release(event); + + g_unexpectedcall = g_expectedcall = 0; + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_unexpectedcall == 0, "unexpected disp event call\n"); + ok(g_expectedcall == 1 || broken(g_expectedcall == 0) /* win2k */, "no expected disp event call\n"); + /* status code after ::open() */ status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); @@ -3225,6 +3361,7 @@ todo_wine { SysFreeString(url); + IDispatch_Release(event); IXMLHttpRequest_Release(pXMLHttpRequest); free_bstrs(); }

1 0

Andrew Eikum : wininet: Clean up returned UrlPath for file protocol URLs.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 3555226acfc811673ffc1f1eccf211424880af91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3555226acfc811673ffc1f1ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 5 10:28:42 2010 -0500 wininet: Clean up returned UrlPath for file protocol URLs. --- dlls/wininet/internet.c | 49 ++++++++++++-- dlls/wininet/tests/url.c | 169 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 207 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3555226acfc811673ffc1…

1 0

Nikolay Sivov : msxml3: Accept versioned XMLHTTP CLSIDs.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 7ff3446be5751319fd402d70df3c307eec0d2fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff3446be5751319fd402d70d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 00:01:45 2010 +0400 msxml3: Accept versioned XMLHTTP CLSIDs. --- dlls/msxml3/factory.c | 6 +++++- include/msxml2.idl | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 5c7d015..bd42f1a 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -253,7 +253,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { cf = (IClassFactory*) &saxreadcf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest)) + else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP26 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP30 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP40 ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP60 )) { cf = (IClassFactory*) &httpreqcf.lpVtbl; } diff --git a/include/msxml2.idl b/include/msxml2.idl index 444ebe8..da520d2 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1330,13 +1330,45 @@ coclass FreeThreadedDOMDocument30 } [ - uuid(88d969c1-f192-11d4-a65f-0040963251e5), + uuid(88d969c1-f192-11d4-a65f-0040963251e5) ] coclass FreeThreadedDOMDocument40 { [default] interface IXMLDOMDocument2; [default, source] dispinterface XMLDOMDocumentEvents; -}; +} + +[ + uuid(f5078f1e-c551-11d3-89b9-0000f81fe221) +] +coclass XMLHTTP26 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(f5078f35-c551-11d3-89b9-0000f81fe221) +] +coclass XMLHTTP30 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(88d969c5-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP40 +{ + [default] interface IXMLHTTPRequest; +} + +[ + uuid(88d96a0a-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP60 +{ + [default] interface IXMLHTTPRequest; +} [ uuid(373984c9-b845-449b-91e7-45ac83036ade)

1 0

Nikolay Sivov : msxml3: Don't fail trying to set NewParser property.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 59c5bd2956e4a8124c676bf86b067f826ac5e16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c5bd2956e4a8124c676bf86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 5 23:56:15 2010 +0400 msxml3: Don't fail trying to set NewParser property. --- dlls/msxml3/domdoc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e55c0ae..1ca1746 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -64,6 +64,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR PropertySelectionLanguageW[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; static const WCHAR PropertySelectionNamespacesW[] = {'S','e','l','e','c','t','i','o','n','N','a','m','e','s','p','a','c','e','s',0}; static const WCHAR PropertyProhibitDTDW[] = {'P','r','o','h','i','b','i','t','D','T','D',0}; +static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0}; static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; @@ -2494,10 +2495,11 @@ static HRESULT WINAPI domdoc_setProperty( VariantClear(&varStr); return hr; } - else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0) + else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || + lstrcmpiW(p, PropertyNewParserW) == 0) { /* Ignore */ - FIXME("Ignoring property ProhibitDTD, value %d\n", V_BOOL(&var)); + FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&var)); return S_OK; }

1 0

Hans Leidekker : msi: Treat empty string as NULL in MsiGetSummaryInformationW.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 2d5351ff824f71005837d1d709216810b24599e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5351ff824f71005837d1d70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:58:12 2010 +0200 msi: Treat empty string as NULL in MsiGetSummaryInformationW. (cherry picked from commit 259b5fdfa6036a1f4d782d215c507c9aaeb33eb4) --- dlls/msi/suminfo.c | 2 +- dlls/msi/tests/suminfo.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 902a61f..b174e5b 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if( !pHandle ) return ERROR_INVALID_PARAMETER; - if( szDatabase ) + if( szDatabase && szDatabase[0] ) { LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index a0b225b..07202a3 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -86,7 +86,18 @@ static void test_suminfo(void) ok(r == ERROR_INVALID_PARAMETER, "MsiGetSummaryInformation wrong error\n"); r = MsiGetSummaryInformation(hdb, NULL, 0, &hsuminfo); - ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiGetSummaryInformation(0, "", 0, &hsuminfo); + todo_wine + ok(r == ERROR_INSTALL_PACKAGE_INVALID || r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, + "MsiGetSummaryInformation failed %u\n", r); + + r = MsiGetSummaryInformation(hdb, "", 0, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); r = MsiSummaryInfoGetPropertyCount(0, NULL); ok(r == ERROR_INVALID_HANDLE, "getpropcount failed\n");

1 0

Hans Leidekker : winecfg: Update Windows 7 version to Service Pack 1.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: ed3c9837027210fed1d71e52a211ee593e5ad83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c9837027210fed1d71e52a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:19 2010 +0200 winecfg: Update Windows 7 version to Service Pack 1. (cherry picked from commit 92b7f57e1e94fcdd8a132404629bcda8afa9eb9c) --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9d06d8f..e109905 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -152,9 +152,9 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN7 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB0, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 } }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index cf07fe8..39ecd4e 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win7", "Windows 7", 6, 1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying window bits if the window didn't move.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: bc62acea046886e8cf82a7dcf6ce46e4e21abe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc62acea046886e8cf82a7dcf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:22:56 2010 +0900 winex11.drv: Avoid copying window bits if the window didn't move. (cherry picked from commit c912af04deed53a0d1c06f03e4515ac838a896b1) --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5050609..e288b82 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2342,7 +2342,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { /* if we have an X window the bits will be moved by the X server */ - if (!data->whole_window) + if (!data->whole_window && (x_offset != 0 || y_offset != 0)) move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else

1 0