November 2009 - Wine-Commits

Rob Shearman : rpcrt4: Add tests for full pointers.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: af271255f5ef44565d40d619d2ddd18b2e5d25c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af271255f5ef44565d40d619d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:25:53 2009 +0000 rpcrt4: Add tests for full pointers. --- dlls/rpcrt4/tests/server.c | 19 +++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 4 ++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1205ea4..6453f53 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -717,6 +717,21 @@ s_get_numbers_struct(numbers_struct_t **ns) } void +s_full_pointer_test(int *a, int *b) +{ + ok(*a == 42, "Expected *a to be 42 instead of %d\n", *a); + ok(*b == 42, "Expected *b to be 42 instead of %d\n", *a); + ok(a == b, "Expected a (%p) to point to the same memory as b (%p)\n", a, b); +} + +void +s_full_pointer_null_test(int *a, int *b) +{ + ok(*a == 42, "Expected *a to be 42 instead of %d\n", *a); + ok(b == NULL, "Expected b to be NULL instead of %p\n", b); +} + +void s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); @@ -1077,6 +1092,7 @@ pointer_tests(void) void *buffer; int *pa2; s123_t *s123; + int val = 42; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); @@ -1137,6 +1153,9 @@ pointer_tests(void) s123 = get_s123(); ok(s123->f1 == 1 && s123->f2 == 2 && s123->f3 == 3, "RPC get_s123\n"); MIDL_user_free(s123); + + full_pointer_test(&val, &val); + full_pointer_null_test(&val, NULL); } static int diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d8e79bd..ee03c0b 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -357,5 +357,9 @@ cpp_quote("#endif") void get_ranged_enum([out] renum_t *re); void context_handle_test(void); + + void full_pointer_test([in, ptr] int *a, [in, ptr] int *b); + void full_pointer_null_test([in, ptr] int *a, [in, ptr] int *b); + void stop(void); }

1 0

Francois Gouget : cmd: Remove spaces before '\n's.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 085c39342b83ba342180c425ce69edf735e839ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=085c39342b83ba342180c425c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 18 11:14:25 2009 +0100 cmd: Remove spaces before '\n's. --- programs/cmd/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index d334ed1..8eb2a33 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -75,7 +75,7 @@ esiste nel cmd di wine.\n" file batch.\n\ \n\ L'etichetta che è l'obiettivo di un GOTO può essere lunga fino a 255 caratteri\n\ -ma non può includere spazi (questo è differente da altri sistemi \n\ +ma non può includere spazi (questo è differente da altri sistemi\n\ operativi). Se esistono due o più etichette identiche esistono in un file batch, la\n\ prima sarà sempre eseguita. Tentare un GOTO verso un'etichetta\n\ inesistente termina l'esecuzione del file batch.\n\

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 1e4412d7319e6673c2251015d761fe8fca83eb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4412d7319e6673c2251015d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 11:11:47 2009 +0100 mshtml/tests: Add a trailing '\n' to ok() calls. --- dlls/mshtml/tests/dom.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 00c67a8..5484134 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5707,7 +5707,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); } VariantClear(&result_var); @@ -5717,7 +5717,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); } VariantClear(&result_var); @@ -5735,7 +5735,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); } VariantClear(&result_var); @@ -5764,7 +5764,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLWindow2_item(window, &index_var, &result_var); ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); } VariantClear(&result_var); @@ -5774,7 +5774,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLWindow2_item(window, &index_var, &result_var); ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); } VariantClear(&result_var); @@ -5792,7 +5792,7 @@ static void test_frameset(IHTMLDocument2 *doc) hres = IHTMLWindow2_item(window, &index_var, &result_var); ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); } VariantClear(&result_var);

1 0

Austin Lund : advapi32/tests: Skip tests for ACL file info if ACL info not stored.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 5c45c35e4e21b577a22de5ae2ae4c4f1c25d25ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c45c35e4e21b577a22de5ae2… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Nov 18 20:52:59 2009 +1000 advapi32/tests: Skip tests for ACL file info if ACL info not stored. --- dlls/advapi32/tests/security.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a327c53..470164a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3156,8 +3156,10 @@ static void test_GetSecurityInfo(void) ok(sd != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - ok(dacl != NULL, "GetSecurityInfo\n"); - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (dacl != NULL) + ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + else + win_skip("No ACL information returned\n"); LocalFree(sd); @@ -3176,8 +3178,10 @@ static void test_GetSecurityInfo(void) ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - ok(dacl != NULL, "GetSecurityInfo\n"); - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (dacl != NULL) + ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + else + win_skip("No ACL information returned\n"); CloseHandle(obj); }

1 0

Rob Shearman : rpcrt4: Fix the return value of NdrFullPointerQueryRefId for a pointer ID of 0.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 51dbc8d06b65a45d4507b6ad15d78c4e24af9689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51dbc8d06b65a45d4507b6ad1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:25:20 2009 +0000 rpcrt4: Fix the return value of NdrFullPointerQueryRefId for a pointer ID of 0. --- dlls/rpcrt4/ndr_fullpointer.c | 3 +++ dlls/rpcrt4/tests/ndr_marshall.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index b686683..2bbd2b2 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -161,6 +161,9 @@ int WINAPI NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES pXlatTables, { TRACE("(%p, 0x%x, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer); + if (!RefId) + return 1; + expand_pointer_table_if_necessary(pXlatTables, RefId); pXlatTables->NextRefId = max(RefId + 1, pXlatTables->NextRefId); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index dbf29a5..91f3040 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1047,7 +1047,6 @@ static void test_fullpointer_xlat(void) /* "unmarshaling" phase */ ret = NdrFullPointerQueryRefId(pXlatTables, 0x0, 0, &Pointer); - todo_wine ok(ret == 1, "ret should be 1 instead of 0x%x\n", ret); ret = NdrFullPointerQueryRefId(pXlatTables, 0x2, 0, &Pointer);

1 0

Rob Shearman : rpcrt4: Fix the pointer saved during full pointer unmarshalling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 37793cd5507df9a42e93f79ba6894fc0be0be431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37793cd5507df9a42e93f79ba… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:25:26 2009 +0000 rpcrt4: Fix the pointer saved during full pointer unmarshalling. The pointer address may set by the type unmarshalling function and therefore will not be base_ptr_val. This value is the value at *pPointer and is what needs to be retrieved during subsequent unmarshalling of the same function. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d1b57fd..8db45b8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -935,7 +935,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (type == RPC_FC_FP) NdrFullPointerInsertRefId(pStubMsg->FullPtrXlatTables, pointer_id, - base_ptr_val); + *pPointer); } TRACE("pointer=%p\n", *pPointer);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'int' data type handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 44980403da3e86b01343defb18e30743bdd4ca58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44980403da3e86b01343defb1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:17 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'int' data type handling. --- dlls/msxml3/node.c | 22 ++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 56a8578..b1f8a9d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -959,12 +959,26 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) } else { - FIXME("Type handling not yet implemented\n"); - V_VT(v) = VT_BSTR; - V_BSTR(v) = bstr_from_xmlChar(str); + VARIANT src; + HRESULT hres; - if(!V_BSTR(v)) + if(!lstrcmpiW(type, szInt)) + V_VT(v) = VT_I4; + else + { + FIXME("Type handling not yet implemented\n"); + V_VT(v) = VT_BSTR; + } + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = bstr_from_xmlChar(str); + + if(!V_BSTR(&src)) return E_OUTOFMEMORY; + + hres = VariantChangeType(v, &src, 0, V_VT(v)); + VariantClear(&src); + return hres; } return S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2f34a24..a0dbe02 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -153,6 +153,7 @@ static const CHAR szTypeValueXML[] = " <string2 dt:dt=\"string\">String</string2>\n" " <number dt:dt=\"number\">12.44</number>\n" " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" +" <int dt:dt=\"int\">-13</int>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4037,6 +4038,19 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/int"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I4, "incorrect type\n"); + ok(V_I4(&v) == -13, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'fixed.14.4' data type handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 47e037d4bb945c6d7ddcea80b1f6fd0dd0bfcf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e037d4bb945c6d7ddcea80b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:24 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'fixed.14.4' data type handling. --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b1f8a9d..0f515c4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -964,6 +964,8 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(!lstrcmpiW(type, szInt)) V_VT(v) = VT_I4; + else if(!lstrcmpiW(type, szFixed)) + V_VT(v) = VT_CY; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a0dbe02..cb8aa4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -154,6 +154,7 @@ static const CHAR szTypeValueXML[] = " <number dt:dt=\"number\">12.44</number>\n" " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" " <int dt:dt=\"int\">-13</int>\n" +" <fixed dt:dt=\"fixed.14.4\">7322.9371</fixed>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4051,6 +4052,27 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/fixed"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + VARIANT hlp_in, hlp_out; + V_VT(&hlp_in) = VT_BSTR; + V_BSTR(&hlp_in) = _bstr_("7322.9371"); + V_VT(&hlp_out) = VT_CY; + ok(VariantChangeType(&hlp_out, &hlp_in, 0, VT_CY) == S_OK, "VariantChangeType failed\n"); + VariantClear(&hlp_in); + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_CY, "incorrect type\n"); + ok(VarCyCmp(V_CY(&v), V_CY(&hlp_out)) == VARCMP_EQ, "incorrect value\n"); + VariantClear(&hlp_out); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'boolean' data type handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 39f0504c86b203b24e7ee15eed4815bd90f09eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f0504c86b203b24e7ee15ee… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:30 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'boolean' data type handling. --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0f515c4..f293154 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -966,6 +966,8 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_I4; else if(!lstrcmpiW(type, szFixed)) V_VT(v) = VT_CY; + else if(!lstrcmpiW(type, szBoolean)) + V_VT(v) = VT_BOOL; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cb8aa4e..8efbddd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -155,6 +155,7 @@ static const CHAR szTypeValueXML[] = " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" " <int dt:dt=\"int\">-13</int>\n" " <fixed dt:dt=\"fixed.14.4\">7322.9371</fixed>\n" +" <bool dt:dt=\"boolean\">1</bool>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4073,6 +4074,19 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/bool"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BOOL, "incorrect type\n"); + ok(V_BOOL(&v) == VARIANT_TRUE, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue date related data types handling.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 0d78a883c00f60010db254d14c82e7ac26f92d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d78a883c00f60010db254d14… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 00:51:40 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue date related data types handling. --- dlls/msxml3/node.c | 67 ++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f293154..4910605 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -957,6 +957,73 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(!V_BSTR(v)) return E_OUTOFMEMORY; } + else if(!lstrcmpiW(type, szDateTime) || !lstrcmpiW(type, szDateTimeTZ) || + !lstrcmpiW(type, szDate) || !lstrcmpiW(type, szTime) || + !lstrcmpiW(type, szTimeTZ)) + { + VARIANT src; + WCHAR *p, *e; + SYSTEMTIME st; + DOUBLE date = 0.0; + + st.wYear = 1899; + st.wMonth = 12; + st.wDay = 30; + st.wDayOfWeek = st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = bstr_from_xmlChar(str); + + if(!V_BSTR(&src)) + return E_OUTOFMEMORY; + + p = V_BSTR(&src); + e = p + SysStringLen(V_BSTR(&src)); + + if(p+4<e && *(p+4)=='-') /* parse date (yyyy-mm-dd) */ + { + st.wYear = atoiW(p); + st.wMonth = atoiW(p+5); + st.wDay = atoiW(p+8); + p += 10; + + if(*p == 'T') p++; + } + + if(p+2<e && *(p+2)==':') /* parse time (hh:mm:ss.?) */ + { + st.wHour = atoiW(p); + st.wMinute = atoiW(p+3); + st.wSecond = atoiW(p+6); + p += 8; + + if(*p == '.') + { + int ms; + + p++; + ms = (*(p++) - '0') * 10; + if(isdigitW(*p)) ms += *(p++) - '0'; + ms *= 10; + if(isdigitW(*p)) ms += *(p++) - '0'; + + st.wMilliseconds = ms; + + while(isdigitW(*p)) p++; + } + } + + SystemTimeToVariantTime(&st, &date); + V_VT(v) = VT_DATE; + V_DATE(v) = date; + + if(*p == '+') /* parse timezone offset (+hh:mm) */ + V_DATE(v) += (DOUBLE)atoiW(p+1)/24 + (DOUBLE)atoiW(p+4)/1440; + else if(*p == '-') /* parse timezone offset (-hh:mm) */ + V_DATE(v) -= (DOUBLE)atoiW(p+1)/24 + (DOUBLE)atoiW(p+4)/1440; + + VariantClear(&src); + } else { VARIANT src; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8efbddd..7c8fddf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -156,6 +156,11 @@ static const CHAR szTypeValueXML[] = " <int dt:dt=\"int\">-13</int>\n" " <fixed dt:dt=\"fixed.14.4\">7322.9371</fixed>\n" " <bool dt:dt=\"boolean\">1</bool>\n" +" <datetime dt:dt=\"datetime\">2009-11-18T03:21:33.12</datetime>\n" +" <datetimetz dt:dt=\"datetime.tz\">2003-07-11T11:13:57+03:00</datetimetz>\n" +" <date dt:dt=\"date\">3721-11-01</date>\n" +" <time dt:dt=\"time\">13:57:12.31321</time>\n" +" <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -252,6 +257,8 @@ static WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; ok(r == (expect), #expr " returned %x, expected %x\n", r, expect); \ } +#define double_eq(x, y) ok((x)-(y)<=1e-14*(x) && (x)-(y)>=-1e-14*(x), "expected %.16g, got %.16g\n", x, y) + static BSTR alloc_str_from_narrow(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -4087,6 +4094,71 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/datetime"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_DATE, "incorrect type\n"); + double_eq(40135.13996666666, V_DATE(&v)); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/datetimetz"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_DATE, "incorrect type\n"); + double_eq(37813.59302083334, V_DATE(&v)); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/date"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_DATE, "incorrect type\n"); + double_eq(665413.0, V_DATE(&v)); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/time"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_DATE, "incorrect type\n"); + double_eq(0.581392511574074, V_DATE(&v)); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/timetz"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_DATE, "incorrect type\n"); + double_eq(1.112513078703703, V_DATE(&v)); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0