wine/dlls/oleaut32 varformat.c

[Alexandre Julliard]

ChangeSet ID:	21117
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/05 04:42:09

Modified files:
	dlls/oleaut32  : varformat.c 

Log message:
	Marcus Meissner <marcus at jet.franken.de>
	Fixed FMT_DATE_GENERAL and FMT_DATE_TIME_SYS cases in
	VARIANT_FormatDate.

Patch: http://cvs.winehq.org/patch.py?id=21117

Old revision  New revision  Changes     Path
 1.14          1.15          +6 -4       wine/dlls/oleaut32/varformat.c

Index: wine/dlls/oleaut32/varformat.c
diff -u -p wine/dlls/oleaut32/varformat.c:1.14 wine/dlls/oleaut32/varformat.c:1.15
--- wine/dlls/oleaut32/varformat.c:1.14	5 Nov 2005 10:42: 9 -0000
+++ wine/dlls/oleaut32/varformat.c	5 Nov 2005 10:42: 9 -0000
@@ -1598,10 +1598,11 @@ static HRESULT VARIANT_FormatDate(LPVARI
     case FMT_DATE_GENERAL:
       {
         BSTR date = NULL;
-        WCHAR *pDate = date;
-        hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, pbstrOut);
+        WCHAR *pDate;
+        hRes = VarBstrFromDate(V_DATE(&vDate), lcid, 0, &date);
         if (FAILED(hRes))
           goto VARIANT_FormatDate_Exit;
+	pDate = date;
         while (*pDate)
           *pBuff++ = *pDate++;
         SysFreeString(date);
@@ -1623,10 +1624,11 @@ static HRESULT VARIANT_FormatDate(LPVARI
       {
         /* FIXME: VARIANT_CALENDAR HIJRI should cause Hijri output */
         BSTR date = NULL;
-        WCHAR *pDate = date;
-        hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, pbstrOut);
+        WCHAR *pDate;
+        hRes = VarBstrFromDate(V_DATE(&vDate), lcid, VAR_TIMEVALUEONLY, &date);
         if (FAILED(hRes))
           goto VARIANT_FormatDate_Exit;
+	pDate = date;
         while (*pDate)
           *pBuff++ = *pDate++;
         SysFreeString(date);