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

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_unordered_access_view().
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 77d6549f55b2a0f9e98aa68210167022453f39b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77d6549f55b2a0f9e98aa682… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 17 19:45:13 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_unordered_access_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 +++++---- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8afa298b905..dbc242f1ba0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1579,19 +1579,20 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con device_invalidate_state(cs->c.device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); } -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline, - unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) +void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, + enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, + unsigned int initial_count) { struct wined3d_cs_set_unordered_access_view *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->pipeline = pipeline; op->view_idx = view_idx; op->view = view; op->initial_count = initial_count; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c4700d2dc65..14a68b4f3b1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1915,7 +1915,8 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { for (j = 0; j < MAX_UNORDERED_ACCESS_VIEWS; ++j) { - wined3d_cs_emit_set_unordered_access_view(device->cs, i, j, state->unordered_access_view[i][j], ~0); + wined3d_device_context_emit_set_unordered_access_view(context, i, j, + state->unordered_access_view[i][j], ~0); } } @@ -2697,7 +2698,7 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev if (uav) wined3d_unordered_access_view_incref(uav); state->unordered_access_view[pipeline][idx] = uav; - wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); + wined3d_device_context_emit_set_unordered_access_view(&device->cs->c, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 877308e543b..0b71da8982c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4783,9 +4783,6 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline, - unsigned int view_idx, struct wined3d_unordered_access_view *view, - unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4828,6 +4825,9 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, + enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, + unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Advertise multisampling only when supported.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 2683c34c90c7a83f6e7e87932c5caab1fa518603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2683c34c90c7a83f6e7e8793… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 17 13:35:21 2021 +0100 wined3d: Advertise multisampling only when supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 11284d19811..dc7823b9534 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3071,7 +3071,9 @@ static void query_internal_format(struct wined3d_adapter *adapter, query_view_class(format); if (format->internal && format->f.flags[WINED3D_GL_RES_TYPE_RB] - & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) + & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL) + && (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) + && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) {

1 0

Hugh McMaster : reg: 'export' sorts before 'import'.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 42420f4d6c13cc4818e10c9b0cd9ee64c3715db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42420f4d6c13cc4818e10c9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 18 22:36:53 2021 +1100 reg: 'export' sorts before 'import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index daeec5f5718..309d855e996 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -306,8 +306,8 @@ static BOOL is_help_switch(const WCHAR *s) enum operations { REG_ADD, REG_DELETE, - REG_IMPORT, REG_EXPORT, + REG_IMPORT, REG_QUERY, REG_INVALID }; @@ -318,16 +318,16 @@ static enum operations get_operation(const WCHAR *str, int *op_help) static const WCHAR add[] = {'a','d','d',0}; static const WCHAR delete[] = {'d','e','l','e','t','e',0}; - static const WCHAR import[] = {'i','m','p','o','r','t',0}; static const WCHAR export[] = {'e','x','p','o','r','t',0}; + static const WCHAR import[] = {'i','m','p','o','r','t',0}; static const WCHAR query[] = {'q','u','e','r','y',0}; static const struct op_info op_array[] = { { add, REG_ADD, STRING_ADD_USAGE }, { delete, REG_DELETE, STRING_DELETE_USAGE }, - { import, REG_IMPORT, STRING_IMPORT_USAGE }, { export, REG_EXPORT, STRING_EXPORT_USAGE }, + { import, REG_IMPORT, STRING_IMPORT_USAGE }, { query, REG_QUERY, STRING_QUERY_USAGE }, { NULL, -1, 0 } }; @@ -389,12 +389,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } - if (op == REG_IMPORT) - return reg_import(argc, argvW); - if (op == REG_EXPORT) return reg_export(argc, argvW); + if (op == REG_IMPORT) + return reg_import(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1;

1 0

Hugh McMaster : reg: Simplify basic syntax checks.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 8801118e384b7388a0fa5c43b5540bfd7f257ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8801118e384b7388a0fa5c43… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 18 22:36:50 2021 +1100 reg: Simplify basic syntax checks. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 354ece86f61..533a9378f92 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,7 +349,6 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { int i, op, op_help, ret; - BOOL show_op_help = FALSE; static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; @@ -377,22 +376,26 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) output_message(STRING_REG_HELP); return 1; } - - if (argc > 2) - show_op_help = is_help_switch(argvW[2]); - - if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3)) + else if (argc == 2) /* Valid operation, no arguments supplied */ { output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; } - else if (show_op_help) + + if (is_help_switch(argvW[2])) { output_message(op_help); return 0; } + if (op == REG_IMPORT && argc > 3) + { + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; + } + if (op == REG_IMPORT) return reg_import(argvW[2]);

1 0

Huw Davies : riched20: Handle WM_SETCURSOR in the host.
by Alexandre Julliard March 18, 2021

March 18, 2021

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

Alistair Leslie-Hughes : msado15: Clear interface point after release.
by Alexandre Julliard March 18, 2021

March 18, 2021

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

Huw Davies : riched20: Handle EM_SETPASSWORDCHAR in the host.
by Alexandre Julliard March 18, 2021

March 18, 2021

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

Alexandre Julliard : setupapi: Create fakedlls before copying files.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 1244b501455b4dac8f4ec9c65067e06f87729b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1244b501455b4dac8f4ec9c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:40:13 2021 +0100 setupapi: Create fakedlls before copying files. Some files may come from dll resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 56a9d4f36c3..23f0fbdd4f1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1085,6 +1085,13 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, if (!iterate_section_fields( hinf, section, L"WinePreInstall", registry_callback, &info )) return FALSE; } + if (flags & SPINST_REGSVR) + { + if (iterate_section_fields( hinf, section, L"WineFakeDlls", fake_dlls_callback, NULL )) + cleanup_fake_dlls(); + else + return FALSE; + } if (flags & SPINST_FILES) { struct files_callback_info info; @@ -1121,24 +1128,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } if (flags & SPINST_REGSVR) { - struct register_dll_info info; + struct register_dll_info info = { .unregister = FALSE }; HRESULT hr; - info.unregister = FALSE; - info.modules_size = 0; - info.modules_count = 0; - info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; info.callback_context = context; } - else info.callback = NULL; - - if (iterate_section_fields( hinf, section, L"WineFakeDlls", fake_dlls_callback, NULL )) - cleanup_fake_dlls(); - else - return FALSE; hr = CoInitialize(NULL); @@ -1153,19 +1150,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } if (flags & SPINST_UNREGSVR) { - struct register_dll_info info; + struct register_dll_info info = { .unregister = TRUE }; HRESULT hr; - info.unregister = TRUE; - info.modules_size = 0; - info.modules_count = 0; - info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; info.callback_context = context; } - else info.callback = NULL; hr = CoInitialize(NULL);

1 0

Alexandre Julliard : wine.inf: Put wineps.drv in the printer driver directory.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 47d8d5659f8970ddcf4a35ea18ac33f4944472a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47d8d5659f8970ddcf4a35ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:41:34 2021 +0100 wine.inf: Put wineps.drv in the printer driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 -- loader/wine.inf.in | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 56d73798538..b95180ee558 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2609,7 +2609,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pDriverPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDriverPath); hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -2620,7 +2619,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pConfigFile); /* XP allocates memory for both ANSI and unicode names */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2b7bc358829..aaed4cf6824 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2609,6 +2609,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.vxd 11,,winhlp32.exe +52,win40\0,wineps16.drv,wineps16.drv16 ; 64bit-only fake dlls [FakeDllsWin64] @@ -2652,6 +2653,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +66000,3,wineps.drv 12,,*.sys,- 11,,* @@ -2707,6 +2709,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +66000,3,wineps.drv 12,,*.sys,- 11,,*

1 0

Alexandre Julliard : wine.inf: Specify the full module path for the source of copied files.
by Alexandre Julliard March 18, 2021

March 18, 2021

Module: wine Branch: master Commit: 8cd5c1bc37cb617a6e88698e289516cee8d2449f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd5c1bc37cb617a6e88698e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:41:13 2021 +0100 wine.inf: Specify the full module path for the source of copied files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3abcc41ffa1..2b7bc358829 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4038,12 +4038,12 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGa HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 [ColorFiles] -srgb color space profile.icm,"@mscms.dll,-1" +srgb color space profile.icm,"@%11%\mscms.dll,-1" [InfFiles] -winebus.inf,"@winebus.sys,-1" -winehid.inf,"@winehid.sys,-1" -wineusb.inf,"@wineusb.sys,-1" +winebus.inf,"@%12%\winebus.sys,-1" +winehid.inf,"@%12%\winehid.sys,-1" +wineusb.inf,"@%12%\wineusb.sys,-1" [NlsFiles] c_037.nls

1 0