Module: wine Branch: master Commit: aa71e545afaad7d03b50637424a36cea32911ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa71e545afaad7d03b50637424...
Author: Piotr Caban piotr@codeweavers.com Date: Sat Nov 14 13:17:31 2015 +0100
oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatDate.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/oleaut32/tests/varformat.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index b81500c..9d7400b 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -564,6 +564,10 @@ static void test_VarFormatFromTokens(void) static const WCHAR number[] = {'6',',','9','0',0}; static const WCHAR number_us[] = {'6','9','0','.','0','0',0};
+ static WCHAR date_fmt[] = {'d','d','-','m','m',0}; + static const WCHAR date[] = {'1','2','-','1','1',0}; + static const WCHAR date_us[] = {'1','1','-','1','2',0}; + BYTE buff[256]; LCID lcid; VARIANT var; @@ -590,6 +594,27 @@ static void test_VarFormatFromTokens(void) SysFreeString(bstr);
VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(date); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantClear(&var); }
START_TEST(varformat) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 1f7d7d5..25feec1 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1621,7 +1621,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, { USHORT usFlags = dwFlags & VARIANT_CALENDAR_HIJRI ? VAR_CALENDAR_HIJRI : 0;
- hRes = VariantChangeTypeEx(&vDate, pVarIn, LCID_US, usFlags, VT_DATE); + hRes = VariantChangeTypeEx(&vDate, pVarIn, lcid, usFlags, VT_DATE); if (FAILED(hRes)) return hRes; dateHeader = (FMT_DATE_HEADER*)(rgbTok + FmtGetPositive(header));