From d805924121d8305c0edfb8d950dbf2f1ce72067c Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Thu, 8 Feb 2007 18:14:35 +0000 Subject: [PATCH] bug 359808 : drop support for Win9x/ME : follow-up fix git-svn-id: svn://10.0.0.236/trunk@219728 18797224-902f-48f8-a5cc-f745e15eee43 --- .../intl/locale/src/windows/nsDateTimeFormatWin.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp index f1327036df3..78a91bfacba 100644 --- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -275,8 +275,10 @@ int nsDateTimeFormatWin::nsGetTimeFormatW(DWORD dwFlags, const SYSTEMTIME *lpTim int len = 0; LPCWSTR wstr = NULL; - if (format) - wstr = NS_CONST_CAST(LPCWSTR, NS_ConvertASCIItoUTF16(format).get()); + if (format) { + NS_ConvertASCIItoUTF16 wFormat(format); + wstr = NS_CONST_CAST(LPCWSTR, wFormat.get()); + } len = GetTimeFormatW(mLCID, dwFlags, lpTime, wstr, (LPWSTR) timeStr, cchTime); return len; } @@ -287,8 +289,10 @@ int nsDateTimeFormatWin::nsGetDateFormatW(DWORD dwFlags, const SYSTEMTIME *lpDat int len = 0; LPCWSTR wstr = NULL; - if (format) - wstr = NS_CONST_CAST(LPCWSTR, NS_ConvertASCIItoUTF16(format).get()); + if (format) { + NS_ConvertASCIItoUTF16 wFormat(format); + wstr = NS_CONST_CAST(LPCWSTR, wFormat.get()); + } len = GetDateFormatW(mLCID, dwFlags, lpDate, wstr, (LPWSTR) dateStr, cchDate); return len; }