Commit 495792e2 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

oleaut32/varformat: Fix day string representation format output.

parent 5b985bcb
...@@ -212,7 +212,9 @@ static const FMTDATERES VarFormat_date_results[] = ...@@ -212,7 +212,9 @@ static const FMTDATERES VarFormat_date_results[] =
{ 2.525, "hh :mm:mm", "12 :36:01" }, { 2.525, "hh :mm:mm", "12 :36:01" },
{ 2.525, "dd :mm:mm", "01 :01:01" }, { 2.525, "dd :mm:mm", "01 :01:01" },
{ 2.525, "dd :mm:nn", "01 :01:36" }, { 2.525, "dd :mm:nn", "01 :01:36" },
{ 2.725, "hh:nn:ss A/P", "05:24:00 P" } { 2.725, "hh:nn:ss A/P", "05:24:00 P" },
{ 40531.0, "dddd", "Sunday" },
{ 40531.0, "ddd", "Sun" }
}; };
#define VNUMFMT(vt,v) \ #define VNUMFMT(vt,v) \
......
...@@ -1725,14 +1725,14 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, ...@@ -1725,14 +1725,14 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
case FMT_DATE_DAY_SHORT: case FMT_DATE_DAY_SHORT:
/* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */ /* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */
TRACE("short day\n"); TRACE("short day\n");
localeValue = LOCALE_SABBREVDAYNAME1 + udate.st.wMonth - 1; localeValue = LOCALE_SABBREVDAYNAME1 + (udate.st.wDayOfWeek + 6)%7;
defaultChar = '?'; defaultChar = '?';
break; break;
case FMT_DATE_DAY_LONG: case FMT_DATE_DAY_LONG:
/* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */ /* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */
TRACE("long day\n"); TRACE("long day\n");
localeValue = LOCALE_SDAYNAME1 + udate.st.wMonth - 1; localeValue = LOCALE_SDAYNAME1 + (udate.st.wDayOfWeek + 6)%7;
defaultChar = '?'; defaultChar = '?';
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment