Fixed FMT_DATE_GENERAL and FMT_DATE_TIME_SYS cases in

VARIANT_FormatDate.
This commit is contained in:
Marcus Meissner 2005-11-05 10:42:09 +00:00 committed by Alexandre Julliard
parent 0e3a3555e9
commit 7e08a24f83

View File

@ -1598,10 +1598,11 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
case FMT_DATE_GENERAL: case FMT_DATE_GENERAL:
{ {
BSTR date = NULL; BSTR date = NULL;
WCHAR *pDate = date; WCHAR *pDate;
hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, pbstrOut); hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, &date);
if (FAILED(hRes)) if (FAILED(hRes))
goto VARIANT_FormatDate_Exit; goto VARIANT_FormatDate_Exit;
pDate = date;
while (*pDate) while (*pDate)
*pBuff++ = *pDate++; *pBuff++ = *pDate++;
SysFreeString(date); SysFreeString(date);
@ -1623,10 +1624,11 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
{ {
/* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */ /* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */
BSTR date = NULL; BSTR date = NULL;
WCHAR *pDate = date; WCHAR *pDate;
hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, pbstrOut); hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, &date);
if (FAILED(hRes)) if (FAILED(hRes))
goto VARIANT_FormatDate_Exit; goto VARIANT_FormatDate_Exit;
pDate = date;
while (*pDate) while (*pDate)
*pBuff++ = *pDate++; *pBuff++ = *pDate++;
SysFreeString(date); SysFreeString(date);