October 2020 - Wine-commits

Nikolay Sivov : evr/mixer: Use regular media type interface for input streams.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 7ab646ad482d5a127d320c7c1f16ccb72569b863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab646ad482d5a127d320c7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:26 2020 +0300 evr/mixer: Use regular media type interface for input streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631cc796ea..a18df5c4b3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -40,7 +40,7 @@ struct input_stream { unsigned int id; IMFAttributes *attributes; - IMFVideoMediaType *media_type; + IMFMediaType *media_type; MFVideoNormalizedRect rect; unsigned int zorder; }; @@ -170,7 +170,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) for (i = 0; i < mixer->input_count; ++i) { if (mixer->inputs[i].media_type) - IMFVideoMediaType_Release(mixer->inputs[i].media_type); + IMFMediaType_Release(mixer->inputs[i].media_type); mixer->inputs[i].media_type = NULL; } for (i = 0; i < mixer->output.type_count; ++i) @@ -714,14 +714,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - GUID subtype = { 0 }; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - WARN("Failed to get subtype %#x.\n", hr); - - if (SUCCEEDED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->inputs[0].media_type))) + if (SUCCEEDED(hr = MFCreateMediaType(&mixer->inputs[0].media_type))) hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type); - } CoTaskMemFree(guids); }

1 0

Nikolay Sivov : evr/mixer: Use regular media type interface for the output stream.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 11594f563f13cd0fa7006d56250c16fe624a6129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11594f563f13cd0fa7006d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:27 2020 +0300 evr/mixer: Use regular media type interface for the output stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a18df5c4b3..bb76fd8894 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -47,8 +47,8 @@ struct input_stream struct output_stream { - IMFVideoMediaType *media_type; - IMFVideoMediaType **media_types; + IMFMediaType *media_type; + IMFMediaType **media_types; unsigned int type_count; }; @@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer) } for (i = 0; i < mixer->output.type_count; ++i) { - IMFVideoMediaType_Release(mixer->output.media_types[i]); + IMFMediaType_Release(mixer->output.media_types[i]); } heap_free(mixer->output.media_types); if (mixer->output.media_type) - IMFVideoMediaType_Release(mixer->output.media_type); + IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; } @@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const for (i = 0; i < count; ++i) { subtype.Data1 = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->output.media_types[i]); + MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.media_types[i]); } mixer->output.type_count = count; }

1 0

Nikolay Sivov : evr/mixer: Implement SetOutputType().
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: b8e003c0e0d9904e1279cafbaa034ad5899006e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8e003c0e0d9904e1279cafb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:28 2020 +0300 evr/mixer: Implement SetOutputType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 11 +++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index bb76fd8894..7cb35983f7 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -738,9 +738,43 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = MF_E_INVALIDMEDIATYPE; + unsigned int i, compare_flags; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id) + return MF_E_INVALIDSTREAMNUMBER; + + EnterCriticalSection(&mixer->cs); + + for (i = 0; i < mixer->output.type_count; ++i) + { + compare_flags = 0; + if (FAILED(IMFMediaType_IsEqual(type, mixer->output.media_types[i], &compare_flags))) + continue; + + if ((compare_flags & equality_flags) == equality_flags) + { + hr = S_OK; + break; + } + } + + if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + { + if (mixer->output.media_type) + IMFMediaType_Release(mixer->output.media_type); + mixer->output.media_type = type; + IMFMediaType_AddRef(mixer->output.media_type); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 13a07c42c5..5829815988 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -958,10 +958,11 @@ todo_wine hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 1, media_type, 0); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine @@ -973,6 +974,12 @@ todo_wine if (SUCCEEDED(hr)) CoTaskMemFree(guids); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + IMFVideoProcessor_Release(processor); IMFVideoMediaType_Release(video_type);

1 0

Nikolay Sivov : dxva2/tests: Add a test for GetVideoProcessorDeviceGuids().
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 1829c196872bec9187e5ef2c2cb99683dbe22bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1829c196872bec9187e5ef2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:19:23 2020 +0300 dxva2/tests: Add a test for GetVideoProcessorDeviceGuids(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f5b28ed3f8..9dcd3e5bf4 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -92,6 +92,7 @@ static void test_device_manager(void) UINT token, count; IDirect3D9 *d3d; HWND window; + GUID *guids; HRESULT hr; RECT rect; @@ -309,6 +310,11 @@ static void test_device_manager(void) video_desc.SampleHeight = 64; video_desc.Format = D3DFMT_A8R8G8B8; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count, "Unexpected format count %u.\n", count); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats);

1 0

Huw Davies : riched20: Use a structure to hold the repaint range.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: efa45652a9cd8dfdab85f690b3553533b5d8caf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa45652a9cd8dfdab85f690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:05 2020 +0100 riched20: Use a structure to hold the repaint range. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a84f738e92..f864d97a0e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -903,16 +903,18 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag editor->total_rows += wc.nRow; } -static void ME_MarkRepaintEnd(ME_DisplayItem *para, - ME_DisplayItem **repaint_start, - ME_DisplayItem **repaint_end) +struct repaint_range { - if (!*repaint_start) - *repaint_start = para; - *repaint_end = para; + ME_DisplayItem *start, *end; +}; + +static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +{ + if (!repaint->start) repaint->start = para; + repaint->end = para; } -static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { if (para->nFlags & MEPF_ROWSTART) { @@ -985,11 +987,11 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + update_repaint( para_get_di( para ), repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); + update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); cell = cell->member.cell.prev_cell; } } @@ -1031,7 +1033,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) struct wine_rb_entry *entry, *next_entry; ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; - ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; + struct repaint_range repaint = { NULL, NULL }; if (!editor->marked_paras.root) return FALSE; @@ -1052,9 +1054,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); 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 ); + update_repaint( para->prev_para, &repaint ); + update_repaint( para_get_di( para ), &repaint ); + adjust_para_y( para, &c, &repaint ); if (para->next_para) { @@ -1064,9 +1066,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + update_repaint( next->next_para, &repaint ); next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + adjust_para_y( &next->next_para->member.para, &c, &repaint ); next = &next->next_para->member.para; } } @@ -1083,9 +1085,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); - if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); - return !!repaint_start; + if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + return !!repaint.start; } void ME_InvalidateParagraphRange(ME_TextEditor *editor,

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs for the update range.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 88cfc04be0a72beffad2e63b34db1d6a46ff56d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88cfc04be0a72beffad2e63b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:06 2020 +0100 riched20: Use ME_Paragraph ptrs for the update range. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/wrap.c | 41 ++++++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 910a87c33c..6c45a3c6b5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -189,7 +189,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 53583de21c..6187fb74f1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1356,7 +1356,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) } if (repaint_start) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); + para_range_invalidate( editor, &repaint_start->member.para, &repaint_end->member.para ); /* remember the last invalidated position */ ME_GetSelectionOfs(editor, &editor->nLastSelStart, &editor->nLastSelEnd); ME_GetSelectionParas(editor, &editor->pLastSelStartPara, &editor->pLastSelEndPara); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f864d97a0e..90835905a0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -905,10 +905,10 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag struct repaint_range { - ME_DisplayItem *start, *end; + ME_Paragraph *start, *end; }; -static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +static void update_repaint( ME_Paragraph *para, struct repaint_range *repaint ) { if (!repaint->start) repaint->start = para; repaint->end = para; @@ -987,11 +987,11 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - update_repaint( para_get_di( para ), repaint ); + update_repaint( para, repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); + update_repaint( &ME_FindItemBack(cell, diParagraph)->member.para, repaint ); cell = cell->member.cell.prev_cell; } } @@ -1054,22 +1054,22 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - update_repaint( para->prev_para, &repaint ); - update_repaint( para_get_di( para ), &repaint ); + update_repaint( para_prev( para ), &repaint ); + update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint ); - if (para->next_para) + if (para_next( para )) { - if (c.pt.y != para->next_para->member.para.pt.y) + if (c.pt.y != para_next( para )->pt.y) { next = para; - while (next->next_para && &next->marked_entry != next_entry && + while (para_next( next ) && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - update_repaint( next->next_para, &repaint ); - next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, &repaint ); - next = &next->next_para->member.para; + update_repaint( para_next( next ), &repaint ); + para_next( next )->pt.y = c.pt.y; + adjust_para_y( para_next( next ), &c, &repaint ); + next = para_next( next ); } } } @@ -1086,13 +1086,12 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } -void ME_InvalidateParagraphRange(ME_TextEditor *editor, - ME_DisplayItem *start_para, - ME_DisplayItem *last_para) +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, + ME_Paragraph *last_para ) { RECT rc; int ofs; @@ -1102,16 +1101,16 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, if (start_para) { - start_para = para_get_di( table_outer_para( &start_para->member.para ) ); - last_para = para_get_di( table_outer_para( &last_para->member.para ) ); - rc.top += start_para->member.para.pt.y - ofs; + start_para = table_outer_para( start_para ); + last_para = table_outer_para( last_para ); + rc.top += start_para->pt.y - ofs; } else { rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->pt.y + last_para->nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); }

1 0

Huw Davies : riched20: Use the table_row_start/end() helpers.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: bb50c5a8457832870161e00646f588ef68b65483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb50c5a8457832870161e006… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:07 2020 +0100 riched20: Use the table_row_start/end() helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 90835905a0..c7b99f5ee2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -919,7 +919,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran if (para->nFlags & MEPF_ROWSTART) { ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); - ME_DisplayItem *endRowPara; + ME_Paragraph *end_row_para = table_row_end( para ); int borderWidth = 0; cell->member.cell.pt = c->pt; /* Offset the text by the largest top border width. */ @@ -928,8 +928,6 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran borderWidth = max(borderWidth, cell->member.cell.border.top.width); cell = cell->member.cell.next_cell; } - endRowPara = ME_FindItemFwd(cell, diParagraph); - assert(endRowPara->member.para.nFlags & MEPF_ROWEND); if (borderWidth > 0) { borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); @@ -940,22 +938,21 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } c->pt.y += borderWidth; } - if (endRowPara->member.para.fmt.dxStartIndent > 0) + if (end_row_para->fmt.dxStartIndent > 0) { - int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; cell = ME_FindItemFwd( para_get_di( para ), diCell); - cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); + cell->member.cell.pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); c->pt.x = cell->member.cell.pt.x; } } else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ - ME_DisplayItem *startRowPara; + ME_Paragraph *start_row_para = table_row_start( para ); int prevHeight, nHeight, bottomBorder = 0; 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)) + if (!(para_next( para )->nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -979,9 +976,8 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran cell->member.cell.nHeight = nHeight; } /* Also set the height of the start row paragraph */ - startRowPara = ME_FindItemBack(cell, diParagraph); - startRowPara->member.para.nHeight = nHeight; - c->pt.x = startRowPara->member.para.pt.x; + start_row_para->nHeight = nHeight; + c->pt.x = start_row_para->pt.x; c->pt.y = cell->member.cell.pt.y + nHeight; if (prevHeight < nHeight) { @@ -996,7 +992,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } } - else if (para->pCell && para->pCell != para->next_para->member.para.pCell) + else if (para->pCell && para->pCell != para_next( para )->pCell) { /* The next paragraph is in the next cell in the table row. */ ME_Cell *cell = &para->pCell->member.cell;

1 0

Huw Davies : riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates().
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: f648eff16261a569552e1199fa4eb3e9f4f044c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f648eff16261a569552e1199… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:08 2020 +0100 riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e9ea64ed1b..bd533f91ba 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -222,49 +222,38 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { ME_DisplayItem *row; - ME_DisplayItem *run = pCursor->pRun; - ME_DisplayItem *para = pCursor->pPara; - ME_DisplayItem *pSizeRun = run; + ME_Run *run = &pCursor->pRun->member.run; + ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Run *size_run = run, *prev; ME_Context c; int run_x; assert(height && x && y); - assert(~para->member.para.nFlags & MEPF_REWRAP); - assert(run && run->type == diRun); - assert(para && para->type == diParagraph); + assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack(run, diStartRowOrParagraph); + row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); assert(row && row->type == diStartRow); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset) - { - ME_DisplayItem *prev = ME_FindItemBack(run, diRunOrParagraph); - assert(prev); - if (prev->type == diRun) - pSizeRun = prev; - } + if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (editor->bCaretAtEnd && !pCursor->nOffset && - run == ME_FindItemFwd(row, diRun)) + run == &ME_FindItemFwd( row, diRun )->member.run) { ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); - assert(tmp); if (tmp->type == diRun) { row = ME_FindItemBack(tmp, diStartRow); - pSizeRun = run = tmp; - assert(run); - assert(run->type == diRun); + size_run = run = &tmp->member.run; } } - run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); - *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline - + run->member.run.pt.y - pSizeRun->member.run.nAscent - - editor->vert_si.nPos; + *height = size_run->nAscent + size_run->nDescent; + *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; + *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; }

1 0

Alexandre Julliard : makefiles: List all possible targets in the stub makefiles.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: aabd2b54b2c538b74d2eb1026c7afdf2f910f253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabd2b54b2c538b74d2eb102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 11 21:35:47 2020 +0200 makefiles: List all possible targets in the stub makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index df3805591e..2eed620b42 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4029,6 +4029,7 @@ static void output_stub_makefile( struct makefile *make ) } output_filenames( targets ); + output_filenames( make->clean_files ); output( ":\n" ); output( "\t(a)cd %s && $(MAKE) %s/$@\n", get_relative_path( make->obj_dir, "" ), make->obj_dir ); output( ".PHONY:" );

1 0

Michael Stefaniuc : qmgr: Use wide-char string literals.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: b0a64a81044bca1ae3f222e7d9976173b317a9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0a64a81044bca1ae3f222e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 11 22:05:23 2020 +0200 qmgr: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 6 ++---- dlls/qmgr/service.c | 3 +-- dlls/qmgr/tests/enum_files.c | 18 ++++++------------ dlls/qmgr/tests/enum_jobs.c | 12 ++++-------- dlls/qmgr/tests/file.c | 11 ++++------- dlls/qmgr/tests/job.c | 24 +++++++++--------------- dlls/qmgr/tests/qmgr.c | 17 ++++------------- 7 files changed, 30 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0a64a81044bca1ae3f2…

1 0