reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-23 06:12:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CB_GETLBTEXT ANSI-Unicode calls when return value is an error

Browse Source 
code.
This commit is contained in:
Krzysztof Foltman 2005-10-19 18:29:36 +00:00 committed by Alexandre Julliard
parent 44cbdf2138
commit 73045050b3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/user/winproc.c
View File

@ -970,7 +970,12 @@ LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
break;
case CB_GETLBTEXT:
if ( WINPROC_TestCBForStr( hwnd ))
if ( result < 0) /* CB_ERR and CB_ERRSPACE */
{
LPARAM *ptr = (LPARAM *)lParam - 1;
HeapFree( GetProcessHeap(), 0, ptr );
}
else if ( WINPROC_TestCBForStr( hwnd ))
{
LPARAM *ptr = (LPARAM *)lParam - 1;
result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1,
@ -1232,7 +1237,12 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam, LPA
break;
case CB_GETLBTEXT:
if ( WINPROC_TestCBForStr( hwnd ))
if ( result < 0) /* CB_ERR and CB_ERRSPACE */
{
LPARAM *ptr = (LPARAM *)lParam - 1;
HeapFree( GetProcessHeap(), 0, ptr );
}
else if ( WINPROC_TestCBForStr( hwnd ))
{
LPARAM *ptr = (LPARAM *)lParam - 1;
result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1;