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

Make Char{Lower,Upper}A call Char{Lower,Upper}BuffA. 

Small optimization to avoid a memory allocation.
Fixed sign extension in Char{Lower,Upper}A (reported by Andreas
Rosenberg).
This commit is contained in:
Alexandre Julliard 2003-12-12 06:07:28 +00:00
parent 6fee8c95b2
commit 54b951a480
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dlls/user/lstr.c
View File

@ -112,7 +112,7 @@ SEGPTR WINAPI AnsiUpper16( SEGPTR strOrChar )
CharUpperA( MapSL(strOrChar) );
return strOrChar;
}
else return toupper((char)strOrChar);
else return (SEGPTR)CharUpperA( (LPSTR)strOrChar );
}
@ -127,7 +127,7 @@ SEGPTR WINAPI AnsiLower16( SEGPTR strOrChar )
CharLowerA( MapSL(strOrChar) );
return strOrChar;
}
else return tolower((char)strOrChar);
else return (SEGPTR)CharLowerA( (LPSTR)strOrChar );
}
@ -360,20 +360,19 @@ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d )
/***********************************************************************
* CharLowerA (USER32.@)
* FIXME: handle current locale
*/
LPSTR WINAPI CharLowerA(LPSTR x)
LPSTR WINAPI CharLowerA(LPSTR str)
{
if (!HIWORD(x)) return (LPSTR)tolower((char)(int)x);
if (!HIWORD(str))
{
char ch = LOWORD(str);
CharLowerBuffA( &ch, 1 );
return (LPSTR)(UINT_PTR)(BYTE)ch;
}
__TRY
{
LPSTR s = x;
while (*s)
{
*s=tolower(*s);
s++;
}
CharLowerBuffA( str, strlen(str) );
}
__EXCEPT(page_fault)
{
@ -381,26 +380,25 @@ LPSTR WINAPI CharLowerA(LPSTR x)
return NULL;
}
__ENDTRY
return x;
return str;
}
/***********************************************************************
* CharUpperA (USER32.@)
* FIXME: handle current locale
*/
LPSTR WINAPI CharUpperA(LPSTR x)
LPSTR WINAPI CharUpperA(LPSTR str)
{
if (!HIWORD(x)) return (LPSTR)toupper((char)(int)x);
if (!HIWORD(str))
{
char ch = LOWORD(str);
CharUpperBuffA( &ch, 1 );
return (LPSTR)(UINT_PTR)(BYTE)ch;
}
__TRY
{
LPSTR s = x;
while (*s)
{
*s=toupper(*s);
s++;
}
CharUpperBuffA( str, strlen(str) );
}
__EXCEPT(page_fault)
{
@ -408,7 +406,7 @@ LPSTR WINAPI CharUpperA(LPSTR x)
return NULL;
}
__ENDTRY
return x;
return str;
}
@ -438,21 +436,23 @@ LPWSTR WINAPI CharUpperW(LPWSTR x)
DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len )
{
DWORD lenW;
WCHAR *strW;
WCHAR buffer[32];
WCHAR *strW = buffer;
if (!str) return 0; /* YES */
lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0);
strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
if(strW)
if (lenW > sizeof(buffer)/sizeof(WCHAR))
{
strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
if (!strW) return 0;
}
MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW);
CharLowerBuffW(strW, lenW);
len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL);
HeapFree(GetProcessHeap(), 0, strW);
if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW);
return len;
}
return 0;
}
/***********************************************************************
@ -473,21 +473,23 @@ DWORD WINAPI CharLowerBuffW( LPWSTR str, DWORD len )
DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len )
{
DWORD lenW;
WCHAR *strW;
WCHAR buffer[32];
WCHAR *strW = buffer;
if (!str) return 0; /* YES */
lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0);
strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
if(strW)
if (lenW > sizeof(buffer)/sizeof(WCHAR))
{
strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
if (!strW) return 0;
}
MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW);
CharUpperBuffW(strW, lenW);
len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL);
HeapFree(GetProcessHeap(), 0, strW);
if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW);
return len;
}
return 0;
}
/***********************************************************************