September 2010 - Wine-Commits

Nikolay Sivov : msxml3: Fix ::selectSingleNode() behaviour on invalid arguments.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: a930084d8664b3c3dacf7c04f2cadcc6766e0cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a930084d8664b3c3dacf7c04f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 23:41:00 2010 +0400 msxml3: Fix ::selectSingleNode() behaviour on invalid arguments. --- dlls/msxml3/node.c | 3 +- dlls/msxml3/tests/domdoc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8f3ebc6..d466780 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1363,6 +1363,8 @@ static HRESULT WINAPI xmlnode_selectNodes( TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList ); + if (!queryString || !resultList) return E_INVALIDARG; + return queryresult_create( This->node, queryString, resultList ); } @@ -1377,7 +1379,6 @@ static HRESULT WINAPI xmlnode_selectSingleNode( TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode ); - *resultNode = NULL; r = IXMLDOMNode_selectNodes(This->iface, queryString, &list); if(r == S_OK) { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f68c972..fc09f15 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6218,6 +6218,74 @@ static void test_get_prefix(void) free_bstrs(); } +static void test_selectSingleNode(void) +{ + IXMLDOMDocument *doc; + IXMLDOMNodeList *list; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT hr; + LONG len; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNodeList_Release(list); + + list = (void*)0xdeadbeef; + hr = IXMLDOMDocument_selectNodes(doc, NULL, &list); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(list == (void*)0xdeadbeef, "got %p\n", list); + + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("nonexistent"), &node); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(node == 0, "got %p\n", node); + + list = (void*)0xdeadbeef; + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("nonexistent"), &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = 1; + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + IXMLDOMNodeList_Release(list); + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -6276,6 +6344,7 @@ START_TEST(domdoc) test_createNode(); test_get_prefix(); test_default_properties(); + test_selectSingleNode(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Store selected query language in backend document instance.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 893e8a46b212e09497e4aab27166f4d8ed0cd3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=893e8a46b212e09497e4aab27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 23:59:32 2010 +0400 msxml3: Store selected query language in backend document instance. --- dlls/msxml3/domdoc.c | 45 ++++++++++++++++++++++++++++++------------- dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f086e80..8f87a56 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -77,7 +77,6 @@ typedef struct _domdoc VARIANT_BOOL validating; VARIANT_BOOL resolving; VARIANT_BOOL preserving; - BOOL XPath; IXMLDOMSchemaCollection *schema; bsc_t *bsc; HRESULT error; @@ -117,6 +116,7 @@ typedef struct _domdoc typedef struct _xmldoc_priv { LONG refs; struct list orphans; + BOOL XPath; } xmldoc_priv; typedef struct _orphan_entry { @@ -124,19 +124,35 @@ typedef struct _orphan_entry { xmlNode * node; } orphan_entry; -static inline xmldoc_priv * priv_from_xmlDocPtr(xmlDocPtr doc) +static inline xmldoc_priv * priv_from_xmlDocPtr(const xmlDocPtr doc) { return doc->_private; } +static inline BOOL is_xpathmode(const xmlDocPtr doc) +{ + return priv_from_xmlDocPtr(doc)->XPath; +} + +static inline void set_xpathmode(const xmlDocPtr doc) +{ + priv_from_xmlDocPtr(doc)->XPath = TRUE; +} + +static inline void reset_xpathmode(const xmlDocPtr doc) +{ + priv_from_xmlDocPtr(doc)->XPath = FALSE; +} + static xmldoc_priv * create_priv(void) { xmldoc_priv *priv; priv = heap_alloc( sizeof (*priv) ); - if(priv) + if (priv) { priv->refs = 0; + priv->XPath = FALSE; list_init( &priv->orphans ); } @@ -2139,9 +2155,9 @@ static HRESULT WINAPI domdoc_setProperty( hr = S_OK; if (lstrcmpiW(bstr, PropValueXPathW) == 0) - This->XPath = TRUE; + set_xpathmode(get_doc(This)); else if (lstrcmpiW(bstr, PropValueXSLPatternW) == 0) - This->XPath = FALSE; + reset_xpathmode(get_doc(This)); else hr = E_FAIL; @@ -2174,17 +2190,16 @@ static HRESULT WINAPI domdoc_getProperty( TRACE("(%p)->(%p)\n", This, debugstr_w(p)); - if (var == NULL) + if (!var) return E_INVALIDARG; if (lstrcmpiW(p, PropertySelectionLanguageW) == 0) { V_VT(var) = VT_BSTR; - if (This->XPath) - V_BSTR(var) = SysAllocString(PropValueXPathW); - else - V_BSTR(var) = SysAllocString(PropValueXSLPatternW); - return S_OK; + V_BSTR(var) = is_xpathmode(This->node.node->doc) ? + SysAllocString(PropValueXPathW) : + SysAllocString(PropValueXSLPatternW); + return V_BSTR(var) ? S_OK : E_OUTOFMEMORY; } FIXME("Unknown property %s\n", wine_dbgstr_w(p)); @@ -2461,7 +2476,6 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->validating = 0; doc->resolving = 0; doc->preserving = 0; - doc->XPath = FALSE; doc->error = S_OK; doc->schema = NULL; doc->stream = NULL; @@ -2482,7 +2496,7 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) xmlDocPtr xmldoc; HRESULT hr; - TRACE("(%p, %p)\n", pUnkOuter, ppObj); + TRACE("(%s, %p, %p)\n", debugstr_guid(clsid), pUnkOuter, ppObj); xmldoc = xmlNewDoc(NULL); if(!xmldoc) @@ -2492,14 +2506,17 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) + { xmlFreeDoc(xmldoc); + return hr; + } /* properties that are dependent on object versions */ if (IsEqualCLSID( clsid, &CLSID_DOMDocument40 ) || IsEqualCLSID( clsid, &CLSID_DOMDocument60 )) { domdoc *This = impl_from_IXMLDOMDocument3(*ppObj); - This->XPath = TRUE; + set_xpathmode(get_doc(This)); } return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fc09f15..c259526 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5961,6 +5961,17 @@ static void test_get_ownerDocument(void) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &var); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(V_BSTR(&var), _bstr_("XSLPattern")) == 0, "expected XSLPattern\n"); + VariantClear(&var); + + /* set to XPath and check that new instances use it */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("XPath"); + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), var); + ok( hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_BSTR; V_BSTR(&var) = _bstr_("xmlns:wi=\'www.winehq.org\'"); hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), var); @@ -5979,9 +5990,14 @@ static void test_get_ownerDocument(void) hr = IXMLDOMDocument2_getProperty(doc_owner, _bstr_("SelectionNamespaces"), &var); todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); todo_wine ok( lstrcmpW(V_BSTR(&var), _bstr_("xmlns:wi=\'www.winehq.org\'")) == 0, "expected previously set value\n"); - IXMLDOMDocument2_Release(doc_owner); VariantClear(&var); + hr = IXMLDOMDocument2_getProperty(doc_owner, _bstr_("SelectionLanguage"), &var); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(V_BSTR(&var), _bstr_("XPath")) == 0, "expected XPath\n"); + VariantClear(&var); + IXMLDOMDocument2_Release(doc_owner); + hr = IXMLDOMNode_get_ownerDocument(node, &doc2); ok( hr == S_OK, "got 0x%08x\n", hr); IXMLDOMNode_Release(node);

1 0

Nikolay Sivov : msxml3: Remove some useless initializers.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: f2ed4de962ddd6ea2ac87a6b0435dcf302f168f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ed4de962ddd6ea2ac87a6b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 00:01:10 2010 +0400 msxml3: Remove some useless initializers. --- dlls/msxml3/pi.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2f64a76..9d6a995 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -206,7 +206,6 @@ static HRESULT WINAPI dom_pi_put_nodeValue( { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); BSTR sTarget; - static const WCHAR szXML[] = {'x','m','l',0}; HRESULT hr; TRACE("(%p)->(v%d)\n", This, V_VT(&value)); @@ -215,7 +214,8 @@ static HRESULT WINAPI dom_pi_put_nodeValue( hr = dom_pi_get_nodeName(iface, &sTarget); if(hr == S_OK) { - if(lstrcmpW( sTarget, szXML) == 0) + static const WCHAR xmlW[] = {'x','m','l',0}; + if(lstrcmpW( sTarget, xmlW) == 0) { SysFreeString(sTarget); return E_FAIL; @@ -539,16 +539,19 @@ static HRESULT WINAPI dom_pi_get_data( IXMLDOMProcessingInstruction *iface, BSTR *p) { - HRESULT hr = E_FAIL; - VARIANT vRet; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + HRESULT hr; + VARIANT ret; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_INVALIDARG; - hr = IXMLDOMProcessingInstruction_get_nodeValue( iface, &vRet ); + hr = IXMLDOMProcessingInstruction_get_nodeValue( iface, &ret ); if(hr == S_OK) { - *p = V_BSTR(&vRet); + *p = V_BSTR(&ret); } return hr; @@ -559,10 +562,9 @@ static HRESULT WINAPI dom_pi_put_data( BSTR data) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - HRESULT hr = E_FAIL; + HRESULT hr; VARIANT val; BSTR sTarget; - static const WCHAR szXML[] = {'x','m','l',0}; TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); @@ -570,7 +572,8 @@ static HRESULT WINAPI dom_pi_put_data( hr = dom_pi_get_nodeName(iface, &sTarget); if(hr == S_OK) { - if(lstrcmpW( sTarget, szXML) == 0) + static const WCHAR xmlW[] = {'x','m','l',0}; + if(lstrcmpW( sTarget, xmlW) == 0) { SysFreeString(sTarget); return E_FAIL; @@ -582,9 +585,7 @@ static HRESULT WINAPI dom_pi_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMProcessingInstruction_put_nodeValue( iface, val ); - - return hr; + return IXMLDOMProcessingInstruction_put_nodeValue( iface, val ); } static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl =

1 0

Eric Pouech : server: Ensure we set proper errors when getting a NULL fd out of a handle.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 687b3dc25c4dd0efefcc53c8c07fa52a833b1a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687b3dc25c4dd0efefcc53c8c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Sep 16 21:05:26 2010 +0200 server: Ensure we set proper errors when getting a NULL fd out of a handle. --- server/console.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 6616bd2..957e35f 100644 --- a/server/console.c +++ b/server/console.c @@ -193,7 +193,10 @@ static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; assert( obj->ops == &console_input_ops ); - return console_input->fd ? (struct fd*)grab_object( console_input->fd ) : NULL; + if (console_input->fd) + return (struct fd*)grab_object( console_input->fd ); + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return NULL; } static enum server_fd_type console_get_fd_type( struct fd *fd ) @@ -1144,7 +1147,10 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) { struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; assert( obj->ops == &screen_buffer_ops ); - return screen_buffer->fd ? (struct fd*)grab_object( screen_buffer->fd ) : NULL; + if (screen_buffer->fd) + return (struct fd*)grab_object( screen_buffer->fd ); + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return NULL; } /* write data into a screen buffer */

1 0

Aurimas Fišeras : inetcpl.cpl: Add Lithuanian translation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: a6bfb91a7a76f28aa757c23fbc3eb502f03ce9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bfb91a7a76f28aa757c23fb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 16 22:49:00 2010 +0300 inetcpl.cpl: Add Lithuanian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Lt.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 5c5588c..c75d77c 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Fr.rc \ cpl_It.rc \ cpl_Ko.rc \ + cpl_Lt.rc \ cpl_Nl.rc \ cpl_Si.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc new file mode 100644 index 0000000..bce5403 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -0,0 +1,33 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Interneto nuostatos" + IDS_CPL_INFO "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" +END

1 0

Alexander Morozov : crypt32: Initialize HashEncryptionAlgorithm.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 190c3518d66df44cfa464d8dc1ca3fd50ff6c361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190c3518d66df44cfa464d8dc… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Sep 16 18:48:30 2010 +0400 crypt32: Initialize HashEncryptionAlgorithm. --- dlls/crypt32/msg.c | 17 +++++++++++++++-- dlls/crypt32/tests/message.c | 12 ------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 886b724..6b2d8b6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -809,9 +809,16 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info, &info->SignerId.u.IssuerSerialNumber.SerialNumber, &in->pCertInfo->SerialNumber); info->SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + info->HashEncryptionAlgorithm.pszObjId = + in->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId; + if (ret) + ret = CRYPT_ConstructBlob(&info->HashEncryptionAlgorithm.Parameters, + &in->pCertInfo->SubjectPublicKeyInfo.Algorithm.Parameters); } else { + const CRYPT_ALGORITHM_IDENTIFIER *pEncrAlg; + /* Implicitly in->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS). * See CRYPT_IsValidSigner. */ @@ -845,6 +852,13 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info, ret = CRYPT_ConstructBlob(&info->SignerId.u.KeyId, &in->SignerId.u.KeyId); } + pEncrAlg = in->HashEncryptionAlgorithm.pszObjId ? + &in->HashEncryptionAlgorithm : + &in->pCertInfo->SubjectPublicKeyInfo.Algorithm; + info->HashEncryptionAlgorithm.pszObjId = pEncrAlg->pszObjId; + if (ret) + ret = CRYPT_ConstructBlob(&info->HashEncryptionAlgorithm.Parameters, + &pEncrAlg->Parameters); } /* Assumption: algorithm IDs will point to static strings, not * stack-based ones, so copying the pointer values is safe. @@ -853,8 +867,6 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info, if (ret) ret = CRYPT_ConstructBlob(&info->HashAlgorithm.Parameters, &in->HashAlgorithm.Parameters); - memset(&info->HashEncryptionAlgorithm, 0, - sizeof(info->HashEncryptionAlgorithm)); if (ret) ret = CRYPT_ConstructAttributes(&info->AuthAttrs, (CRYPT_ATTRIBUTES *)&in->cAuthAttr); @@ -876,6 +888,7 @@ static void CSignerInfo_Free(CMSG_CMS_SIGNER_INFO *info) else CryptMemFree(info->SignerId.u.KeyId.pbData); CryptMemFree(info->HashAlgorithm.Parameters.pbData); + CryptMemFree(info->HashEncryptionAlgorithm.Parameters.pbData); CryptMemFree(info->EncryptedHash.pbData); for (i = 0; i < info->AuthAttrs.cAttr; i++) { diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 8e214e7..f2977cd 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1024,10 +1024,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, TRUE, 0, NULL, NULL, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedHashForEmptyMessage), "unexpected size %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedHashForEmptyMessage, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob); @@ -1044,10 +1042,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, FALSE, 0, NULL, NULL, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedEmptyMessage), "unexpected size %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedEmptyMessage, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob); @@ -1065,10 +1061,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedHash), "unexpected size of signed blob %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedHash, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob); @@ -1089,10 +1083,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedHashWithCert), "unexpected size of signed blob %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedHashWithCert, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob); @@ -1120,10 +1112,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedHashWithCRL), "unexpected size of signed blob %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedHashWithCRL, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob); @@ -1145,10 +1135,8 @@ static void test_sign_message(void) ret = CryptSignMessage(&para, FALSE, 1, toSign, signSize, signedBlob, &signedBlobSize); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); - todo_wine ok(signedBlobSize == sizeof(signedData), "unexpected size of signed blob %d\n", signedBlobSize); - todo_wine ok(!memcmp(signedBlob, signedData, signedBlobSize), "unexpected value\n"); CryptMemFree(signedBlob);

1 0

André Hentschel : user32: Only select needed part of the flags.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 49434929c67b8c8d5c5437ef798425d5c527d730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49434929c67b8c8d5c5437ef7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 16 19:59:22 2010 +0200 user32: Only select needed part of the flags. --- dlls/user32/uitools.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 2b63118..e11c411 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -939,7 +939,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags) UITOOLS95_DFC_ButtonPush(dc, r, uFlags & 0xff00); - switch(uFlags & 0xff) + switch(uFlags & 0xf) { case DFCS_CAPTIONCLOSE: str[0] = 0x72; break; case DFCS_CAPTIONHELP: str[0] = 0x73; break;

1 0

Oldřich Jedlička : ddraw: Allow creating back buffer for DirectX 1 interfaces.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: bec3b7692d02b343936c42d08a5c48b92335e182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec3b7692d02b343936c42d08… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Wed Sep 15 21:33:02 2010 +0200 ddraw: Allow creating back buffer for DirectX 1 interfaces. --- dlls/ddraw/ddraw.c | 73 ++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/d3d.c | 4 +- dlls/ddraw/tests/dsurface.c | 4 +- dlls/ddraw/tests/visual.c | 2 +- 4 files changed, 70 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb942d4..5449d84 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2880,7 +2880,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur * DDERR_* if an error occurs * *****************************************************************************/ -static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, +static HRESULT CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *DDSD, IDirectDrawSurface7 **Surf, IUnknown *UnkOuter) { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; @@ -2944,9 +2944,9 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, return DDERR_NOEXCLUSIVEMODE; } - if(DDSD->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { - WARN("Application tried to create an explicit front or back buffer\n"); - LeaveCriticalSection(&ddraw_cs); + if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + { + WARN("Application wanted to create back buffer primary surface\n"); return DDERR_INVALIDCAPS; } @@ -3305,6 +3305,27 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, return hr; } +static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, + DDSURFACEDESC2 *surface_desc, IDirectDrawSurface7 **surface, IUnknown *outer_unknown) +{ + TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", + iface, surface_desc, surface, outer_unknown); + + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc(surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + return CreateSurface(iface, surface_desc, surface, outer_unknown); +} + static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2 *surface_desc, IDirectDrawSurface4 **surface, IUnknown *outer_unknown) { @@ -3315,7 +3336,19 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc(surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); impl = (IDirectDrawSurfaceImpl *)*surface; if (SUCCEEDED(hr) && impl) { @@ -3339,7 +3372,19 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; @@ -3367,7 +3412,19 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) + { + if (TRACE_ON(ddraw)) + { + TRACE(" (%p) Requesting surface desc :\n", iface); + DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + } + + WARN("Application tried to create an explicit front or back buffer\n"); + return DDERR_INVALIDCAPS; + } + + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; @@ -3397,7 +3454,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; - hr = ddraw7_CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface((IDirectDraw7 *)ddraw, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); if (FAILED(hr)) { *surface = NULL; diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d291705..5043a01 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3569,7 +3569,7 @@ static void BackBuffer3DCreateSurfaceTest(void) created_ddsd.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surf, NULL); - todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); if (surf != NULL) { hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); @@ -3636,7 +3636,7 @@ static void BackBuffer3DAttachmentTest(void) ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &surface2, NULL); - todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); if (surface2 != NULL) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 95b0f26..1c219a4 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3425,7 +3425,7 @@ static void BackBufferCreateSurfaceTest(void) created_ddsd.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); - todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); if (surf != NULL) { hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); @@ -3482,7 +3482,7 @@ static void BackBufferAttachmentFlipTest(void) ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface2, NULL); - todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); if (surface2 != NULL) { diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 2616a36..e668691 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2980,7 +2980,7 @@ static void DX1_BackBufferFlipTest(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Backbuffer, NULL); - todo_wine ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); + ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); if(FAILED(hr)) goto out; hr = IDirectDrawSurface_AddAttachedSurface(Primary, Backbuffer);

1 0

Sven Baars : shell32: Update the Dutch translation.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 5f6f0815debdcadaef9449abb1436a24b6b34145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6f0815debdcadaef9449abb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 16 20:01:39 2010 +0200 shell32: Update the Dutch translation. --- dlls/shell32/shell32_Nl.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 48ed84e..259c6b8 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -278,14 +278,34 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\Geschiedenis" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "Mijn Afbeeldingen" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documenten" IDS_ADMINTOOLS "Start Menu\\Programma's\\Administratieve Tools" IDS_COMMON_MUSIC "Documenten\\Mijn Muziek" IDS_COMMON_PICTURES "Documenten\\Mijn Afbeeldingen" IDS_COMMON_VIDEO "Documenten\\Mijn Videos" IDS_CDBURN_AREA "Local Settings\\Applicatie Data\\Microsoft\\CD Branden" + IDS_CONTACTS "Contacten" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Afbeeldingen\\Diashows" + IDS_PLAYLISTS "Muziek\\Afspeellijsten" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Muziek\\Voorbeelden van muziek" + IDS_SAMPLE_PICTURES "Afbeeldingen\\Voorbeelden van afbeeldingen" + IDS_SAMPLE_PLAYLISTS "Muziek\\Voorbeelden van afspeellijsten" + IDS_SAMPLE_VIDEOS "Video's\\Voorbeelden van video's" + IDS_SAVED_GAMES "Opgeslagen Spellen" + IDS_SAVED_SEARCHES "Zoekopdrachten" + IDS_USER_PROFILES "Gebruikers" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Documenten" + IDS_DOWNLOADS "Downloads" IDS_NEWFOLDER "Nieuwe Map"

1 0

Sven Baars : inetcpl.cpl: Add the Dutch translation.
by Alexandre Julliard Sept. 16, 2010

Sept. 16, 2010

Module: wine Branch: master Commit: 76730382342d02f2c46fa225acbbea0e8527f041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76730382342d02f2c46fa225a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 16 20:01:46 2010 +0200 inetcpl.cpl: Add the Dutch translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Nl.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 4965a0a..5c5588c 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Fr.rc \ cpl_It.rc \ cpl_Ko.rc \ + cpl_Nl.rc \ cpl_Si.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Nl.rc b/dlls/inetcpl.cpl/cpl_Nl.rc new file mode 100644 index 0000000..7c9acc7 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Nl.rc @@ -0,0 +1,30 @@ +/* + * Dutch resources for the Internet control panel applet + * + * Copyright 2010 Sven Baars + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet-instellingen" + IDS_CPL_INFO "Configureer Wine Internet Browser en gerelateerde instellingen" +END

1 0