November 2018 - Wine-commits

Sergio Gómez Del Real : riched20: Add helper function to mark paragraphs for rewrapping.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: ad5887564297ee95da7e7e848f7aff5a13970ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5887564297ee95da7e7e84… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:51 2018 -0500 riched20: Add helper function to mark paragraphs for rewrapping. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 3 ++- dlls/riched20/editor.h | 2 ++ dlls/riched20/para.c | 33 ++++++++++++++++++++++----------- dlls/riched20/run.c | 8 ++++---- dlls/riched20/undo.c | 2 +- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4664f0c..ad72511 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -380,7 +380,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - ME_FindItemBack(c.pRun, diParagraph)->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, ME_FindItemBack(c.pRun, diParagraph)); cursor = c; /* nChars is the number of characters that should be deleted from the diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d79888b..9ecba6f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2564,7 +2564,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun->member.run.style); para = editor->pBuffer->pFirst->member.para.next_para; ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = MEPF_REWRAP; + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eb37368..3b4dc54 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -203,6 +203,8 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +ME_DisplayItem *get_di_from_para(ME_Paragraph *para) DECLSPEC_HIDDEN; /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c5755b1..85703b5 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,6 +23,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); +void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) +{ + para->member.para.nFlags |= MEPF_REWRAP; +} + +ME_DisplayItem *get_di_from_para(ME_Paragraph *para) +{ + return (ME_DisplayItem *)((ptrdiff_t)para - offsetof(ME_DisplayItem, member)); +} + static ME_DisplayItem *make_para(ME_TextEditor *editor) { ME_DisplayItem *item = ME_MakeDI(diParagraph); @@ -143,7 +153,7 @@ static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, con { while(first != last) { - first->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, first); first = first->member.para.next_para; } } @@ -366,11 +376,11 @@ void para_num_clear( struct para_num *pn ) pn->text = NULL; } -static void para_num_clear_list( ME_Paragraph *para, const PARAFORMAT2 *orig_fmt ) +static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, const PARAFORMAT2 *orig_fmt ) { do { - para->nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, get_di_from_para(para)); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -445,12 +455,12 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - para->nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, get_di_from_para(para)); if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) { - para_num_clear_list( para, &copy ); + para_num_clear_list( editor, para, &copy ); } } @@ -487,7 +497,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* Clear any cached para numbering following this paragraph */ if (run_para->member.para.fmt.wNumbering) - para_num_clear_list( &run_para->member.para, &run_para->member.para.fmt ); + para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); @@ -519,7 +529,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; new_para->member.para.nCharOfs += eol_len; - new_para->member.para.nFlags = MEPF_REWRAP; + new_para->member.para.nFlags = 0; + mark_para_rewrap(editor, new_para); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ new_para->member.para.fmt = run_para->member.para.fmt; @@ -585,8 +596,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } /* force rewrap of the */ - run_para->member.para.prev_para->member.para.nFlags |= MEPF_REWRAP; - new_para->member.para.prev_para->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, run_para->member.para.prev_para); + mark_para_rewrap(editor, new_para->member.para.prev_para); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); @@ -613,7 +624,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, /* Clear any cached para numbering following this paragraph */ if (tp->member.para.fmt.wNumbering) - para_num_clear_list( &tp->member.para, &tp->member.para.fmt ); + para_num_clear_list( editor, &tp->member.para, &tp->member.para.fmt ); pNext = tp->member.para.next_para; @@ -721,7 +732,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_CheckCharOffsets(editor); editor->nParagraphs--; - tp->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, tp); return tp; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 73adc7e..76f509c 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -224,7 +224,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) int i; assert(p->type == diRun && pNext->type == diRun); assert(p->member.run.nCharOfs != -1); - ME_GetParagraph(p)->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, ME_GetParagraph(p)); /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { @@ -277,7 +277,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) editor->pCursors[i].nOffset -= nOffset; } } - cursor->pPara->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, cursor->pPara); return run; } @@ -345,7 +345,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); - insert_before->member.run.para->nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, get_di_from_para(insert_before->member.run.para)); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ prev = ME_FindItemBack( pDI, diRun ); @@ -766,7 +766,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; } - para->nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, get_di_from_para(para)); } } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 582f888..2f18fc7 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,7 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; - para->member.para.nFlags |= MEPF_REWRAP; + mark_para_rewrap(editor, para); break; } case undo_set_char_fmt:

1 0

Sergio Gómez Del Real : riched20: Guard paragraph wrapping against special case where type is diTextStart.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 618f0a8b2aa1786268d452dfd17d8aaaea399d97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=618f0a8b2aa1786268d452df… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:52 2018 -0500 riched20: Guard paragraph wrapping against special case where type is diTextStart. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 85703b5..ae2227e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -596,7 +596,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } /* force rewrap of the */ - mark_para_rewrap(editor, run_para->member.para.prev_para); + if (run_para->member.para.prev_para->type == diParagraph) + mark_para_rewrap(editor, run_para->member.para.prev_para); + mark_para_rewrap(editor, new_para->member.para.prev_para); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */

1 0

Sergio Gómez Del Real : riched20: Implement list of marked paragraphs.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 195f84cfa1b81d3b526dde64f614169d5da5d86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=195f84cfa1b81d3b526dde64… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:53 2018 -0500 riched20: Implement list of marked paragraphs. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 ++ dlls/riched20/editstr.h | 2 ++ dlls/riched20/para.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/wrap.c | 60 +++++++++++++++++++++++++++++--------- 5 files changed, 127 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ecba6f..bf4c8ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3035,6 +3035,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ed->exStyleFlags = 0; + ed->first_marked_para = NULL; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD| diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 3b4dc54..2da7365 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -205,6 +205,8 @@ void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; ME_DisplayItem *get_di_from_para(ME_Paragraph *para) DECLSPEC_HIDDEN; +void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 206ce85..2cd16c9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -219,6 +219,7 @@ typedef struct tagME_Paragraph struct para_num para_num; ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; + struct tagME_DisplayItem *prev_marked, *next_marked; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -432,6 +433,7 @@ typedef struct tagME_TextEditor int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ ME_SelectionType nSelectionType; + ME_DisplayItem *first_marked_para; /* Track previous notified selection */ CHARRANGE notified_cr; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ae2227e..aaa2bda 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) { para->member.para.nFlags |= MEPF_REWRAP; + add_marked_para(editor, para); } ME_DisplayItem *get_di_from_para(ME_Paragraph *para) @@ -39,6 +40,8 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; + item->member.para.next_marked = item->member.para.prev_marked = NULL; + return item; } @@ -53,6 +56,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) } ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); + remove_marked_para(editor, item); ME_DestroyDisplayItem(item); } @@ -74,6 +78,77 @@ int get_total_width(ME_TextEditor *editor) return total_width; } +void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +{ + ME_DisplayItem *head = editor->first_marked_para; + + assert(di->type == diParagraph); + if (!di->member.para.next_marked && !di->member.para.prev_marked) + { + if (di == head) + editor->first_marked_para = NULL; + } + else if (di->member.para.next_marked && di->member.para.prev_marked) + { + di->member.para.prev_marked->member.para.next_marked = di->member.para.next_marked; + di->member.para.next_marked->member.para.prev_marked = di->member.para.prev_marked; + di->member.para.prev_marked = di->member.para.next_marked = NULL; + } + else if (di->member.para.next_marked) + { + assert(di == editor->first_marked_para); + editor->first_marked_para = di->member.para.next_marked; + di->member.para.next_marked->member.para.prev_marked = NULL; + di->member.para.next_marked = NULL; + } + else + { + di->member.para.prev_marked->member.para.next_marked = NULL; + di->member.para.prev_marked = NULL; + } +} + +void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +{ + ME_DisplayItem *iter = editor->first_marked_para; + + if (!iter) + { + editor->first_marked_para = di; + return; + } + while (iter) + { + if (iter == di) + return; + else if (di->member.para.nCharOfs < iter->member.para.nCharOfs) + { + if (iter == editor->first_marked_para) + editor->first_marked_para = di; + di->member.para.next_marked = iter; + iter->member.para.prev_marked = di; + break; + } + else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) + { + if (!iter->member.para.next_marked || + (iter->member.para.next_marked && + di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs)) + { + if (iter->member.para.next_marked) + { + di->member.para.next_marked = iter->member.para.next_marked; + iter->member.para.next_marked->member.para.prev_marked = di; + } + di->member.para.prev_marked = iter; + iter->member.para.next_marked = di; + break; + } + } + iter = iter->member.para.next_marked; + } +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -146,6 +221,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; + add_marked_para(editor, para); ME_DestroyContext(&c); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e1ec692..c2e3f62 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1098,29 +1098,61 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; ME_Context c; - int totalWidth = 0; + int totalWidth = editor->nTotalWidth, diff = 0, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; + ME_Paragraph *para; + + if (!editor->first_marked_para) + return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - c.pt.x = 0; - item = editor->pBuffer->pFirst->next; - while(item != editor->pBuffer->pLast) { - BOOL bRedraw = FALSE; + item = editor->first_marked_para; + c.pt = item->member.para.pt; + while (item != editor->pBuffer->pLast) + { assert(item->type == diParagraph); - if ((item->member.para.nFlags & MEPF_REWRAP) - || (item->member.para.pt.y != c.pt.y)) - bRedraw = TRUE; - item->member.para.pt = c.pt; + prev_width = item->member.para.nWidth; ME_WrapTextParagraph(&c, item); + if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) + totalWidth = get_total_width(editor); + else + totalWidth = max(totalWidth, item->member.para.nWidth); - if (bRedraw) - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - + if (!item->member.para.nCharOfs) + ME_MarkRepaintEnd(item->member.para.prev_para, &repaint_start, &repaint_end); + ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); adjust_para_y(item, &c, repaint_start, repaint_end); - totalWidth = max(totalWidth, item->member.para.nWidth); - item = item->member.para.next_para; + + if (item->member.para.next_para) + { + diff = c.pt.y - item->member.para.next_para->member.para.pt.y; + if (diff) + { + para = &item->member.para; + while (para->next_para && para != &item->member.para.next_marked->member.para && + para != &editor->pBuffer->pLast->member.para) + { + ME_MarkRepaintEnd(para->next_para, &repaint_start, &repaint_end); + para->next_para->member.para.pt.y = c.pt.y; + adjust_para_y(para->next_para, &c, repaint_start, repaint_end); + para = &para->next_para->member.para; + } + } + } + if (item->member.para.next_marked) + { + ME_DisplayItem *rem = item; + item = item->member.para.next_marked; + remove_marked_para(editor, rem); + } + else + { + remove_marked_para(editor, item); + item = editor->pBuffer->pLast; + } + c.pt.y = item->member.para.pt.y; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top;

1 0

Sergio Gómez Del Real : riched20: Cache number of rows in editor.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: a60965a156b2774e8855e313ade77bb859814003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60965a156b2774e8855e313… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:54 2018 -0500 riched20: Cache number of rows in editor. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 17 ++++------------- dlls/riched20/editstr.h | 1 + dlls/riched20/para.c | 1 + dlls/riched20/wrap.c | 10 ++++++---- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bf4c8ea..052400c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3036,6 +3036,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->styleFlags = 0; ed->exStyleFlags = 0; ed->first_marked_para = NULL; + ed->total_rows = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD| @@ -4215,22 +4216,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINECOUNT: { - ME_DisplayItem *item = editor->pBuffer->pFirst->next; - int nRows = 0; - + ME_DisplayItem *item = editor->pBuffer->pLast; + int nRows = editor->total_rows; ME_DisplayItem *prev_para = NULL, *last_para = NULL; - while (item != editor->pBuffer->pLast) - { - assert(item->type == diParagraph); - prev_para = ME_FindItemBack(item, diRun); - if (prev_para) { - assert(prev_para->member.run.nFlags & MERF_ENDPARA); - } - nRows += item->member.para.nRows; - item = item->member.para.next_para; - } last_para = ME_FindItemBack(item, diRun); + prev_para = ME_FindItemBack(last_para, diRun); assert(last_para); assert(last_para->member.run.nFlags & MERF_ENDPARA); if (editor->bEmulateVersion10 && prev_para && diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2cd16c9..96c9a1f 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -397,6 +397,7 @@ typedef struct tagME_TextEditor int nTotalWidth, nLastTotalWidth; int nAvailWidth; /* 0 = wrap to client area, else wrap width in twips */ int nUDArrowX; + int total_rows; COLORREF rgbBackColor; HBRUSH hbrBackground; BOOL bCaretAtEnd; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index aaa2bda..c4ddb65 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -54,6 +54,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) item->member.para.nWidth = 0; editor->nTotalWidth = get_total_width(editor); } + editor->total_rows -= item->member.para.nRows; ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); remove_marked_para(editor, item); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c2e3f62..c344494 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -733,12 +733,13 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; } -static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { +static void ME_PrepareParagraphForWrapping(ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p; tp->member.para.nWidth = 0; /* remove row start items as they will be reinserted by the * paragraph wrapper anyway */ + editor->total_rows -= tp->member.para.nRows; tp->member.para.nRows = 0; for (p = tp->next; p != tp->member.para.next_para; p = p->next) { if (p->type == diStartRow) { @@ -870,7 +871,7 @@ static HRESULT shape_para( ME_Context *c, ME_DisplayItem *p ) return hr; } -static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { +static void ME_WrapTextParagraph(ME_TextEditor *editor, ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p; ME_WrapContext wc; int border = 0; @@ -881,7 +882,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { if (!(tp->member.para.nFlags & MEPF_REWRAP)) { return; } - ME_PrepareParagraphForWrapping(c, tp); + ME_PrepareParagraphForWrapping(editor, c, tp); /* Calculate paragraph numbering label */ para_num_init( c, &tp->member.para ); @@ -969,6 +970,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { tp->member.para.nFlags &= ~MEPF_REWRAP; tp->member.para.nHeight = wc.pt.y; tp->member.para.nRows = wc.nRow; + editor->total_rows += wc.nRow; } static void ME_MarkRepaintEnd(ME_DisplayItem *para, @@ -1114,7 +1116,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) assert(item->type == diParagraph); prev_width = item->member.para.nWidth; - ME_WrapTextParagraph(&c, item); + ME_WrapTextParagraph(editor, &c, item); if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) totalWidth = get_total_width(editor); else

1 0

Sergio Gómez Del Real : riched20: ME_CheckCharOffsets() calls should only be done when tracing.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 14984a169a7f744489742d5f457709a941efb93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14984a169a7f744489742d5f… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:55 2018 -0500 riched20: ME_CheckCharOffsets() calls should only be done when tracing. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 6 ++++-- dlls/riched20/wrap.c | 7 ++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 76f509c..2cdd3d8 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -103,6 +103,9 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) ME_DisplayItem *p = editor->pBuffer->pFirst; int ofs = 0, ofsp = 0; + if (!TRACE_ON(richedit_check)) + return; + TRACE_(richedit_check)("Checking begin\n"); if(TRACE_ON(richedit_lists)) { @@ -238,8 +241,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) ME_Remove(pNext); ME_DestroyDisplayItem(pNext); ME_UpdateRunFlags(editor, &p->member.run); - if(TRACE_ON(richedit_check)) - ME_CheckCharOffsets(editor); + ME_CheckCharOffsets(editor); } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c344494..a66137d 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -23,7 +23,6 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); -WINE_DECLARE_DEBUG_CHANNEL(richedit_check); /* * Unsolved problems: @@ -140,8 +139,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite ME_Cursor cursor = {wc->pPara, item, nVChar}; assert(item->member.run.nCharOfs != -1); - if(TRACE_ON(richedit_check)) - ME_CheckCharOffsets(editor); + ME_CheckCharOffsets(editor); run = &item->member.run; @@ -160,8 +158,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; - if(TRACE_ON(richedit_check)) - ME_CheckCharOffsets(editor); + ME_CheckCharOffsets(editor); TRACE("After split: %s(%d, %d), %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y,

1 0

Ralf Habacker : explorer: Fix atom leaks caused by not releasing DDE interface.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: ddb713653b329f72e4b91beffef60e72c8a61574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb713653b329f72e4b91bef… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Tue Nov 27 10:37:43 2018 +0100 explorer: Fix atom leaks caused by not releasing DDE interface. Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d802bc3..27b9b24 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -921,6 +921,7 @@ void manage_desktop( WCHAR *arg ) WCHAR *p = arg; const WCHAR *name = NULL; BOOL enable_shell = FALSE; + void (WINAPI *pShellDDEInit)( BOOL ) = NULL; /* get the rest of the command line (if any) */ while (*p && !is_whitespace(*p)) p++; @@ -993,7 +994,6 @@ void manage_desktop( WCHAR *arg ) if (graphics_driver) { HMODULE shell32; - void (WINAPI *pShellDDEInit)( BOOL ); if (using_root) enable_shell = FALSE; @@ -1035,6 +1035,8 @@ void manage_desktop( WCHAR *arg ) WINE_TRACE( "desktop message loop exiting for hwnd %p\n", hwnd ); } + if (pShellDDEInit) pShellDDEInit( FALSE ); + ExitProcess( 0 ); }

1 0

Zebediah Figura : ddraw: Get rid of redundant call to wined3d_stateblock_capture().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: c6a5bc3ca145909e71363b038cd437d31364d557 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a5bc3ca145909e71363b03… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 28 19:43:52 2018 -0600 ddraw: Get rid of redundant call to wined3d_stateblock_capture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5043994..6b2abe3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -933,7 +933,6 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, goto done; } - wined3d_stateblock_capture(stateblock); rtv = wined3d_device_get_rendertarget_view(ddraw->wined3d_device, 0); /* Rendering to ddraw->wined3d_frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv))

1 0

Józef Kucia : dxgi/tests: Add test for ResizeTarget() with window procedure.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 5fb9e144c65b7af05f17fc0c080e1eb8a8f99cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fb9e144c65b7af05f17fc0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:39 2018 +0100 dxgi/tests: Add test for ResizeTarget() with window procedure. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b3a4705..bfe98f4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2665,6 +2665,114 @@ static void test_resize_target(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + DXGI_SWAP_CHAIN_DESC desc; + HRESULT hr; + + switch (message) + { + case WM_SIZE: + ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); + hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); + ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); + return 0; + + default: + return DefWindowProcA(hwnd, message, wparam, lparam); + } +} + +static void test_resize_target_wndproc(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + DXGI_MODE_DESC mode; + IDXGIDevice *device; + ULONG refcount; + LONG_PTR data; + WNDCLASSA wc; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", + "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); + + memset(&mode, 0, sizeof(mode)); + mode.Width = 600; + mode.Height = 400; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); + ok(swapchain_desc.BufferDesc.Width == 800, + "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); + ok(swapchain_desc.BufferDesc.Height == 600, + "Got unexpected buffer height %u.\n", swapchain_desc.BufferDesc.Height); + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + ok(rect.right == mode.Width && rect.bottom == mode.Height, + "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); +} + static void test_inexact_modes(void) { struct swapchain_fullscreen_state initial_state, expected_state; @@ -4753,6 +4861,7 @@ START_TEST(dxgi) queue_test(test_output); queue_test(test_find_closest_matching_mode); queue_test(test_get_containing_output); + queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); queue_test(test_swapchain_present);

1 0

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 0896decb183b4363235e7bd47ff780c92ba992e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0896decb183b4363235e7bd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:40 2018 +0100 wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target(). Fixes a deadlock. It can also be seen as a small step towards more fine-grained locking in wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d325cf..76a4d44 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -434,7 +434,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_display_mode mode; - HRESULT hr; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -451,11 +450,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - wined3d_mutex_lock(); - hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 43582ce..2170629 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1327,29 +1327,38 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { - struct wined3d_device *device = swapchain->device; struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; + struct wined3d_device *device; + HWND window; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); + wined3d_mutex_lock(); + + device = swapchain->device; + window = swapchain->device_window; + if (swapchain->desc.windowed) { SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, - GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, - GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); SetRect(&window_rect, 0, 0, window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(swapchain->device_window, &original_window_rect); + GetWindowRect(window, &original_window_rect); OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + { + wined3d_mutex_unlock(); return hr; + } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else @@ -1358,15 +1367,17 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } - MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, - window_rect.bottom - window_rect.top, TRUE); + wined3d_mutex_unlock(); + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); return WINED3D_OK; }

1 0

Józef Kucia : dxgi/tests: Add separate window thread for test_resize_target_wndproc().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 03c37f22eb38e8c3a43c07aa238bf30693b821e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c37f22eb38e8c3a43c07aa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:41 2018 +0100 dxgi/tests: Add separate window thread for test_resize_target_wndproc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 80 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bfe98f4..1aaed46 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2686,20 +2686,65 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W } } +struct window_thread_data +{ + HWND window; + HANDLE window_created; + HANDLE finished; +}; + +static DWORD WINAPI window_thread(void *data) +{ + struct window_thread_data *thread_data = data; + unsigned int ret; + WNDCLASSA wc; + MSG msg; + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + thread_data->window = CreateWindowA("dxgi_resize_target_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!thread_data->window, "Failed to create window.\n"); + + ret = SetEvent(thread_data->window_created); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + + for (;;) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + ret = WaitForSingleObject(thread_data->finished, 0); + if (ret != WAIT_TIMEOUT) + break; + } + ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError()); + + DestroyWindow(thread_data->window); + thread_data->window = NULL; + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + + return 0; +} + static void test_resize_target_wndproc(void) { + struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; DXGI_MODE_DESC mode; IDXGIDevice *device; + unsigned int ret; ULONG refcount; LONG_PTR data; - WNDCLASSA wc; + HANDLE thread; HRESULT hr; RECT rect; - BOOL ret; if (!(device = create_device(0))) { @@ -2707,10 +2752,16 @@ static void test_resize_target_wndproc(void) return; } - memset(&wc, 0, sizeof(wc)); - wc.lpfnWndProc = resize_target_wndproc; - wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; - ok(RegisterClassA(&wc), "Failed to register window class.\n"); + memset(&thread_data, 0, sizeof(thread_data)); + thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError()); + thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError()); + + thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread_data.window_created, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); hr = IDXGIDevice_GetAdapter(device, &adapter); ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); @@ -2728,18 +2779,14 @@ static void test_resize_target_wndproc(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = thread_data.window; swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - - swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", - "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); - ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); memset(&mode, 0, sizeof(mode)); @@ -2762,7 +2809,6 @@ static void test_resize_target_wndproc(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -2770,7 +2816,13 @@ static void test_resize_target_wndproc(void) refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + ret = SetEvent(thread_data.finished); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + CloseHandle(thread); + CloseHandle(thread_data.window_created); + CloseHandle(thread_data.finished); } static void test_inexact_modes(void)

1 0