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

msvcrt: Use internal toupper implementation.

Browse Source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2019-03-26 11:31:06 +01:00 committed by Alexandre Julliard
parent 834134f284
commit 3f675c1a9d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/file.c
View File

@ -3007,7 +3007,7 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf)
as a drive letter as a drive letter
*/ */
if (isalpha(*path)&& (*(path+1)==':')) if (isalpha(*path)&& (*(path+1)==':'))
buf->st_dev = buf->st_rdev = toupper(*path) - 'A'; /* drive num */ buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */
else else
buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1;

6
dlls/msvcrt/mbcs.c
View File

@ -417,7 +417,7 @@ unsigned int CDECL _mbctoupper(unsigned int c)
FIXME("Handle MBC chars\n"); FIXME("Handle MBC chars\n");
return c; return c;
} }
return toupper(c); /* ASCII CP or SB char */ return MSVCRT__toupper_l(c, NULL); /* ASCII CP or SB char */
} }
/********************************************************************* /*********************************************************************
@ -1977,7 +1977,7 @@ unsigned char* CDECL _mbsupr(unsigned char* s)
*s++=c; *s++=c;
} }
} }
else for ( ; *s; s++) *s = toupper(*s); else for ( ; *s; s++) *s = MSVCRT__toupper_l(*s, NULL);
return ret; return ret;
} }
@ -2011,7 +2011,7 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len)
*s++=c; *s++=c;
} }
} }
else for ( ; *s && len > 0; s++, len--) *s = toupper(*s); else for ( ; *s && len > 0; s++, len--) *s = MSVCRT__toupper_l(*s, NULL);
if (*s) if (*s)
{ {
*s = '\0'; *s = '\0';

6
dlls/msvcrt/printf.h
View File

@ -354,7 +354,7 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf, BOOL three_digit_exp)
{ {
char* tmp = buf; char* tmp = buf;
while(tmp[0] && toupper(tmp[0])!='E') while(tmp[0] && MSVCRT__toupper_l(tmp[0], NULL)!='E')
tmp++; tmp++;
if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') &&
@ -664,10 +664,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
sprintf(tmp, nan_str); sprintf(tmp, nan_str);
if (strchr("EFG", flags.Format)) if (strchr("EFG", flags.Format))
for(i=0; tmp[i]; i++) for(i=0; tmp[i]; i++)
tmp[i] = toupper(tmp[i]); tmp[i] = MSVCRT__toupper_l(tmp[i], NULL);
} else { } else {
sprintf(tmp, float_fmt, val); sprintf(tmp, float_fmt, val);
if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') if(MSVCRT__toupper_l(flags.Format, NULL)=='E' || MSVCRT__toupper_l(flags.Format, NULL)=='G')
FUNC_NAME(pf_fixup_exponent)(tmp, three_digit_exp); FUNC_NAME(pf_fixup_exponent)(tmp, three_digit_exp);
} }