- Wine-Devel - list.winehq.org

[PATCH 4/5] riched20: Add next / prev run from cursor helpers.
by Huw Davies Nov. 6, 2020

Nov. 6, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 5 ++- dlls/riched20/list.c | 45 ------------------------ dlls/riched20/run.c | 78 +++++++++++++++++++++++++++++++++++------- dlls/riched20/writer.c | 2 +- 5 files changed, 70 insertions(+), 62 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b27bab48738..36918c9dd79 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5423,7 +5423,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, } cursor.nOffset = 0; - if (!ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)) + if (!cursor_next_run( &cursor, TRUE )) goto done; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index df8e9d2b829..d06fcef332f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -67,8 +67,6 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DE /* list.c */ void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) DECLSPEC_HIDDEN; void ME_Remove(ME_DisplayItem *diWhere) DECLSPEC_HIDDEN; -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; @@ -126,7 +124,8 @@ static inline ME_DisplayItem *row_get_di( ME_Row *row ) /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; - +BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; +BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) 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, diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 23d1a38991d..891a52e605f 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -63,51 +63,6 @@ static BOOL ME_DITypesEqual(ME_DIType type, ME_DIType nTypeOrClass) } } -/* Modifies run pointer to point to the next run. - * If all_para is FALSE constrain the search to the current para, - * otherwise modify the paragraph pointer if moving into the next paragraph. - * - * Returns TRUE if next run is found, otherwise returns FALSE. */ -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) -{ - ME_DisplayItem *p = (*run)->next; - while (p->type != diTextEnd) - { - if (p->type == diParagraph) { - if (!all_para) return FALSE; - *para = p; - } else if (p->type == diRun) { - *run = p; - return TRUE; - } - p = p->next; - } - return FALSE; -} - -/* Modifies run pointer to point to the previous run. - * If all_para is FALSE constrain the search to the current para, - * otherwise modify the paragraph pointer if moving into the previous paragraph. - * - * Returns TRUE if previous run is found, otherwise returns FALSE. */ -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) -{ - ME_DisplayItem *p = (*run)->prev; - while (p->type != diTextStart) - { - if (p->type == diParagraph) { - if (!all_para) return FALSE; - if (para && p->member.para.prev_para->type == diParagraph) - *para = p->member.para.prev_para; - } else if (p->type == diRun) { - *run = p; - return TRUE; - } - p = p->prev; - } - return FALSE; -} - ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) { if (!di) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index b1436ad5060..978f6691356 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -27,42 +27,96 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DECLARE_DEBUG_CHANNEL(richedit_check); WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) +{ + ME_DisplayItem *p = cursor->pRun->next; + + while (p->type != diTextEnd) + { + if (p->type == diParagraph && !all_para) return FALSE; + else if (p->type == diRun) + { + cursor->pRun = p; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; + return TRUE; + } + p = p->next; + } + return FALSE; +} + +BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) +{ + ME_DisplayItem *p = cursor->pRun->prev; + + while (p->type != diTextStart) + { + if (p->type == diParagraph && !all_para) return FALSE; + else if (p->type == diRun) + { + cursor->pRun = p; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; + return TRUE; + } + p = p->prev; + } + return FALSE; +} + ME_Run *run_next( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_NextRun( NULL, &item, FALSE )) - return &item->member.run; + if (cursor_next_run( &cursor, FALSE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_prev( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_PrevRun( NULL, &item, FALSE )) - return &item->member.run; + if (cursor_prev_run( &cursor, FALSE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_next_all_paras( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + ME_Cursor cursor; - if (ME_NextRun( &dummy, &item, TRUE )) - return &item->member.run; + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; + + if (cursor_next_run( &cursor, TRUE )) + return &cursor.pRun->member.run; return NULL; } ME_Run *run_prev_all_paras( ME_Run *run ) { - ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( run->para ); + cursor.nOffset = 0; - if (ME_PrevRun( &dummy, &item, TRUE )) - return &item->member.run; + if (cursor_prev_run( &cursor, TRUE )) + return &cursor.pRun->member.run; return NULL; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 72242194127..1fc2bfad51e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1107,7 +1107,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, return FALSE; cursor.nOffset = 0; } - } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)); + } while (cursor.pRun != endCur.pRun && cursor_next_run( &cursor, TRUE )); if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE; -- 2.23.0

1 0

[PATCH 3/5] riched20: Use cell ptrs to link the cells.
by Huw Davies Nov. 6, 2020

Nov. 6, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editstr.h | 4 ++-- dlls/riched20/para.c | 31 ++++++++++++++----------------- dlls/riched20/table.c | 8 +++----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index bd839afb0c0..9c2cdd685b1 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -206,7 +206,7 @@ typedef struct tagME_Paragraph PARAFORMAT2 fmt; ME_String *text; - struct tagME_DisplayItem *pCell; /* v4.1 */ + struct tagME_Cell *cell; /* v4.1 */ ME_BorderRect border; int nCharOfs; @@ -228,7 +228,7 @@ typedef struct tagME_Cell /* v4.1 */ POINT pt; int nHeight, nWidth; int yTextOffset; /* The text offset is caused by the largest top border. */ - struct tagME_DisplayItem *prev_cell, *next_cell, *parent_cell; + struct tagME_Cell *prev_cell, *next_cell, *parent_cell; } ME_Cell; typedef struct tagME_Row diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 47640a6fd50..d01a264765a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -126,8 +126,7 @@ BOOL para_in_table( ME_Paragraph *para ) ME_Cell *para_cell( ME_Paragraph *para ) { - if (!para->pCell) return NULL; - return &para->pCell->member.cell; + return para->cell; } ME_Row *para_first_row( ME_Paragraph *para ) @@ -625,13 +624,13 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, { ME_Cell *cell = cell_create(); ME_InsertBefore( para_get_di( new_para ), cell_get_di( cell ) ); - new_para->pCell = cell_get_di( cell ); + new_para->cell = cell; cell->next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { old_para->nFlags |= MEPF_ROWSTART; cell->prev_cell = NULL; - cell->parent_cell = old_para->pCell; + cell->parent_cell = old_para->cell; if (para_cell( old_para )) cell->nNestingLevel = para_cell( old_para )->nNestingLevel + 1; else @@ -639,8 +638,8 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, } else { - cell->prev_cell = old_para->pCell; - cell_prev( cell )->next_cell = cell_get_di( cell ); + cell->prev_cell = old_para->cell; + cell_prev( cell )->next_cell = cell; assert( old_para->nFlags & MEPF_CELL ); assert( !(old_para->nFlags & MEPF_ROWSTART) ); cell->nNestingLevel = cell_prev( cell )->nNestingLevel; @@ -650,19 +649,19 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, else if (paraFlags & MEPF_ROWEND) { old_para->nFlags |= MEPF_ROWEND; - old_para->pCell = old_para->pCell->member.cell.parent_cell; - new_para->pCell = old_para->pCell; + old_para->cell = old_para->cell->parent_cell; + new_para->cell = old_para->cell; assert( para_prev( old_para )->nFlags & MEPF_CELL ); assert( !(para_prev( old_para )->nFlags & MEPF_ROWSTART) ); - if (new_para->pCell != para_next( new_para )->pCell - && para_next( new_para )->pCell - && !para_next( new_para )->pCell->member.cell.prev_cell) + if (new_para->cell != para_next( new_para )->cell + && para_next( new_para )->cell + && !cell_prev( para_next( new_para )->cell )) { /* Row starts just after the row that was ended. */ new_para->nFlags |= MEPF_ROWSTART; } } - else new_para->pCell = old_para->pCell; + else new_para->cell = old_para->cell; table_update_flags( old_para ); table_update_flags( new_para ); @@ -721,7 +720,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir { /* Table cell/row properties are always moved over from the removed para. */ para->nFlags = next->nFlags; - para->pCell = next->pCell; + para->cell = next->cell; /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ @@ -740,10 +739,8 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir if (cell) { ME_Remove( cell_get_di( cell ) ); - if (cell_prev( cell )) - cell_prev( cell )->next_cell = cell_next( cell ) ? cell_get_di( cell_next( cell ) ) : NULL; - if (cell_next( cell )) - cell_next( cell )->prev_cell = cell_prev( cell ) ? cell_get_di( cell_prev( cell ) ) : NULL; + if (cell_prev( cell )) cell_prev( cell )->next_cell = cell_next( cell ); + if (cell_next( cell )) cell_next( cell )->prev_cell = cell_prev( cell ); ME_DestroyDisplayItem( cell_get_di( cell ) ); } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 08f04e06ca7..8d58c3e4f8f 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -96,7 +96,7 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap while (para != end_para) { - para->pCell = cell_get_di( para_cell( prev_para ) ); + para->cell = para_cell( prev_para ); para->nFlags |= MEPF_CELL; para->nFlags &= ~(MEPF_ROWSTART | MEPF_ROWEND); para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; @@ -193,14 +193,12 @@ ME_Cell *cell_create( void ) ME_Cell *cell_next( ME_Cell *cell ) { - if (!cell->next_cell) return NULL; - return &cell->next_cell->member.cell; + return cell->next_cell; } ME_Cell *cell_prev( ME_Cell *cell ) { - if (!cell->prev_cell) return NULL; - return &cell->prev_cell->member.cell; + return cell->prev_cell; } ME_Paragraph *cell_first_para( ME_Cell *cell ) -- 2.23.0

1 0

[PATCH 2/5] riched20: Use cell ptrs in the paragraph splitting and joining functions.
by Huw Davies Nov. 6, 2020

Nov. 6, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 60 +++++++++++++++++++++--------------------- dlls/riched20/table.c | 6 +++++ 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 24e750be1de..df8e9d2b829 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -289,6 +289,7 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ +ME_Cell *cell_create( void ) 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; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e7c3c6934b9..47640a6fd50 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -243,7 +243,7 @@ static void table_update_flags( ME_Paragraph *para ) { para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; - if (para->pCell) para->nFlags |= MEPF_CELL; + if (para_cell( para )) para->nFlags |= MEPF_CELL; else para->nFlags &= ~MEPF_CELL; if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; @@ -623,29 +623,28 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, { if (paraFlags & (MEPF_ROWSTART | MEPF_CELL)) { - ME_DisplayItem *cell = ME_MakeDI(diCell); - ME_InsertBefore( para_get_di( new_para ), cell ); - new_para->pCell = cell; - cell->member.cell.next_cell = NULL; + ME_Cell *cell = cell_create(); + ME_InsertBefore( para_get_di( new_para ), cell_get_di( cell ) ); + new_para->pCell = cell_get_di( cell ); + cell->next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { old_para->nFlags |= MEPF_ROWSTART; - cell->member.cell.prev_cell = NULL; - cell->member.cell.parent_cell = old_para->pCell; - if (old_para->pCell) - cell->member.cell.nNestingLevel = old_para->pCell->member.cell.nNestingLevel + 1; + cell->prev_cell = NULL; + cell->parent_cell = old_para->pCell; + if (para_cell( old_para )) + cell->nNestingLevel = para_cell( old_para )->nNestingLevel + 1; else - cell->member.cell.nNestingLevel = 1; + cell->nNestingLevel = 1; } else { - cell->member.cell.prev_cell = old_para->pCell; - assert(cell->member.cell.prev_cell); - cell->member.cell.prev_cell->member.cell.next_cell = cell; + cell->prev_cell = old_para->pCell; + cell_prev( cell )->next_cell = cell_get_di( cell ); assert( old_para->nFlags & MEPF_CELL ); assert( !(old_para->nFlags & MEPF_ROWSTART) ); - cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; - cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; + cell->nNestingLevel = cell_prev( cell )->nNestingLevel; + cell->parent_cell = cell_prev( cell )->parent_cell; } } else if (paraFlags & MEPF_ROWEND) @@ -653,11 +652,11 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, old_para->nFlags |= MEPF_ROWEND; old_para->pCell = old_para->pCell->member.cell.parent_cell; new_para->pCell = old_para->pCell; - assert( old_para->prev_para->member.para.nFlags & MEPF_CELL ); - assert( !(old_para->prev_para->member.para.nFlags & MEPF_ROWSTART) ); - if (new_para->pCell != new_para->next_para->member.para.pCell - && new_para->next_para->member.para.pCell - && !new_para->next_para->member.para.pCell->member.cell.prev_cell) + assert( para_prev( old_para )->nFlags & MEPF_CELL ); + assert( !(para_prev( old_para )->nFlags & MEPF_ROWSTART) ); + if (new_para->pCell != para_next( new_para )->pCell + && para_next( new_para )->pCell + && !para_next( new_para )->pCell->member.cell.prev_cell) { /* Row starts just after the row that was ended. */ new_para->nFlags |= MEPF_ROWSTART; @@ -686,9 +685,10 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, specified in use_first_fmt */ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) { - ME_DisplayItem *tmp, *pCell = NULL; + ME_DisplayItem *tmp; ME_Paragraph *next = para_next( para ); ME_Run *end_run, *next_first_run, *tmp_run; + ME_Cell *cell = NULL; int i, shift; int end_len; CHARFORMAT2W fmt; @@ -729,22 +729,22 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir { if (tmp->type == diCell) { - pCell = tmp; + cell = &tmp->member.cell; break; } } } - add_undo_split_para( editor, next, eol_str, pCell ? &pCell->member.cell : NULL ); + add_undo_split_para( editor, next, eol_str, cell ); - if (pCell) + if (cell) { - ME_Remove( pCell ); - if (pCell->member.cell.prev_cell) - pCell->member.cell.prev_cell->member.cell.next_cell = pCell->member.cell.next_cell; - if (pCell->member.cell.next_cell) - pCell->member.cell.next_cell->member.cell.prev_cell = pCell->member.cell.prev_cell; - ME_DestroyDisplayItem( pCell ); + ME_Remove( cell_get_di( cell ) ); + if (cell_prev( cell )) + cell_prev( cell )->next_cell = cell_next( cell ) ? cell_get_di( cell_next( cell ) ) : NULL; + if (cell_next( cell )) + cell_next( cell )->prev_cell = cell_prev( cell ) ? cell_get_di( cell_prev( cell ) ) : NULL; + ME_DestroyDisplayItem( cell_get_di( cell ) ); } if (!use_first_fmt) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 83b089d6dbc..08f04e06ca7 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -185,6 +185,12 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) return cell_next( para_cell( para ) ); } +ME_Cell *cell_create( void ) +{ + ME_DisplayItem *item = ME_MakeDI( diCell ); + return &item->member.cell; +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL; -- 2.23.0

1 0

[PATCH 1/5] riched20: Use more cell helpers in some of the table functions.
by Huw Davies Nov. 6, 2020

Nov. 6, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/table.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 9d0d24fa1c3..83b089d6dbc 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -96,7 +96,7 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap while (para != end_para) { - para->pCell = prev_para->pCell; + para->pCell = cell_get_di( para_cell( prev_para ) ); para->nFlags |= MEPF_CELL; para->nFlags &= ~(MEPF_ROWSTART | MEPF_ROWEND); para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; @@ -128,32 +128,31 @@ ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph* table_row_end( ME_Paragraph *para ) { - ME_DisplayItem *cell; - assert( para ); + ME_Cell *cell; + if (para->nFlags & MEPF_ROWEND) return para; if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); - cell = para->pCell; - assert(cell && cell->type == diCell); - while (cell->member.cell.next_cell) - cell = cell->member.cell.next_cell; + cell = para_cell( para ); + while (cell_next( cell )) + cell = cell_next( cell ); - para = &ME_FindItemFwd( cell, diParagraph )->member.para; + para = &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; assert( para && para->nFlags & MEPF_ROWEND ); return para; } ME_Paragraph* table_row_start( ME_Paragraph *para ) { - ME_DisplayItem *cell; - assert( para ); + ME_Cell *cell; + if (para->nFlags & MEPF_ROWSTART) return para; if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); - cell = para->pCell; - assert(cell && cell->type == diCell); - while (cell->member.cell.prev_cell) - cell = cell->member.cell.prev_cell; + cell = para_cell( para ); + + while (cell_prev( cell )) + cell = cell_prev( cell ); - para = &ME_FindItemBack( cell, diParagraph )->member.para; + para = &ME_FindItemBack( cell_get_di( cell ), diParagraph )->member.para; assert( para && para->nFlags & MEPF_ROWSTART ); return para; } @@ -161,11 +160,11 @@ ME_Paragraph* table_row_start( ME_Paragraph *para ) ME_Paragraph* table_outer_para( ME_Paragraph *para ) { if (para->nFlags & MEPF_ROWEND) para = para_prev( para ); - while (para->pCell) + while (para_cell( para )) { para = table_row_start( para ); - if (!para->pCell) break; - para = &ME_FindItemBack( para->pCell, diParagraph )->member.para; + if (!para_cell( para )) break; + para = &ME_FindItemBack( cell_get_di( para_cell( para ) ), diParagraph )->member.para; } return para; } -- 2.23.0

1 0

[PATCH] wininet: Fix error handling INTERNET_OPTION_PROXY in InternetSetOptionA.
by Jiangyi Chen Nov. 6, 2020

Nov. 6, 2020

1 0

[PATCH] iphlpapi: Update a comment.
by Haoyang Chen Nov. 5, 2020

Nov. 5, 2020

1 0

[PATCH] wine.inf: Update Pacific SA Time Zone.
by Daniel Lehman Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- loader/wine.inf.in | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2699a982acb..b742b2df410 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3463,10 +3463,25 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA D HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.dll,-65009" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Std",,"@tzres.dll,-65008" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-11233" -- 2.25.1

1 0

[PATCH 1/2] wine.inf: Update Azerbaijan Time Zone.
by Daniel Lehman Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- loader/wine.inf.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ee816a5cdef..88fadca2342 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2834,7 +2834,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Dlt",,"Azerbaijan D HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.dll,-11313" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Std",,"@tzres.dll,-11312" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Std",,"Azerbaijan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2016",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azores" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"MUI_Dlt",,"@tzres.dll,-18833" -- 2.25.1

1 1

[PATCH] ole32/tests: Fix flaky test in cowait_unmarshal_thread.
by Kevin Puetz Nov. 5, 2020

Nov. 5, 2020

When run with runtest -q (WINETEST_DEBUG=0) it passed within the first 50ms, but with any verbose logging it sometimes failed. Use CoWaitForMultipleHandles (which keeps pumping the STA) since cowait_unmarshal_thread only releases its marshaled unk at the end, so it needs to be able to call back in order to exit cleanly. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> -- It's a bit weird how this was split into 50ms with message pumping (that will always time out), and then <=200ms more to actually exit. With the latter being WaitForSingleObject, if it didn't complete in that first 50ms, the call to Release will just hang anyway after test_CoWaitForMultipleHandles_thread quits pumping. We could also just combine these and give CoWaitForMultipleHandles the full 50+200ms timeout period in one call, exiting early when done, but then the RPC_S_CALLPENDING path would not be excercised. This case seems to about CoRegisterMessageFilter, so that might be OK; there are many others which would still test timeouts. But keeping the shape unchanged seems like a more conservative fix, in case there was a reason jacek wanted to test timeouts here when he added these cases in de90cca586b6a04340907ebefd31ede38f6894fa. --- dlls/ole32/tests/compobj.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5ed3f9638b1..0d7f3d8adee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2772,8 +2772,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); hr = CoWaitForMultipleHandles(0, 50, 1, &event, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - index = WaitForSingleObject(thread, 200); - ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL);

1 0

[PATCH v3 1/6] amstream: Wait for the state transition to complete in AMMultiMediaStream::SetState.
by Anton Baskanov Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/multimedia.c | 4 ++ dlls/amstream/tests/amstream.c | 76 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 82ef4822344..967baacb747 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -156,7 +156,11 @@ static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STR { hr = IMediaControl_Run(This->media_control); if (SUCCEEDED(hr)) + { + FILTER_STATE state; + IMediaControl_GetState(This->media_control, INFINITE, (OAFilterState *)&state); hr = S_OK; + } } else if (new_state == STREAMSTATE_STOP) hr = IMediaControl_Stop(This->media_control); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b436840e407..bd4f94f7327 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -924,11 +924,13 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; const AM_MEDIA_TYPE *preferred_mt; + HANDLE wait_state_event; HRESULT get_duration_hr; HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; + HRESULT wait_state_hr; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -947,6 +949,7 @@ static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, un static void testfilter_destroy(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); + CloseHandle(filter->wait_state_event); strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); } @@ -971,12 +974,27 @@ static HRESULT testfilter_cleanup_stream(struct strmbase_filter *iface) return filter->cleanup_stream_hr; } +static HRESULT testfilter_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + HRESULT hr; + + LeaveCriticalSection(&filter->filter.csFilter); + WaitForSingleObject(filter->wait_state_event, timeout); + EnterCriticalSection(&filter->filter.csFilter); + + hr = filter->wait_state_hr; + + return hr; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, .filter_init_stream = testfilter_init_stream, .filter_cleanup_stream = testfilter_cleanup_stream, + .filter_wait_state = testfilter_wait_state, }; static inline struct testfilter *impl_from_base_pin(struct strmbase_pin *iface) @@ -1060,6 +1078,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); filter->stop_position = 0x8000000000000000ULL; + filter->wait_state_event = CreateEventW(NULL, TRUE, TRUE, NULL); } static inline struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) @@ -2319,11 +2338,25 @@ static void test_initialize(void) IUnknown_Release(graph_inner_unk); } +static IAMMultiMediaStream *mmstream_mmstream; +static STREAM_STATE mmstream_state; + +static DWORD CALLBACK mmstream_set_state(void *param) +{ + HRESULT hr; + + hr = IAMMultiMediaStream_SetState(mmstream_mmstream, mmstream_state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + return 0; +} + static void test_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); struct testfilter source; IGraphBuilder *graph; + HANDLE thread; HRESULT hr; ULONG ref; @@ -2353,6 +2386,42 @@ static void test_set_state(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = E_FAIL; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + ResetEvent(source.wait_state_event); + + mmstream_mmstream = mmstream; + mmstream_state = STREAMSTATE_RUN; + thread = CreateThread(NULL, 0, mmstream_set_state, NULL, 0, NULL); + + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "SetState returned prematurely.\n"); + + EnterCriticalSection(&source.filter.csFilter); + source.wait_state_hr = S_OK; + SetEvent(source.wait_state_event); + LeaveCriticalSection(&source.filter.csFilter); + + ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); + CloseHandle(thread); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.init_stream_hr = E_FAIL; + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + source.init_stream_hr = S_OK; + source.wait_state_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); source.cleanup_stream_hr = E_FAIL; @@ -2369,6 +2438,13 @@ static void test_set_state(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); source.cleanup_stream_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.wait_state_hr = S_OK; + ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IGraphBuilder_Release(graph); -- 2.17.1

2 11