Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

one more error handling fix for GetTimeFormatA()

Browse source 
svn path=/trunk/; revision=9093
This commit is contained in:
Martin Fuchs 2004-04-12 10:49:48 +00:00
parent a46eec6cea
commit bdc459faa9
1 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/lib/kernel32/misc/lang.c
View file

@ -1,4 +1,4 @@
/* $Id: lang.c,v 1.13 2004/04/12 10:19:43 mf Exp $
/* $Id: lang.c,v 1.14 2004/04/12 10:49:48 mf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT : ReactOS user mode libraries
@ -1259,10 +1259,10 @@ STDCALL
GetTimeFormatW (
LCID Locale,
DWORD dwFlags,
CONST SYSTEMTIME * lpTime,
CONST SYSTEMTIME* lpTime,
LPCWSTR lpFormat,
LPWSTR lpTimeStr,
int cchTime
int cchTime
)
{
WCHAR Buffer[40];
@ -1311,16 +1311,16 @@ STDCALL
GetTimeFormatA (
LCID Locale,
DWORD dwFlags,
CONST SYSTEMTIME * lpTime,
CONST SYSTEMTIME* lpTime,
LPCSTR lpFormat,
LPSTR lpTimeStr,
int cchTime
int cchTime
)
{
LPWSTR lpFormatU = NULL;
LPWSTR lpTimeStrU;
LPWSTR lpTimeStrU;
int numCharsU;
int retVal;
int retVal = 0;
if (lpFormat != NULL) {
/* First just determine the number of necessary bytes
@ -1352,31 +1352,28 @@ GetTimeFormatA (
Unicode output */
numCharsU = GetTimeFormatW(Locale,dwFlags,lpTime,lpFormatU,NULL,0);
if (numCharsU == 0) {
if (lpFormatU != NULL)
HeapFree(GetProcessHeap(),0,lpFormatU);
return 0;
if (numCharsU != 0) {
lpTimeStrU = HeapAlloc(GetProcessHeap(),0,numCharsU*sizeof(WCHAR));
if (lpTimeStrU == NULL) {
if (lpFormatU != NULL)
HeapFree(GetProcessHeap(),0,lpFormatU);
return 0;
}
if (GetTimeFormatW(Locale,dwFlags,lpTime,lpFormatU,lpTimeStrU,numCharsU))
/* Convert the output string to ANSI */
retVal = WideCharToMultiByte(CP_ACP,
0,
lpTimeStrU,
numCharsU,
lpTimeStr,
cchTime,
NULL,
NULL);
HeapFree(GetProcessHeap(),0,lpTimeStrU);
}
lpTimeStrU = HeapAlloc(GetProcessHeap(),0,numCharsU*sizeof(WCHAR));
if (lpTimeStrU == NULL) {
if (lpFormatU != NULL)
HeapFree(GetProcessHeap(),0,lpFormatU);
return 0;
}
if (GetTimeFormatW(Locale,dwFlags,lpTime,lpFormatU,lpTimeStrU,numCharsU))
/* Convert the output string to ANSI */
retVal = WideCharToMultiByte(CP_ACP,
0,
lpTimeStrU,
numCharsU,
lpTimeStr,
cchTime,
NULL,
NULL);
HeapFree(GetProcessHeap(),0,lpTimeStrU);
if (lpFormatU != NULL)
HeapFree(GetProcessHeap(),0,lpFormatU);