reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 13:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Fix character conversion in combo box.

Browse Source 
Replace toupper/tolower with CharUpper/CharLower functions.
This commit is contained in:
Vitaly Lipatov 2006-06-14 21:12:16 +04:00 committed by Alexandre Julliard
parent 8cc69977eb
commit 88694be2ad
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/user/combo.c
View File

@ -2080,26 +2080,28 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
if( unicode ) if( unicode )
{ {
if( lphc->dwStyle & CBS_LOWERCASE ) if( lphc->dwStyle & CBS_LOWERCASE )
strlwrW((LPWSTR)lParam); CharLowerW((LPWSTR)lParam);
else if( lphc->dwStyle & CBS_UPPERCASE ) else if( lphc->dwStyle & CBS_UPPERCASE )
struprW((LPWSTR)lParam); CharUpperW((LPWSTR)lParam);
return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
} }
else /* unlike the unicode version, the ansi version does not overwrite else /* unlike the unicode version, the ansi version does not overwrite
the string if converting case */ the string if converting case */
{ {
char *p, *string = NULL; char *string = NULL;
LRESULT ret; LRESULT ret;
if( lphc->dwStyle & CBS_LOWERCASE ) if( lphc->dwStyle & CBS_LOWERCASE )
{ {
string = strdupA((LPSTR)lParam); string = strdupA((LPSTR)lParam);
for (p = string; *p; p++) *p = tolower(*p); CharLowerA(string);
} }
else if( lphc->dwStyle & CBS_UPPERCASE ) else if( lphc->dwStyle & CBS_UPPERCASE )
{ {
string = strdupA((LPSTR)lParam); string = strdupA((LPSTR)lParam);
for (p = string; *p; p++) *p = toupper(*p); CharUpperA(string);
} }
ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam);
HeapFree(GetProcessHeap(), 0, string); HeapFree(GetProcessHeap(), 0, string);
return ret; return ret;
@ -2112,18 +2114,18 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
if( unicode ) if( unicode )
{ {
if( lphc->dwStyle & CBS_LOWERCASE ) if( lphc->dwStyle & CBS_LOWERCASE )
strlwrW((LPWSTR)lParam); CharLowerW((LPWSTR)lParam);
else if( lphc->dwStyle & CBS_UPPERCASE ) else if( lphc->dwStyle & CBS_UPPERCASE )
struprW((LPWSTR)lParam); CharUpperW((LPWSTR)lParam);
return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
} }
else else
{ {
char *p;
if( lphc->dwStyle & CBS_LOWERCASE ) if( lphc->dwStyle & CBS_LOWERCASE )
for (p = (LPSTR)lParam; *p; p++) *p = tolower(*p); CharLowerA((LPSTR)lParam);
else if( lphc->dwStyle & CBS_UPPERCASE ) else if( lphc->dwStyle & CBS_UPPERCASE )
for (p = (LPSTR)lParam; *p; p++) *p = toupper(*p); CharUpperA((LPSTR)lParam);
return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
} }
case CB_DELETESTRING16: case CB_DELETESTRING16: