October 2020 - Wine-commits

Sergei Trofimovich : aclocal.m4: Fix compatibility with upcoming autoconf-2.70.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: d7645b67c350f7179a1eba749ec4524c74948d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7645b67c350f7179a1eba74… Author: Sergei Trofimovich <slyfox(a)gentoo.org> Date: Thu Oct 29 22:51:57 2020 +0000 aclocal.m4: Fix compatibility with upcoming autoconf-2.70. Under autoconf 2.69c (beta) `./configure` fails as: ``` ./configure ... checking for msgfmt... msgfmt ./configure: line 7441: syntax error near unexpected token `newline' ./configure: line 7441: ` ''' ``` This happens due to underquoting of a snippet argument for `AS_VAR_SET_IF` call. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index c5edd85cee4..bd8ca6b33e5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name dnl AC_DEFUN([WINE_CHECK_HOST_TOOL], [AS_VAR_SET_IF([ac_tool_prefix], - AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])) + [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])]) AS_VAR_IF([ac_cv_prog_$1],[], [AS_VAR_IF([cross_compiling],[yes],[], [AS_UNSET([ac_cv_prog_$1])

1 0

Zhiyi Zhang : winemac.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: ce9aaf3f4250536aadf04ad77fcaa1836242b696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9aaf3f4250536aadf04ad7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:19:50 2020 +0800 winemac.drv: Send HTMENU instead of HTCAPTION to query window activation. Equivalent of cfcc280905b7804efde8f42bcd6bddbe5ebd8cad for winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 066eb553f76..e7f5327fcdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2348,11 +2348,11 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN)); + MAKELONG(HTMENU, WM_LBUTTONDOWN)); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd);

1 0

Zhiyi Zhang : winex11.drv: Update a comment.
by Alexandre Julliard 30 Oct '20

30 Oct '20

Module: wine Branch: master Commit: 28735278198e7ef8a4d0b73e9859748eab9d6570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28735278198e7ef8a4d0b73e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:20:10 2020 +0800 winex11.drv: Update a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1ad502..d21d2a7fb1b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -702,7 +702,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (can_activate_window(hwnd)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ),

1 0

Daniel Lehman : tzres: Add Tocantins Standard Time Zone.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: a7634295d6a73fbbf51dbaf0e6faae673ba26312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7634295d6a73fbbf51dbaf0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 07:07:43 2020 -0700 tzres: Add Tocantins Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 12 +++++++++ po/ar.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ast.po | 70 ++++++++++++++++++++++++++++++---------------------- po/bg.po | 66 +++++++++++++++++++++++++++---------------------- po/ca.po | 70 ++++++++++++++++++++++++++++++---------------------- po/cs.po | 70 ++++++++++++++++++++++++++++++---------------------- po/da.po | 70 ++++++++++++++++++++++++++++++---------------------- po/de.po | 70 ++++++++++++++++++++++++++++++---------------------- po/el.po | 66 +++++++++++++++++++++++++++---------------------- po/en.po | 66 +++++++++++++++++++++++++++---------------------- po/en_US.po | 66 +++++++++++++++++++++++++++---------------------- po/eo.po | 70 ++++++++++++++++++++++++++++++---------------------- po/es.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fa.po | 68 ++++++++++++++++++++++++++++---------------------- po/fi.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/he.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hi.po | 66 +++++++++++++++++++++++++++---------------------- po/hr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hu.po | 70 ++++++++++++++++++++++++++++++---------------------- po/it.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ja.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ko.po | 70 ++++++++++++++++++++++++++++++---------------------- po/lt.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ml.po | 66 +++++++++++++++++++++++++++---------------------- po/nb_NO.po | 70 ++++++++++++++++++++++++++++++---------------------- po/nl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/or.po | 66 +++++++++++++++++++++++++++---------------------- po/pa.po | 66 +++++++++++++++++++++++++++---------------------- po/pl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_BR.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_PT.po | 70 ++++++++++++++++++++++++++++++---------------------- po/rm.po | 66 +++++++++++++++++++++++++++---------------------- po/ro.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ru.po | 66 +++++++++++++++++++++++++++---------------------- po/si.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sk.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 68 ++++++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 68 ++++++++++++++++++++++++++++---------------------- po/sv.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ta.po | 66 +++++++++++++++++++++++++++---------------------- po/te.po | 66 +++++++++++++++++++++++++++---------------------- po/th.po | 68 ++++++++++++++++++++++++++++---------------------- po/tr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/uk.po | 66 +++++++++++++++++++++++++++---------------------- po/wa.po | 68 ++++++++++++++++++++++++++++---------------------- po/wine.pot | 66 +++++++++++++++++++++++++++---------------------- po/zh_CN.po | 70 ++++++++++++++++++++++++++++++---------------------- po/zh_TW.po | 70 ++++++++++++++++++++++++++++++---------------------- 51 files changed, 1957 insertions(+), 1421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7634295d6a73fbbf51d…

1 0

Zhiyi Zhang : wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: c9e2deac39924473ac538ee22a2a0c0dbe3bad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e2deac39924473ac538ee2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 28 14:38:44 2020 +0800 wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_main.c | 22 +++++++++------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index aa56634f3f3..847907c6d4c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1319,11 +1319,12 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat } GetWindowRect(window, &state->original_window_rect); + state->wined3d = wined3d; state->device_window = window; state->parent = parent; if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) - wined3d_swapchain_state_register(state, wined3d); + wined3d_swapchain_state_register(state); return hr; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7e96f874682..e1ed86e80ed 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -59,7 +59,6 @@ struct wined3d_window_hook struct wined3d_registered_swapchain_state { struct wined3d_swapchain_state *state; - struct wined3d *wined3d; DWORD thread_id; }; @@ -574,8 +573,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { - struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain_state *state; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -589,26 +588,25 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam for (i = 0; i < swapchain_state_table.state_count; ++i) { - registered_state = &swapchain_state_table.states[i]; + state = swapchain_state_table.states[i].state; - if (registered_state->state->device_window != msg->hwnd) + if (state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - swapchain_desc = registered_state->state->desc; + swapchain_desc = state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(registered_state->wined3d, - registered_state->state->device_window))) + if (!(output = wined3d_get_output_from_window(state->wined3d, state->device_window))) { - ERR("Failed to get output from window %p.\n", registered_state->state->device_window); + ERR("Failed to get output from window %p.\n", state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -774,8 +772,7 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) return NULL; } -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -791,7 +788,6 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; - state_entry->wined3d = wined3d; state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); if ((hook = wined3d_find_hook(state_entry->thread_id))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d7dcbc91dd..15380f5ac81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5072,6 +5072,7 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie struct wined3d_swapchain_state { + struct wined3d *wined3d; struct wined3d_swapchain_desc desc; struct wined3d_swapchain_state_parent *parent; @@ -5085,8 +5086,7 @@ struct wined3d_swapchain_state }; void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) DECLSPEC_HIDDEN; +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state,

1 0

Hans Leidekker : msi: Use wide character string literals in the remaining files.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: c4fc91f4bf0ffdc4a7dc2e582e5bd3fddca85222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fc91f4bf0ffdc4a7dc2e58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:47:14 2020 +0100 msi: Use wide character string literals in the remaining files. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/appsearch.c | 101 ++++++++------------------- dlls/msi/assembly.c | 100 +++++++-------------------- dlls/msi/automation.c | 20 ++---- dlls/msi/cond.y | 75 +++++++++----------- dlls/msi/custom.c | 97 +++++++++----------------- dlls/msi/database.c | 187 ++++++++++++++++---------------------------------- dlls/msi/delete.c | 2 +- dlls/msi/distinct.c | 2 +- dlls/msi/files.c | 51 +++++--------- dlls/msi/font.c | 43 ++++-------- dlls/msi/format.c | 7 +- dlls/msi/install.c | 41 ++++++----- dlls/msi/media.c | 23 ++----- dlls/msi/msi.c | 8 +-- dlls/msi/msipriv.h | 105 ---------------------------- dlls/msi/msiquery.c | 22 +++--- dlls/msi/patch.c | 107 +++++++++-------------------- dlls/msi/record.c | 5 +- dlls/msi/script.c | 12 ++-- dlls/msi/select.c | 8 +-- dlls/msi/source.c | 72 ++++++++----------- dlls/msi/sql.y | 3 +- dlls/msi/storages.c | 6 +- dlls/msi/streams.c | 8 +-- dlls/msi/string.c | 18 ++--- dlls/msi/suminfo.c | 29 ++++---- dlls/msi/table.c | 111 +++++++++++++----------------- dlls/msi/upgrade.c | 19 +++-- dlls/msi/where.c | 2 +- 29 files changed, 420 insertions(+), 864 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4fc91f4bf0ffdc4a7dc…

1 0

Hans Leidekker : msi/tests: Use wide character string literals.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 058ca3d04a4a712d86a111a1975045be02e03133 URL: https://source.winehq.org/git/wine.git/?a=commit;h=058ca3d04a4a712d86a111a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:47:15 2020 +0100 msi/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 273 ++++++++++++++++++-------------------------- dlls/msi/tests/custom.c | 81 ++++++------- dlls/msi/tests/db.c | 75 ++++-------- dlls/msi/tests/install.c | 27 ++--- dlls/msi/tests/msi.c | 30 ++--- dlls/msi/tests/package.c | 124 +++++++++----------- dlls/msi/tests/patch.c | 15 +-- dlls/msi/tests/record.c | 7 +- dlls/msi/tests/suminfo.c | 3 +- 9 files changed, 250 insertions(+), 385 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=058ca3d04a4a712d86a1…

1 0

Huw Davies : riched20: Use para and run ptrs in the table deletion function.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 20b4a0355356d7f7f8ccf914560239c46387dfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b4a0355356d7f7f8ccf914… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:11 2020 +0000 riched20: Use para and run ptrs in the table deletion function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 7 ++- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 136 +++++++++++++++++++++++-------------------------- 3 files changed, 67 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8af0f1de724..68bf40c76de 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -306,12 +306,11 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, if (!bForce) { - ME_ProtectPartialTableDeletion(editor, &c, &nChars); - if (nChars == 0) - return FALSE; + table_protect_partial_deletion( editor, &c, &nChars ); + if (nChars == 0) return FALSE; } - while(nChars > 0) + while (nChars > 0) { ME_Run *run; cursor_from_char_ofs( editor, nOfs + nChars, &c ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ddb6d138957..6e1c639236e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -302,12 +302,12 @@ ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) D ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; +void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 33e89a11771..40eef4bbd13 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -315,123 +315,113 @@ BOOL ME_IsInTable(ME_DisplayItem *pItem) } /* Table rows should either be deleted completely or not at all. */ -void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) +void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) { - int nOfs = ME_GetCursorOfs(c); + int start_ofs = ME_GetCursorOfs( c ); ME_Cursor c2 = *c; - ME_DisplayItem *this_para = c->pPara; - ME_DisplayItem *end_para; + ME_Paragraph *this_para = &c->pPara->member.para, *end_para; - ME_MoveCursorChars(editor, &c2, *nChars, FALSE); - end_para = c2.pPara; - if (c2.pRun->member.run.nFlags & MERF_ENDPARA) { + ME_MoveCursorChars( editor, &c2, *num_chars, FALSE ); + end_para = &c2.pPara->member.para; + if (c2.pRun->member.run.nFlags & MERF_ENDPARA) + { /* End offset might be in the middle of the end paragraph run. * If this is the case, then we need to use the next paragraph as the last * paragraphs. */ - int remaining = nOfs + *nChars - c2.pRun->member.run.nCharOfs - - end_para->member.para.nCharOfs; + int remaining = start_ofs + *num_chars - c2.pRun->member.run.nCharOfs - end_para->nCharOfs; if (remaining) { - assert(remaining < c2.pRun->member.run.len); - end_para = end_para->member.para.next_para; + assert( remaining < c2.pRun->member.run.len ); + end_para = para_next( end_para ); } } - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (this_para->member.para.pCell != end_para->member.para.pCell || - ((this_para->member.para.nFlags|end_para->member.para.nFlags) - & (MEPF_ROWSTART|MEPF_ROWEND))) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para_cell( this_para ) != para_cell( end_para ) || + ((this_para->nFlags | end_para->nFlags) & (MEPF_ROWSTART | MEPF_ROWEND))) { while (this_para != end_para) { - ME_DisplayItem *next_para = this_para->member.para.next_para; - BOOL bTruancateDeletion = FALSE; - if (this_para->member.para.nFlags & MEPF_ROWSTART) { + ME_Paragraph *next_para = para_next( this_para ); + BOOL truancate_del = FALSE; + if (this_para->nFlags & MEPF_ROWSTART) + { /* The following while loop assumes that next_para is MEPF_ROWSTART, - * so moving back one paragraph let's it be processed as the start + * so moving back one paragraph lets it be processed as the start * of the row. */ next_para = this_para; - this_para = this_para->member.para.prev_para; - } else if (next_para->member.para.pCell != this_para->member.para.pCell - || this_para->member.para.nFlags & MEPF_ROWEND) + this_para = para_prev( this_para ); + } + else if (para_cell( next_para) != para_cell( this_para ) || this_para->nFlags & MEPF_ROWEND) { /* Start of the deletion from after the start of the table row. */ - bTruancateDeletion = TRUE; + truancate_del = TRUE; } - while (!bTruancateDeletion && - next_para->member.para.nFlags & MEPF_ROWSTART) + while (!truancate_del && next_para->nFlags & MEPF_ROWSTART) { - next_para = table_row_end( &next_para->member.para )->next_para; - if (next_para->member.para.nCharOfs > nOfs + *nChars) + next_para = para_next( table_row_end( next_para ) ); + if (next_para->nCharOfs > start_ofs + *num_chars) { /* End of deletion is not past the end of the table row. */ - next_para = this_para->member.para.next_para; + next_para = para_next( this_para ); /* Delete the end paragraph preceding the table row if the * preceding table row will be empty. */ - if (this_para->member.para.nCharOfs >= nOfs) - { - next_para = next_para->member.para.next_para; - } - bTruancateDeletion = TRUE; - } else { - this_para = next_para->member.para.prev_para; + if (this_para->nCharOfs >= start_ofs) next_para = para_next( next_para ); + truancate_del = TRUE; } + else this_para = para_prev( next_para ); } - if (bTruancateDeletion) + if (truancate_del) { - ME_Run *end_run = &ME_FindItemBack(next_para, diRun)->member.run; - int nCharsNew = (next_para->member.para.nCharOfs - nOfs - - end_run->len); - nCharsNew = max(nCharsNew, 0); - assert(nCharsNew <= *nChars); - *nChars = nCharsNew; + ME_Run *end_run = para_end_run( para_prev( next_para ) ); + int new_chars = next_para->nCharOfs - start_ofs - end_run->len; + new_chars = max( new_chars, 0 ); + assert( new_chars <= *num_chars); + *num_chars = new_chars; break; } this_para = next_para; } } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *pRun; - int nCharsToBoundary; + } + else /* v1.0 - 3.0 */ + { + ME_Run *run; + int chars_to_boundary; - if ((this_para->member.para.nCharOfs != nOfs || this_para == end_para) && - this_para->member.para.fmt.dwMask & PFM_TABLE && - this_para->member.para.fmt.wEffects & PFE_TABLE) + if ((this_para->nCharOfs != start_ofs || this_para == end_para) && para_in_table( this_para )) { - pRun = c->pRun; + run = &c->pRun->member.run; /* Find the next tab or end paragraph to use as a delete boundary */ - while (!(pRun->member.run.nFlags & (MERF_TAB|MERF_ENDPARA))) - pRun = ME_FindItemFwd(pRun, diRun); - nCharsToBoundary = pRun->member.run.nCharOfs - - c->pRun->member.run.nCharOfs - - c->nOffset; - *nChars = min(*nChars, nCharsToBoundary); - } else if (end_para->member.para.fmt.dwMask & PFM_TABLE && - end_para->member.para.fmt.wEffects & PFE_TABLE) + while (!(run->nFlags & (MERF_TAB | MERF_ENDPARA))) + run = run_next( run ); + chars_to_boundary = run->nCharOfs - c->pRun->member.run.nCharOfs - c->nOffset; + *num_chars = min( *num_chars, chars_to_boundary ); + } + else if (para_in_table( end_para )) { /* The deletion starts from before the row, so don't join it with * previous non-empty paragraphs. */ - ME_DisplayItem *curPara; - pRun = NULL; - if (nOfs > this_para->member.para.nCharOfs) { - pRun = ME_FindItemBack(end_para, diRun); - curPara = end_para->member.para.prev_para; + ME_Paragraph *cur_para; + run = NULL; + if (start_ofs > this_para->nCharOfs) + { + cur_para = para_prev( end_para ); + run = para_end_run( cur_para ); } - if (!pRun) { - pRun = ME_FindItemFwd(end_para, diRun); - curPara = end_para; + if (!run) + { + cur_para = end_para; + run = para_first_run( end_para ); } - if (pRun) + if (run) { - nCharsToBoundary = curPara->member.para.nCharOfs - + pRun->member.run.nCharOfs - - nOfs; - if (nCharsToBoundary >= 0) - *nChars = min(*nChars, nCharsToBoundary); + chars_to_boundary = cur_para->nCharOfs + run->nCharOfs - start_ofs; + if (chars_to_boundary >= 0) *num_chars = min( *num_chars, chars_to_boundary ); } } - if (*nChars < 0) - *nChars = 0; + if (*num_chars < 0) *num_chars = 0; } }

1 0

Huw Davies : riched20: Use cell ptrs in the append table row function.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 77895ecdde8bb4c54bb1ae6d688ed92292c81a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77895ecdde8bb4c54bb1ae6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:12 2020 +0000 riched20: Use cell ptrs in the append table row function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/table.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 40eef4bbd13..cc2ebb8ed50 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -429,16 +429,14 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) { WCHAR endl = '\r', tab = '\t'; ME_Run *run; - PARAFORMAT2 *pFmt; int i; - assert(table_row); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *insertedCell, *cell; - ME_Paragraph *para, *prev_table_end; + ME_Cell *new_cell, *cell; + ME_Paragraph *para, *prev_table_end, *new_row_start; - cell = ME_FindItemFwd( para_get_di( table_row_start( table_row ) ), diCell ); + cell = table_row_first_cell( table_row ); prev_table_end = table_row_end( table_row ); para = para_next( prev_table_end ); run = para_first_run( para ); @@ -446,38 +444,37 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - para = table_insert_row_start( editor, editor->pCursors ); - insertedCell = ME_FindItemFwd( para_get_di( para ), diCell ); + new_row_start = table_insert_row_start( editor, editor->pCursors ); + new_cell = table_row_first_cell( new_row_start ); /* Copy cell properties */ - insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; - insertedCell->member.cell.border = cell->member.cell.border; - while (cell->member.cell.next_cell) + new_cell->nRightBoundary = cell->nRightBoundary; + new_cell->border = cell->border; + while (cell_next( cell )) { - cell = cell->member.cell.next_cell; + cell = cell_next( cell ); para = table_insert_cell( editor, editor->pCursors ); - insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); + new_cell = para_cell( para ); /* Copy cell properties */ - insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; - insertedCell->member.cell.border = cell->member.cell.border; + new_cell->nRightBoundary = cell->nRightBoundary; + new_cell->border = cell->border; }; para = table_insert_row_end( editor, editor->pCursors ); para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ - return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para ); + return new_row_start; } else /* v1.0 - 3.0 */ { run = para_end_run( table_row ); - pFmt = &table_row->fmt; - assert(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE); + assert( para_in_table( table_row ) ); editor->pCursors[0].pPara = para_get_di( table_row ); editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_InsertTextFromCursor( editor, 0, &endl, 1, run->style ); run = &editor->pCursors[0].pRun->member.run; - for (i = 0; i < pFmt->cTabCount; i++) - ME_InsertTextFromCursor(editor, 0, &tab, 1, run->style); + for (i = 0; i < table_row->fmt.cTabCount; i++) + ME_InsertTextFromCursor( editor, 0, &tab, 1, run->style ); return para_next( table_row ); }

1 0

Huw Davies : riched20: Use cell ptrs in the table tab handler.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 963075706d6fcd23b9a0064ae46a210df9a4a005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=963075706d6fcd23b9a0064a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:13 2020 +0000 riched20: Use cell ptrs in the table tab handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 104 +++++++++++++++++++++++-------------------------- 3 files changed, 52 insertions(+), 60 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d06693232ab..7687ec9d93e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2799,7 +2799,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, !(ctrl_is_down && !editor->bEmulateVersion10)) { ME_DisplayItem *para; - BOOL bSelectedRow = FALSE; + BOOL selected_row = FALSE; para = cursor.pPara; if (ME_IsSelection(editor) && @@ -2808,11 +2808,11 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, para->member.para.prev_para->type == diParagraph) { para = para->member.para.prev_para; - bSelectedRow = TRUE; + selected_row = TRUE; } if (ME_IsInTable(para)) { - ME_TabPressedInTable(editor, bSelectedRow); + table_handle_tab( editor, selected_row ); ME_CommitUndo(editor); return 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6e1c639236e..a49883c9861 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -297,6 +297,7 @@ ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; @@ -308,7 +309,6 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index cc2ebb8ed50..25c4e1820ce 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -481,30 +481,27 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) } /* Selects the next table cell or appends a new table row if at end of table */ -static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *run ) +static void table_select_next_cell_or_append( ME_TextEditor *editor, ME_Run *run ) { - ME_Paragraph *para = run->member.run.para; + ME_Paragraph *para = run->para; + ME_Cell *cell; int i; - assert(run && run->type == diRun); - assert(ME_IsInTable(run)); + assert( para_in_table( para ) ); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *cell; /* Get the initial cell */ - if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; - else if (para->nFlags & MEPF_ROWEND) cell = para_prev( para )->pCell; - else cell = para->pCell; - assert(cell); + if (para->nFlags & MEPF_ROWSTART) cell = para_cell( para_next( para ) ); + else if (para->nFlags & MEPF_ROWEND) cell = para_cell( para_prev( para ) ); + else cell = para_cell( para ); /* Get the next cell. */ - if (cell->member.cell.next_cell && - cell->member.cell.next_cell->member.cell.next_cell) + if (cell_next( cell ) && cell_next( cell_next( cell ) )) + cell = cell_next( cell ); + else { - cell = cell->member.cell.next_cell; - } else { - para = para_next( table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para ) ); - if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + para = para_next( table_row_end( para ) ); + if (para->nFlags & MEPF_ROWSTART) cell = para_cell( para_next( para ) ); else { /* Insert row */ @@ -521,38 +518,32 @@ static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *ru } } /* Select cell */ - editor->pCursors[1].pRun = ME_FindItemFwd(cell, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[1].pPara = para_get_di( cell_first_para( cell ) ); + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; - assert(editor->pCursors[0].pRun); - cell = cell->member.cell.next_cell; - editor->pCursors[0].pRun = ME_FindItemBack(cell, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); + editor->pCursors[0].pPara = para_get_di( cell_end_para( cell ) ); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); editor->pCursors[0].nOffset = 0; - assert(editor->pCursors[1].pRun); } else /* v1.0 - 3.0 */ { - if (run->member.run.nFlags & MERF_ENDPARA && - ME_IsInTable(ME_FindItemFwd(run, diParagraphOrEnd))) + if (run->nFlags & MERF_ENDPARA && para_in_table( para_next( para ) )) { - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); assert(run); } for (i = 0; i < 2; i++) { - while (!(run->member.run.nFlags & MERF_TAB)) + while (!(run->nFlags & MERF_TAB)) { - run = ME_FindItemFwd(run, diRunOrParagraphOrEnd); - if (run->type != diRun) + if (!run_next( run )) { - para = &run->member.para; + para = para_next( run->para ); if (para_in_table( para )) { - run = run_get_di( para_first_run( para ) ); - assert(run); + run = para_first_run( para ); editor->pCursors[0].pPara = para_get_di( para ); - editor->pCursors[0].pRun = run; + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; i = 1; } @@ -569,18 +560,18 @@ static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *ru return; } } + else run = run_next( run ); } - if (i == 0) - run = ME_FindItemFwd(run, diRun); - editor->pCursors[i].pRun = run; - editor->pCursors[i].pPara = ME_GetParagraph(run); + if (i == 0) run = run_next_all_paras( run ); + editor->pCursors[i].pRun = run_get_di( run ); + editor->pCursors[i].pPara = para_get_di( run->para ); editor->pCursors[i].nOffset = 0; } } } -void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) +void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) { /* FIXME: Shift tab should move to the previous cell. */ ME_Cursor fromCursor, toCursor; @@ -593,7 +584,9 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) { fromCursor = editor->pCursors[0]; toCursor = editor->pCursors[1]; - } else { + } + else + { fromCursor = editor->pCursors[1]; toCursor = editor->pCursors[0]; } @@ -604,29 +597,28 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) { editor->pCursors[0] = toCursor; editor->pCursors[1] = toCursor; - } else { - ME_SelectOrInsertNextCell(editor, toCursor.pRun); } - } else { /* v1.0 - 3.0 */ - if (!ME_IsInTable(fromCursor.pRun)) { + else table_select_next_cell_or_append( editor, &toCursor.pRun->member.run ); + } + else /* v1.0 - 3.0 */ + { + if (!ME_IsInTable(fromCursor.pRun)) + { editor->pCursors[0] = fromCursor; editor->pCursors[1] = fromCursor; /* FIXME: For some reason the caret is shown at the start of the * previous paragraph in v1.0 to v3.0 */ - } else if ((bSelectedRow || !ME_IsInTable(toCursor.pRun))) { - ME_SelectOrInsertNextCell(editor, fromCursor.pRun); - } else { - if (ME_IsSelection(editor) && !toCursor.nOffset) - { - ME_DisplayItem *run; - run = ME_FindItemBack(toCursor.pRun, diRunOrParagraphOrEnd); - if (run->type == diRun && run->member.run.nFlags & MERF_TAB) - ME_SelectOrInsertNextCell(editor, run); - else - ME_SelectOrInsertNextCell(editor, toCursor.pRun); - } else { - ME_SelectOrInsertNextCell(editor, toCursor.pRun); - } + } + else if ((selected_row || !para_in_table( &toCursor.pPara->member.para ))) + table_select_next_cell_or_append( editor, &fromCursor.pRun->member.run ); + else + { + ME_Run *run = run_prev( &toCursor.pRun->member.run ); + + if (ME_IsSelection(editor) && !toCursor.nOffset && run && run->nFlags & MERF_TAB) + table_select_next_cell_or_append( editor, run ); + else + table_select_next_cell_or_append( editor, &toCursor.pRun->member.run ); } } ME_InvalidateSelection(editor);

1 0