October 2020 - Wine-commits

Alexandre Julliard : ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 54c31d5332a71d785db1b73cf3be41818adeab8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c31d5332a71d785db1b73c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:17:46 2020 +0200 ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 +-- dlls/ntdll/locale.c | 184 +------------------------------------------ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/unix/env.c | 153 ++++++++++++++++++++++++++++++++--- 4 files changed, 151 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c31d5332a71d785db1…

1 0

Huw Davies : riched20: Use run ptrs in GetCharFormat().
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 1994d21ddb45341ef84f6381331f6bc2cf7ebd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1994d21ddb45341ef84f6381… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:37 2020 +0100 riched20: Use run ptrs in GetCharFormat(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 67 ++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a5888960f38..75195e343ed 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -816,9 +816,9 @@ void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, } } -static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) +static void run_copy_char_fmt( ME_Run *run, CHARFORMAT2W *fmt ) { - ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + ME_CopyCharFormat( fmt, &run->style->fmt ); } /****************************************************************************** @@ -856,33 +856,25 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) +void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *run_end; + ME_Run *run, *run_end, *prev_run; CHARFORMAT2W tmp; - run = from->pRun; + run = &from->pRun->member.run; /* special case - if selection is empty, take previous char's formatting */ if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!from->nOffset) - { - ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); - if (tmp_run->type == diRun) { - ME_GetRunCharFormat(editor, tmp_run, pFmt); - return; - } - } - ME_GetRunCharFormat(editor, run, pFmt); + if (!from->nOffset && (prev_run = run_prev( run ))) run = prev_run; + run_copy_char_fmt( run, fmt ); return; } - run_end = to->pRun; - if (!to->nOffset) - run_end = ME_FindItemBack(run_end, diRun); + run_end = &to->pRun->member.run; + if (!to->nOffset) run_end = run_prev_all_paras( run_end ); - ME_GetRunCharFormat(editor, run, pFmt); + run_copy_char_fmt( run, fmt ); if (run == run_end) return; @@ -891,40 +883,37 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); - ZeroMemory(&tmp, sizeof(tmp)); + memset( &tmp, 0, sizeof(tmp) ); tmp.cbSize = sizeof(tmp); - ME_GetRunCharFormat(editor, run, &tmp); + run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->dwMask & CFM_FACE) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE)) - pFmt->dwMask &= ~CFM_FACE; - else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || - pFmt->bPitchAndFamily != tmp.bPitchAndFamily) - pFmt->dwMask &= ~CFM_FACE; + fmt->dwMask &= ~CFM_FACE; + else if (wcscmp( fmt->szFaceName, tmp.szFaceName ) || + fmt->bPitchAndFamily != tmp.bPitchAndFamily) + fmt->dwMask &= ~CFM_FACE; } - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->bUnderlineType != tmp.bUnderlineType) - pFmt->dwMask &= ~CFM_UNDERLINETYPE; - if (pFmt->dwMask & CFM_COLOR) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->bUnderlineType != tmp.bUnderlineType) fmt->dwMask &= ~CFM_UNDERLINETYPE; + if (fmt->dwMask & CFM_COLOR) { - if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) + if (!((fmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) { - if (pFmt->crTextColor != tmp.crTextColor) - pFmt->dwMask &= ~CFM_COLOR; + if (fmt->crTextColor != tmp.crTextColor) + fmt->dwMask &= ~CFM_COLOR; } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); - pFmt->dwEffects = tmp.dwEffects; + fmt->dwMask &= ~((fmt->dwEffects ^ tmp.dwEffects) & dwEffects); + fmt->dwEffects = tmp.dwEffects; } while(run != run_end); }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: bed3b61b498af5339f53ecc23937ff3b81b196d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed3b61b498af5339f53ecc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:10 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++------ programs/conhost/conhost.c | 45 --------------------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index efcfc1a5b9..602b499114 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -97,12 +97,8 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; -#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x01 -#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x02 -#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x04 -#define SET_CONSOLE_INPUT_INFO_WIN 0x08 -#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x10 -#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x20 +#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x01 +#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x02 /* IOCTL_CONDRV_WRITE_OUTPUT and IOCTL_CONDRV_READ_OUTPUT params */ struct condrv_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dc508a2fd7..9c780d4951 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2448,55 +2448,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const struct condrv_input_info_params *params = in_data; TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; - if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) - { - console->history_mode = params->info.history_mode; - } - if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && - console->history_size != params->info.history_size) - { - struct history_line **mem = NULL; - int i, delta; - - if (params->info.history_size) - { - if (!(mem = malloc( params->info.history_size * sizeof(*mem) ))) - return STATUS_NO_MEMORY; - memset( mem, 0, params->info.history_size * sizeof(*mem) ); - } - - delta = (console->history_index > params->info.history_size) - ? (console->history_index - params->info.history_size) : 0; - - for (i = delta; i < console->history_index; i++) - { - mem[i - delta] = console->history[i]; - console->history[i] = NULL; - } - console->history_index -= delta; - - for (i = 0; i < console->history_size; i++) - free( console->history[i] ); - free( console->history ); - console->history = mem; - console->history_size = params->info.history_size; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) - { - console->edition_mode = params->info.edition_mode; - } if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) - { console->input_cp = params->info.input_cp; - } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) - { console->output_cp = params->info.output_cp; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) - { - console->win = wine_server_ptr_handle( params->info.win ); - } return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: d7e831c1123cca7785a6b8813f4991b42f9473e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e831c1123cca7785a6b881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:17 2020 +0200 conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 - programs/conhost/conhost.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 602b499114..72aecedd38 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -115,7 +115,6 @@ enum char_info_mode CHAR_INFO_MODE_TEXT, /* characters only */ CHAR_INFO_MODE_ATTR, /* attributes only */ CHAR_INFO_MODE_TEXTATTR, /* both characters and attributes */ - CHAR_INFO_MODE_TEXTSTDATTR, /* characters but use standard attributes */ }; /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9c780d4951..9b082dffc2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1963,10 +1963,6 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct case CHAR_INFO_MODE_TEXTATTR: *dest = *(const char_info_t *)src; break; - case CHAR_INFO_MODE_TEXTSTDATTR: - dest->ch = *(const WCHAR *)src; - dest->attr = screen_buffer->attr; - break; default: return STATUS_INVALID_PARAMETER; } @@ -2131,13 +2127,6 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c dest[i].attr = params->attr; } break; - case CHAR_INFO_MODE_TEXTSTDATTR: - for (i = 0; i < count; i++) - { - dest[i].ch = params->ch; - dest[i].attr = screen_buffer->attr; - } - break; default: return STATUS_INVALID_PARAMETER; }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: ef2e281dc26c4eb4fb4bc09deb3b3dbf5f2e73fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2e281dc26c4eb4fb4bc09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:25 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 +--- programs/conhost/conhost.c | 25 ------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 72aecedd38..f4ed77a69b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -154,9 +154,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9b082dffc2..b8f954acb5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1731,7 +1731,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, const struct condrv_output_info_params *params, size_t extra_size ) { const struct condrv_output_info *info = &params->info; - WCHAR *font_name; NTSTATUS status; TRACE( "%p\n", screen_buffer ); @@ -1825,30 +1824,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) - { - memcpy( screen_buffer->color_map, info->color_map, sizeof(screen_buffer->color_map) ); - } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) - { - screen_buffer->font.width = info->font_width; - screen_buffer->font.height = info->font_height; - screen_buffer->font.weight = info->font_weight; - screen_buffer->font.pitch_family = info->font_pitch_family; - if (extra_size) - { - const WCHAR *params_font = (const WCHAR *)(params + 1); - extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); - font_name = malloc( extra_size ); - if (font_name) - { - memcpy( font_name, params_font, extra_size ); - free( screen_buffer->font.face_name ); - screen_buffer->font.face_name = font_name; - screen_buffer->font.face_len = extra_size; - } - } - } if (is_active( screen_buffer )) {

1 0

Jacek Caban : conhost: Remove no longer needed condrv_input_info fields.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: e909986e6ea5ecd49b2b847f321ad89b2ae4f6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e909986e6ea5ecd49b2b847f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:39 2020 +0200 conhost: Remove no longer needed condrv_input_info fields. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ---- programs/conhost/conhost.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f4ed77a69b..eed8bc5bfc 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -82,10 +82,6 @@ struct condrv_input_info { unsigned int input_cp; /* console input codepage */ unsigned int output_cp; /* console output codepage */ - unsigned int history_mode; /* whether we duplicate lines in history */ - unsigned int history_size; /* number of lines in history */ - unsigned int history_index; /* number of used lines in history */ - unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ condrv_handle_t win; /* renderer window handle */ }; diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b8f954acb5..a93f9be73b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2396,14 +2396,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "get info\n" ); if (in_size || *out_size != sizeof(*info)) return STATUS_INVALID_PARAMETER; if (!(info = alloc_ioctl_buffer( sizeof(*info )))) return STATUS_NO_MEMORY; - info->history_mode = console->history_mode; - info->history_size = console->history_size; - info->history_index = console->history_index; - info->edition_mode = console->edition_mode; - info->input_cp = console->input_cp; - info->output_cp = console->output_cp; - info->win = condrv_handle( console->win ); - info->input_count = console->record_count; + info->input_cp = console->input_cp; + info->output_cp = console->output_cp; + info->win = condrv_handle( console->win ); + info->input_count = console->record_count; return STATUS_SUCCESS; }

1 0

Hans Leidekker : dssenh: Implement CPVerifySignature.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 52ad894784eb745a74759d2f560b6ef632385e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ad894784eb745a74759d2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:56 2020 +0200 dssenh: Implement CPVerifySignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index da269807bf..752189d15b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -759,7 +759,24 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, const WCHAR *desc, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + struct key *key = (struct key *)hpubkey; + UCHAR hashval[MAX_HASH_LEN]; + ULONG hashlen = sizeof(hashval); + + TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, + debugstr_w(desc), flags ); + + if (hash->magic != MAGIC_HASH || key->magic != MAGIC_KEY) return FALSE; + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + + return !BCryptVerifySignature( key->handle, NULL, hashval, hashlen, (UCHAR *)sig, siglen, 0 ); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Hans Leidekker : dssenh: Implement CPGenKey.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 90bb4fe34b5cc78e5e5daef9398337a78a3f46e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bb4fe34b5cc78e5e5daef9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:57 2020 +0200 dssenh: Implement CPGenKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 143 ++++++++++++++++++++++++++++++++++----------- dlls/dssenh/tests/dssenh.c | 109 +++++++++++++++++----------------- 2 files changed, 164 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90bb4fe34b5cc78e5e5d…

1 0

Huw Davies : riched20: Return a run ptr from the run splitting function.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 0b01b40a7c827c8a1509e60b5eb1c7f2c9a3bcf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b01b40a7c827c8a1509e60b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:14 2020 +0100 riched20: Return a run ptr from the run splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 ++++-- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 16 ++++++++-------- dlls/riched20/table.c | 4 ++-- dlls/riched20/undo.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1c3f4b1652..5f7d52aa4c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -607,7 +607,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, /* handle special \r\r\n sequence (richedit 2.x and higher only) */ WCHAR space = ' '; ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); - } else { + } + else + { const WCHAR cr = '\r', *eol_str = str; if (!editor->bEmulateVersion10) @@ -625,7 +627,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } else { - if (p->nOffset) ME_SplitRunSimple(editor, p); + if (p->nOffset) run_split( editor, p ); run = &p->pRun->member.run; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 244010df73..7ae0b5341b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -132,7 +132,7 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 84b851039b..3f550d8d99 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -268,12 +268,12 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) } /****************************************************************************** - * ME_SplitRunSimple + * run_split * * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Run *run = &cursor->pRun->member.run, *new_run; int i; @@ -303,7 +303,7 @@ ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) } } para_mark_rewrap( editor, run->para ); - return run_get_di( run ); + return run; } /****************************************************************************** @@ -359,7 +359,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } else { - ME_SplitRunSimple( editor, cursor ); + run_split( editor, cursor ); insert_before = cursor->pRun; } } @@ -756,12 +756,12 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C start_run = ME_FindItemFwd( start->pRun, diRun ); else if (start->nOffset) { - /* SplitRunSimple may or may not update the cursors, depending on whether they + /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; - ME_DisplayItem *split_run = ME_SplitRunSimple(editor, start); + ME_Run *split_run = run_split( editor, start ); start_run = start->pRun; - if (end && end->pRun == split_run) + if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; end->nOffset -= split_offset; @@ -774,7 +774,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C end_run = ME_FindItemFwd( end->pRun, diRun ); else { - if (end->nOffset) ME_SplitRunSimple(editor, end); + if (end->nOffset) run_split( editor, end ); end_run = end->pRun; } } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 615145b85e..95b0fb0a8a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -66,8 +66,8 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); ME_DisplayItem *tp; ME_Cursor* cursor = &editor->pCursors[nCursor]; - if (cursor->nOffset) - ME_SplitRunSimple(editor, cursor); + + if (cursor->nOffset) run_split( editor, cursor ); tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, eol_len, paraFlags); ME_ReleaseStyle(pStyle); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index c6b898b2dd..55574dc412 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -383,9 +383,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_DisplayItem *this_para, *new_para; BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); + ME_CursorFromCharOfs(editor, undo->u.split_para.pos, &tmp); - if (tmp.nOffset) - ME_SplitRunSimple(editor, &tmp); + if (tmp.nOffset) run_split( editor, &tmp ); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; if (bFixRowStart) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index fda1d99557..393b1784d4 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -139,7 +139,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y); - ME_SplitRunSimple(editor, &cursor); + run_split( editor, &cursor ); run2 = &cursor.pRun->member.run; run2->script_analysis = run->script_analysis; @@ -776,7 +776,7 @@ static HRESULT itemize_para( ME_Context *c, ME_Paragraph *para ) if (run->nCharOfs + run->len > items[cur_item+1].iCharPos) { ME_Cursor cursor = {para_get_di( para ), run_get_di( run ), items[cur_item+1].iCharPos - run->nCharOfs}; - ME_SplitRunSimple( c->editor, &cursor ); + run_split( c->editor, &cursor ); } }

1 0

Huw Davies : riched20: Don't mark the diTextStart paragraph as requiring repainting.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 02f4a178ffc80b1ff4beb6e3c4ad569b2ca18cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f4a178ffc80b1ff4beb6e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:15 2020 +0100 riched20: Don't mark the diTextStart paragraph as requiring repainting. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 393b1784d4..26f1c30b83 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1049,8 +1049,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) else totalWidth = max(totalWidth, para->nWidth); - if (!para->nCharOfs) - update_repaint( para_prev( para ), &repaint ); update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint );

1 0