From 5a91bea3b213ce243a293d3450a5788747ebf2ac Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Sun, 19 Sep 2010 13:20:00 +0400 Subject: [PATCH] msxml3/tests: Fix locale dependent string comparison. --- dlls/msxml3/tests/domdoc.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 50a4e54eb70..205716aab43 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5073,22 +5073,28 @@ static void test_nodeTypedValue(void) if (entry->type != VT_BSTR) { - if (entry->type == VT_DATE) + if (entry->type == VT_DATE || + entry->type == VT_R8 || + entry->type == VT_CY) { - hr = VariantChangeType(&value, &value, 0, VT_R4); + if (entry->type == VT_DATE) + { + hr = VariantChangeType(&value, &value, 0, VT_R4); + ok(hr == S_OK, "ret %08x\n", hr ); + } + hr = VariantChangeTypeEx(&value, &value, + MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), SORT_DEFAULT), + VARIANT_NOUSEROVERRIDE, VT_BSTR); ok(hr == S_OK, "ret %08x\n", hr ); - hr = VariantChangeType(&value, &value, 0, VT_BSTR); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else { hr = VariantChangeType(&value, &value, 0, VT_BSTR); ok(hr == S_OK, "ret %08x\n", hr ); - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } + + ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, + "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, -- 2.11.4.GIT