October 2020 - Wine-devel - list.winehq.org

[PATCH v2 1/2] winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Zebediah Figura 22 Oct '20

22 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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); -- 2.28.0

1 1

[PATCH v2 1/2] winex11.drv: Keep the window's own restored state when unminimized, if it was fullscreen before.
by Gabriel Ivăncescu 22 Oct '20

22 Oct '20

Fixes a regression introduced by commit 82c6ec3a32f44e8b3e0cc88b7f10e0c0d7fa1b89, which caused the WM_ACTIVATEAPP to be sent while the window is minimized, if it has been clicked on in the taskbar to be restored. According to the Extended Window Manager Hints spec, WMs remove the NET_WM_STATE_FULLSCREEN state when restored, they use the previous size of the window (not the fullscreen). This caused the WM_SYSCOMMAND SC_RESTORE message's ShowWindow to revert the window back to its original (non-fullscreen) size, instead of being restored to fullscreen, breaking some apps like Heroes of Might and Magic V. We have to override the X server's window state here to match Windows behavior and restore it back to fullscreen. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- read_net_wm_states is when X11 changes some state from outside Wine and sends it a notification that it did; then Wine has to update its own wm states to match the X server (so it's properly integrated). However, in this case, since the WM clears the fullscreen state on minimization, we must not do that, because Windows doesn't—and more, when the window is restored from minimized, we must ignore the X11 state changes and force it back to what Wine had (usually fullscreen unless it gets hooked by the app, then we keep what the app changed). This is to match Windows behavior, which differs from X11, and apps rely on. dlls/winex11.drv/event.c | 14 ++++++++++++++ dlls/winex11.drv/window.c | 12 +++++++++++- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1a..c17ae27 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1296,6 +1296,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if (data->iconic && data->wm_state == NormalState) /* restore window */ { + DWORD old_state = data->net_wm_state; + data->iconic = FALSE; read_net_wm_states( event->display, data ); if ((style & WS_CAPTION) == WS_CAPTION && (data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED))) @@ -1313,11 +1315,23 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { + /* if the window was fullscreen before minimized, we have to keep its + state and restore it to the fullscreen state, because WMs remove the + fullscreen state when minimized, so we can't use the X server state. */ + BOOL keep_state = (style & WS_MINIMIZE) && (old_state & (1 << NET_WM_STATE_FULLSCREEN)); + + if (keep_state) + data->keep_fs_state = TRUE; TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + if (keep_state && (data = get_win_data( hwnd ))) + { + data->keep_fs_state = FALSE; + release_win_data( data ); + } return; } TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4571739..17b5a8c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1076,6 +1076,11 @@ void read_net_wm_states( Display* display, struct x11drv_win_data *data ) if (!maximized_horz) new_state &= ~(1 << NET_WM_STATE_MAXIMIZED); + /* WMs remove it when minimizing a window. Keep track of it internally, + so we can restore it properly when the time comes to check for it. */ + if ((data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) && data->iconic) + new_state |= 1 << NET_WM_STATE_FULLSCREEN; + data->net_wm_state = new_state; } @@ -2450,6 +2455,11 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (event_type != ConfigureNotify && event_type != PropertyNotify && event_type != GravityNotify && event_type != ReparentNotify) event_type = 0; /* ignore other events */ + + /* if we keep the Wine window's restored state, we pretend it's + not an event, so that it's synced properly with the X server. */ + if (data->keep_fs_state && !(new_style & WS_MINIMIZE)) + event_type = 0; } if (data->mapped && event_type != ReparentNotify) @@ -2545,7 +2555,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) } goto done; } - if (!data->managed || !data->mapped || data->iconic) goto done; + if (!data->managed || !data->mapped || data->iconic || data->keep_fs_state) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b..f0d2fba 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -574,6 +574,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL keep_fs_state : 1; /* don't override the window state when restoring from an event, if fullscreen */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.21.0

2 2

[PATCH v2] msado15: Implement _Recordset get/put CursorType
by Hans Leidekker 22 Oct '20

22 Oct '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Fix cursor_typo ;) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ); -- 2.28.0

1 0

[PATCH 5/5] riched20: Simplify some of the drawing code using a few helpers.
by Huw Davies 22 Oct '20

22 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 -- 2.23.0

1 0

[PATCH 4/5] riched20: Use cell ptrs in the rtf writing code.
by Huw Davies 22 Oct '20

22 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 */ { -- 2.23.0

1 0

[PATCH 3/5] riched20: Use cell ptrs in the rtf parsing code.
by Huw Davies 22 Oct '20

22 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 -- 2.23.0

1 0

[PATCH 2/5] riched20: Return paragraph ptrs from the remaining table insert functions.
by Huw Davies 22 Oct '20

22 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 ); -- 2.23.0

1 0

[PATCH 1/5] riched20: Return a para ptr from the insert start table row functions.
by Huw Davies 22 Oct '20

22 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 191 +++++++++++++++++++++-------------------- dlls/riched20/editor.h | 5 +- dlls/riched20/rtf.h | 4 +- dlls/riched20/table.c | 63 +++++++------- 4 files changed, 131 insertions(+), 132 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5cf1ad35f59..36c2e108b2d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -585,27 +585,29 @@ void ME_RTFParAttrHook(RTF_Info *info) if (!info->editor->bEmulateVersion10) /* v4.1 */ { - if (info->tableDef && info->tableDef->tableRowStart && - info->tableDef->tableRowStart->member.para.nFlags & MEPF_ROWEND) + if (info->tableDef && info->tableDef->row_start && + info->tableDef->row_start->nFlags & MEPF_ROWEND) { ME_Cursor cursor; - ME_DisplayItem *para; + ME_Paragraph *para; /* We are just after a table row. */ RTFFlushOutputBuffer(info); cursor = info->editor->pCursors[0]; - para = cursor.pPara; - if (para == info->tableDef->tableRowStart->member.para.next_para + para = &cursor.pPara->member.para; + if (para == para_next( info->tableDef->row_start ) && !cursor.nOffset && !cursor.pRun->member.run.nCharOfs) { /* Since the table row end, no text has been inserted, and the \intbl * control word has not be used. We can confirm that we are not in a * table anymore. */ - info->tableDef->tableRowStart = NULL; + info->tableDef->row_start = NULL; info->canInheritInTbl = FALSE; } } - } else { /* v1.0 - v3.0 */ + } + else /* v1.0 - v3.0 */ + { info->fmt.dwMask |= PFM_TABLE; info->fmt.wEffects &= ~PFE_TABLE; } @@ -613,26 +615,26 @@ void ME_RTFParAttrHook(RTF_Info *info) case rtfNestLevel: if (!info->editor->bEmulateVersion10) /* v4.1 */ { - while (info->rtfParam > info->nestingLevel) { + while (info->rtfParam > info->nestingLevel) + { RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); tableDef->parent = info->tableDef; info->tableDef = tableDef; RTFFlushOutputBuffer(info); - if (tableDef->tableRowStart && - tableDef->tableRowStart->member.para.nFlags & MEPF_ROWEND) + if (tableDef->row_start && tableDef->row_start->nFlags & MEPF_ROWEND) + { + ME_Paragraph *para = para_next( tableDef->row_start ); + tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); + } + else { - ME_DisplayItem *para = tableDef->tableRowStart; - para = para->member.para.next_para; - para = ME_InsertTableRowStartAtParagraph(info->editor, para); - tableDef->tableRowStart = para; - } else { ME_Cursor cursor; WCHAR endl = '\r'; cursor = info->editor->pCursors[0]; if (cursor.nOffset || cursor.pRun->member.run.nCharOfs) ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); - tableDef->tableRowStart = ME_InsertTableRowStartFromCursor(info->editor); + tableDef->row_start = table_insert_row_start( info->editor, info->editor->pCursors ); } info->nestingLevel++; @@ -647,21 +649,19 @@ void ME_RTFParAttrHook(RTF_Info *info) if (info->nestingLevel < 1) { RTFTable *tableDef; + ME_Paragraph *para; + if (!info->tableDef) info->tableDef = heap_alloc_zero(sizeof(*info->tableDef)); tableDef = info->tableDef; RTFFlushOutputBuffer(info); - if (tableDef->tableRowStart && - tableDef->tableRowStart->member.para.nFlags & MEPF_ROWEND) - { - ME_DisplayItem *para = tableDef->tableRowStart; - para = para->member.para.next_para; - para = ME_InsertTableRowStartAtParagraph(info->editor, para); - tableDef->tableRowStart = para; - } + if (tableDef->row_start && tableDef->row_start->nFlags & MEPF_ROWEND) + para = para_next( tableDef->row_start ); else - tableDef->tableRowStart = ME_InsertTableRowStartAtParagraph( info->editor, - info->editor->pCursors[0].pPara ); + para = &info->editor->pCursors[0].pPara->member.para; + + tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); + info->nestingLevel = 1; info->canInheritInTbl = TRUE; } @@ -956,25 +956,24 @@ void ME_RTFSpecialCharHook(RTF_Info *info) if (!tableDef) break; RTFFlushOutputBuffer(info); - if (!info->editor->bEmulateVersion10) { /* v4.1 */ - if (tableDef->tableRowStart) + if (!info->editor->bEmulateVersion10) /* v4.1 */ + { + if (tableDef->row_start) { - if (!info->nestingLevel && - tableDef->tableRowStart->member.para.nFlags & MEPF_ROWEND) + if (!info->nestingLevel && tableDef->row_start->nFlags & MEPF_ROWEND) { - ME_DisplayItem *para = tableDef->tableRowStart; - para = para->member.para.next_para; - para = ME_InsertTableRowStartAtParagraph(info->editor, para); - tableDef->tableRowStart = para; + ME_Paragraph *para = para_next( tableDef->row_start ); + tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); info->nestingLevel = 1; } ME_InsertTableCellFromCursor(info->editor); } - } else { /* v1.0 - v3.0 */ - ME_DisplayItem *para = info->editor->pCursors[0].pPara; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - if (pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE && - tableDef->numCellsInserted < tableDef->numCellsDefined) + } + else /* v1.0 - v3.0 */ + { + ME_Paragraph *para = &info->editor->pCursors[0].pPara->member.para; + + if (para_in_table( para ) && tableDef->numCellsInserted < tableDef->numCellsDefined) { WCHAR tab = '\t'; ME_InsertTextFromCursor(info->editor, 0, &tab, 1, info->style); @@ -988,26 +987,24 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *para, *cell, *run; + ME_DisplayItem *cell, *run; + ME_Paragraph *para; int i; if (!tableDef) break; RTFFlushOutputBuffer(info); - if (!info->editor->bEmulateVersion10) { /* v4.1 */ - if (!tableDef->tableRowStart) - break; - if (!info->nestingLevel && - tableDef->tableRowStart->member.para.nFlags & MEPF_ROWEND) + if (!info->editor->bEmulateVersion10) /* v4.1 */ + { + if (!tableDef->row_start) break; + if (!info->nestingLevel && tableDef->row_start->nFlags & MEPF_ROWEND) { - para = tableDef->tableRowStart; - para = para->member.para.next_para; - para = ME_InsertTableRowStartAtParagraph(info->editor, para); - tableDef->tableRowStart = para; + para = para_next( tableDef->row_start ); + tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); info->nestingLevel++; } - para = tableDef->tableRowStart; - cell = ME_FindItemFwd(para, diCell); + para = tableDef->row_start; + cell = ME_FindItemFwd( para_get_di( para ), diCell ); assert(cell && !cell->member.cell.prev_cell); if (tableDef->numCellsDefined < 1) { @@ -1021,10 +1018,12 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nRightBoundary += defaultCellSize; cell->member.cell.nRightBoundary = nRightBoundary; } - para = ME_InsertTableCellFromCursor(info->editor); - cell = para->member.para.pCell; + para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + cell = para->pCell; cell->member.cell.nRightBoundary = nRightBoundary; - } else { + } + else + { for (i = 0; i < tableDef->numCellsDefined; i++) { RTFCell *cellDef = &tableDef->cells[i]; @@ -1034,8 +1033,8 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell = cell->member.cell.next_cell; if (!cell) { - para = ME_InsertTableCellFromCursor(info->editor); - cell = para->member.para.pCell; + para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + cell = para->pCell; } } /* Cell for table row delimiter is empty */ @@ -1057,45 +1056,47 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nChars, TRUE); } - para = ME_InsertTableRowEndFromCursor(info->editor); - para->member.para.fmt.dxOffset = abs(info->tableDef->gapH); - para->member.para.fmt.dxStartIndent = info->tableDef->leftEdge; - ME_ApplyBorderProperties(info, &para->member.para.border, - tableDef->border); + para = &ME_InsertTableRowEndFromCursor(info->editor)->member.para; + para->fmt.dxOffset = abs(info->tableDef->gapH); + para->fmt.dxStartIndent = info->tableDef->leftEdge; + ME_ApplyBorderProperties( info, &para->border, tableDef->border ); info->nestingLevel--; if (!info->nestingLevel) { - if (info->canInheritInTbl) { - tableDef->tableRowStart = para; - } else { - while (info->tableDef) { + if (info->canInheritInTbl) tableDef->row_start = para; + else + { + while (info->tableDef) + { tableDef = info->tableDef; info->tableDef = tableDef->parent; heap_free(tableDef); } } - } else { + } + else + { info->tableDef = tableDef->parent; heap_free(tableDef); } - } else { /* v1.0 - v3.0 */ + } + else /* v1.0 - v3.0 */ + { WCHAR endl = '\r'; - ME_DisplayItem *para = info->editor->pCursors[0].pPara; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - pFmt->dxOffset = info->tableDef->gapH; - pFmt->dxStartIndent = info->tableDef->leftEdge; - ME_ApplyBorderProperties(info, &para->member.para.border, - tableDef->border); + para = &info->editor->pCursors[0].pPara->member.para; + para->fmt.dxOffset = info->tableDef->gapH; + para->fmt.dxStartIndent = info->tableDef->leftEdge; + + ME_ApplyBorderProperties( info, &para->border, tableDef->border ); while (tableDef->numCellsInserted < tableDef->numCellsDefined) { WCHAR tab = '\t'; ME_InsertTextFromCursor(info->editor, 0, &tab, 1, info->style); tableDef->numCellsInserted++; } - pFmt->cTabCount = min(tableDef->numCellsDefined, MAX_TAB_STOPS); - if (!tableDef->numCellsDefined) - pFmt->wEffects &= ~PFE_TABLE; + para->fmt.cTabCount = min(tableDef->numCellsDefined, MAX_TAB_STOPS); + if (!tableDef->numCellsDefined) para->fmt.wEffects &= ~PFE_TABLE; ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); tableDef->numCellsInserted = 0; } @@ -1103,13 +1104,13 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } case rtfTab: case rtfPar: - if (info->editor->bEmulateVersion10) { /* v1.0 - 3.0 */ - ME_DisplayItem *para; - PARAFORMAT2 *pFmt; + if (info->editor->bEmulateVersion10) /* v1.0 - 3.0 */ + { + ME_Paragraph *para; + RTFFlushOutputBuffer(info); - para = info->editor->pCursors[0].pPara; - pFmt = &para->member.para.fmt; - if (pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + para = &info->editor->pCursors[0].pPara->member.para; + if (para_in_table( para )) { /* rtfPar is treated like a space within a table. */ info->rtfClass = rtfText; @@ -1695,13 +1696,14 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre /* do the parsing */ RTFRead(&parser); RTFFlushOutputBuffer(&parser); - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (parser.tableDef && parser.tableDef->tableRowStart && + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (parser.tableDef && parser.tableDef->row_start && (parser.nestingLevel > 0 || parser.canInheritInTbl)) { /* Delete any incomplete table row at the end of the rich text. */ int nOfs, nChars; - ME_DisplayItem *para; + ME_Paragraph *para; parser.rtfMinor = rtfRow; /* Complete the table row before deleting it. @@ -1712,23 +1714,24 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre { while (parser.nestingLevel > 1) ME_RTFSpecialCharHook(&parser); /* Decrements nestingLevel */ - para = parser.tableDef->tableRowStart; + para = parser.tableDef->row_start; ME_RTFSpecialCharHook(&parser); - } else { - para = parser.tableDef->tableRowStart; + } + else + { + para = parser.tableDef->row_start; ME_RTFSpecialCharHook(&parser); - assert(para->member.para.nFlags & MEPF_ROWEND); - para = para->member.para.next_para; + assert( para->nFlags & MEPF_ROWEND ); + para = para_next( para ); } - editor->pCursors[1].pPara = para; - editor->pCursors[1].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1].pPara = para_get_di( para ); + editor->pCursors[1].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1].nOffset = 0; nOfs = ME_GetCursorOfs(&editor->pCursors[1]); nChars = ME_GetCursorOfs(&editor->pCursors[0]) - nOfs; ME_InternalDeleteText(editor, &editor->pCursors[1], nChars, TRUE); - if (parser.tableDef) - parser.tableDef->tableRowStart = NULL; + if (parser.tableDef) parser.tableDef->row_start = NULL; } } ME_CheckTablesForCorruption(editor); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b1cd75f2946..e9a7a77e234 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -279,12 +279,11 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, - ME_DisplayItem *para) 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_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; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 66d88b55da9..35a0ee878e9 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1035,10 +1035,10 @@ struct RTFTable int numCellsInserted; /* v4.1 */ - /* tableRowStart may be the start row paragraph of the table row, + /* row_start may be the start row paragraph of the table row, * or it may store the end of the previous row if it may still be * continued, otherwise NULL is stored. */ - ME_DisplayItem *tableRowStart; + ME_Paragraph *row_start; /* Table definitions are stored as a stack to support nested tables. */ RTFTable *parent; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 14fdf6eb73a..1b735638606 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -73,44 +73,41 @@ static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cu return para; } -ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWSTART ); - return para_get_di( para_prev( para ) ); + para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWSTART ); + return para_prev( para ); } -ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, - ME_DisplayItem *para) +ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) { - ME_DisplayItem *prev_para, *end_para; - ME_Cursor savedCursor = editor->pCursors[0]; - ME_DisplayItem *startRowPara; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - startRowPara = ME_InsertTableRowStartFromCursor(editor); - savedCursor.pPara = ME_GetParagraph(savedCursor.pRun); - editor->pCursors[0] = savedCursor; - editor->pCursors[1] = editor->pCursors[0]; - - end_para = editor->pCursors[0].pPara->member.para.next_para; - prev_para = startRowPara->member.para.next_para; - para = prev_para->member.para.next_para; - while (para != end_para) - { - para->member.para.pCell = prev_para->member.para.pCell; - para->member.para.nFlags |= MEPF_CELL; - para->member.para.nFlags &= ~(MEPF_ROWSTART|MEPF_ROWEND); - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - para->member.para.fmt.wEffects |= PFE_TABLE; - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - prev_para = para; - para = para->member.para.next_para; - } - return startRowPara; + ME_Paragraph *prev_para, *end_para, *start_row; + ME_Cursor cursor; + + cursor.pPara = para_get_di( para ); + cursor.pRun = run_get_di( para_first_run( para ) ); + cursor.nOffset = 0; + + start_row = table_insert_row_start( editor, &cursor ); + + end_para = para_next( &editor->pCursors[0].pPara->member.para ); + prev_para = para_next( start_row ); + para = para_next( prev_para ); + + while (para != end_para) + { + para->pCell = prev_para->pCell; + para->nFlags |= MEPF_CELL; + para->nFlags &= ~(MEPF_ROWSTART | MEPF_ROWEND); + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + para->fmt.wEffects |= PFE_TABLE; + para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + prev_para = para; + para = para_next( para ); + } + return start_row; } /* Inserts a diCell and starts a new paragraph for the next cell. @@ -419,7 +416,7 @@ 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 = &ME_InsertTableRowStartFromCursor(editor)->member.para; + para = table_insert_row_start( editor, editor->pCursors ); insertedCell = ME_FindItemFwd( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; -- 2.23.0

1 0

[v2 PATCH 1/3] evr/sample: Implement SetDirectXManager().
by Nikolay Sivov 22 Oct '20

22 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/sample.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cd6cef001aa..f5189443307 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -21,6 +21,8 @@ #include "evr.h" #include "mfapi.h" #include "mferror.h" +#include "d3d9.h" +#include "dxva2api.h" #include "wine/debug.h" #include "wine/heap.h" @@ -108,6 +110,7 @@ struct sample_allocator IMFVideoSampleAllocatorNotify *callback; unsigned int free_samples; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; }; @@ -168,6 +171,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) { if (allocator->callback) IMFVideoSampleAllocatorNotify_Release(allocator->callback); + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); DeleteCriticalSection(&allocator->cs); heap_free(allocator); } @@ -178,9 +183,27 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator *iface, IUnknown *manager) { - FIXME("%p, %p.\n", iface, manager); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + IDirect3DDeviceManager9 *device_manager = NULL; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, manager); + + if (manager && FAILED(hr = IUnknown_QueryInterface(manager, &IID_IDirect3DDeviceManager9, + (void **)&device_manager))) + { + return hr; + } + + EnterCriticalSection(&allocator->cs); + + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); + allocator->device_manager = device_manager; + + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static HRESULT WINAPI sample_allocator_UninitializeSampleAllocator(IMFVideoSampleAllocator *iface) -- 2.28.0

1 2

[PATCH 1/3] evr/sample: Implement SetDirectXManager().
by Nikolay Sivov 22 Oct '20

22 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/sample.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cd6cef001aa..f5189443307 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -21,6 +21,8 @@ #include "evr.h" #include "mfapi.h" #include "mferror.h" +#include "d3d9.h" +#include "dxva2api.h" #include "wine/debug.h" #include "wine/heap.h" @@ -108,6 +110,7 @@ struct sample_allocator IMFVideoSampleAllocatorNotify *callback; unsigned int free_samples; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; }; @@ -168,6 +171,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) { if (allocator->callback) IMFVideoSampleAllocatorNotify_Release(allocator->callback); + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); DeleteCriticalSection(&allocator->cs); heap_free(allocator); } @@ -178,9 +183,27 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator *iface, IUnknown *manager) { - FIXME("%p, %p.\n", iface, manager); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + IDirect3DDeviceManager9 *device_manager = NULL; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, manager); + + if (manager && FAILED(hr = IUnknown_QueryInterface(manager, &IID_IDirect3DDeviceManager9, + (void **)&device_manager))) + { + return hr; + } + + EnterCriticalSection(&allocator->cs); + + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); + allocator->device_manager = device_manager; + + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static HRESULT WINAPI sample_allocator_UninitializeSampleAllocator(IMFVideoSampleAllocator *iface) -- 2.28.0

2 3