wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Huw Davies : riched20: Don't create a display context in InvalidateParagraphRange().
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: c3e6cb5b70a99feb863a158104d8db58165079be URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e6cb5b70a99feb863a1581… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:21 2020 +0100 riched20: Don't create a display context in InvalidateParagraphRange(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 819915d4c0..5ff9623e33 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1093,28 +1093,25 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) { - ME_Context c; RECT rc; int ofs; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - rc = c.rcView; + rc = editor->rcFormat; ofs = editor->vert_si.nPos; - if (start_para) { + if (start_para) + { start_para = ME_GetOuterParagraph(start_para); last_para = ME_GetOuterParagraph(last_para); - rc.top = c.rcView.top + start_para->member.para.pt.y - ofs; + rc.top += start_para->member.para.pt.y - ofs; } else { - rc.top = c.rcView.top + editor->nTotalLength - ofs; + rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.rcView.top + editor->nLastTotalLength - ofs; + rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = c.rcView.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - - ME_DestroyContext(&c); }

1 0

Huw Davies : riched20: Move the marked paragraph list to a rbtree.
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: b466eefbdfffb0b86a394c6568c8f0b4c5d4f520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466eefbdfffb0b86a394c65… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:20 2020 +0100 riched20: Move the marked paragraph list to a rbtree. 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/editstr.h | 5 ++-- dlls/riched20/para.c | 73 +++++++------------------------------------------ dlls/riched20/wrap.c | 39 ++++++++++---------------- 4 files changed, 28 insertions(+), 90 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2fb7e3650d..e7e33c2758 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3062,7 +3062,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ed->exStyleFlags = 0; - ed->first_marked_para = NULL; ed->total_rows = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2c5737f3e9..fd5c9bc3df 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,6 +47,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" +#include "wine/rbtree.h" #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; @@ -216,7 +217,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; + struct wine_rb_entry marked_entry; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -431,7 +432,6 @@ 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; @@ -445,6 +445,7 @@ typedef struct tagME_TextEditor int wheel_remain; struct list style_list; struct list reobj_list; + struct wine_rb_tree marked_paras; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9d8693ed41..58dcfc8e71 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,6 @@ 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; } @@ -74,74 +73,21 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) +static int para_mark_compare( const void *key, const struct wine_rb_entry *entry ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *head = editor->first_marked_para; + ME_Paragraph *para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); - 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; - } + return *(int *)key - para->nCharOfs; } -void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *iter = editor->first_marked_para; + wine_rb_remove_key( &editor->marked_paras, &para->nCharOfs ); +} - 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 || 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 para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +{ + wine_rb_put( &editor->marked_paras, &para->nCharOfs, &para->marked_entry ); } ME_Run *para_first_run( ME_Paragraph *para ) @@ -229,6 +175,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; + wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cb17f2963b..819915d4c0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1029,19 +1029,22 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_Paragraph *para, *next; + struct wine_rb_entry *entry, *next_entry; ME_Context c; - int totalWidth = editor->nTotalWidth, diff = 0, prev_width; + int totalWidth = editor->nTotalWidth, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - if (!editor->first_marked_para) - return FALSE; + if (!editor->marked_paras.root) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - para = &editor->first_marked_para->member.para; - c.pt = para->pt; - while (para_get_di( para ) != editor->pBuffer->pLast) + entry = wine_rb_head( editor->marked_paras.root ); + while (entry) { + para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); + next_entry = wine_rb_next( entry ); + + c.pt = para->pt; prev_width = para->nWidth; ME_WrapTextParagraph( editor, &c, para ); if (prev_width == totalWidth && para->nWidth < totalWidth) @@ -1056,11 +1059,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para->next_para) { - diff = c.pt.y - para->next_para->member.para.pt.y; - if (diff) + if (c.pt.y != para->next_para->member.para.pt.y) { next = para; - while (next->next_para && next != &para->next_marked->member.para && + while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); @@ -1070,26 +1072,15 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) } } } - if (para->next_marked) - { - ME_Paragraph *tmp = para; - para = &para->next_marked->member.para; - para_mark_remove( editor, tmp ); - } - else - { - para_mark_remove( editor, para ); - para = &editor->pBuffer->pLast->member.para; - } - c.pt.y = para->pt.y; + entry = next_entry; } + wine_rb_clear( &editor->marked_paras, NULL, NULL ); + editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; - editor->nTotalLength = c.pt.y; + editor->nTotalLength = editor->pBuffer->pLast->member.para.pt.y; editor->nTotalWidth = totalWidth; - editor->pBuffer->pLast->member.para.pt.x = 0; - editor->pBuffer->pLast->member.para.pt.y = c.pt.y; ME_DestroyContext(&c);

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs().
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 3a1aaf2655bf5d984b8998e554f418748f8aff0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a1aaf2655bf5d984b8998e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:19 2020 +0100 riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c0c9c8f07e..cb17f2963b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -913,11 +913,11 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) { - if (item->member.para.nFlags & MEPF_ROWSTART) + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); + ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_DisplayItem *endRowPara; int borderWidth = 0; cell->member.cell.pt = c->pt; @@ -942,19 +942,19 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r if (endRowPara->member.para.fmt.dxStartIndent > 0) { int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; - cell = ME_FindItemFwd(item, diCell); + cell = ME_FindItemFwd( para_get_di( para ), diCell); cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); c->pt.x = cell->member.cell.pt.x; } } - else if (item->member.para.nFlags & MEPF_ROWEND) + else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ ME_DisplayItem *startRowPara; int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack(item, diCell); - item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) + ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); + para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -964,12 +964,12 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r cell = cell->member.cell.prev_cell; } bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack(item, diCell); + cell = ME_FindItemBack( para_get_di( para ), diCell ); } prevHeight = cell->member.cell.nHeight; nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; cell->member.cell.nHeight = nHeight; - item->member.para.nHeight = nHeight; + para->nHeight = nHeight; cell = cell->member.cell.prev_cell; cell->member.cell.nHeight = nHeight; while (cell->member.cell.prev_cell) @@ -986,8 +986,8 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - cell = ME_FindItemBack(item, diCell); + ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); @@ -995,12 +995,11 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r } } } - else if (item->member.para.pCell && - item->member.para.pCell != item->member.para.next_para->member.para.pCell) + else if (para->pCell && para->pCell != para->next_para->member.para.pCell) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &item->member.para.pCell->member.cell; - cell->nHeight = c->pt.y + item->member.para.nHeight - cell->pt.y; + ME_Cell *cell = &para->pCell->member.cell; + cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ @@ -1010,82 +1009,79 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; cell->next_cell->member.cell.pt = c->pt; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) + if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (item->member.para.pCell) + if (para->pCell) { /* Next paragraph in the same cell. */ - c->pt.x = item->member.para.pCell->member.cell.pt.x; + c->pt.x = para->pCell->member.cell.pt.x; } else /* Normal paragraph */ c->pt.x = 0; - c->pt.y += item->member.para.nHeight; + c->pt.y += para->nHeight; } } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - ME_DisplayItem *item; + ME_Paragraph *para, *next; ME_Context c; 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)); - item = editor->first_marked_para; - c.pt = item->member.para.pt; - while (item != editor->pBuffer->pLast) + para = &editor->first_marked_para->member.para; + c.pt = para->pt; + while (para_get_di( para ) != editor->pBuffer->pLast) { - assert(item->type == diParagraph); - - prev_width = item->member.para.nWidth; - ME_WrapTextParagraph( editor, &c, &item->member.para ); - if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) + prev_width = para->nWidth; + ME_WrapTextParagraph( editor, &c, para ); + if (prev_width == totalWidth && para->nWidth < totalWidth) totalWidth = get_total_width(editor); else - totalWidth = max(totalWidth, item->member.para.nWidth); + totalWidth = max(totalWidth, para->nWidth); - 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); + if (!para->nCharOfs) + ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); + ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); + adjust_para_y( para, &c, repaint_start, repaint_end ); - if (item->member.para.next_para) + if (para->next_para) { - diff = c.pt.y - item->member.para.next_para->member.para.pt.y; + diff = c.pt.y - 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) + next = para; + while (next->next_para && next != &para->next_marked->member.para && + next != &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; + ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + next->next_para->member.para.pt.y = c.pt.y; + adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + next = &next->next_para->member.para; } } } - if (item->member.para.next_marked) + if (para->next_marked) { - ME_DisplayItem *rem = item; - item = item->member.para.next_marked; - para_mark_remove( editor, &rem->member.para ); + ME_Paragraph *tmp = para; + para = &para->next_marked->member.para; + para_mark_remove( editor, tmp ); } else { - para_mark_remove( editor, &item->member.para ); - item = editor->pBuffer->pLast; + para_mark_remove( editor, para ); + para = &editor->pBuffer->pLast->member.para; } - c.pt.y = item->member.para.pt.y; + c.pt.y = para->pt.y; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top;

1 0

Huw Davies : riched20: Pass a ME_Paragraph ptr to the marking functions.
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 02cf14cf439f2100764ec3d3139721b9d0691837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02cf14cf439f2100764ec3d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:18 2020 +0100 riched20: Pass a ME_Paragraph ptr to the marking functions. 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 | 2 +- dlls/riched20/editor.h | 6 +++--- dlls/riched20/para.c | 31 ++++++++++++++++--------------- dlls/riched20/run.c | 8 ++++---- dlls/riched20/undo.c | 2 +- dlls/riched20/wrap.c | 4 ++-- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ed34372e3..89fd9d7326 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -394,7 +394,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - mark_para_rewrap(editor, ME_FindItemBack(c.pRun, diParagraph)); + para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); 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 abc4592087..2fb7e3650d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2509,7 +2509,7 @@ static BOOL handle_enter(ME_TextEditor *editor) para = editor->pBuffer->pFirst->member.para.next_para; ME_SetDefaultParaFormat(editor, &para->member.para.fmt); para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.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 47e822c2d3..e768727251 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,9 +208,9 @@ 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; -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fb994506be..9d8693ed41 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,10 +23,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) { - para->member.para.nFlags |= MEPF_REWRAP; - add_marked_para(editor, para); + para->nFlags |= MEPF_REWRAP; + para_mark_add( editor, para ); } static ME_DisplayItem *make_para(ME_TextEditor *editor) @@ -52,7 +52,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) 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); + para_mark_remove( editor, &item->member.para ); ME_DestroyDisplayItem(item); } @@ -74,11 +74,11 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); 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) @@ -104,8 +104,9 @@ void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } } -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *iter = editor->first_marked_para; if (!iter) @@ -228,7 +229,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; - add_marked_para(editor, para); + para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } @@ -236,7 +237,7 @@ static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, con { while(first != last) { - mark_para_rewrap(editor, first); + para_mark_rewrap( editor, &first->member.para ); first = first->member.para.next_para; } } @@ -462,7 +463,7 @@ static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, cons { do { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -537,7 +538,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, 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))) @@ -612,7 +613,7 @@ 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 = 0; - mark_para_rewrap(editor, new_para); + para_mark_rewrap( editor, &new_para->member.para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ new_para->member.para.fmt = run_para->member.para.fmt; @@ -679,9 +680,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) - mark_para_rewrap(editor, run_para->member.para.prev_para); + para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - mark_para_rewrap(editor, new_para->member.para.prev_para); + para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); @@ -816,7 +817,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_CheckCharOffsets(editor); editor->nParagraphs--; - mark_para_rewrap(editor, tp); + para_mark_rewrap( editor, &tp->member.para ); return tp; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f98288a94a..c3bc7f50b3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -247,7 +247,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); - mark_para_rewrap(editor, ME_GetParagraph(p)); + para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { @@ -299,7 +299,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) editor->pCursors[i].nOffset -= nOffset; } } - mark_para_rewrap(editor, cursor->pPara); + para_mark_rewrap( editor, &cursor->pPara->member.para ); return run; } @@ -367,7 +367,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 ); - mark_para_rewrap( editor, para_get_di( insert_before->member.run.para ) ); + para_mark_rewrap( editor, 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 ); @@ -787,7 +787,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; } - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); } } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 2f18fc78bb..c6b898b2dd 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; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); break; } case undo_set_char_fmt: diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4853eefcab..c0c9c8f07e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1078,11 +1078,11 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *rem = item; item = item->member.para.next_marked; - remove_marked_para(editor, rem); + para_mark_remove( editor, &rem->member.para ); } else { - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); item = editor->pBuffer->pLast; } c.pt.y = item->member.para.pt.y;

1 0

Nikolay Sivov : mf/evr: Implement IsMediaTypeSupported().
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: e2bcf44080070436bfae9888c8e6001d511192e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2bcf44080070436bfae9888… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:40 2020 +0300 mf/evr: Implement IsMediaTypeSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---------- dlls/mf/tests/mf.c | 12 +++++++++++ 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 087ac2a88e..c3548170af 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,12 +362,57 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } +/* Mixer expects special video media type instance. */ +static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) +{ + GUID subtype; + HRESULT hr; + + *video_type = NULL; + + if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) + return hr; + + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); + if (FAILED(hr)) + { + IMFVideoMediaType_Release(*video_type); + *video_type = NULL; + } + + return hr; +} + static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { - FIXME("%p, %p, %p.\n", iface, in_type, out_type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + IMFVideoMediaType *video_type; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + if (!in_type) + return E_POINTER; + + if (!stream->parent) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) + return hr; + + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + MFT_SET_TYPE_TEST_ONLY))) + { + if (out_type) *out_type = NULL; + } + + IMFVideoMediaType_Release(video_type); + + return hr; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) @@ -394,7 +439,6 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); IMFVideoMediaType *video_type; - GUID subtype; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -405,16 +449,10 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - /* Mixer expects special video media type instance. */ - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &video_type))) + if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) return hr; - if (SUCCEEDED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)video_type))) - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); IMFVideoMediaType_Release(video_type); return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5ffc191667..351a6e1eda 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3332,9 +3332,21 @@ static void test_evr(void) hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + media_type2 = (void *)0x1; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected media type %p.\n", media_type2); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Add support for MFT_SET_TYPE_TEST_ONLY for inputs.
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 24c9d77cee95a778c95a03c6083739cc31989e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c9d77cee95a778c95a03c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:39 2020 +0300 evr/mixer: Add support for MFT_SET_TYPE_TEST_ONLY for inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 12 +++++++----- dlls/evr/tests/evr.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 107438b1f1..54da3a9ce1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -611,12 +611,12 @@ static int rt_formats_sort_compare(const void *left, const void *right) } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, - IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices) + IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; D3DFORMAT *rt_formats = NULL, *formats, *ptr; + HRESULT hr = MF_E_INVALIDMEDIATYPE; GUID subtype; - HRESULT hr; count = 0; for (i = 0; i < device_count; ++i) @@ -640,7 +640,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const } } - if (count) + if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { qsort(rt_formats, count, sizeof(*rt_formats), rt_formats_sort_compare); @@ -690,7 +690,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW EnterCriticalSection(&mixer->cs); - video_mixer_clear_types(mixer); + if (!(flags & MFT_SET_TYPE_TEST_ONLY)) + video_mixer_clear_types(mixer); if (!mixer->device_manager) hr = MF_E_NOT_INITIALIZED; @@ -708,7 +709,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids))) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids))) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, + guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { GUID subtype = { 0 }; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7ad011d2a0..175c30e818 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -862,6 +862,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + /* Now try with device manager. */ window = create_window(); @@ -883,6 +886,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -904,6 +910,12 @@ static void test_default_mixer_type_negotiation(void) hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Set stream media type to the mixer.
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 430c179fe86dd7f9b3ddfb6ef30f6359633ef0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=430c179fe86dd7f9b3ddfb6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:38 2020 +0300 mf/evr: Set stream media type to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ebeb8899ee..087ac2a88e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -392,16 +392,47 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + IMFVideoMediaType *video_type; + GUID subtype; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + /* Mixer expects special video media type instance. */ + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &video_type))) + return hr; + + if (SUCCEEDED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)video_type))) + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); + + IMFVideoMediaType_Release(video_type); + + return hr; } static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + return IMFTransform_GetInputCurrentType(stream->parent->mixer, stream->id, type); } static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index db442453d6..5ffc191667 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3237,6 +3237,7 @@ static void test_evr(void) { IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; + IMFMediaType *media_type, *media_type2; IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; IMFMediaTypeHandler *type_handler; @@ -3305,6 +3306,47 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected count %u.\n", count); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 0, NULL); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 0, &media_type); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_QueryInterface(media_type2, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFMediaType_Release(media_type2); + + IMFMediaType_Release(media_type); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */

1 0

Nikolay Sivov : mf/evr: Implement GetMediaTypeByIndex().
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 7b54ce1e07fe09b0734407db012c754c48aee4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b54ce1e07fe09b0734407db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:37 2020 +0300 mf/evr: Implement GetMediaTypeByIndex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 7567b1a709..ebeb8899ee 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -385,9 +385,9 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHan static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %u, %p.\n", iface, index, type); - return E_NOTIMPL; + return MF_E_NO_MORE_TYPES; } static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type)

1 0

Nikolay Sivov : mf/evr: Implement GetMediaTypeCount().
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: 6408aa3ab74d4740f276c0b8cc444dd6a9e6842e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6408aa3ab74d4740f276c0b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:36 2020 +0300 mf/evr: Implement GetMediaTypeCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 +++++++-- dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac3f17fa58..7567b1a709 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -372,9 +372,14 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a63c353a4b..db442453d6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3296,6 +3296,15 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + /* Supported types are not advertised. */ + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 1; + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */

1 0

Hans Leidekker : dssenh: Implement CPImportKey and CPDestroyKey.
by Alexandre Julliard 09 Oct '20

09 Oct '20

Module: wine Branch: master Commit: c1371f356c1019e8d47ab8be0bdeda1cbc804c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1371f356c1019e8d47ab8be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 12:46:00 2020 +0200 dssenh: Implement CPImportKey and CPDestroyKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 144 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 10 ++-- 2 files changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index a3a4e1b2c3..f02e04585a 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -317,13 +317,153 @@ BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *re BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); + + if (key->magic != MAGIC_KEY) + { + SetLastError( NTE_BAD_KEY ); + return FALSE; + } + + destroy_key( key ); + return TRUE; +} + +static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DATA_BLOB blob_in, blob_out; + DWORD len; + BYTE *data; + BOOL ret = TRUE; + + if (!key) return TRUE; + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return FALSE; + + if (BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &len, 0 )) return FALSE; + if (!(data = heap_alloc( len ))) return FALSE; + + if (!BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, data, len, &len, 0 )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if ((ret = CryptProtectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out ))) + { + ret = !RegSetValueExW( hkey, value, 0, REG_BINARY, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static BOOL store_key_container_keys( struct container *container ) +{ + HKEY hkey; + DWORD flags; + BOOL ret; + + if (container->flags & CRYPT_MACHINE_KEYSET) + flags = CRYPTPROTECT_LOCAL_MACHINE; + else + flags = 0; + + if (!create_container_regkey( container, KEY_WRITE, &hkey )) return FALSE; + + ret = store_key_pair( container->exch_key, hkey, AT_KEYEXCHANGE, flags ); + if (ret) store_key_pair( container->sign_key, hkey, AT_SIGNATURE, flags ); + RegCloseKey( hkey ); + return ret; } +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) +#define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) + BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, HCRYPTKEY *ret_key ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct key *key; + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + const WCHAR *type; + NTSTATUS status; + + TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + if (len < sizeof(*hdr)) return FALSE; + + hdr = (BLOBHEADER *)data; + if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 || + hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "bType %u\n", hdr->bType ); + FIXME( "bVersion %u\n", hdr->bVersion ); + FIXME( "reserved %u\n", hdr->reserved ); + FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg ); + return FALSE; + } + + if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; + pubkey = (DSSPUBKEY *)(hdr + 1); + + switch (pubkey->magic) + { + case MAGIC_DSS1: + type = LEGACY_DSA_V2_PUBLIC_BLOB; + break; + + case MAGIC_DSS2: + type = LEGACY_DSA_V2_PRIVATE_BLOB; + break; + + default: + FIXME( "unsupported key magic %08x\n", pubkey->magic ); + return FALSE; + } + + if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE; + + if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) + { + TRACE( "failed to import key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + + if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB)) + { + switch (hdr->aiKeyAlg) + { + case AT_KEYEXCHANGE: + case CALG_DH_SF: + container->exch_key = key; + break; + + case AT_SIGNATURE: + case CALG_DSS_SIGN: + container->sign_key = key; + break; + + default: + FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg ); + destroy_key( key ); + return FALSE; + } + + if (!store_key_container_keys( container )) + { + destroy_key( key ); + return FALSE; + } + } + + *ret_key = (HCRYPTKEY)key; + return TRUE; } BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 3bd546524f..d4a231562e 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -853,11 +853,6 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -895,6 +890,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Sign hash 1 */ result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020