March 2021 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msado15: Clear interface point after release.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 83b558c5f320bfd952c9af49d8a3e326629c2979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b558c5f320bfd952c9af49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 18 16:29:42 2021 +1100 msado15: Clear interface point after release. Since we clear the recordset pointer, we need to reassign it when retreiving Fields. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b690e243189..a86936eb037 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -488,6 +488,7 @@ static ULONG WINAPI fields_Release( Fields *iface ) if (!refs) { if (fields->recordset) _Recordset_Release( &fields->recordset->Recordset_iface ); + fields->recordset = NULL; WARN( "not destroying %p\n", fields ); return InterlockedIncrement( &fields->refs ); } @@ -864,7 +865,6 @@ static void close_recordset( struct recordset *recordset ) if (!recordset->fields) return; col_count = get_column_count( recordset ); - recordset->fields->recordset = NULL; Fields_Release( &recordset->fields->Fields_iface ); recordset->fields = NULL; @@ -1092,6 +1092,7 @@ static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) { /* yes, this adds a reference to the recordset instead of the fields object */ _Recordset_AddRef( &recordset->Recordset_iface ); + recordset->fields->recordset = recordset; *obj = &recordset->fields->Fields_iface; return S_OK; }

1 0

Zebediah Figura : server: Do not allow selecting on the ifchange object.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 340cc46287d7861ce6cae19401752e65f4089ae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340cc46287d7861ce6cae194… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:23 2021 -0500 server: Do not allow selecting on the ifchange object. We never pass a handle to this object to the client anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3aed5494612..8ab7d5b7236 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1536,7 +1536,7 @@ static const struct object_ops ifchange_ops = sizeof(struct ifchange), /* size */ &no_type, /* type */ ifchange_dump, /* dump */ - add_queue, /* add_queue */ + no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */

1 0

Zebediah Figura : server: Make pulse_event() static.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: fe9e2f070b475774211ac955c3b5881d0ef1d067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9e2f070b475774211ac955… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:24 2021 -0500 server: Make pulse_event() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/event.c | 2 +- server/object.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/event.c b/server/event.c index c45c093e9d3..ccdd465dd5b 100644 --- a/server/event.c +++ b/server/event.c @@ -160,7 +160,7 @@ struct event *get_event_obj( struct process *process, obj_handle_t handle, unsig return (struct event *)get_handle_obj( process, handle, access, &event_ops ); } -void pulse_event( struct event *event ) +static void pulse_event( struct event *event ) { event->signaled = 1; /* wake up all waiters if manual reset, a single one otherwise */ diff --git a/server/object.h b/server/object.h index 5b2c309f0b2..1aef43018b2 100644 --- a/server/object.h +++ b/server/object.h @@ -215,7 +215,6 @@ extern struct keyed_event *create_keyed_event( struct object *root, const struct unsigned int attr, const struct security_descriptor *sd ); extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern void pulse_event( struct event *event ); extern void set_event( struct event *event ); extern void reset_event( struct event *event );

1 0

Zebediah Figura : server: Use default_fd_signaled() for sockets.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 731339cd60c255fd5890063b144ad7c00661f5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731339cd60c255fd5890063b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:25 2021 -0500 server: Use default_fd_signaled() for sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8ab7d5b7236..775ec6edf32 100644 --- a/server/sock.c +++ b/server/sock.c @@ -163,7 +163,6 @@ struct sock }; static void sock_dump( struct object *obj, int verbose ); -static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void sock_destroy( struct object *obj ); @@ -189,7 +188,7 @@ static const struct object_ops sock_ops = sock_dump, /* dump */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - sock_signaled, /* signaled */ + default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ sock_get_fd, /* get_fd */ @@ -773,10 +772,6 @@ static void sock_poll_event( struct fd *fd, int event ) event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); - /* if anyone is stupid enough to wait on the socket object itself, - * maybe we should wake them up too, just in case? */ - wake_up( &sock->obj, 0 ); - sock_reselect( sock ); } @@ -789,14 +784,6 @@ static void sock_dump( struct object *obj, int verbose ) sock->mask, sock->pmask, sock->hmask ); } -static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct sock *sock = (struct sock *)obj; - assert( obj->ops == &sock_ops ); - - return check_fd_events( sock->fd, sock_get_poll_events( sock->fd ) ) != 0; -} - static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd );

1 0

Zebediah Figura : server: Fix a copy-paste error in a comment.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 9922b5210b906b8b61c4899f8286e75b0b72b22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9922b5210b906b8b61c4899f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:26 2021 -0500 server: Fix a copy-paste error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index a5790cda939..03161c830c0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -668,7 +668,7 @@ typedef union } map_view; struct { - enum apc_type type; /* APC_MAP_VIEW */ + enum apc_type type; /* APC_UNMAP_VIEW */ unsigned int status; /* status returned by call */ } unmap_view; struct

1 0

Zebediah Figura : server: Remove a no longer relevant "see below" from a comment.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 4c0a69f5865c37c2693813670433381c4737a40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0a69f5865c37c269381367… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 00:41:27 2021 -0500 server: Remove a no longer relevant "see below" from a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index 03161c830c0..2bfdcca6de1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1114,7 +1114,7 @@ typedef struct obj_handle_t dst_process; /* dst process handle */ unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - unsigned int options; /* duplicate options (see below) */ + unsigned int options; /* duplicate options */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ int self; /* is the source the current process? */

1 0

Huw Davies : riched20: Handle EM_SETBKGNDCOLOR in the host.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: b927bc8d99e658d5c0d0af943010f38e984baab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b927bc8d99e658d5c0d0af94… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:06 2021 +0000 riched20: Handle EM_SETBKGNDCOLOR in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 26 -------------------------- dlls/riched20/editstr.h | 2 -- dlls/riched20/txthost.c | 26 ++++++++++++++++++++++---- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 13a04a003f4..3073294bd7b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3005,8 +3005,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastTotalLength = ed->nTotalLength = 0; ed->nLastTotalWidth = ed->nTotalWidth = 0; ed->nUDArrowX = -1; - ed->rgbBackColor = -1; - ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); ed->nEventMask = 0; ed->nModifyStep = 0; ed->nTextLimit = TEXT_LIMIT_DEFAULT; @@ -3100,8 +3098,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - if (editor->rgbBackColor != -1) - DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); if (editor->reOle) @@ -3516,28 +3512,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SELECTIONTYPE: return ME_GetSelectionType(editor); - case EM_SETBKGNDCOLOR: - { - LRESULT lColor; - if (editor->rgbBackColor != -1) { - DeleteObject(editor->hbrBackground); - lColor = editor->rgbBackColor; - } - else lColor = ITextHost_TxGetSysColor(editor->texthost, COLOR_WINDOW); - - if (wParam) - { - editor->rgbBackColor = -1; - editor->hbrBackground = GetSysColorBrush(COLOR_WINDOW); - } - else - { - editor->rgbBackColor = lParam; - editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); - } - ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - return lColor; - } case EM_GETMODIFY: return editor->nModifyStep == 0 ? 0 : -1; case EM_SETMODIFY: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1f277cbf6bc..0273fde4350 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -392,8 +392,6 @@ typedef struct tagME_TextEditor int nAvailWidth; /* 0 = wrap to client area, else wrap width in twips */ int nUDArrowX; int total_rows; - COLORREF rgbBackColor; - HBRUSH hbrBackground; int nEventMask; int nModifyStep; struct list undo_stack; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c80263bbd69..ebccddf65e3 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -45,9 +45,11 @@ struct host unsigned int sel_bar : 1; unsigned int client_edge : 1; unsigned int use_set_rect : 1; + unsigned int use_back_colour : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; + COLORREF back_colour; }; static const ITextHostVtbl textHostVtbl; @@ -111,6 +113,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->use_set_rect = 0; SetRectEmpty( &texthost->set_rect ); GetClientRect( hwnd, &texthost->client_rect ); + texthost->use_back_colour = 0; return texthost; } @@ -346,6 +349,9 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost *ifa DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost *iface, int index ) { + struct host *host = impl_from_ITextHost( iface ); + + if (index == COLOR_WINDOW && host->use_back_colour) return host->back_colour; return GetSysColor( index ); } @@ -992,9 +998,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, { HDC hdc = (HDC)wparam; RECT rc; + HBRUSH brush; if (GetUpdateRect( editor->hWnd, &rc, TRUE )) - FillRect( hdc, &rc, editor->hbrBackground ); + { + brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); + FillRect( hdc, &rc, brush ); + DeleteObject( brush ); + } return 1; } case EM_FINDTEXT: @@ -1127,13 +1138,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HDC hdc; RECT rc; PAINTSTRUCT ps; - HBRUSH old_brush; + HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE ); - old_brush = SelectObject( hdc, editor->hbrBackground ); + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) @@ -1166,7 +1177,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } ME_PaintContent( editor, hdc, &ps.rcPaint ); - SelectObject( hdc, old_brush ); + DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0; } @@ -1181,6 +1192,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = len; break; } + case EM_SETBKGNDCOLOR: + res = ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ); + host->use_back_colour = !wparam; + if (host->use_back_colour) host->back_colour = lparam; + InvalidateRect( hwnd, NULL, TRUE ); + break; + case EM_SETEVENTMASK: host->event_mask = lparam; hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res );

1 0

Huw Davies : riched20: Handle EM_SETPASSWORDCHAR in the host.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 06fb9c7f4c6949057ac6e167ef6d3bfc74cf07e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fb9c7f4c6949057ac6e167… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:07 2021 +0000 riched20: Handle EM_SETPASSWORDCHAR in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 16 +++------------- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/run.c | 12 ++++++------ dlls/riched20/txthost.c | 20 ++++++++++++++++++-- dlls/riched20/txtsrv.c | 7 +++++++ dlls/riched20/wrap.c | 2 +- 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3073294bd7b..f7d383c2f10 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2375,7 +2375,7 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) int start_cursor = ME_GetSelectionOfs( editor, &offs, &count ); ME_Cursor *sel_start = &editor->pCursors[start_cursor]; - if (editor->cPasswordMask) return FALSE; + if (editor->password_char) return FALSE; count -= offs; hr = editor_copy_or_cut( editor, cut, sel_start, count, NULL ); @@ -3041,9 +3041,9 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) else ed->selofs = 0; ed->nSelectionType = stPosition; - ed->cPasswordMask = 0; + ed->password_char = 0; if (ed->props & TXTBIT_USEPASSWORD) - ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); + ITextHost_TxGetPasswordChar( texthost, &ed->password_char ); ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) && (ed->props & TXTBIT_MULTILINE); @@ -4217,10 +4217,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 1; return 0; } - case EM_GETPASSWORDCHAR: - { - return editor->cPasswordMask; - } case EM_SETOLECALLBACK: if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); @@ -4274,12 +4270,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->mode = (editor->mode & ~mask) | changes; return 0; } - case EM_SETPASSWORDCHAR: - { - editor->cPasswordMask = wParam; - ME_RewrapRepaint(editor); - return 0; - } case EM_SETTARGETDEVICE: if (wParam == 0) { diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 0273fde4350..df07923548d 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -416,7 +416,7 @@ typedef struct tagME_TextEditor int mode; BOOL bHideSelection; BOOL AutoURLDetect_bEnable; - WCHAR cPasswordMask; + WCHAR password_char; BOOL bHaveFocus; /*for IME */ int imeStartIndex; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8ef5ada5855..607ced52089 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -333,9 +333,9 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, && !(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects) ) ); - if (c->editor->cPasswordMask) + if (c->editor->password_char) { - masked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + masked = ME_MakeStringR( c->editor->password_char, run->len ); text = masked->szData; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index e099c0be6dc..bc282b20a57 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -543,9 +543,9 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO return closest ? cp + trailing : cp; } - if (c->editor->cPasswordMask) + if (c->editor->password_char) { - mask_text = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + mask_text = ME_MakeStringR( c->editor->password_char, run->len ); str = mask_text->szData; } else @@ -626,9 +626,9 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua if (visual_order && pRun->script_analysis.fRTL) x = pRun->nWidth - x - 1; return x; } - if (c->editor->cPasswordMask) + if (c->editor->password_char) { - mask_text = ME_MakeStringR(c->editor->cPasswordMask, pRun->len); + mask_text = ME_MakeStringR( c->editor->password_char, pRun->len ); str = mask_text->szData; } else @@ -678,9 +678,9 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i { size.cx = run->nWidth; } - else if (c->editor->cPasswordMask) + else if (c->editor->password_char) { - ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask,nLen); + ME_String *szMasked = ME_MakeStringR( c->editor->password_char, nLen ); ME_GetTextExtent(c, szMasked->szData, nLen,run->style, &size); ME_DestroyString(szMasked); } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ebccddf65e3..beb2e423089 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -50,6 +50,7 @@ struct host DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; COLORREF back_colour; + WCHAR password_char; }; static const ITextHostVtbl textHostVtbl; @@ -114,6 +115,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) SetRectEmpty( &texthost->set_rect ); GetClientRect( hwnd, &texthost->client_rect ); texthost->use_back_colour = 0; + texthost->password_char = (texthost->props & TXTBIT_USEPASSWORD) ? '*' : 0; return texthost; } @@ -381,8 +383,10 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *ifa DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost *iface, WCHAR *c ) { - *c = '*'; - return S_OK; + struct host *host = impl_from_ITextHost( iface ); + + *c = host->password_char; + return *c ? S_OK : S_FALSE; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) @@ -1058,6 +1062,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else hr = get_lineA( host->text_srv, wparam, lparam, &res ); break; + case EM_GETPASSWORDCHAR: + ITextHost_TxGetPasswordChar( &host->ITextHost_iface, (WCHAR *)&res ); + break; + case EM_GETRECT: hr = ITextHost_TxGetClientRect( &host->ITextHost_iface, (RECT *)lparam ); break; @@ -1208,6 +1216,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, hr = set_options( host, wparam, lparam, &res ); break; + case EM_SETPASSWORDCHAR: + if (wparam == host->password_char) break; + host->password_char = wparam; + if (wparam) host->props |= TXTBIT_USEPASSWORD; + else host->props &= ~TXTBIT_USEPASSWORD; + ITextServices_OnTxPropertyBitsChange( host->text_srv, TXTBIT_USEPASSWORD, host->props & TXTBIT_USEPASSWORD ); + break; + case EM_SETREADONLY: { DWORD op = wparam ? ECOOP_OR : ECOOP_AND; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 9cf1908b4de..e86a8936531 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -390,6 +390,13 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic if (SUCCEEDED( hr )) repaint = TRUE; } + if (mask & TXTBIT_USEPASSWORD) + { + if (bits & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar( services->host, &services->editor->password_char ); + else services->editor->password_char = 0; + repaint = TRUE; + } + if (repaint) ME_RewrapRepaint( services->editor ); return S_OK; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 0ca70b8a8ad..dcda041d773 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -829,7 +829,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag para_num_init( c, para ); /* For now treating all non-password text as complex for better testing */ - if (!c->editor->cPasswordMask /* && + if (!c->editor->password_char /* && ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) { if (SUCCEEDED( itemize_para( c, para ) ))

1 0

Huw Davies : riched20: Don't set the cursor during mouse messages.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: cd5b064af8c82c182525967d3e98a81962f06367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5b064af8c82c182525967d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:08 2021 +0000 riched20: Don't set the cursor during mouse messages. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f7d383c2f10..fe22554327f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3954,7 +3954,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ITextHost_TxSetCapture(editor->texthost, TRUE); editor->bMouseCaptured = TRUE; ME_LinkNotify(editor, msg, wParam, lParam); - if (!ME_SetCursor(editor)) goto do_default; break; } case WM_MOUSEMOVE: @@ -3962,9 +3961,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); else ME_LinkNotify(editor, msg, wParam, lParam); - /* Set cursor if mouse is captured, since WM_SETCURSOR won't be received. */ - if (editor->bMouseCaptured) - ME_SetCursor(editor); break; case WM_LBUTTONUP: if (editor->bMouseCaptured) { @@ -3975,7 +3971,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->nSelectionType = stPosition; else { - ME_SetCursor(editor); ME_LinkNotify(editor, msg, wParam, lParam); } break;

1 0

Huw Davies : riched20: Handle WM_SETCURSOR in the host.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 887ffec967e6693d99f682a8cd991ba22b14d3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887ffec967e6693d99f682a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 18 08:30:09 2021 +0000 riched20: Handle WM_SETCURSOR in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 139 +++++++++++++++--------------------------------- dlls/riched20/editor.h | 4 +- dlls/riched20/txthost.c | 17 +++++- dlls/riched20/txtsrv.c | 17 ++++-- 4 files changed, 74 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=887ffec967e6693d99f6…

1 0