wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Juan Lang : crypt32: Test encoding more quoted strings.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 8b3681e92195b895865055c7984ab16c023173f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3681e92195b895865055c79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 18 14:04:53 2010 -0700 crypt32: Test encoding more quoted strings. --- dlls/crypt32/tests/str.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index afc8544..614039e 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -480,6 +480,24 @@ static const BYTE encodedQuotedCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03, 0x55, 0x04,0x03,0x1e,0x06,0x00,0x22,0x00,0x31,0x00,0x22, }; static const BYTE encodedMultipleAttrCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x31,0x2b,0x32 }; +static const BYTE encodedCommaCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x2c, +0x62 }; +static const BYTE encodedEqualCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x3d, +0x62 }; +static const BYTE encodedLessThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3c +}; +static const BYTE encodedGreaterThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3e +}; +static const BYTE encodedHashCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x23 +}; +static const BYTE encodedSemiCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3b +}; static const struct StrToNameA namesA[] = { { "CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, @@ -489,6 +507,12 @@ static const struct StrToNameA namesA[] = { { "CN=\" 1 \"", sizeof(encodedSpacedCN), encodedSpacedCN }, { "CN=\"\"\"1\"\"\"", sizeof(encodedQuotedCN), encodedQuotedCN }, { "CN=\"1+2\"", sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, + { "CN=\"a,b\"", sizeof(encodedCommaCN), encodedCommaCN }, + { "CN=\"a=b\"", sizeof(encodedEqualCN), encodedEqualCN }, + { "CN=\"<\"", sizeof(encodedLessThanCN), encodedLessThanCN }, + { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, + { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, }; static void test_CertStrToNameA(void) @@ -561,6 +585,12 @@ static const WCHAR multipleAttrCN_W[] = { 'C','N','=','"','1','+','2','"',0 }; static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; +static const WCHAR commaCN_W[] = { 'C','N','=','"','a',',','b','"',0 }; +static const WCHAR equalCN_W[] = { 'C','N','=','"','a','=','b','"',0 }; +static const WCHAR lessThanCN_W[] = { 'C','N','=','"','<','"',0 }; +static const WCHAR greaterThanCN_W[] = { 'C','N','=','"','>','"',0 }; +static const WCHAR hashCN_W[] = { 'C','N','=','"','#','"',0 }; +static const WCHAR semiCN_W[] = { 'C','N','=','"',';','"',0 }; static const struct StrToNameW namesW[] = { { simpleCN_W, sizeof(encodedSimpleCN), encodedSimpleCN }, @@ -571,6 +601,12 @@ static const struct StrToNameW namesW[] = { { quotedCN_W, sizeof(encodedQuotedCN), encodedQuotedCN }, { multipleAttrCN_W, sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, { japaneseCN_W, sizeof(encodedJapaneseCN), encodedJapaneseCN }, + { commaCN_W, sizeof(encodedCommaCN), encodedCommaCN }, + { equalCN_W, sizeof(encodedEqualCN), encodedEqualCN }, + { lessThanCN_W, sizeof(encodedLessThanCN), encodedLessThanCN }, + { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, + { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, }; static void test_CertStrToNameW(void)

1 0

Damjan Jovanovic : msvcrt: Improve wcsncat_s.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: b39c59e75d0cc33ab68ec384d4c4bf63048341f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39c59e75d0cc33ab68ec384d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 19 07:24:52 2010 +0200 msvcrt: Improve wcsncat_s. --- dlls/msvcrt/tests/string.c | 7 ++++++- dlls/msvcrt/wcs.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b568345..85e4cf3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1459,8 +1459,13 @@ static void test_wcsncat_s(void) dst[0] = 0; ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); - todo_wine ok(ret == 80, "err = %d\n", ret); + ok(ret == STRUNCATE, "err = %d\n", ret); ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); + + memcpy(dst, abcW, sizeof(abcW)); + dst[3] = 'd'; + ret = p_wcsncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); } START_TEST(string) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 98aa6c5..d7d2fd4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1588,8 +1588,8 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, const MSVCRT_wchar_t *src, MSVCRT_size_t count) { MSVCRT_size_t srclen; - MSVCRT_size_t i; MSVCRT_wchar_t dststart; + INT ret = 0; if (src == NULL && count > 0) return MSVCRT_EINVAL; @@ -1597,34 +1597,33 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, return MSVCRT_EINVAL; if (elem == 0) return MSVCRT_EINVAL; + if (count == 0) + return 0; - for (i = 0; i < elem; i++) + for (dststart = 0; dststart < elem; dststart++) { - dststart = i; - if (dst[i] == '\0') + if (dst[dststart] == '\0') break; } if (dststart == elem) return MSVCRT_EINVAL; if (count == MSVCRT__TRUNCATE) - srclen = elem - dststart - 1; - else - srclen = count; - for (i = 0; i < srclen; i++) { - if (src[i] == '\0') + srclen = strlenW(src); + if (srclen >= (elem - dststart)) { - srclen = i; - break; + srclen = elem - dststart - 1; + ret = MSVCRT_STRUNCATE; } } - + else + srclen = min(strlenW(src), count); if (srclen < (elem - dststart)) { memcpy(&dst[dststart], src, srclen*sizeof(MSVCRT_wchar_t)); dst[srclen] = '\0'; - return 0; + return ret; } dst[0] = '\0'; return MSVCRT_ERANGE;

1 0

Damjan Jovanovic : msvcrt: Define STRUNCATE.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: c7536ef86848e0134e7870bc1582fecd5f4f04a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7536ef86848e0134e7870bc1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 19 07:23:30 2010 +0200 msvcrt: Define STRUNCATE. --- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/errno.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3d9639e..167fa83 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -544,6 +544,7 @@ struct MSVCRT__stat64 { #define MSVCRT_ENOSYS 40 #define MSVCRT_ENOTEMPTY 41 #define MSVCRT_EILSEQ 42 +#define MSVCRT_STRUNCATE 80 #define MSVCRT_LC_ALL 0 #define MSVCRT_LC_COLLATE 1 diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index 115c5e4..dddc013 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -61,6 +61,8 @@ # define ENOTEMPTY 41 # define EILSEQ 42 +# define STRUNCATE 80 + #ifdef __cplusplus extern "C" { #endif

1 0

Nikolay Sivov : msxml3: Get rid of ::put_text() forward to IXMLDOMNode interface.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: b22149817d11dbd072b529d290f9dc0e51d5d28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22149817d11dbd072b529d29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 19 03:27:48 2010 +0400 msxml3: Get rid of ::put_text() forward to IXMLDOMNode interface. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 21 +++++++++------------ dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 1a56a35..f29ba48 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -385,7 +385,8 @@ static HRESULT WINAPI domattr_put_text( BSTR p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domattr_get_specified( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index bbe8a87..c37923a 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -396,7 +396,8 @@ static HRESULT WINAPI domcdata_put_text( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domcdata_get_specified( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 86d4bca..2ea03f4 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -389,7 +389,8 @@ static HRESULT WINAPI domcomment_put_text( BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domcomment_get_specified( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index d700493..2754ef2 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -393,7 +393,8 @@ static HRESULT WINAPI domfrag_put_text( BSTR p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domfrag_get_specified( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9f3f1eb..8230feb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1113,7 +1113,8 @@ static HRESULT WINAPI domdoc_put_text( BSTR text ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), text ); + TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + return E_FAIL; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7f3d7ef..a3834ff 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -401,7 +401,8 @@ static HRESULT WINAPI domelem_put_text( BSTR p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domelem_get_specified( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f4c31c9..2a936bc 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -387,7 +387,8 @@ static HRESULT WINAPI entityref_put_text( BSTR p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI entityref_get_specified( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 5d0ac7a..fcf3dc0 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -171,6 +171,7 @@ extern HRESULT node_get_previous_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**); extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**); +extern HRESULT node_put_text(xmlnode*,BSTR); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6716c5d..56d41ee 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -745,23 +745,12 @@ static HRESULT WINAPI xmlnode_get_text( return S_OK; } -static HRESULT WINAPI xmlnode_put_text( - IXMLDOMNode *iface, - BSTR text) +HRESULT node_put_text(xmlnode *This, BSTR text) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlChar *str, *str2; TRACE("(%p)->(%s)\n", This, debugstr_w(text)); - switch(This->node->type) - { - case XML_DOCUMENT_NODE: - return E_FAIL; - default: - break; - } - str = xmlChar_from_wchar(text); /* Escape the string. */ @@ -774,6 +763,14 @@ static HRESULT WINAPI xmlnode_put_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) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2467603..6bd34c0 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -403,7 +403,8 @@ static HRESULT WINAPI dom_pi_put_text( BSTR p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI dom_pi_get_specified( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 2e79cd9..521d750 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -402,7 +402,8 @@ static HRESULT WINAPI domtext_put_text( BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + return node_put_text( &This->node, p ); } static HRESULT WINAPI domtext_get_specified(

1 0

Nikolay Sivov : msxml3: Get rid of ::get_dataType() forward to IXMLDOMNode interface.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 0f19df8b6ae59ecee370f739d54a4826aa1f5412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f19df8b6ae59ecee370f739d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 19 03:13:30 2010 +0400 msxml3: Get rid of ::get_dataType() forward to IXMLDOMNode interface. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 18 ++++++++++++++++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 10 +++++++++- dlls/msxml3/node.c | 41 ++--------------------------------------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 51 insertions(+), 58 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 15c84a6..1a56a35 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -422,10 +422,11 @@ static HRESULT WINAPI domattr_put_nodeTypedValue( static HRESULT WINAPI domattr_get_dataType( IXMLDOMAttribute *iface, - VARIANT* var1) + VARIANT* typename) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI domattr_put_dataType( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b87bbe1..bbe8a87 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -433,10 +433,11 @@ static HRESULT WINAPI domcdata_put_nodeTypedValue( static HRESULT WINAPI domcdata_get_dataType( IXMLDOMCDATASection *iface, - VARIANT* var1) + VARIANT* typename) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI domcdata_put_dataType( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 0f2b61a..86d4bca 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -426,10 +426,11 @@ static HRESULT WINAPI domcomment_put_nodeTypedValue( static HRESULT WINAPI domcomment_get_dataType( IXMLDOMComment *iface, - VARIANT* var1) + VARIANT* typename) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI domcomment_put_dataType( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 99f8e81..d700493 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -430,10 +430,11 @@ static HRESULT WINAPI domfrag_put_nodeTypedValue( static HRESULT WINAPI domfrag_get_dataType( IXMLDOMDocumentFragment *iface, - VARIANT* var1) + VARIANT* typename) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI domfrag_put_dataType( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1adc84d..9f3f1eb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1154,10 +1154,11 @@ static HRESULT WINAPI domdoc_put_nodeTypedValue( static HRESULT WINAPI domdoc_get_dataType( IXMLDOMDocument3 *iface, - VARIANT* dataTypeName ) + VARIANT* typename ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), dataTypeName ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 16651e8..7f3d7ef 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -438,10 +438,24 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( static HRESULT WINAPI domelem_get_dataType( IXMLDOMElement *iface, - VARIANT* var1) + VARIANT* typename) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + xmlChar *pVal = xmlGetNsProp(get_element(This), (const xmlChar*)"dt", + (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); + + TRACE("(%p)->(%p)\n", This, typename); + + V_VT(typename) = VT_NULL; + + if (pVal) + { + V_VT(typename) = VT_BSTR; + V_BSTR(typename) = bstr_from_xmlChar( pVal ); + xmlFree(pVal); + } + + return (V_VT(typename) != VT_NULL) ? S_OK : S_FALSE; } static HRESULT WINAPI domelem_put_dataType( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index cc2aa1d..f4c31c9 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -424,10 +424,11 @@ static HRESULT WINAPI entityref_put_nodeTypedValue( static HRESULT WINAPI entityref_get_dataType( IXMLDOMEntityReference *iface, - VARIANT* var1) + VARIANT* typename) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p): should return a valid value\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI entityref_put_dataType( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b16267c..5d0ac7a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -172,7 +172,6 @@ extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**); extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**); - extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); static inline BSTR bstr_from_xmlChar(const xmlChar *str) @@ -223,6 +222,15 @@ static inline HRESULT return_null_ptr(void **p) return S_FALSE; } +static inline HRESULT return_null_var(VARIANT *p) +{ + if(!p) + return E_INVALIDARG; + + V_VT(p) = VT_NULL; + return S_FALSE; +} + #endif extern void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8a92fe6..6716c5d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1020,45 +1020,8 @@ static HRESULT WINAPI xmlnode_get_dataType( IXMLDOMNode *iface, VARIANT* dataTypeName) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlChar *pVal; - - TRACE("(%p)->(%p)\n", This, dataTypeName); - - if(!dataTypeName) - return E_INVALIDARG; - - /* Attribute, CDATA Section, Comment, Document, Document Fragment, - Entity, Notation, PI, and Text Node are non-typed. */ - V_BSTR(dataTypeName) = NULL; - V_VT(dataTypeName) = VT_NULL; - - switch ( This->node->type ) - { - case XML_ELEMENT_NODE: - pVal = xmlGetNsProp(This->node, (const xmlChar*)"dt", - (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); - if (pVal) - { - V_VT(dataTypeName) = VT_BSTR; - V_BSTR(dataTypeName) = bstr_from_xmlChar( pVal ); - xmlFree(pVal); - } - break; - case XML_ENTITY_REF_NODE: - FIXME("XML_ENTITY_REF_NODE should return a valid value.\n"); - break; - default: - TRACE("Type %d returning NULL\n", This->node->type); - } - - /* non-typed nodes return S_FALSE */ - if(V_VT(dataTypeName) == VT_NULL) - { - return S_FALSE; - } - - return S_OK; + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI xmlnode_put_dataType( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2d33d80..2467603 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -440,10 +440,11 @@ static HRESULT WINAPI dom_pi_put_nodeTypedValue( static HRESULT WINAPI dom_pi_get_dataType( IXMLDOMProcessingInstruction *iface, - VARIANT* var1) + VARIANT* typename) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI dom_pi_put_dataType( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index be61376..2e79cd9 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -439,10 +439,11 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( static HRESULT WINAPI domtext_get_dataType( IXMLDOMText *iface, - VARIANT* var1) + VARIANT* typename) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); + TRACE("(%p)->(%p)\n", This, typename); + return return_null_var( typename ); } static HRESULT WINAPI domtext_put_dataType(

1 0

Luca Bennati : jscript: Update Italian translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 032a2ba164fe74e1df1e59175413a1ff2364f30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=032a2ba164fe74e1df1e59175… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Oct 18 22:58:45 2010 +0200 jscript: Update Italian translation. --- dlls/jscript/jscript_It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_It.rc b/dlls/jscript/jscript_It.rc index 4534303..42033d3 100644 --- a/dlls/jscript/jscript_It.rc +++ b/dlls/jscript/jscript_It.rc @@ -28,6 +28,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Errore nel convertire un oggetto ad un tipo primitivo" IDS_INVALID_CALL_ARG "Chiamata o argomento di procedura non valido" + IDS_SUBSCRIPT_OUT_OF_RANGE "Sottoscript fuori portata" IDS_CREATE_OBJ_ERROR "Il server di automazione non può creare l'oggetto" IDS_NO_PROPERTY "L'oggetto non supporta questa proprietà o metodo" IDS_UNSUPPORTED_ACTION "L'oggetto non supporta questa azione" @@ -44,6 +45,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Assegnamento illegale" IDS_UNDEFINED "'|' non è definito" IDS_NOT_BOOL "Richiesto un oggetto Booleano" + IDS_NOT_VBARRAY "Richiesto un oggetto VBArray" IDS_JSCRIPT_EXPECTED "Richiesto un oggetto JScript" IDS_REGEXP_SYNTAX_ERROR "Errore di sintassi nell'espressione regolare" IDS_URI_INVALID_CHAR "L'URI da codificare contiene caratteri non validi"

1 0

Paul Vriens : clock: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 6e12858dc0062a3f989209237c62e49a26dc9871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e12858dc0062a3f989209237… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 18 22:19:23 2010 +0200 clock: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/clock/Makefile.in | 1 + programs/clock/Sr.rc | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index db863c7..f77c831 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -30,6 +30,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sk.rc \ + Sr.rc \ Sv.rc \ Th.rc \ Tr.rc \ diff --git a/programs/clock/Sr.rc b/programs/clock/Sr.rc new file mode 100644 index 0000000..a3d2526 --- /dev/null +++ b/programs/clock/Sr.rc @@ -0,0 +1,79 @@ +/* + * Clock (Serbian resources) + * + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Đorđe Vasiljević + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +MAIN_MENU MENU +{ + POPUP "&Својства" { + MENUITEM "&Аналогни", IDM_ANALOG + MENUITEM "&Дигитални", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "&Фонт...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "&Без насловне палете", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "&Секунде", IDM_SECONDS + MENUITEM "&Датум", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "&Увек на врху", IDM_ONTOP + } + POPUP "&Подаци" { + MENUITEM "&О часовнику...", IDM_ABOUT + } +} + +STRINGTABLE +{ +IDS_CLOCK, "Часовник" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +MAIN_MENU MENU +{ + POPUP "&Svojstva" { + MENUITEM "&Analogni", IDM_ANALOG + MENUITEM "&Digitalni", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "&Bez naslovne palete", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "&Sekunde", IDM_SECONDS + MENUITEM "&Datum", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "&Uvek na vrhu", IDM_ONTOP + } + POPUP "&Podaci" { + MENUITEM "&O časovniku...", IDM_ABOUT + } +} + +STRINGTABLE +{ +IDS_CLOCK, "Časovnik" +}

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 731ec282496791d9dc851777fcb062a357f7db44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731ec282496791d9dc851777f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 18 23:44:28 2010 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index f3a643c..a78afd2 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -26,6 +26,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Fehler beim umwandeln des Objektes in einen Grundtyp" IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" + IDS_SUBSCRIPT_OUT_OF_RANGE "Index außerhalb des Bereichs" IDS_CREATE_OBJ_ERROR "Automatisierungsserver konnte das Objekt nicht erstellen" IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" IDS_UNSUPPORTED_ACTION "Das Objekt unterstützt diese Aktion nicht" @@ -42,6 +43,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Unzulässige Zuweisung" IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet" + IDS_NOT_VBARRAY "VBArray Objekt erwartet" IDS_JSCRIPT_EXPECTED "JScript Objekt erwartet" IDS_REGEXP_SYNTAX_ERROR "Syntax Fehler in regulärem Ausdruck" IDS_URI_INVALID_CHAR "Zu verschlüsselnde URI enthält ungültige Zeichen"

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 5b85404447742ae488e4646477f8fcf51450aad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b85404447742ae488e464647… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 18 23:05:53 2010 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 7d62eb6..3196655 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -29,6 +29,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Erreur lors de la conversion de l'objet vers un type primitif" IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" + IDS_SUBSCRIPT_OUT_OF_RANGE "Indice hors limites" IDS_CREATE_OBJ_ERROR "Le serveur d'automatisation ne peut créer l'objet" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" IDS_UNSUPPORTED_ACTION "Cet objet ne supporte pas cette action" @@ -45,6 +46,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Affectation illégale" IDS_UNDEFINED "« | » n'est pas défini" IDS_NOT_BOOL "Objet booléen attendu" + IDS_NOT_VBARRAY "Objet VBArray attendu" IDS_JSCRIPT_EXPECTED "Objet JScript attendu" IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" IDS_URI_INVALID_CHAR "L'URI à coder contient des caractères invalides"

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 39a43d943c8a28d9fc7333d4de67b6ef54bcca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a43d943c8a28d9fc7333d4d… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 18 21:52:17 2010 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 0b3fbcd..5cdf572 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -27,6 +27,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Klaida keičiant objektą į primityvų tipą" IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" + IDS_SUBSCRIPT_OUT_OF_RANGE "Indeksas nepatenka į rėžius" IDS_CREATE_OBJ_ERROR "Automatizacijos serveriui nepavyko sukurti objekto" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" IDS_UNSUPPORTED_ACTION "Objektas nepalaiko šio veiksmo" @@ -43,6 +44,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Neleistinas priskyrimas" IDS_UNDEFINED "„|“ yra neapibrėžtas" IDS_NOT_BOOL "Tikėtasi loginio objekto" + IDS_NOT_VBARRAY "Tikėtasi VBArray objekto" IDS_JSCRIPT_EXPECTED "Tikėtasi JScript objekto" IDS_REGEXP_SYNTAX_ERROR "Sintaksės klaida reguliariajame reiškinyje" IDS_URI_INVALID_CHAR "Koduotiname URI yra netinkamų simbolių"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010