ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RICHED20] txthost.c: Partial Wine Sync of RichEditWndProc_common (#7817)

Browse Source 
Add extra parameters to 'struct host' to handle 'defer_release' and 'notify_level' and use these.
Fixes crash when using 'Enter' key in DevCpp installer license edit box.

Update and retrial of #7733. CORE-19991
Cherry pick of wine commit: https://github.com/wine-mirror/wine/commit/8138159f20d6453443861570689e0f14018051da
This commit is contained in:
Doug Lyons
2025-03-25 13:15:59 -05:00
committed by GitHub
parent 48beb0433e
commit 0c6423da8d
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/riched20/txthost.c
+23 -6
View File
@@ -45,11 +45,13 @@ struct host
unsigned int client_edge : 1;
unsigned int use_set_rect : 1;
unsigned int use_back_colour : 1;
unsigned int defer_release : 1;
PARAFORMAT2 para_fmt;
DWORD props, scrollbars, event_mask;
RECT client_rect, set_rect;
COLORREF back_colour;
WCHAR password_char;
unsigned int notify_level;
};
static const ITextHost2Vtbl textHostVtbl;
@@ -119,6 +121,8 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 )
GetClientRect( hwnd, &texthost->client_rect );
texthost->use_back_colour = 0;
texthost->password_char = (texthost->props & TXTBIT_USEPASSWORD) ? '*' : 0;
texthost->defer_release = 0;
texthost->notify_level = 0;
return texthost;
}
@@ -1361,12 +1365,24 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam,
if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) ||
((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) ||
((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) &&
send_msg_filter( host, msg, &wparam, &lparam ))
((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)))
{
TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n",
hwnd, msg, get_msg_name(msg), wparam, lparam, res );
return res;
host->notify_level++;
res = send_msg_filter( host, msg, &wparam, &lparam );
if (!--host->notify_level && host->defer_release)
{
TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %lx %lx -> 0\n",
hwnd, msg, get_msg_name(msg), wparam, lparam );
ITextHost2_Release( &host->ITextHost_iface );
return 0;
}
if (res)
{
TRACE( "exit (filtered %lu) hwnd %p msg %04x (%s) %lx %lx -> 0\n",
res, hwnd, msg, get_msg_name(msg), wparam, lparam );
return 0;
}
}
switch (msg)
@@ -1402,7 +1418,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam,
break;
}
case WM_DESTROY:
ITextHost2_Release( &host->ITextHost_iface );
if (!host->notify_level) ITextHost2_Release( &host->ITextHost_iface );
else host->defer_release = 1;
return 0;
case WM_ERASEBKGND: