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

user: Added fast A->W mapping for LB_GETTEXT and CB_GETLBTEXT.

This commit is contained in:
Alexandre Julliard 2006-05-20 18:55:34 +02:00
parent 4dd1cce203
commit 19b428755c
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/user/winproc.c
View File

@ -775,17 +775,6 @@ static INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM
case LB_GETTEXTLEN:
return 1; /* need to map result */
case LB_GETTEXT: /* FIXME: fixed sized buffer */
case CB_GETLBTEXT:
if ( WINPROC_TestLBForStr( hwnd, msg ))
{
LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 * sizeof(WCHAR) + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
return 1;
/* Multiline edit */
case EM_GETLINE:
{ WORD len = (WORD)*plparam;
@ -885,18 +874,6 @@ static LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPA
HeapFree( GetProcessHeap(), 0, (void *)lParam );
break;
case LB_GETTEXT:
case CB_GETLBTEXT:
if ( WINPROC_TestLBForStr( hwnd, msg ))
{
LPARAM *ptr = (LPARAM *)lParam - 1;
if (result >= 0)
result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1,
(LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1;
HeapFree( GetProcessHeap(), 0, ptr );
}
break;
/* Multiline edit */
case EM_GETLINE:
{
@ -2713,6 +2690,24 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg,
}
break;
case LB_GETTEXT:
case CB_GETLBTEXT:
if (lParam && WINPROC_TestLBForStr( hwnd, msg ))
{
WCHAR buffer[512]; /* FIXME: fixed sized buffer */
ret = callback( hwnd, msg, wParam, (LPARAM)buffer, result, arg );
if (*result >= 0)
{
DWORD len;
RtlUnicodeToMultiByteN( (LPSTR)lParam, ~0u, &len,
buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) );
*result = len - 1;
}
}
else ret = callback( hwnd, msg, wParam, lParam, result, arg );
break;
default:
if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) {
ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",