wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Joachim Priesner : ntdll: Fix read buffer overflow in find_file_in_dir().
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: e533a26dcff611f312e5bfce47061d2155476c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e533a26dcff611f312e5bfce… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Oct 22 18:29:49 2020 +0200 ntdll: Fix read buffer overflow in find_file_in_dir(). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index afb552be098..d12a3ffb119 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2550,6 +2550,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i goto not_found; } } + /* if that did not work, restore previous state of unix_name */ + unix_name[pos - 1] = 0; } close( fd ); }

1 0

Paul Gofman : ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 36dcb6965146022c1a1f15c1653d5d713036db3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36dcb6965146022c1a1f15c1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 21 22:52:24 2020 +0300 ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50010 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6fbb612825b..a332f961908 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1086,7 +1086,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rsi\n\t" "pushq %rdi\n\t" "leaq 0x200(%rcx),%rsi\n\t" - "leaq 0x60(%rsp),%rdi\n\t" + "leaq 0x70(%rsp),%rdi\n\t" "movq $0x14,%rcx\n\t" "cld\n\t" "rep; movsq\n\t"

1 0

Zebediah Figura : winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 63cf882e392478f8df339a3aa45940af9fe75936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cf882e392478f8df339a3a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:17 2020 -0500 winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 22 +++++++++++++++++++++ dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 60b38a48f5a..57d40d19a89 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -37,9 +37,31 @@ #include "dshow.h" #include "strmif.h" #include "mfobjects.h" +#include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) extern LONG object_locks; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68b12cf8f14..9f5e147b7ed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2032,45 +2032,57 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) return IPin_Release(&pin->pin.pin.IPin_iface); } -static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstClockTime timestamp; GstClockTimeDiff diff; - GstEvent *evt; + GstEvent *event; - TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, - qm.Type, qm.Proportion, - wine_dbgstr_longlong(qm.Late), - wine_dbgstr_longlong(qm.TimeStamp)); + TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", + pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, + debugstr_time(q.Late), debugstr_time(q.TimeStamp)); mark_wine_thread(); - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ - if (qm.Type == Famine && qm.Proportion > 1000) + if (q.Type == Famine && q.Proportion < 1000) type = GST_QOS_TYPE_UNDERFLOW; /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is * unsigned, so clamp it to 0. */ - timestamp = max(qm.TimeStamp * 100, 0); + timestamp = max(q.TimeStamp * 100, 0); /* The documentation specifies that timestamp + diff must be nonnegative. */ - diff = qm.Late * 100; + diff = q.Late * 100; if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); + /* DirectShow "Proportion" describes what percentage of buffers the upstream + * filter should keep (i.e. dropping the rest). If frames are late, the + * proportion will be less than 1. For example, a proportion of 500 means + * that the element should drop half of its frames, essentially because + * frames are taking twice as long as they should to arrive. + * + * GStreamer "proportion" is the inverse of this; it describes how much + * faster the upstream element should produce frames. I.e. if frames are + * taking twice as long as they should to arrive, we want the frames to be + * decoded twice as fast, and so we pass 2.0 to GStreamer. */ - if (!evt) { - WARN("Failed to create QOS event\n"); - return E_INVALIDARG; + if (!q.Proportion) + { + WARN("Ignoring quality message with zero proportion.\n"); + return S_OK; } - gst_pad_push_event(pin->my_sink, evt); + if (!(event = gst_event_new_qos(type, 1000.0 / q.Proportion, diff, timestamp))) + ERR("Failed to create QOS event.\n"); + + gst_pad_push_event(pin->my_sink, event); return S_OK; }

1 0

Zebediah Figura : winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 458dfcb95a9d8877921574535fc0d8d08084ac6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=458dfcb95a9d887792157453… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:16 2020 -0500 winegstreamer: Respect integer promotion rules when clamping timestamp + diff. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6279c2c28c0..68b12cf8f14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2060,7 +2060,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil /* The documentation specifies that timestamp + diff must be nonnegative. */ diff = qm.Late * 100; - if (timestamp < -diff) + if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp);

1 0

Gijs Vermeulen : qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 4aabbaaf95444c0b88978128a25a65e4ecf12743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aabbaaf95444c0b88978128… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Oct 22 18:14:56 2020 +0200 qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46950 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 3 +++ dlls/qcap/tests/capturegraph.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b4f83956f0e..b98a321cb3a 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -343,6 +343,9 @@ static HRESULT WINAPI fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 TRACE("graph %p, category %s, majortype %s, filter %p, iid %s, out %p.\n", graph, debugstr_guid(category), debugstr_guid(majortype), filter, debugstr_guid(iid), out); + if (!filter) + return E_POINTER; + if (category && IsEqualGUID(category, &LOOK_DOWNSTREAM_ONLY)) return find_interface_recurse(PINDIR_OUTPUT, NULL, NULL, filter, iid, out); diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index c37ac515734..cdd9a27828a 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -384,6 +384,10 @@ static void test_find_interface(void) /* Test search order without any restrictions applied. */ + hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype, + NULL, &testiid, (void **)&unk); + ok(hr == E_POINTER, "got hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests_from_filter2); ++i) { hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype,

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CursorType.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 7287bd50077ce5d187e5435e9192ffcdc73e2d3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7287bd50077ce5d187e5435e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 22 14:46:20 2020 +0200 msado15: Implement _Recordset get/put CursorType. 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 | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a5096e5c4ff..e3dd83a4309 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -44,6 +44,7 @@ struct recordset LONG index; VARIANT *data; CursorLocationEnum cursor_location; + CursorTypeEnum cursor_type; }; struct fields @@ -910,14 +911,22 @@ static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) { - FIXME( "%p, %p\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_type ); + + *cursor_type = recordset->cursor_type; + return S_OK; } static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) { - FIXME( "%p, %d\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %d\n", iface, cursor_type ); + + recordset->cursor_type = cursor_type; + return S_OK; } static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) @@ -1546,6 +1555,7 @@ HRESULT Recordset_create( void **obj ) recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; + recordset->cursor_type = adOpenForwardOnly; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index adf9fb30bc2..e95df49c2c2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,7 @@ static void test_Recordset(void) LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; + CursorTypeEnum cursor; BSTR name; HRESULT hr; @@ -144,6 +145,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( location == adUseServer, "got %d\n", location ); + cursor = adOpenUnspecified; + hr = _Recordset_get_CursorType( recordset, &cursor ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Huw Davies : riched20: Simplify some of the drawing code using a few helpers.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 6488613a3ad605d5640cff29aa86d65b2531b419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6488613a3ad605d5640cff29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:50 2020 +0100 riched20: Simplify some of the drawing code using a few helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 3 +++ dlls/riched20/paint.c | 59 +++++++++++++++++++++++--------------------------- dlls/riched20/table.c | 22 +++++++++++++++++++ 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 97d4c3bc5ab..68c54c2b328 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -280,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; +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; @@ -289,6 +291,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) 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; 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; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5a0432a9eed..30c0d7f57fd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -23,12 +23,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { - ME_DisplayItem *item; + ME_Paragraph *para; ME_Context c; + ME_Cell *cell; int ys, ye; HRGN oldRgn; @@ -44,36 +45,29 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - item = editor->pBuffer->pFirst->next; + para = editor_first_para( editor ); /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ c.pt.x = c.rcView.left - editor->horz_si.nPos; c.pt.y = c.rcView.top - editor->vert_si.nPos; - while(item != editor->pBuffer->pLast) + while (para_next( para )) { - assert(item->type == diParagraph); - - ys = c.pt.y + item->member.para.pt.y; - if (item->member.para.pCell - != item->member.para.next_para->member.para.pCell) - { - ME_Cell *cell = NULL; - cell = &ME_FindItemBack(item->member.para.next_para, diCell)->member.cell; + ys = c.pt.y + para->pt.y; + cell = para_cell( para ); + if (cell && para == cell_end_para( cell )) ye = c.pt.y + cell->pt.y + cell->nHeight; - } else { - ye = ys + item->member.para.nHeight; - } - if (item->member.para.pCell && !(item->member.para.nFlags & MEPF_ROWEND) && - item->member.para.pCell != item->member.para.prev_para->member.para.pCell) + else ye = ys + para->nHeight; + + if (cell && !(para->nFlags & MEPF_ROWEND) && para == cell_first_para( cell )) { /* the border shifts the text down */ - ys -= item->member.para.pCell->member.cell.yTextOffset; + ys -= para_cell( para )->yTextOffset; } /* Draw the paragraph if any of the paragraph is in the update region. */ if (ys < rcUpdate->bottom && ye > rcUpdate->top) - ME_DrawParagraph(&c, item); - item = item->member.para.next_para; + draw_paragraph( &c, para ); + para = para_next( para ); } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) { @@ -909,12 +903,12 @@ static void draw_para_number( ME_Context *c, ME_Paragraph *para ) } } -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; + ME_Cell *cell; ME_Run *run; - ME_Paragraph *para = NULL; RECT rc, bounds; int y; int height = 0, baseline = 0, no=0; @@ -923,32 +917,33 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.left = c->pt.x; rc.right = c->rcView.right; - assert(paragraph); - para = &paragraph->member.para; y = c->pt.y + para->pt.y; - if (para->pCell) + if ((cell = para_cell( para ))) { - ME_Cell *cell = &para->pCell->member.cell; rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; } - if (para->nFlags & MEPF_ROWSTART) { - ME_Cell *cell = &para->next_para->member.para.pCell->member.cell; + if (para->nFlags & MEPF_ROWSTART) + { + cell = table_row_first_cell( para ); rc.right = c->pt.x + cell->pt.x; - } else if (para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &para->prev_para->member.para.pCell->member.cell; + } + else if (para->nFlags & MEPF_ROWEND) + { + cell = table_row_end_cell( para ); rc.left = c->pt.x + cell->pt.x + cell->nWidth; } ME_DrawParaDecoration(c, para, y, &bounds); y += bounds.top; - if (bounds.left || bounds.right) { + if (bounds.left || bounds.right) + { rc.left = max(rc.left, c->pt.x + bounds.left); rc.right = min(rc.right, c->pt.x - bounds.right + max(c->editor->sizeWindow.cx, c->editor->nTotalWidth)); } - for (p = paragraph->next; p != para->next_para; p = p->next) + for (p = para_get_di( para )->next; p != para_get_di( para_next( para ) ); p = p->next) { switch(p->type) { case diParagraph: diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 63b5d0fd05b..daae18d5968 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -180,6 +180,14 @@ ME_Cell *table_row_first_cell( ME_Paragraph *para ) return para_cell( para ); } +ME_Cell *table_row_end_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_prev( table_row_end( para )); + return cell_next( para_cell( para ) ); +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL; @@ -192,6 +200,20 @@ ME_Cell *cell_prev( ME_Cell *cell ) return &cell->prev_cell->member.cell; } +ME_Paragraph *cell_first_para( ME_Cell *cell ) +{ + return &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; +} + +ME_Paragraph *cell_end_para( ME_Cell *cell ) +{ + ME_Cell *next = cell_next( cell ); + + if (!next) return cell_first_para( cell ); /* End of row */ + + return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Use cell ptrs in the rtf writing code.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: b2c812e3a3f8c3286373433635c4b653704c3d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c812e3a3f8c32863734336… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:49 2020 +0100 riched20: Use cell ptrs in the rtf writing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 182a725dbad..9e79eda274d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -316,7 +316,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pCell = NULL; + ME_Cell *cell = NULL; ME_Paragraph *prev_para = NULL; do @@ -336,12 +336,10 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs if (run->para->fmt.wNumbering) add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = run->para->pCell)) + if ((cell = para_cell( run->para ))) { - ME_Border* borders[4] = { &pCell->member.cell.border.top, - &pCell->member.cell.border.left, - &pCell->member.cell.border.bottom, - &pCell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); @@ -389,7 +387,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream, ME_Paragraph *para ) { - ME_DisplayItem *cell; + ME_Cell *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; const char sideChar[4] = {'t','l','b','r'}; @@ -399,19 +397,16 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream if (!editor->bEmulateVersion10) /* v4.1 */ { PARAFORMAT2 *pFmt = &table_row_end( para )->fmt; - para = table_row_start( para ); - cell = para->next_para->member.para.pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { - ME_Border* borders[4] = { &cell->member.cell.border.top, - &cell->member.cell.border.left, - &cell->member.cell.border.bottom, - &cell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) { if (borders[i]->width) @@ -425,9 +420,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream sprintf(props + strlen(props), "\\brdrcf%u", idx); } } - sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); - cell = cell->member.cell.next_cell; - } while (cell->member.cell.next_cell); + sprintf( props + strlen(props), "\\cellx%d", cell->nRightBoundary ); + cell = cell_next( cell ); + } while (cell_next( cell )); } else /* v1.0 - 3.0 */ {

1 0

Huw Davies : riched20: Use cell ptrs in the rtf parsing code.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 431ee50875a0356ece4c27f5c8699494f044b550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431ee50875a0356ece4c27f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:48 2020 +0100 riched20: Use cell ptrs in the rtf parsing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 39 ++++++++++++++++++++------------------- dlls/riched20/editor.h | 9 +++++++++ dlls/riched20/para.c | 6 ++++++ dlls/riched20/table.c | 20 ++++++++++++++++++++ 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 15dd75b9575..0cc33ad5d9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,8 +987,9 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *cell, *run; + ME_DisplayItem *run; ME_Paragraph *para; + ME_Cell *cell; int i; if (!tableDef) @@ -1004,44 +1005,44 @@ void ME_RTFSpecialCharHook(RTF_Info *info) info->nestingLevel++; } para = tableDef->row_start; - cell = ME_FindItemFwd( para_get_di( para ), diCell ); - assert(cell && !cell->member.cell.prev_cell); + cell = table_row_first_cell( para ); + assert( cell && !cell_prev( cell ) ); if (tableDef->numCellsDefined < 1) { /* 2000 twips appears to be the cell size that native richedit uses * when no cell sizes are specified. */ - const int defaultCellSize = 2000; - int nRightBoundary = defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; - while (cell->member.cell.next_cell) { - cell = cell->member.cell.next_cell; - nRightBoundary += defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; + const int default_size = 2000; + int right_boundary = default_size; + cell->nRightBoundary = right_boundary; + while (cell_next( cell )) + { + cell = cell_next( cell ); + right_boundary += default_size; + cell->nRightBoundary = right_boundary; } para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; - cell->member.cell.nRightBoundary = nRightBoundary; + cell = para_cell( para ); + cell->nRightBoundary = right_boundary; } else { for (i = 0; i < tableDef->numCellsDefined; i++) { RTFCell *cellDef = &tableDef->cells[i]; - cell->member.cell.nRightBoundary = cellDef->rightBoundary; - ME_ApplyBorderProperties(info, &cell->member.cell.border, - cellDef->border); - cell = cell->member.cell.next_cell; + cell->nRightBoundary = cellDef->rightBoundary; + ME_ApplyBorderProperties( info, &cell->border, cellDef->border ); + cell = cell_next( cell ); if (!cell) { para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; + cell = para_cell( para ); } } /* Cell for table row delimiter is empty */ - cell->member.cell.nRightBoundary = tableDef->cells[i-1].rightBoundary; + cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd(cell, diRun); + run = ME_FindItemFwd( cell_get_di( cell) , diRun ); if (info->editor->pCursors[0].pRun != run || info->editor->pCursors[0].nOffset) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 168a8e58cc2..97d4c3bc5ab 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -204,6 +204,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPE void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; @@ -279,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) 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; 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; @@ -286,6 +289,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) 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; ME_Paragraph *table_row_end( 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; @@ -293,6 +297,11 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HID 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; +static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) +{ + return (ME_DisplayItem *)((ptrdiff_t)cell - offsetof(ME_DisplayItem, member)); +} + /* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1db553a3478..db258947916 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -124,6 +124,12 @@ BOOL para_in_table( ME_Paragraph *para ) return para->fmt.wEffects & PFE_TABLE; } +ME_Cell *para_cell( ME_Paragraph *para ) +{ + if (!para->pCell) return NULL; + return &para->pCell->member.cell; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index aff4f0dc13f..63b5d0fd05b 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -172,6 +172,26 @@ ME_Paragraph* table_outer_para( ME_Paragraph *para ) return para; } +ME_Cell *table_row_first_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_next( table_row_start( para ) ); + return para_cell( para ); +} + +ME_Cell *cell_next( ME_Cell *cell ) +{ + if (!cell->next_cell) return NULL; + return &cell->next_cell->member.cell; +} + +ME_Cell *cell_prev( ME_Cell *cell ) +{ + if (!cell->prev_cell) return NULL; + return &cell->prev_cell->member.cell; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Return paragraph ptrs from the remaining table insert functions.
by Alexandre Julliard 22 Oct '20

22 Oct '20

Module: wine Branch: master Commit: 670dadf719798c7ae95a0922d610d2c011df4a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=670dadf719798c7ae95a0922… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:47 2020 +0100 riched20: Return paragraph ptrs from the remaining table insert functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 4 ++-- dlls/riched20/table.c | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 36c2e108b2d..15dd75b9575 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -966,7 +966,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); info->nestingLevel = 1; } - ME_InsertTableCellFromCursor(info->editor); + table_insert_cell( info->editor, info->editor->pCursors ); } } else /* v1.0 - v3.0 */ @@ -1018,7 +1018,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nRightBoundary += defaultCellSize; cell->member.cell.nRightBoundary = nRightBoundary; } - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; cell->member.cell.nRightBoundary = nRightBoundary; } @@ -1033,7 +1033,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell = cell->member.cell.next_cell; if (!cell) { - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; } } @@ -1056,7 +1056,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nChars, TRUE); } - para = &ME_InsertTableRowEndFromCursor(info->editor)->member.para; + para = table_insert_row_end( info->editor, info->editor->pCursors ); para->fmt.dxOffset = abs(info->tableDef->gapH); para->fmt.dxStartIndent = info->tableDef->leftEdge; ME_ApplyBorderProperties( info, &para->border, tableDef->border ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e9a7a77e234..168a8e58cc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -279,9 +279,9 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_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; 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; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 1b735638606..aff4f0dc13f 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -113,21 +113,19 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap /* Inserts a diCell and starts a new paragraph for the next cell. * * Returns the first paragraph of the new cell. */ -ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_Paragraph *para; WCHAR tab = '\t'; - para = table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); - return para_get_di( para ); + return table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); } -ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWEND ); - return para_get_di( para_prev( para ) ); + para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + return para_prev( para ); } ME_Paragraph* table_row_end( ME_Paragraph *para ) @@ -424,13 +422,13 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) while (cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; - para = &ME_InsertTableCellFromCursor( editor )->member.para; + para = table_insert_cell( editor, editor->pCursors ); insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - para = &ME_InsertTableRowEndFromCursor(editor)->member.para; + 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 );

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020