October 2010 - Wine-commits

Austin Lund : kernel32/tests: Increase timeouts to avoid test failures in CreateRemoteThread.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 86c39000a45d6b1660ce5215014bdf572231d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c39000a45d6b1660ce52150… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 25 11:56:48 2010 +1000 kernel32/tests: Increase timeouts to avoid test failures in CreateRemoteThread. --- dlls/kernel32/tests/thread.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index c285b01..fe1cc7d 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -310,18 +310,18 @@ static VOID test_CreateRemoteThread(void) ok(ret == 2, "ret=%u, err=%u\n", ret, GetLastError()); /* thread still suspended, so wait times out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); ret = ResumeThread(hThread); ok(ret == 1, "ret=%u, err=%u\n", ret, GetLastError()); /* wait that doesn't time out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_OBJECT_0, "object not signaled, ret=%u\n", ret); /* wait for thread end */ - ret = WaitForSingleObject(hThread, 100); + ret = WaitForSingleObject(hThread, 1000); ok(ret == WAIT_OBJECT_0, "waiting for thread failed, ret=%u\n", ret); CloseHandle(hThread); @@ -330,7 +330,7 @@ static VOID test_CreateRemoteThread(void) threadFunc_CloseHandle, hRemoteEvent, 0, &tid); ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); - ret = WaitForSingleObject(hThread, 100); + ret = WaitForSingleObject(hThread, 1000); ok(ret == WAIT_OBJECT_0, "waiting for thread failed, ret=%u\n", ret); CloseHandle(hThread); @@ -341,7 +341,7 @@ static VOID test_CreateRemoteThread(void) ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); /* closed handle, so wait times out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); /* check that remote SetEvent() failed */

1 0

Austin Lund : gdiplus/tests: Fix GetLogFont charset tests for Asian platforms.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: ae0a48494504a73b5a9ad70901c621433bb673ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0a48494504a73b5a9ad7090… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 25 14:39:08 2010 +1000 gdiplus/tests: Fix GetLogFont charset tests for Asian platforms. --- dlls/gdiplus/tests/font.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index c2ed3c7..834ba60 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -129,7 +129,8 @@ static void test_logfont(void) expect(0, lfa2.lfItalic); expect(0, lfa2.lfUnderline); expect(0, lfa2.lfStrikeOut); - expect(GetTextCharset(hdc), lfa2.lfCharSet); + ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET, + "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet); expect(0, lfa2.lfOutPrecision); expect(0, lfa2.lfClipPrecision); expect(0, lfa2.lfQuality); @@ -159,7 +160,8 @@ static void test_logfont(void) expect(TRUE, lfa2.lfItalic); expect(TRUE, lfa2.lfUnderline); expect(TRUE, lfa2.lfStrikeOut); - expect(GetTextCharset(hdc), lfa2.lfCharSet); + ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET, + "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet); expect(0, lfa2.lfOutPrecision); expect(0, lfa2.lfClipPrecision); expect(0, lfa2.lfQuality);

1 0

Juan Lang : crypt32: Check revocation status of chain element-by-element.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: dd7a45be7c28300c3521e3f34227ddf25682331b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7a45be7c28300c3521e3f34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 12:48:59 2009 -0800 crypt32: Check revocation status of chain element-by-element. Due to a quirk in CertVerifyRevocation (see its tests), checking an entire chain doesn't appear to be supported, even though the API would appear to support doing so. Checking element by element allows revocation to be checked for the entire chain. --- dlls/crypt32/chain.c | 142 +++++++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 71 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e3cf401..fa739fe 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2594,84 +2594,84 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, cContext = 0; if (cContext) { - PCCERT_CONTEXT *contexts = - CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT)); + DWORD i, j, iContext, revocationFlags; + CERT_REVOCATION_PARA revocationPara = { sizeof(revocationPara), 0 }; + CERT_REVOCATION_STATUS revocationStatus = + { sizeof(revocationStatus), 0 }; + BOOL ret; - if (contexts) + revocationFlags = CERT_VERIFY_REV_CHAIN_FLAG; + if (chainFlags & CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY) + revocationFlags |= CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION; + if (chainFlags & CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT) + revocationFlags |= CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG; + revocationPara.pftTimeToUse = pTime; + if (hAdditionalStore) { - DWORD i, j, iContext, revocationFlags; - CERT_REVOCATION_PARA revocationPara = { sizeof(revocationPara), 0 }; - CERT_REVOCATION_STATUS revocationStatus = - { sizeof(revocationStatus), 0 }; - BOOL ret; - - for (i = 0, iContext = 0; iContext < cContext && i < chain->cChain; - i++) - { - for (j = 0; iContext < cContext && - j < chain->rgpChain[i]->cElement; j++) - contexts[iContext++] = - chain->rgpChain[i]->rgpElement[j]->pCertContext; - } - revocationFlags = CERT_VERIFY_REV_CHAIN_FLAG; - if (chainFlags & CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY) - revocationFlags |= CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION; - if (chainFlags & CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT) - revocationFlags |= CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG; - revocationPara.pftTimeToUse = pTime; - if (hAdditionalStore) - { - revocationPara.cCertStore = 1; - revocationPara.rgCertStore = &hAdditionalStore; - revocationPara.hCrlStore = hAdditionalStore; - } - if (pChainPara->cbSize == sizeof(CERT_CHAIN_PARA)) - { - revocationPara.dwUrlRetrievalTimeout = - pChainPara->dwUrlRetrievalTimeout; - revocationPara.fCheckFreshnessTime = - pChainPara->fCheckRevocationFreshnessTime; - revocationPara.dwFreshnessTime = - pChainPara->dwRevocationFreshnessTime; - } - ret = CertVerifyRevocation(X509_ASN_ENCODING, - CERT_CONTEXT_REVOCATION_TYPE, cContext, (void **)contexts, - revocationFlags, &revocationPara, &revocationStatus); - if (!ret) + revocationPara.cCertStore = 1; + revocationPara.rgCertStore = &hAdditionalStore; + revocationPara.hCrlStore = hAdditionalStore; + } + if (pChainPara->cbSize == sizeof(CERT_CHAIN_PARA)) + { + revocationPara.dwUrlRetrievalTimeout = + pChainPara->dwUrlRetrievalTimeout; + revocationPara.fCheckFreshnessTime = + pChainPara->fCheckRevocationFreshnessTime; + revocationPara.dwFreshnessTime = + pChainPara->dwRevocationFreshnessTime; + } + for (i = 0, iContext = 0; iContext < cContext && i < chain->cChain; i++) + { + for (j = 0; iContext < cContext && + j < chain->rgpChain[i]->cElement; j++, iContext++) { - PCERT_CHAIN_ELEMENT element = - CRYPT_FindIthElementInChain(chain, revocationStatus.dwIndex); - DWORD error; + PCCERT_CONTEXT certToCheck = + chain->rgpChain[i]->rgpElement[j]->pCertContext; - switch (revocationStatus.dwError) - { - case CRYPT_E_NO_REVOCATION_CHECK: - case CRYPT_E_NO_REVOCATION_DLL: - case CRYPT_E_NOT_IN_REVOCATION_DATABASE: - /* If the revocation status is unknown, it's assumed to be - * offline too. - */ - error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN | - CERT_TRUST_IS_OFFLINE_REVOCATION; - break; - case CRYPT_E_REVOCATION_OFFLINE: - error = CERT_TRUST_IS_OFFLINE_REVOCATION; - break; - case CRYPT_E_REVOKED: - error = CERT_TRUST_IS_REVOKED; - break; - default: - WARN("unmapped error %08x\n", revocationStatus.dwError); - error = 0; - } - if (element) + if (j < chain->rgpChain[i]->cElement - 1) + revocationPara.pIssuerCert = + chain->rgpChain[i]->rgpElement[j + 1]->pCertContext; + else + revocationPara.pIssuerCert = NULL; + ret = CertVerifyRevocation(X509_ASN_ENCODING, + CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, + revocationFlags, &revocationPara, &revocationStatus); + if (!ret) { - /* FIXME: set element's pRevocationInfo member */ - element->TrustStatus.dwErrorStatus |= error; + PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( + chain, iContext); + DWORD error; + + switch (revocationStatus.dwError) + { + case CRYPT_E_NO_REVOCATION_CHECK: + case CRYPT_E_NO_REVOCATION_DLL: + case CRYPT_E_NOT_IN_REVOCATION_DATABASE: + /* If the revocation status is unknown, it's assumed + * to be offline too. + */ + error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN | + CERT_TRUST_IS_OFFLINE_REVOCATION; + break; + case CRYPT_E_REVOCATION_OFFLINE: + error = CERT_TRUST_IS_OFFLINE_REVOCATION; + break; + case CRYPT_E_REVOKED: + error = CERT_TRUST_IS_REVOKED; + break; + default: + WARN("unmapped error %08x\n", revocationStatus.dwError); + error = 0; + } + if (element) + { + /* FIXME: set element's pRevocationInfo member */ + element->TrustStatus.dwErrorStatus |= error; + } + chain->TrustStatus.dwErrorStatus |= error; } - chain->TrustStatus.dwErrorStatus |= error; } - CryptMemFree(contexts); } } }

1 0

Detlef Riekenberg : shdocvw: Add a stub for ImportPrivacySettings.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 0fda52b8d724ee7be30e43008eababa52ab30a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda52b8d724ee7be30e43008… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 24 15:31:09 2010 +0200 shdocvw: Add a stub for ImportPrivacySettings. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 32 ++++++++++++++++++++++++++++++++ include/shlobj.h | 1 + 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 4a0dd2c..be59d85 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -120,7 +120,7 @@ @ stub HlinkFrameNavigateNHL @ stub IEAboutBox @ stub IEWriteErrorLog -@ stub ImportPrivacySettings +@ stdcall ImportPrivacySettings(wstr ptr ptr) @ stub InstallReg_RunDLL @ stdcall OpenURL(long long str long) @ stub SHGetIDispatchForFolder diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5dfd2b9..f0fa0f6 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -461,3 +461,35 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) heap_free(urlW); return res; } + +/****************************************************************** + * ImportPrivacySettings (SHDOCVW.@) + * + * Import global and/or per site privacy preferences from an xml file + * + * PARAMS + * filename [I] XML file to use + * pGlobalPrefs [IO] PTR to a usage flag for the global privacy preferences + * pPerSitePrefs [IO] PTR to a usage flag for the per site privacy preferences + * + * RETURNS + * Success: TRUE (the privacy preferences where updated) + * Failure: FALSE (the privacy preferences are unchanged) + * + * NOTES + * Set the flag to TRUE, when the related privacy preferences in the xml file + * should be used (parsed and overwrite the current settings). + * On return, the flag is TRUE, when the related privacy settings where used + * + */ +BOOL WINAPI ImportPrivacySettings(LPCWSTR filename, BOOL *pGlobalPrefs, BOOL * pPerSitePrefs) +{ + FIXME("(%s, %p->%d, %p->%d): stub\n", debugstr_w(filename), + pGlobalPrefs, pGlobalPrefs ? *pGlobalPrefs : 0, + pPerSitePrefs, pPerSitePrefs ? *pPerSitePrefs : 0); + + if (pGlobalPrefs) *pGlobalPrefs = FALSE; + if (pPerSitePrefs) *pPerSitePrefs = FALSE; + + return TRUE; +} diff --git a/include/shlobj.h b/include/shlobj.h index ad41f94..f3aa3b6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -84,6 +84,7 @@ int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); +BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); #define KF_FLAG_SIMPLE_IDLIST 0x00000100 #define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200

1 0

Jacek Caban : msxml3: Remove unused xmlnode_* functions.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 16647d42db43c9c7106325b66cee5c482a21d11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16647d42db43c9c7106325b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 24 22:54:46 2010 +0200 msxml3: Remove unused xmlnode_* functions. --- dlls/msxml3/node.c | 236 +++++----------------------------------------------- 1 files changed, 22 insertions(+), 214 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 56d41ee..170a6b9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -110,74 +110,6 @@ static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); } -static HRESULT WINAPI xmlnode_QueryInterface( - IXMLDOMNode *iface, - REFIID riid, - void** ppvObject ) -{ - ERR("Should not be called\n"); - return E_NOINTERFACE; -} - -static ULONG WINAPI xmlnode_AddRef( - IXMLDOMNode *iface ) -{ - ERR("Should not be called\n"); - return 2; -} - -static ULONG WINAPI xmlnode_Release( - IXMLDOMNode *iface ) -{ - ERR("Should not be called\n"); - return 1; -} - -static HRESULT WINAPI xmlnode_GetTypeInfoCount( - IXMLDOMNode *iface, - UINT* pctinfo ) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlnode_GetTypeInfo( - IXMLDOMNode *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo** ppTInfo ) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlnode_GetIDsOfNames( - IXMLDOMNode *iface, - REFIID riid, - LPOLESTR* rgszNames, - UINT cNames, - LCID lcid, - DISPID* rgDispId ) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlnode_Invoke( - IXMLDOMNode *iface, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS* pDispParams, - VARIANT* pVarResult, - EXCEPINFO* pExcepInfo, - UINT* puArgErr ) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { if (!name) @@ -190,14 +122,6 @@ HRESULT node_get_nodeName(xmlnode *This, BSTR *name) return S_OK; } -static HRESULT WINAPI xmlnode_get_nodeName( - IXMLDOMNode *iface, - BSTR* name) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_content(xmlnode *This, VARIANT *value) { xmlChar *content; @@ -214,14 +138,6 @@ HRESULT node_get_content(xmlnode *This, VARIANT *value) return S_OK; } -static HRESULT WINAPI xmlnode_get_nodeValue( - IXMLDOMNode *iface, - VARIANT* value) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_put_value(xmlnode *This, VARIANT *value) { VARIANT string_value; @@ -243,22 +159,6 @@ HRESULT node_put_value(xmlnode *This, VARIANT *value) return S_OK; } -static HRESULT WINAPI xmlnode_put_nodeValue( - IXMLDOMNode *iface, - VARIANT value) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlnode_get_nodeType( - IXMLDOMNode *iface, - DOMNodeType* type) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - static HRESULT get_node( xmlnode *This, const char *name, @@ -285,14 +185,6 @@ HRESULT node_get_parent(xmlnode *This, IXMLDOMNode **parent) return get_node( This, "parent", This->node->parent, parent ); } -static HRESULT WINAPI xmlnode_get_parentNode( - IXMLDOMNode *iface, - IXMLDOMNode** parent) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_child_nodes(xmlnode *This, IXMLDOMNodeList **ret) { if(!ret) @@ -305,74 +197,26 @@ HRESULT node_get_child_nodes(xmlnode *This, IXMLDOMNodeList **ret) return S_OK; } -static HRESULT WINAPI xmlnode_get_childNodes( - IXMLDOMNode *iface, - IXMLDOMNodeList** childList) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_first_child(xmlnode *This, IXMLDOMNode **ret) { return get_node(This, "firstChild", This->node->children, ret); } -static HRESULT WINAPI xmlnode_get_firstChild( - IXMLDOMNode *iface, - IXMLDOMNode** firstChild) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_last_child(xmlnode *This, IXMLDOMNode **ret) { return get_node(This, "lastChild", This->node->last, ret); } -static HRESULT WINAPI xmlnode_get_lastChild( - IXMLDOMNode *iface, - IXMLDOMNode** lastChild) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_previous_sibling(xmlnode *This, IXMLDOMNode **ret) { return get_node(This, "previous", This->node->prev, ret); } -static HRESULT WINAPI xmlnode_get_previousSibling( - IXMLDOMNode *iface, - IXMLDOMNode** previousSibling) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) { return get_node(This, "next", This->node->next, ret); } -static HRESULT WINAPI xmlnode_get_nextSibling( - IXMLDOMNode *iface, - IXMLDOMNode** nextSibling) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlnode_get_attributes( - IXMLDOMNode *iface, - IXMLDOMNamedNodeMap** attributeMap) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { @@ -440,16 +284,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT return S_OK; } -static HRESULT WINAPI xmlnode_insertBefore( - IXMLDOMNode *iface, - IXMLDOMNode* newChild, - VARIANT refChild, - IXMLDOMNode** outNewChild) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *oldChild, IXMLDOMNode **ret) { @@ -514,16 +348,6 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol return S_OK; } -static HRESULT WINAPI xmlnode_replaceChild( - IXMLDOMNode *iface, - IXMLDOMNode* newChild, - IXMLDOMNode* oldChild, - IXMLDOMNode** outOldChild) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - static HRESULT WINAPI xmlnode_removeChild( IXMLDOMNode *iface, IXMLDOMNode* childNode, @@ -763,14 +587,6 @@ HRESULT node_put_text(xmlnode *This, BSTR text) return S_OK; } -static HRESULT WINAPI xmlnode_put_text( - IXMLDOMNode *iface, - BSTR text) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - static HRESULT WINAPI xmlnode_get_specified( IXMLDOMNode *iface, VARIANT_BOOL* isSpecified) @@ -1013,14 +829,6 @@ static HRESULT WINAPI xmlnode_put_nodeTypedValue( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_dataType( - IXMLDOMNode *iface, - VARIANT* dataTypeName) -{ - ERR("Should not be called\n"); - return E_NOTIMPL; -} - static HRESULT WINAPI xmlnode_put_dataType( IXMLDOMNode *iface, BSTR dataTypeName) @@ -1460,26 +1268,26 @@ static HRESULT WINAPI xmlnode_transformNodeToObject( static const struct IXMLDOMNodeVtbl xmlnode_vtbl = { - xmlnode_QueryInterface, - xmlnode_AddRef, - xmlnode_Release, - xmlnode_GetTypeInfoCount, - xmlnode_GetTypeInfo, - xmlnode_GetIDsOfNames, - xmlnode_Invoke, - xmlnode_get_nodeName, - xmlnode_get_nodeValue, - xmlnode_put_nodeValue, - xmlnode_get_nodeType, - xmlnode_get_parentNode, - xmlnode_get_childNodes, - xmlnode_get_firstChild, - xmlnode_get_lastChild, - xmlnode_get_previousSibling, - xmlnode_get_nextSibling, - xmlnode_get_attributes, - xmlnode_insertBefore, - xmlnode_replaceChild, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, xmlnode_removeChild, xmlnode_appendChild, xmlnode_hasChildNodes, @@ -1487,12 +1295,12 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_cloneNode, xmlnode_get_nodeTypeString, xmlnode_get_text, - xmlnode_put_text, + NULL, xmlnode_get_specified, xmlnode_get_definition, xmlnode_get_nodeTypedValue, xmlnode_put_nodeTypedValue, - xmlnode_get_dataType, + NULL, xmlnode_put_dataType, xmlnode_get_xml, xmlnode_transformNode,

1 0

Piotr Caban : msvcr90/tests: Make some tests fail if invalid_parameter_handler was not invoked.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 3b7a5d410e05ed20955abecaa2e628ea6a14d65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7a5d410e05ed20955abecaa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Oct 24 23:41:23 2010 +0200 msvcr90/tests: Make some tests fail if invalid_parameter_handler was not invoked. --- dlls/msvcr90/tests/msvcr90.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ad0d334..5a60871 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -25,6 +25,32 @@ #include <errno.h> #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(invalid_parameter_handler); + static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); typedef int (__cdecl *_INITTERM_E_FN)(void); static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); @@ -48,6 +74,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) { + CHECK_EXPECT(invalid_parameter_handler); ok(expression == NULL, "expression is not NULL\n"); ok(function == NULL, "function is not NULL\n"); ok(file == NULL, "file is not NULL\n"); @@ -223,18 +250,35 @@ static void test__strtoi64(void) } errno = 0xdeadbeef; + SET_EXPECT(invalid_parameter_handler); res = p_strtoi64(NULL, NULL, 10); ok(res == 0, "res != 0\n"); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); res = p_strtoi64("123", NULL, 1); ok(res == 0, "res != 0\n"); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); res = p_strtoi64("123", NULL, 37); ok(res == 0, "res != 0\n"); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); ures = p_strtoui64(NULL, NULL, 10); ok(ures == 0, "res = %d\n", (int)ures); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); ures = p_strtoui64("123", NULL, 1); ok(ures == 0, "res = %d\n", (int)ures); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); ures = p_strtoui64("123", NULL, 37); ok(ures == 0, "res = %d\n", (int)ures); + CHECK_CALLED(invalid_parameter_handler); ok(errno == 0xdeadbeef, "errno = %x\n", errno); }

1 0

Alexandre Julliard : kernel32: Fix a FAT format sanity check for floppies.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 1379269587e6f158a22e2bc784861a881e23f3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1379269587e6f158a22e2bc78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 12:40:54 2010 +0200 kernel32: Fix a FAT format sanity check for floppies. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 17e70e5..19858cf 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -368,7 +368,7 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) reasonable = num_boot_sectors < total_sectors && num_fats < 16 && bytes_per_sector >= 512 && bytes_per_sector % 512 == 0 && - sectors_per_cluster > 1; + sectors_per_cluster >= 1; if (!reasonable) return FS_UNKNOWN; sectors = total_sectors - num_boot_sectors - num_fats * sect_per_fat - (num_root_dir_ents * 32 + bytes_per_sector - 1) / bytes_per_sector;

1 0

Alexandre Julliard : comctl32: Make more functions available by name.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 478d35fa7501373f76ed4eca290a38038236e496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478d35fa7501373f76ed4eca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 12:41:04 2010 +0200 comctl32: Make more functions available by name. --- dlls/comctl32/comctl32.spec | 56 +++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index c77c2fa..4613fda 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -38,27 +38,27 @@ 234 stdcall -noname Str_SetPtrA(str str) 235 stdcall -noname Str_GetPtrW(wstr wstr long) 236 stdcall -noname Str_SetPtrW(wstr wstr) -320 stdcall -noname DSA_Create(long long) -321 stdcall -noname DSA_Destroy(ptr) -322 stdcall -noname DSA_GetItem(ptr long long) -323 stdcall -noname DSA_GetItemPtr(ptr long) -324 stdcall -noname DSA_InsertItem(ptr long long) -325 stdcall -noname DSA_SetItem (ptr long long) -326 stdcall -noname DSA_DeleteItem(ptr long) -327 stdcall -noname DSA_DeleteAllItems(ptr) -328 stdcall -noname DPA_Create(long) -329 stdcall -noname DPA_Destroy(ptr) -330 stdcall -noname DPA_Grow(ptr long) -331 stdcall -noname DPA_Clone(ptr ptr) -332 stdcall -noname DPA_GetPtr(ptr long) -333 stdcall -noname DPA_GetPtrIndex(ptr ptr) -334 stdcall -noname DPA_InsertPtr(ptr long ptr) -335 stdcall -noname DPA_SetPtr(ptr long ptr) -336 stdcall -noname DPA_DeletePtr(ptr long) -337 stdcall -noname DPA_DeleteAllPtrs(ptr) -338 stdcall -noname DPA_Sort(ptr ptr long) -339 stdcall -noname DPA_Search(ptr ptr long ptr long long) -340 stdcall -noname DPA_CreateEx(long long) +320 stdcall -ordinal DSA_Create(long long) +321 stdcall -ordinal DSA_Destroy(ptr) +322 stdcall -ordinal DSA_GetItem(ptr long long) +323 stdcall -ordinal DSA_GetItemPtr(ptr long) +324 stdcall -ordinal DSA_InsertItem(ptr long long) +325 stdcall -ordinal DSA_SetItem (ptr long long) +326 stdcall -ordinal DSA_DeleteItem(ptr long) +327 stdcall -ordinal DSA_DeleteAllItems(ptr) +328 stdcall -ordinal DPA_Create(long) +329 stdcall -ordinal DPA_Destroy(ptr) +330 stdcall -ordinal DPA_Grow(ptr long) +331 stdcall -ordinal DPA_Clone(ptr ptr) +332 stdcall -ordinal DPA_GetPtr(ptr long) +333 stdcall -ordinal DPA_GetPtrIndex(ptr ptr) +334 stdcall -ordinal DPA_InsertPtr(ptr long ptr) +335 stdcall -ordinal DPA_SetPtr(ptr long ptr) +336 stdcall -ordinal DPA_DeletePtr(ptr long) +337 stdcall -ordinal DPA_DeleteAllPtrs(ptr) +338 stdcall -ordinal DPA_Sort(ptr ptr long) +339 stdcall -ordinal DPA_Search(ptr ptr long ptr long long) +340 stdcall -ordinal DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 350 stdcall -noname StrChrA(str str) @@ -90,16 +90,16 @@ 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -noname DPA_EnumCallback(long long long) -386 stdcall -noname DPA_DestroyCallback(ptr ptr long) -387 stdcall -noname DSA_EnumCallback(ptr ptr long) -388 stdcall -noname DSA_DestroyCallback(ptr ptr long) +385 stdcall -ordinal DPA_EnumCallback(long long long) +386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) +387 stdcall -ordinal DSA_EnumCallback(ptr ptr long) +388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) 389 stub -noname SHGetProcessDword 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) -400 stdcall -noname CreateMRUListW(ptr) -401 stdcall -noname AddMRUStringW(long wstr) +400 stdcall -ordinal CreateMRUListW(ptr) +401 stdcall -ordinal AddMRUStringW(long wstr) 402 stdcall -noname FindMRUStringW(long wstr ptr) -403 stdcall -noname EnumMRUListW(long long ptr long) +403 stdcall -ordinal EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) 410 stdcall -ordinal SetWindowSubclass(long ptr long long) 411 stdcall -ordinal GetWindowSubclass(long ptr long ptr)

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface for a few stub functions.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 70edd9a7fb03d2b15f4f4b3d167ac39fdba03f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70edd9a7fb03d2b15f4f4b3d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 24 22:55:04 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface for a few stub functions. --- dlls/msxml3/attribute.c | 17 ++++++++++----- dlls/msxml3/cdata.c | 17 ++++++++++----- dlls/msxml3/comment.c | 17 ++++++++++----- dlls/msxml3/docfrag.c | 17 ++++++++++----- dlls/msxml3/domdoc.c | 9 +++++++- dlls/msxml3/element.c | 17 ++++++++++----- dlls/msxml3/entityref.c | 17 ++++++++++----- dlls/msxml3/node.c | 52 ++++++++++++---------------------------------- dlls/msxml3/pi.c | 17 ++++++++++----- dlls/msxml3/text.c | 17 ++++++++++----- 10 files changed, 110 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70edd9a7fb03d2b15f4f4…

1 0

Alexandre Julliard : shell32: Make more functions available by name.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 8451598014d56bb395c5d2da2f4fe9876cb99b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8451598014d56bb395c5d2da2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 12:41:09 2010 +0200 shell32: Make more functions available by name. --- dlls/shell32/shell32.spec | 130 ++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8451598014d56bb395c5d…

1 0