system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

riched20: Handle EM_FINDTEXT's unicode conversion in the host.

Browse source 
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2021-03-12 09:01:37 +00:00 committed by Alexandre Julliard
parent 93fec636d5
commit c80be66cc4
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/riched20/editor.c
View file

@ -4167,24 +4167,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
{
return editor->nTextLimit;
}
case EM_FINDTEXT:
{
LRESULT r;
if(!unicode){
FINDTEXTA *ft = (FINDTEXTA *)lParam;
int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0);
WCHAR *tmp;
if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL)
MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars);
r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL);
heap_free(tmp);
}else{
FINDTEXTW *ft = (FINDTEXTW *)lParam;
r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL);
}
return r;
}
case EM_FINDTEXTEX:
{
LRESULT r;
@ -4203,6 +4185,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
}
return r;
}
case EM_FINDTEXT:
case EM_FINDTEXTW:
{
FINDTEXTW *ft = (FINDTEXTW *)lParam;

16
dlls/riched20/txthost.c
View file

@ -834,6 +834,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam,
FillRect( hdc, &rc, editor->hbrBackground );
return 1;
}
case EM_FINDTEXT:
{
FINDTEXTW *params = (FINDTEXTW *)lparam;
FINDTEXTW new_params;
int len;
if (!unicode)
{
new_params.chrg = params->chrg;
new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len );
params = &new_params;
}
hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTW, wparam, (LPARAM)params, &res );
if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText );
break;
}
case WM_GETTEXT:
{
GETTEXTEX params;