November 2020 - Wine-commits

Daniel Lehman : wine.inf: Add Dynamic DST for Australian time zones.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: da46adac997c127f1da7eba4ed25de29a9dc0965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da46adac997c127f1da7eba4… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Nov 8 23:02:34 2020 -0800 wine.inf: Add Dynamic DST for Australian time zones. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c87e6745ca1..15f0634ca5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2843,6 +2843,12 @@ HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30368" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Std",,"AUS Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Display",,"Asia/Baku" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Dlt",,"Azerbaijan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.dll,-11313" @@ -2916,6 +2922,12 @@ HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Std",,"@tzres.dll,-38928" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Std",,"Cen. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2005",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2006",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2007",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2008",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Display",,"America/Guatemala" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Dlt",,"Central America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Dlt",,"@tzres.dll,-36657" @@ -3707,6 +3719,14 @@ HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65376" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Std",,"W. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"TZI",1,20,fe,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\W. Australia Standard Time\Dynamic DST,"2005",1,20,fe,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\W. Australia Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2009",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2010",1,20,fe,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\W. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Display",,"Africa/Lagos" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Dlt",,"W. Central Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"MUI_Dlt",,"@tzres.dll,-64977"

1 0

Huw Davies : riched20: Pass a para or run ptr to the char ofs propagation function.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 47228b7db4ab57b0cb929cec13d13de6d7bb08aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=47228b7db4ab57b0cb929cec… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 08:45:03 2020 +0000 riched20: Pass a para or run ptr to the char ofs propagation function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 ++--- dlls/riched20/editor.h | 3 +-- dlls/riched20/para.c | 12 +++------ dlls/riched20/run.c | 66 +++++++++++++++++--------------------------------- 4 files changed, 29 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 813074599a7..2fa6842da13 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -413,10 +413,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, /* c = updated data now */ - if (c.run == cursor.run) - ME_SkipAndPropagateCharOffset( run_get_di( c.run ), shift ); - else - ME_PropagateCharOffset( run_get_di( c.run ), shift ); + if (c.run == cursor.run) c.run->nCharOfs -= shift; + editor_propagate_char_ofs( NULL, c.run, shift ); if (!cursor.run->len) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d06fcef332f..c29619cc793 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -126,12 +126,12 @@ static inline ME_DisplayItem *row_get_di( ME_Row *row ) 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; +void editor_propagate_char_ofs( ME_Paragraph *para, ME_Run *run, int shift ) DECLSPEC_HIDDEN; int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; @@ -147,7 +147,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a8168ff0daa..1a53ba46a27 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -674,7 +674,7 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); + editor_propagate_char_ofs( next_para, NULL, eol_len ); editor->nParagraphs++; return new_para; @@ -688,8 +688,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir 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; + int i, end_len; CHARFORMAT2W fmt; ME_Cursor startCur, endCur; ME_String *eol_str; @@ -751,8 +750,6 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir para->border = next->border; } - shift = next->nCharOfs - para->nCharOfs - end_len; - /* Update selection cursors so they don't point to the removed end * paragraph run, and point to the correct paragraph. */ for (i = 0; i < editor->nCursors; i++) @@ -768,8 +765,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir for (tmp_run = next_first_run; tmp_run; tmp_run = run_next( tmp_run )) { - TRACE( "shifting %s by %d (previous %d)\n", debugstr_run( tmp_run ), shift, tmp_run->nCharOfs ); - tmp_run->nCharOfs += shift; + tmp_run->nCharOfs += next->nCharOfs - para->nCharOfs - end_len; tmp_run->para = para; } @@ -789,7 +785,7 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir ME_Remove( para_get_di(next) ); para_destroy( editor, next ); - ME_PropagateCharOffset( para->next_para, -end_len ); + editor_propagate_char_ofs( para_next( para ), NULL, -end_len ); ME_CheckCharOffsets(editor); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index db0ae0a6aa0..fdda43ba51a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -137,54 +137,32 @@ BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) return TRUE; } -void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) -{ - p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); - assert(p); - ME_PropagateCharOffset(p, shift); -} - /****************************************************************************** - * ME_PropagateCharOffsets + * editor_propagate_char_ofs * * Shifts (increases or decreases) character offset (relative to beginning of - * the document) of the part of the text starting from given place. + * the document) of the part of the text starting from given place. + * Call with only one of para or run non-NULL. */ -void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) +void editor_propagate_char_ofs( ME_Paragraph *para, ME_Run *run, int shift ) { - /* Runs in one paragraph contain character offset relative to their owning - * paragraph. If we start the shifting from the run, we need to shift - * all the relative offsets until the end of the paragraph - */ - if (p->type == diRun) /* propagate in all runs in this para */ - { - TRACE("PropagateCharOffset(%s, %d)\n", debugstr_run( &p->member.run ), shift); - do { - p->member.run.nCharOfs += shift; - assert(p->member.run.nCharOfs >= 0); - p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); - } while(p->type == diRun); - } - /* Runs in next paragraphs don't need their offsets updated, because they, - * again, those offsets are relative to their respective paragraphs. - * Instead of that, we're updating paragraphs' character offsets. - */ - if (p->type == diParagraph) /* propagate in all next paras */ - { - do { - p->member.para.nCharOfs += shift; - assert(p->member.para.nCharOfs >= 0); - p = p->member.para.next_para; - } while(p->type == diParagraph); - } - /* diTextEnd also has character offset in it, which makes finding text length - * easier. But it needs to be up to date first. - */ - if (p->type == diTextEnd) - { - p->member.para.nCharOfs += shift; - assert(p->member.para.nCharOfs >= 0); - } + assert( !para ^ !run ); + + if (run) + { + para = para_next( run->para ); + do + { + run->nCharOfs += shift; + run = run_next( run ); + } while (run); + } + + do + { + para->nCharOfs += shift; + para = para_next( para ); + } while (para); } /****************************************************************************** @@ -422,7 +400,7 @@ ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertString( run->para->text, run->nCharOfs, str, len ); ME_InsertBefore( run_get_di( insert_before ), run_get_di( run ) ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset( run_get_di( insert_before ), len ); + editor_propagate_char_ofs( NULL, insert_before, len ); para_mark_rewrap( editor, insert_before->para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */

1 0

Huw Davies : riched20: Use row ptrs in the page up/down handlers.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: ab95fb31fc0e81d802064ba328bcb592ef57f49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab95fb31fc0e81d802064ba3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 08:45:04 2020 +0000 riched20: Use row ptrs in the page up/down handlers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 135 ++++++++++++++++++------------------------------- dlls/riched20/editor.h | 3 ++ dlls/riched20/row.c | 26 ++++++++++ 3 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2fa6842da13..f36c00458b8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1272,105 +1272,68 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL row_cursor( editor, &pItem->member.row, x, pCursor ); } -static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowPageUp( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *p = ME_FindItemFwd(editor->pBuffer->pFirst, diStartRow); + ME_Row *row = para_first_row( editor_first_para( editor ) ), *last_row; + int x, yd, old_scroll_pos = editor->vert_si.nPos; - if (editor->vert_si.nPos < p->member.row.nHeight) - { - ME_SetCursorToStart(editor, pCursor); - /* Native clears seems to clear this x value on page up at the top - * of the text, but not on page down at the end of the text. - * Doesn't make sense, but we try to be bug for bug compatible. */ - editor->nUDArrowX = -1; - } else { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_DisplayItem *pLast; - int x, y, yd, yp; - int yOldScrollPos = editor->vert_si.nPos; - - x = ME_GetXForArrow(editor, pCursor); - - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - y = yp + p->member.row.pt.y; + if (editor->vert_si.nPos < row->nHeight) + { + ME_SetCursorToStart( editor, cursor ); + /* Native clears seems to clear this x value on page up at the top + * of the text, but not on page down at the end of the text. + * Doesn't make sense, but we try to be bug for bug compatible. */ + editor->nUDArrowX = -1; + } + else + { + x = ME_GetXForArrow( editor, cursor ); + row = row_from_cursor( cursor ); - ME_ScrollUp(editor, editor->sizeWindow.cy); - /* Only move the cursor by the amount scrolled. */ - yd = y + editor->vert_si.nPos - yOldScrollPos; - pLast = p; + ME_ScrollUp( editor, editor->sizeWindow.cy ); + /* Only move the cursor by the amount scrolled. */ + yd = cursor->para->pt.y + row->pt.y + editor->vert_si.nPos - old_scroll_pos; + last_row = row; - do { - p = ME_FindItemBack(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { /* crossing paragraphs */ - if (p->member.para.prev_para == NULL) - break; - yp = p->member.para.prev_para->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y < yd) - break; - pLast = p; - } while(1); + while ((row = row_prev_all_paras( row ))) + { + if (row_para( row )->pt.y + row->pt.y < yd) break; + last_row = row; + } - row_cursor( editor, &pLast->member.row, x, pCursor ); - } + row_cursor( editor, last_row, x, cursor ); + } } -static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowPageDown( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pLast; - int x, y; + ME_Row *row = para_end_row( para_prev( editor_end_para( editor ) ) ), *last_row; + int x, yd, old_scroll_pos = editor->vert_si.nPos; - /* Find y position of the last row */ - pLast = editor->pBuffer->pLast; - y = pLast->member.para.prev_para->member.para.pt.y - + ME_FindItemBack(pLast, diStartRow)->member.row.pt.y; + x = ME_GetXForArrow( editor, cursor ); - x = ME_GetXForArrow(editor, pCursor); + if (editor->vert_si.nPos >= row_para( row )->pt.y + row->pt.y - editor->sizeWindow.cy) + ME_SetCursorToEnd( editor, cursor, FALSE ); + else + { + row = row_from_cursor( cursor ); - if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) - { - ME_SetCursorToEnd(editor, pCursor, FALSE); - } else { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_DisplayItem *p; - int yd, yp; - int yOldScrollPos = editor->vert_si.nPos; - - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - y = yp + p->member.row.pt.y; - - /* For native richedit controls: - * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us - * v4.1 can scroll past this position here. */ - ME_ScrollDown(editor, editor->sizeWindow.cy); - /* Only move the cursor by the amount scrolled. */ - yd = y + editor->vert_si.nPos - yOldScrollPos; - pLast = p; + /* For native richedit controls: + * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us + * v4.1 can scroll past this position here. */ + ME_ScrollDown( editor, editor->sizeWindow.cy ); + /* Only move the cursor by the amount scrolled. */ + yd = cursor->para->pt.y + row->pt.y + editor->vert_si.nPos - old_scroll_pos; + last_row = row; - do { - p = ME_FindItemFwd(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { - yp = p->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y >= yd) - break; - pLast = p; - } while(1); + while ((row = row_next_all_paras( row ))) + { + if (row_para( row )->pt.y + row->pt.y >= yd) break; + last_row = row; + } - row_cursor( editor, &pLast->member.row, x, pCursor ); - } + row_cursor( editor, last_row, x, cursor ); + } } static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c29619cc793..e7ae7b806be 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -115,8 +115,11 @@ ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_next_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) DECLSPEC_HIDDEN; +ME_Paragraph *row_para( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_prev_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index f5d3ad15701..715d2adbf62 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -33,6 +33,24 @@ ME_Row *row_next( ME_Row *row ) return &item->member.row; } +ME_Row *row_next_all_paras( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Row *row_prev_all_paras( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + ME_Run *row_first_run( ME_Row *row ) { ME_DisplayItem *item; @@ -82,6 +100,14 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->run->len : 0; } +ME_Paragraph *row_para( ME_Row *row ) +{ + ME_Cursor cursor; + + row_first_cursor( row, &cursor ); + return cursor.para; +} + ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { ME_Paragraph *para = editor_first_para( editor );

1 0

Huw Davies : riched20: Use row and para ptrs in the cursor up/down handler.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: cb9353bca95a5d1d05decf366ae3230eb0fb9c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9353bca95a5d1d05decf36… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 08:45:05 2020 +0000 riched20: Use row and para ptrs in the cursor up/down handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 130 +++++++++++++++++++++++-------------------------- dlls/riched20/editor.h | 1 - dlls/riched20/para.c | 4 -- 3 files changed, 60 insertions(+), 75 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index f36c00458b8..6417bbde442 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1196,80 +1196,70 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) } -static void -ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) +static void cursor_move_line( ME_TextEditor *editor, ME_Cursor *cursor, BOOL up, BOOL extend ) { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_Paragraph *old_para = pCursor->para, *new_para; - ME_DisplayItem *pItem; - int x = ME_GetXForArrow(editor, pCursor); + ME_Paragraph *old_para = cursor->para, *new_para; + ME_Row *row = row_from_cursor( cursor ); + int x = ME_GetXForArrow( editor, cursor ); - if (nRelOfs == -1) - { - /* start of this row */ - pItem = ME_FindItemBack(pRun, diStartRow); - assert(pItem); - /* start of the previous row */ - pItem = ME_FindItemBack(pItem, diStartRow); - if (!pItem) /* row not found */ - { - if (extend) - ME_SetCursorToStart(editor, pCursor); - return; - } - new_para = &ME_GetParagraph(pItem)->member.para; - if (old_para->nFlags & MEPF_ROWEND || - (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) - { - /* Brought out of a cell */ - new_para = para_prev( table_row_start( old_para )); - if (!new_para) return; /* At the top, so don't go anywhere. */ - pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow); - } - if (new_para->nFlags & MEPF_ROWEND) - { - /* Brought into a table row */ - ME_Cell *cell = table_row_end_cell( new_para ); - while (x < cell->pt.x && cell_prev( cell )) - cell = cell_prev( cell ); - if (cell_next( cell )) /* else - we are still at the end of the row */ - pItem = ME_FindItemBack( cell_get_di( cell_next( cell ) ), diStartRow ); - } - } - else - { - /* start of the next row */ - pItem = ME_FindItemFwd(pRun, diStartRow); - if (!pItem) /* row not found */ - { - if (extend) - ME_SetCursorToEnd(editor, pCursor, TRUE); - return; - } - new_para = &ME_GetParagraph(pItem)->member.para; - if (old_para->nFlags & MEPF_ROWSTART || - (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + if (up) { - /* Brought out of a cell */ - new_para = para_next( table_row_end( old_para ) ); - if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ - pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow ); + /* start of the previous row */ + row = row_prev_all_paras( row ); + if (!row) + { + if (extend) ME_SetCursorToStart( editor, cursor ); + return; + } + new_para = row_para( row ); + if (old_para->nFlags & MEPF_ROWEND || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + { + /* Brought out of a cell */ + new_para = para_prev( table_row_start( old_para )); + if (!new_para) return; /* At the top, so don't go anywhere. */ + row = para_first_row( new_para ); + } + if (new_para->nFlags & MEPF_ROWEND) + { + /* Brought into a table row */ + ME_Cell *cell = table_row_end_cell( new_para ); + while (x < cell->pt.x && cell_prev( cell )) + cell = cell_prev( cell ); + if (cell_next( cell )) /* else - we are still at the end of the row */ + row = para_end_row( cell_end_para( cell ) ); + } } - if (new_para->nFlags & MEPF_ROWSTART) + else { - /* Brought into a table row */ - ME_Cell *cell = table_row_first_cell( new_para ); - while (cell_next( cell ) && x >= cell_next( cell )->pt.x) - cell = cell_next( cell ); - pItem = ME_FindItemFwd( cell_get_di( cell ), diStartRow ); + /* start of the next row */ + row = row_next_all_paras( row ); + if (!row) + { + if (extend) ME_SetCursorToEnd( editor, cursor, TRUE ); + return; + } + new_para = row_para( row ); + if (old_para->nFlags & MEPF_ROWSTART || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + { + /* Brought out of a cell */ + new_para = para_next( table_row_end( old_para ) ); + if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ + row = para_first_row( new_para ); + } + if (new_para->nFlags & MEPF_ROWSTART) + { + /* Brought into a table row */ + ME_Cell *cell = table_row_first_cell( new_para ); + while (cell_next( cell ) && x >= cell_next( cell )->pt.x) + cell = cell_next( cell ); + row = para_first_row( cell_first_para( cell ) ); + } } - } - if (!pItem) - { - /* row not found - ignore */ - return; - } - row_cursor( editor, &pItem->member.row, x, pCursor ); + if (!row) return; + + row_cursor( editor, row, x, cursor ); } static void ME_ArrowPageUp( ME_TextEditor *editor, ME_Cursor *cursor ) @@ -1434,10 +1424,10 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: - ME_MoveCursorLines(editor, &tmp_curs, -1, extend); + cursor_move_line( editor, &tmp_curs, TRUE, extend ); break; case VK_DOWN: - ME_MoveCursorLines(editor, &tmp_curs, +1, extend); + cursor_move_line( editor, &tmp_curs, FALSE, extend ); break; case VK_PRIOR: ME_ArrowPageUp(editor, &tmp_curs); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7ae7b806be..7a9d445f98f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,7 +208,6 @@ void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ) DE void editor_mark_rewrap_all( ME_TextEditor *editor ) DECLSPEC_HIDDEN; void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1a53ba46a27..c0f2a7b5471 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -794,10 +794,6 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir return para; } -ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *item) { - return ME_FindItemBackOrHere(item, diParagraph); -} - void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) { char *p;

1 0

Huw Davies : riched20: Simplify search for the cell to delete.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 378a86b8b62c5c586ab4044d91d5e2ddb8c5dc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=378a86b8b62c5c586ab4044d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 08:45:06 2020 +0000 riched20: Simplify search for the cell to delete. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c0f2a7b5471..cb98218aeab 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -684,7 +684,6 @@ 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; ME_Paragraph *next = para_next( para ); ME_Run *end_run, *next_first_run, *tmp_run; ME_Cell *cell = NULL; @@ -717,20 +716,13 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir if (!editor->bEmulateVersion10) /* v4.1 */ { + /* Remove cell boundary if it is between the end paragraph run and the next + * paragraph display item. */ + if (para->cell != next->cell) cell = next->cell; + /* Table cell/row properties are always moved over from the removed para. */ para->nFlags = next->nFlags; para->cell = next->cell; - - /* Remove cell boundary if it is between the end paragraph run and the next - * paragraph display item. */ - for (tmp = run_get_di( end_run ); tmp != para_get_di( next ); tmp = tmp->next) - { - if (tmp->type == diCell) - { - cell = &tmp->member.cell; - break; - } - } } add_undo_split_para( editor, next, eol_str, cell );

1 0

Huw Davies : riched20: Move the code to clear the cell bottom out of the loop.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 3f0c4d5c72ec49a22c001752daff9a39fd0ed4c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f0c4d5c72ec49a22c001752… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 08:45:07 2020 +0000 riched20: Move the code to clear the cell bottom out of the loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ad2ffb9abb9..ffb50d5ceff 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1015,26 +1015,24 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) ME_DebugWrite(c->hDC, &pt, buf); } break; - case diCell: - /* Clear any space at the bottom of the cell after the text. */ - if (para->nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) - break; - y += height; - rc.top = c->pt.y + para->pt.y + para->nHeight; - rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; - if (RectVisible(c->hDC, &rc)) - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); - break; default: break; } no++; } - draw_table_borders( c, para ); - draw_para_number( c, para ); + if (para_cell( para )) + { + /* Clear any space at the bottom of the cell after the text. */ + rc.top = c->pt.y + para->pt.y + para->nHeight; + rc.bottom = c->pt.y + cell->pt.y + cell->nHeight; + PatBlt( c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + } + + draw_table_borders( c, para ); + draw_para_number( c, para ); - SetTextAlign(c->hDC, align); + SetTextAlign( c->hDC, align ); } void ME_ScrollAbs(ME_TextEditor *editor, int x, int y)

1 0

Esme Povirk : windowscodecs: Move jpeg decoding to the unix lib.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: c837215382c3c42ea38cb931319e46a5acfe288d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c837215382c3c42ea38cb931… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Nov 8 11:10:02 2020 -0600 windowscodecs: Move jpeg decoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 7 + dlls/windowscodecs/jpegformat.c | 671 +-------------------------------- dlls/windowscodecs/libjpeg.c | 464 +++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 2 + 6 files changed, 491 insertions(+), 657 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c837215382c3c42ea38c…

1 0

Zebediah Figura : quartz: Don't hold an extra reference in async_run_cb().
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: c44173dd496aa1d1c499e593b7902b2879730a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44173dd496aa1d1c499e593… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 6 13:46:05 2020 -0600 quartz: Don't hold an extra reference in async_run_cb(). We don't actually need to, because we'll wait for the callback when stopping the graph. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49907 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0f22bb5888c..b7f15695a6d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1837,7 +1837,6 @@ static void CALLBACK async_run_cb(TP_CALLBACK_INSTANCE *instance, void *context, } LeaveCriticalSection(&graph->cs); - IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) @@ -1897,7 +1896,6 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) if (!graph->async_run_work) graph->async_run_work = CreateThreadpoolWork(async_run_cb, graph, NULL); graph->needs_async_run = 1; - IUnknown_AddRef(graph->outer_unk); SubmitThreadpoolWork(graph->async_run_work); } else @@ -5008,9 +5006,8 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) LeaveCriticalSection(&graph->cs); - /* Don't cancel the callback; it's holding a reference to the graph. */ if (work) - WaitForThreadpoolWorkCallbacks(work, FALSE); + WaitForThreadpoolWorkCallbacks(work, TRUE); return hr; } @@ -5059,9 +5056,8 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) LeaveCriticalSection(&graph->cs); - /* Don't cancel the callback; it's holding a reference to the graph. */ if (work) - WaitForThreadpoolWorkCallbacks(work, FALSE); + WaitForThreadpoolWorkCallbacks(work, TRUE); return hr; }

1 0

Zebediah Figura : quartz/tests: Test releasing the graph while waiting for an asynchronous paused -> running transition.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 40a43d72a234b2b0cd4901530e8864d33c4d00bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a43d72a234b2b0cd490153… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 6 13:46:06 2020 -0600 quartz/tests: Test releasing the graph while waiting for an asynchronous paused -> running transition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 20a730f6aa0..4d2a3195b6d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3613,6 +3613,27 @@ todo_wine ok(sink.state == State_Stopped, "Got state %u.\n", sink.state); ok(source.state == State_Stopped, "Got state %u.\n", source.state); + /* Same, but tear down the graph instead. */ + + sink.state_hr = S_FALSE; + sink.GetState_hr = VFW_S_STATE_INTERMEDIATE; + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IMediaFilter_Release(filter); + IMediaControl_Release(control); + IMediaSeeking_Release(seeking); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + graph = create_graph(); + IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); + IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + IPin_Connect(&source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + /* This logic doesn't apply when using IMediaFilter methods directly. */ source.expect_run_prev = sink.expect_run_prev = State_Stopped; @@ -3692,11 +3713,6 @@ todo_wine hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); -todo_wine - ok(source.start_time > 0 && source.start_time < 500 * 10000, - "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); - ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", - wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); source.expect_stop_prev = sink.expect_stop_prev = State_Running; IMediaFilter_Release(filter);

1 0

Ziqing Hui : windowscodecs: Correctly set pixel format of uncompressed DDS with extended header.
by Alexandre Julliard 09 Nov '20

09 Nov '20

Module: wine Branch: master Commit: 3b531c06e009a15d0f77c55bf724d4772ae68038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b531c06e009a15d0f77c55b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 6 11:43:47 2020 +0800 windowscodecs: Correctly set pixel format of uncompressed DDS with extended header. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 36 ++++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 5 ----- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 9e6886e7ea7..d0932767d6f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -251,7 +251,24 @@ static struct dds_format { &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R8G8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, - { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } + { { 0 }, &GUID_WICPixelFormat8bppAlpha, 8, DXGI_FORMAT_A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppGray, 16, DXGI_FORMAT_R16_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppGrayHalf, 16, DXGI_FORMAT_R16_FLOAT }, + { { 0 }, &GUID_WICPixelFormat16bppBGR565, 16, DXGI_FORMAT_B5G6R5_UNORM }, + { { 0 }, &GUID_WICPixelFormat16bppBGRA5551, 16, DXGI_FORMAT_B5G5R5A1_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppGrayFloat, 32, DXGI_FORMAT_R32_FLOAT }, + { { 0 }, &GUID_WICPixelFormat32bppRGBA, 32, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppBGRA, 32, DXGI_FORMAT_B8G8R8A8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppBGR, 32, DXGI_FORMAT_B8G8R8X8_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppR10G10B10A2, 32, DXGI_FORMAT_R10G10B10A2_UNORM }, + { { 0 }, &GUID_WICPixelFormat32bppRGBE, 32, DXGI_FORMAT_R9G9B9E5_SHAREDEXP }, + { { 0 }, &GUID_WICPixelFormat32bppRGBA1010102XR, 32, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM }, + { { 0 }, &GUID_WICPixelFormat64bppRGBA, 64, DXGI_FORMAT_R16G16B16A16_UNORM }, + { { 0 }, &GUID_WICPixelFormat64bppRGBAHalf, 64, DXGI_FORMAT_R16G16B16A16_FLOAT }, + { { 0 }, &GUID_WICPixelFormat96bppRGBFloat, 96, DXGI_FORMAT_R32G32B32_FLOAT }, + { { 0 }, &GUID_WICPixelFormat128bppRGBAFloat, 128, DXGI_FORMAT_R32G32B32A32_FLOAT }, + { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } }; static DXGI_FORMAT compressed_formats[] = { @@ -449,6 +466,18 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) +{ + UINT i; + for (i = 0; i < ARRAY_SIZE(dds_format_table); i++) + { + if (dds_format_table[i].pixel_format.size == 0 && + dds_format_table[i].dxgi_format == dxgi_format) + return dds_format_table[i].wic_format; + } + return &GUID_WICPixelFormatUndefined; +} + static BOOL is_compressed(DXGI_FORMAT format) { UINT i; @@ -485,9 +514,8 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; info->pixel_format_bpp = 32; } else { - info->pixel_format = &GUID_WICPixelFormatUndefined; - info->pixel_format_bpp = 0; - FIXME("Pixel format is incorrect for uncompressed DDS image with extended header\n"); + info->pixel_format = dxgi_format_to_wic_format(info->format); + info->pixel_format_bpp = get_bytes_per_block_from_format(info->format) * 8; } } else { format_info = get_dds_format(&header->ddspf); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 2e7304b9d42..b7b002d380d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -941,7 +941,6 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format)); @@ -1076,7 +1075,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); @@ -1113,7 +1111,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); - } hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); @@ -1126,7 +1123,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } - todo_wine_if(IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat96bppRGBFloat)) { memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); @@ -1152,7 +1148,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; } - } } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i)

1 0