October 2020 - Wine-Commits

Huw Davies : riched20: Pass a paragraph ptr to the table update flags function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 77f1894f21a872394e3d92872cbf78e705c8b470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f1894f21a872394e3d9287… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:06 2020 +0100 riched20: Pass a paragraph ptr to the table update flags function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 431f89faed3..2d5072e232e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -static void ME_UpdateTableFlags(ME_DisplayItem *para) +static void table_update_flags( ME_Paragraph *para ) { - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - if (para->member.para.pCell) { - para->member.para.nFlags |= MEPF_CELL; - } else { - para->member.para.nFlags &= ~MEPF_CELL; - } - if (para->member.para.nFlags & MEPF_ROWEND) { - para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER; - } else { - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - } - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND)) - para->member.para.fmt.wEffects |= PFE_TABLE; - else - para->member.para.fmt.wEffects &= ~PFE_TABLE; + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + + if (para->pCell) para->nFlags |= MEPF_CELL; + else para->nFlags &= ~MEPF_CELL; + + if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; + else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + + if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND)) + para->fmt.wEffects |= PFE_TABLE; + else + para->fmt.wEffects &= ~PFE_TABLE; } static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) @@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { new_para->member.para.pCell = run_para->member.para.pCell; } - ME_UpdateTableFlags(run_para); - ME_UpdateTableFlags(new_para); + table_update_flags( &run_para->member.para ); + table_update_flags( &new_para->member.para ); } /* force rewrap of the */

1 0

Zebediah Figura : vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_shader_trace() (Valgrind).
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 86cf5145dc58b00b7311c4f3651601233024fb8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=86cf5145dc58b00b7311c4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 10:44:44 2020 -0500 vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_shader_trace() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9b49ca1..e9c462e 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1618,16 +1618,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code void vkd3d_shader_trace(void *data) { - const char *p, *q; + const char *p, *q, *end; struct vkd3d_shader_code code; if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) return; - for (p = code.code; *p; p = q) + end = (const char *)code.code + code.size; + for (p = code.code; p < end; p = q) { - if (!(q = strstr(p, "\n"))) - q = p + strlen(p); + if (!(q = memchr(p, '\n', end - p))) + q = end; else ++q; TRACE(" %.*s", (int)(q - p), p);

1 0

Zebediah Figura : vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_string_buffer_trace() (Valgrind).
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: dffff8bdbc97acbbaab8bd0e860190ea4987984c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dffff8bdbc97acbbaab8bd0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 10:44:45 2020 -0500 vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_string_buffer_trace() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7c3885e..664110e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -93,15 +93,15 @@ static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_strin static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) { - const char *p, *q; + const char *p, *q, *end = buffer->buffer + buffer->content_size; if (!TRACE_ON()) return; - for (p = buffer->buffer; *p; p = q) + for (p = buffer->buffer; p < end; p = q) { - if (!(q = strchr(p, '\n'))) - q = p + strlen(p); + if (!(q = memchr(p, '\n', end - p))) + q = end; else ++q; vkd3d_dbg_printf(VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p);

1 0

Zebediah Figura : include: Clarify that struct vkd3d_shader_code is not null-terminated.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 5d9398e10ca38df956e746d4ee51f6c71d56819a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d9398e10ca38df956e746d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 15:24:32 2020 -0500 include: Clarify that struct vkd3d_shader_code is not null-terminated. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b95896..74e2eb0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -155,7 +155,13 @@ enum vkd3d_shader_visibility /** A generic structure containing a GPU shader, in text or byte-code format. */ struct vkd3d_shader_code { - /** Pointer to the code. */ + /** + * Pointer to the code. Note that textual formats are not null-terminated. + * Therefore \a size should not include a null terminator, when this + * structure is passed as input to a vkd3d-shader function, and the + * allocated string will not include a null terminator when this structure + * is used as output. + */ const void *code; /** Size of \a code, in bytes. */ size_t size;

1 0

Zebediah Figura : vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 1c2344818d433adc2d2d88379611544770cef2bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c2344818d433adc2d2d883… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 15:27:25 2020 -0500 vkd3d-shader: Adjust the API for struct vkd3d_shader_macro. To more closely match the behaviour of D3D_SHADER_MACRO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 74e2eb0..03225d3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -635,12 +635,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info struct vkd3d_shader_macro { /** - * A null-terminated string containing the name of a macro. This macro must - * not be a parameterized (i.e. function-like) macro. If this field is not a - * valid macro identifier, it will be ignored. + * Pointer to a null-terminated string containing the name of a macro. This + * macro must not be a parameterized (i.e. function-like) macro. If this + * field is not a valid macro identifier, this macro will be ignored. */ const char *name; - /** A null-terminated string containing the expansion of the macro. */ + /** + * Optional pointer to a null-terminated string containing the expansion of + * the macro. This field may be set to NULL, in which case the macro has an + * empty expansion. + */ const char *value; }; @@ -713,7 +717,7 @@ struct vkd3d_shader_preprocess_info * be expanded as if a corresponding #define statement were prepended to the * source code. * - * If the same macro is specified multiple times, only the first value is + * If the same macro is specified multiple times, only the last value is * used. */ const struct vkd3d_shader_macro *macros;

1 0

Jacek Caban : conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 01c17ca26027d055c5e983c8d76d60647bf7f24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c17ca26027d055c5e983c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:59 2020 +0200 conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 345241a44fd..2b3c6c3315a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length */ BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) { - int blocking = 1; - if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), + if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0, buffer, length * sizeof(*buffer), count )) return FALSE; *count /= sizeof(*buffer); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8fb28e18ba9..3b4255ea310 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_INPUT: { - unsigned int blocking; - if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - blocking = in_size && *(unsigned int *)in_data; - if (blocking && !console->record_count && *out_size) + if (!console->record_count && *out_size) { TRACE( "pending read\n" ); console->read_ioctl = IOCTL_CONDRV_READ_INPUT;

1 0

Austin English : qedit: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: c130054120cffe595e21f43d5e7d2202f23c91a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130054120cffe595e21f43d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:36:22 2020 -0500 qedit: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 2 ++ dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 4891328c7a9..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ timeline.c IDL_SRCS = qedit_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc new file mode 100644 index 00000000000..dd5f3ccbc7f --- /dev/null +++ b/dlls/qedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qedit" +#define WINE_FILENAME_STR "qedit.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: ea8fa3174cba57df1120438724ddb8d41442c2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8fa3174cba57df11204387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:49 2020 +0200 kernel32: Move FlushConsoleInputBuffer to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f9d24f5c885..4b74c1183ca 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,15 +148,6 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/*********************************************************************** - * FlushConsoleInputBuffer (KERNEL32.@) - */ -BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) -{ - return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); -} - - /*********************************************************************** * SetConsoleTitleA (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08a64955123..79964c7a9b3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -517,7 +517,7 @@ @ stdcall -import FlsFree(long) @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) +@ stdcall -import FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d073b77eaa3..345241a44fd 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1704,6 +1704,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, } +/*********************************************************************** + * FlushConsoleInputBuffer (kernelbase.@) + */ +BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) +{ + return console_ioctl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL ); +} + + /*********************************************************************** * Beep (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e55194f2041..9c7babde7fd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -381,7 +381,7 @@ @ stdcall FlsFree(long) @ stdcall FlsGetValue(long) @ stdcall FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer +@ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers

1 0

Damjan Jovanovic : riched20: Implement ITextRange/ITextSelection Copy and Cut.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: aa1ef09fefafd785b21bfe458da45df0521c0057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa1ef09fefafd785b21bfe45… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 15 10:39:42 2020 +0100 riched20: Implement ITextRange/ITextSelection Copy and Cut. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 84 ++++++++++++++++++++++++++----------------- dlls/riched20/editor.h | 2 ++ dlls/riched20/richole.c | 51 +++++++++++++++++++++----- dlls/riched20/tests/richole.c | 74 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa1ef09fefafd785b21b…

1 0

Huw Davies : riched20: Simplify the char offset from run offset function.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 120ee0de1b1d947e96ec3b5290b5f5212f9c4cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=120ee0de1b1d947e96ec3b52… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:39 2020 +0100 riched20: Simplify the char offset from run offset function. 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/run.c | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 30441658311..d9bcea84f74 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4322,15 +4322,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } cursor_from_char_ofs( editor, wParam, &cursor ); item = ME_RowStart( cursor.pRun ); - nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); + nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); else { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; + nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 163be9c8179..0503a671ea1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,6 +120,7 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -140,7 +141,6 @@ 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; -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 92d0721247c..22a5db8610b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -187,18 +187,15 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) } /****************************************************************************** - * ME_CharOfsFromRunOfs + * run_char_ofs * - * Converts a character position relative to the start of the run, to a + * Converts a character position relative to the start of the run to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, - const ME_DisplayItem *pRun, int nOfs) + +int run_char_ofs( ME_Run *run, int ofs ) { - assert(pRun && pRun->type == diRun); - assert(pPara && pPara->type == diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; + return run->para->nCharOfs + run->nCharOfs + ofs; } /******************************************************************************

1 0