ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some more overflowing string traces.

Browse Source
This commit is contained in:
Andreas Mohr 2001-07-17 00:51:00 +00:00 committed by Alexandre Julliard
parent 326b280efc
commit a49b5be97d
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/user/text.c
View File

@ -747,7 +747,7 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count,
DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count,
INT cTabStops, const INT *lpTabPos ) INT cTabStops, const INT *lpTabPos )
{ {
TRACE("%04x '%.*s' %d\n", hdc, count, lpstr, count ); TRACE("%04x %s %d\n", hdc, debugstr_an(lpstr,count), count );
return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops, return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops,
NULL, lpTabPos, 0, FALSE ); NULL, lpTabPos, 0, FALSE );
} }

22
ole/ole2nls.c
View File

@ -1892,11 +1892,12 @@ INT WINAPI LCMapStringA(
int i; int i;
TRACE("(0x%04lx,0x%08lx,%s,%d,%p,%d)\n", TRACE("(0x%04lx,0x%08lx,%s,%d,%p,%d)\n",
lcid,mapflags,srcstr,srclen,dststr,dstlen); lcid,mapflags,debugstr_an(srcstr,srclen),srclen,dststr,dstlen);
if ( ((dstlen!=0) && (dststr==NULL)) || (srcstr==NULL) ) if ( ((dstlen!=0) && (dststr==NULL)) || (srcstr==NULL) )
{ {
ERR("(src=%s,dest=%s): Invalid NULL string\n", srcstr, dststr); ERR("(src=%s,dest=%s): Invalid NULL string\n",
debugstr_an(srcstr,srclen), dststr);
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
@ -2470,11 +2471,12 @@ UINT WINAPI CompareStringA(
int result; int result;
LPSTR sk1,sk2; LPSTR sk1,sk2;
TRACE("%s and %s\n", TRACE("%s and %s\n",
debugstr_a (s1), debugstr_a (s2)); debugstr_an (s1,l1), debugstr_an (s2,l2));
if ( (s1==NULL) || (s2==NULL) ) if ( (s1==NULL) || (s2==NULL) )
{ {
ERR("(s1=%s,s2=%s): Invalid NULL string\n", s1, s2); ERR("(s1=%s,s2=%s): Invalid NULL string\n",
debugstr_an(s1,l1), debugstr_an(s2,l2));
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
@ -3074,10 +3076,10 @@ INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
if (xtime == NULL) { if (xtime == NULL) {
GetSystemTime(&t); GetSystemTime(&t);
} else { } else {
/* Silently correct wDayOfWeek by tranforming to FileTime and back again*/ /* Silently correct wDayOfWeek by transforming to FileTime and back again */
res=SystemTimeToFileTime(xtime,&ft); res=SystemTimeToFileTime(xtime,&ft);
/* Check year(?)/month and date for range and set ERROR_INVALID_PARAMETER on error */ /* Check year(?)/month and date for range and set ERROR_INVALID_PARAMETER on error */
/*FIXME: SystemTimeToFileTime doesn't yet do that ckeck*/ /*FIXME: SystemTimeToFileTime doesn't yet do that check */
if(!res) if(!res)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
@ -3575,7 +3577,7 @@ BOOL bInDecimal = FALSE;
* Description: A number could be formatted using different numbers * Description: A number could be formatted using different numbers
* of "digits in group" (example: 4;3;2;0). * of "digits in group" (example: 4;3;2;0).
* The first parameter of this function is an array * The first parameter of this function is an array
* containing the rule to be used. It's format is the following: * containing the rule to be used. Its format is the following:
* |NDG|DG1|DG2|...|0| * |NDG|DG1|DG2|...|0|
* where NDG is the number of used "digits in group" and DG1, DG2, * where NDG is the number of used "digits in group" and DG1, DG2,
* are the corresponding "digits in group". * are the corresponding "digits in group".
@ -3860,7 +3862,7 @@ INT WINAPI GetNumberFormatW(LCID locale, DWORD dwflags,
LPCWSTR lpvalue, const NUMBERFMTW * lpFormat, LPCWSTR lpvalue, const NUMBERFMTW * lpFormat,
LPWSTR lpNumberStr, int cchNumber) LPWSTR lpNumberStr, int cchNumber)
{ {
FIXME("%s: stub, no reformating done\n",debugstr_w(lpvalue)); FIXME("%s: stub, no reformatting done\n",debugstr_w(lpvalue));
lstrcpynW( lpNumberStr, lpvalue, cchNumber ); lstrcpynW( lpNumberStr, lpvalue, cchNumber );
return cchNumber? strlenW( lpNumberStr ) : 0; return cchNumber? strlenW( lpNumberStr ) : 0;
@ -4168,7 +4170,7 @@ GetTimeFormatA(LCID locale, /* [in] */
SYSTEMTIME t; SYSTEMTIME t;
LPSYSTEMTIME thistime; LPSYSTEMTIME thistime;
LCID thislocale=0; LCID thislocale=0;
DWORD thisflags=LOCALE_STIMEFORMAT; /* standart timeformat */ DWORD thisflags=LOCALE_STIMEFORMAT; /* standard timeformat */
INT ret; INT ret;
TRACE("GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags,xtime,format,timestr,timelen); TRACE("GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags,xtime,format,timestr,timelen);
@ -4216,7 +4218,7 @@ GetTimeFormatW(LCID locale, /* [in] */
SYSTEMTIME t; SYSTEMTIME t;
LPSYSTEMTIME thistime; LPSYSTEMTIME thistime;
LCID thislocale=0; LCID thislocale=0;
DWORD thisflags=LOCALE_STIMEFORMAT; /* standart timeformat */ DWORD thisflags=LOCALE_STIMEFORMAT; /* standard timeformat */
INT ret; INT ret;
TRACE("GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags, TRACE("GetTimeFormat(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",locale,flags,