October 2020 - Wine-Commits

Nikolay Sivov : dbgeng/tests: Use different flags for unsupported options.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 535cf25f46f618367157ccdd7b73cec65a29c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535cf25f46f618367157ccdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 11 09:33:08 2020 +0300 dbgeng/tests: Use different flags for unsupported options. Fixes test failures on recent Windows 10 builds, where 0x00800000 option is acceptable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/dbgeng.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 572d96e405..6279717519 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -50,7 +50,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->AddEngineOptions(control, 0x00800000); + hr = control->lpVtbl->AddEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0; @@ -58,7 +58,7 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->RemoveEngineOptions(control, 0x00800000); + hr = control->lpVtbl->RemoveEngineOptions(control, 0x01000000); ok(hr == S_OK, "Failed to remove options, hr %#x.\n", hr); hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); @@ -86,10 +86,10 @@ static void test_engine_options(void) ok(hr == S_OK, "Failed to get engine options, hr %#x.\n", hr); ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#x.\n", options); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = control->lpVtbl->SetEngineOptions(control, 0x00800000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); + hr = control->lpVtbl->SetEngineOptions(control, 0x01000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); options = 0;

1 0

Michael Stefaniuc : localui: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 3503fb0eef1a99cf69f958ca6424d4c3058ace1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3503fb0eef1a99cf69f958ca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:09 2020 +0200 localui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/localui.c | 58 ++++++++++++-------------------------------- dlls/localui/tests/localui.c | 19 ++++++--------- 2 files changed, 23 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3503fb0eef1a99cf69f9…

1 0

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

Oct. 12, 2020

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

Michael Stefaniuc : winmgmt: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 82a7936c02768781aa80035bc44e5b36ad387c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a7936c02768781aa80035b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:53 2020 +0200 winmgmt: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winmgmt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index 8b262d00f3..bc7150a08c 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); -static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; +static WCHAR winmgmtW[] = L"Winmgmt"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

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

Oct. 12, 2020

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

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

Oct. 12, 2020

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

Michael Stefaniuc : presentationfontcache: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: f95a4de5d5579af877d8cdb90626bb7f41d82e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95a4de5d5579af877d8cdb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:50 2020 +0200 presentationfontcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/presentationfontcache/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index 694ad792db..ab2d0e2106 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; +static WCHAR fontcacheW[] = L"FontCache3.0.0.0"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : wer: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 99ebf988158b018148443f5e0e51bac6c24529cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ebf988158b018148443f5e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:10 2020 +0200 wer: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 6 +----- dlls/wer/tests/main.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index b40aa1b762..ad57cbdf40 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -48,11 +48,7 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); -static const WCHAR regpath_exclude[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; +static const WCHAR regpath_exclude[] = L"Software\\Microsoft\\Windows Error Reporting\\ExcludedApplications"; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 7fa9a8c67f..038b29c25a 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -29,11 +29,7 @@ #include "werapi.h" #include "wine/test.h" - -static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; -static const WCHAR backslash[] = {'\\',0}; -static const WCHAR empty[] = {0}; -static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; +static const WCHAR winetest_wer[] = L"winetest_wer.exe"; /* ###### */ @@ -51,7 +47,7 @@ static void test_WerAddExcludedApplication(void) hr = WerAddExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerAddExcludedApplication(empty, FALSE); + hr = WerAddExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerAddExcludedApplication(winetest_wer, FALSE); @@ -74,7 +70,7 @@ static void test_WerAddExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); @@ -106,7 +102,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(NULL, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); - hr = WerRemoveExcludedApplication(empty, FALSE); + hr = WerRemoveExcludedApplication(L"", FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(winetest_wer, FALSE); @@ -130,7 +126,7 @@ static void test_WerRemoveExcludedApplication(void) hr = WerRemoveExcludedApplication(buffer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); - lstrcatW(buffer, backslash); + lstrcatW(buffer, L"\\"); hr = WerAddExcludedApplication(buffer, FALSE); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); hr = WerRemoveExcludedApplication(buffer, FALSE); @@ -152,7 +148,7 @@ static void test_WerReportCloseHandle(void) HREPORT report; report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -183,7 +179,7 @@ static void test_WerReportCreate(void) report = (void *) 0xdeadbeef; /* test a simple valid case */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &report); ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -195,7 +191,7 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); /* the ptr to store the created handle is always needed */ - hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); /* the event type must be a valid string */ @@ -204,13 +200,13 @@ static void test_WerReportCreate(void) ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); report = (void *) 0xdeadbeef; - hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + hr = WerReportCreate(L"", WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); /* a valid WER_REPORT_TYPE works */ for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, i, NULL, &report); + hr = WerReportCreate(L"APPCRASH", i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); hr = WerReportCloseHandle(report); @@ -222,7 +218,7 @@ static void test_WerReportCreate(void) but older windows versions did not check the report type and WerReportCreate always succeeded */ report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + hr = WerReportCreate(L"APPCRASH", WerReportInvalid, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -231,7 +227,7 @@ static void test_WerReportCreate(void) } report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, 42, NULL, &report); + hr = WerReportCreate(L"APPCRASH", 42, NULL, &report); ok((hr == E_INVALIDARG) | broken(hr == S_OK), "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); if (hr == S_OK) { @@ -243,7 +239,7 @@ static void test_WerReportCreate(void) memset(table, 0, sizeof(table)); for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; - hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + hr = WerReportCreate(L"APPCRASH", WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); }

1 0

Haoyang Chen : gdiplus: Fix texture brush rotation.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 2697b74d6753a4bf528659047c2ce971f39fb6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2697b74d6753a4bf52865904… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Oct 9 10:24:54 2020 +0800 gdiplus: Fix texture brush rotation. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1615f592d5..190f45d64a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1374,7 +1374,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, { GpPointF point; point.X = draw_points[0].X + x * x_dx + y * y_dx; - point.Y = draw_points[0].Y + y * x_dy + y * y_dy; + point.Y = draw_points[0].Y + x * x_dy + y * y_dy; argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( &src_area, fill->bitmap_bits, bitmap->width, bitmap->height,

1 0

Nikolay Sivov : mfplat/mediatype: Enable IMFVideoMediaType based on major type.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: a6166a5e1aa119dd426c8482e8e66e627488ddbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6166a5e1aa119dd426c8482… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:23 2020 +0300 mfplat/mediatype: Enable IMFVideoMediaType based on major type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 108 ++++++++++++++++++++------------------------- dlls/mfplat/tests/mfplat.c | 53 +++++++++++++++++++++- 2 files changed, 101 insertions(+), 60 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 5eaa4fdd08..0c0d962032 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -96,20 +96,32 @@ static struct presentation_desc *impl_from_IMFPresentationDescriptor(IMFPresenta static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, void **out) { + struct media_type *media_type = impl_from_IMFMediaType(iface); + GUID major = { 0 }; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IMFMediaType) || + attributes_GetGUID(&media_type->attributes, &MF_MT_MAJOR_TYPE, &major); + + if (IsEqualGUID(&major, &MFMediaType_Video) && IsEqualIID(riid, &IID_IMFVideoMediaType)) + { + *out = &media_type->IMFVideoMediaType_iface; + } + else if (IsEqualIID(riid, &IID_IMFMediaType) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = iface; - IMFMediaType_AddRef(iface); - return S_OK; + *out = &media_type->IMFMediaType_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) @@ -613,48 +625,20 @@ static const IMFMediaTypeVtbl mediatypevtbl = static HRESULT WINAPI video_mediatype_QueryInterface(IMFVideoMediaType *iface, REFIID riid, void **out) { - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFVideoMediaType) || - IsEqualIID(riid, &IID_IMFMediaType) || - IsEqualIID(riid, &IID_IMFAttributes) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = iface; - IMFVideoMediaType_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + return IMFMediaType_QueryInterface(&media_type->IMFMediaType_iface, riid, out); } static ULONG WINAPI video_mediatype_AddRef(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; + return IMFMediaType_AddRef(&media_type->IMFMediaType_iface); } static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) { struct media_type *media_type = impl_from_IMFVideoMediaType(iface); - ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - { - clear_attributes_object(&media_type->attributes); - CoTaskMemFree(media_type->video_format); - heap_free(media_type); - } - - return refcount; + return IMFMediaType_Release(&media_type->IMFMediaType_iface); } static HRESULT WINAPI video_mediatype_GetItem(IMFVideoMediaType *iface, REFGUID key, PROPVARIANT *value) @@ -1039,6 +1023,28 @@ static const IMFVideoMediaTypeVtbl videomediatypevtbl = video_mediatype_GetVideoRepresentation, }; +static HRESULT create_media_type(struct media_type **ret) +{ + struct media_type *object; + HRESULT hr; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; + object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; + + *ret = object; + + return S_OK; +} + /*********************************************************************** * MFCreateMediaType (mfplat.@) */ @@ -1052,16 +1058,8 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **media_type) if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; *media_type = &object->IMFMediaType_iface; @@ -2633,19 +2631,11 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe if (!media_type) return E_INVALIDARG; - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); + if (FAILED(hr = create_media_type(&object))) return hr; - } - object->IMFVideoMediaType_iface.lpVtbl = &videomediatypevtbl; - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); - IMFVideoMediaType_SetGUID(&object->IMFVideoMediaType_iface, &MF_MT_SUBTYPE, subtype); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + IMFMediaType_SetGUID(&object->IMFMediaType_iface, &MF_MT_SUBTYPE, subtype); *media_type = &object->IMFVideoMediaType_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 309f7b669a..c355810654 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,8 +763,10 @@ static void init_functions(void) static void test_media_type(void) { IMFMediaType *mediatype, *mediatype2; + IMFVideoMediaType *video_type; + IUnknown *unk, *unk2; + DWORD count, flags; BOOL compressed; - DWORD flags; HRESULT hr; GUID guid; @@ -862,6 +864,55 @@ if(0) IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); + + /* IMFVideoMediaType */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_QueryInterface(mediatype, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr); + + hr = IMFMediaType_QueryInterface(mediatype, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk2 == (IUnknown *)mediatype, "Unexpected pointer.\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + + hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Major and subtype are set on creation. */ + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(count == 2, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_DeleteAllItems(video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(!count, "Unexpected attribute count %#x.\n", hr); + + hr = IMFVideoMediaType_QueryInterface(video_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFVideoMediaType_Release(video_type); + + IMFMediaType_Release(mediatype); } static void test_MFCreateMediaEvent(void)

1 0

Nikolay Sivov : evr/mixer: Add SetOutputBounds().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 14d2b044785911ae8e0664167dce0ae40882d4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d2b044785911ae8e066416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:25 2020 +0300 evr/mixer: Add SetOutputBounds(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 17 +++++++++++++++-- dlls/evr/tests/evr.c | 3 +++ include/basetsd.h | 2 ++ include/mftransform.idl | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 54da3a9ce1..631cc796ea 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -79,6 +79,8 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + LONGLONG lower_bound; + LONGLONG upper_bound; CRITICAL_SECTION cs; }; @@ -814,9 +816,18 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + EnterCriticalSection(&mixer->cs); + + mixer->lower_bound = lower; + mixer->upper_bound = upper; + + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) @@ -1879,6 +1890,8 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->input_count = 1; + object->lower_bound = MFT_OUTPUT_BOUND_LOWER_UNBOUNDED; + object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 175c30e818..13a07c42c5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -531,6 +531,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_SetOutputBounds(transform, 100, 10); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/basetsd.h b/include/basetsd.h index c9f5c90e86..7087b592d1 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -265,6 +265,8 @@ typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR KAFFINITY, *PKAFFINITY; +#define MINLONGLONG ((LONGLONG)~MAXLONGLONG) + /* Some Wine-specific definitions */ /* Architecture dependent settings. */ diff --git a/include/mftransform.idl b/include/mftransform.idl index 1b402a5cc7..3f4b550020 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,9 @@ import "mfobjects.idl"; +cpp_quote("#define MFT_OUTPUT_BOUND_LOWER_UNBOUNDED MINLONGLONG") +cpp_quote("#define MFT_OUTPUT_BOUND_UPPER_UNBOUNDED MAXLONGLONG") + typedef [v1_enum] enum _MFT_MESSAGE_TYPE { MFT_MESSAGE_COMMAND_FLUSH = 0x00000000,

1 0

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

Oct. 12, 2020

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

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

Oct. 12, 2020

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

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

Oct. 12, 2020

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 : evr/mixer: Use regular media type interface for input streams.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

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 : mfplat/mediatype: Add IMFAudioMediaType stub.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: ad65d03013a3e49dd970bf0a3c9e4fa22c1bca2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad65d03013a3e49dd970bf0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:24 2020 +0300 mfplat/mediatype: Add IMFAudioMediaType stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 394 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 48 ++++++ 2 files changed, 442 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad65d03013a3e49dd970…

1 0

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: fef92bacc5967c1a45d7bae98af364a5df47981b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef92bacc5967c1a45d7bae9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 11 23:52:19 2020 +0900 documentation: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.ja b/documentation/README.ja index 9b44353306..57b35de991 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -19,6 +19,14 @@ READMEというファイル]を含むディレクトリ）から、以下を実 ./configure make +それから次のいずれか、Wineをインストールするか: + +make install + +または、Wineをビルドディレクトリから直接実行してください: + +./wine notepad + "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。

1 0

Zhiyi Zhang : wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 62fa286edfe1755182e2b266b17fa6d7bd46d55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fa286edfe1755182e2b266… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 12 16:41:01 2020 +0800 wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 8 +++++--- dlls/wined3d/wined3d_main.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f821437997..aa56634f3f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_swapchain_state_unregister(&swapchain->state); + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1359,7 +1359,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); - goto err; + wined3d_mutex_unlock(); + return hr; } swapchain->swapchain_ops = swapchain_ops; @@ -1565,6 +1566,7 @@ err: wined3d_texture_decref(swapchain->front_buffer); } + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_mutex_unlock(); return hr; @@ -2290,7 +2292,7 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { - wined3d_swapchain_state_unregister(state); + wined3d_swapchain_state_cleanup(state); heap_free(state); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 001b7dd125..7e96f87468 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -817,7 +817,7 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, wined3d_wndproc_mutex_unlock(); } -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) +static void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; @@ -850,6 +850,11 @@ void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) wined3d_wndproc_mutex_unlock(); } +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) +{ + wined3d_swapchain_state_unregister(state); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c2204cd86..901c809d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5083,13 +5083,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {

1 0

Michael Stefaniuc : termsv: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: c5ce35aaf89c8a78e4080f8d2eb9abd06536b6fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ce35aaf89c8a78e4080f8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:52 2020 +0200 termsv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/termsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/termsv/main.c b/programs/termsv/main.c index eb79d17f00..2ca6d0809d 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(termsv); -static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; +static WCHAR termserviceW[] = L"TermService"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : plugplay: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: d638cca0fe5bcfdca5776d71f6f254437e71fc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d638cca0fe5bcfdca5776d71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:49 2020 +0200 plugplay: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 8e00704842..2c4054de3e 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; +static WCHAR plugplayW[] = L"PlugPlay"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

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

Oct. 12, 2020

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

Michael Stefaniuc : ntdsapi: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b3a5662c49e54be9c5da9705b32af7f640684d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a5662c49e54be9c5da9705… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 11 22:05:24 2020 +0200 ntdsapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/ntdsapi.c | 3 +-- dlls/ntdsapi/tests/ntdsapi.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 8966a679ac..929b994484 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -130,10 +130,9 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, if (inst_port) { - static const WCHAR percentU[] = {'%','u',0}; *p = ':'; p++; - wsprintfW(p, percentU, inst_port); + wsprintfW(p, L"%u", inst_port); p += lstrlenW(p); } diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index b6dc1856a4..77dd675fc9 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -33,15 +33,15 @@ static void test_DsMakeSpn(void) DWORD ret; WCHAR spn[256]; DWORD spn_length; - static const WCHAR wszServiceClass[] = {'c','l','a','s','s',0}; - static const WCHAR wszServiceHost[] = {'h','o','s','t',0}; - static const WCHAR wszInstanceName[] = {'i','n','s','t','a','n','c','e',0}; - static const WCHAR wszReferrer[] = {'r','e','f','e','r','r','e','r',0}; - static const WCHAR wszSpn1[] = {'c','l','a','s','s','/','h','o','s','t',0}; - static const WCHAR wszSpn2[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e','/','h','o','s','t',0}; - static const WCHAR wszSpn3[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn4[] = {'c','l','a','s','s','/','i','n','s','t','a','n','c','e',':','5','5','5','/','h','o','s','t',0}; - static const WCHAR wszSpn5[] = {'c','l','a','s','s','/','h','o','s','t',':','5','5','5',0}; + static const WCHAR wszServiceClass[] = L"class"; + static const WCHAR wszServiceHost[] = L"host"; + static const WCHAR wszInstanceName[] = L"instance"; + static const WCHAR wszReferrer[] = L"referrer"; + static const WCHAR wszSpn1[] = L"class/host"; + static const WCHAR wszSpn2[] = L"class/instance/host"; + static const WCHAR wszSpn3[] = L"class/instance:555/host"; + static const WCHAR wszSpn4[] = L"class/instance:555/host"; + static const WCHAR wszSpn5[] = L"class/host:555"; spn[0] = '\0'; @@ -86,9 +86,9 @@ static void test_DsMakeSpn(void) static void test_DsClientMakeSpnForTargetServer(void) { - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; - static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR classW[] = L"class"; + static const WCHAR hostW[] = L"host.domain"; + static const WCHAR resultW[] = L"class/host.domain"; DWORD ret, len; WCHAR buf[256];

1 0

Michael Stefaniuc : write: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 48964553f0aa3d8e26679fff35ae3dee1c934244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48964553f0aa3d8e26679fff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:48 2020 +0200 write: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/write.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 4039af4398..1481e900f7 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,17 +25,15 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; - int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { WCHAR path[MAX_PATH]; STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) goto failed; - lstrcatW(path, SZ_WORDPAD); + lstrcatW(path, L"\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf);

1 0

Michael Stefaniuc : spoolsv: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 3f20bf4119c931f5d844c22202d127e5c412200c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f20bf4119c931f5d844c222… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:51 2020 +0200 spoolsv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/spoolsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 8fe37f2354..2893fa614a 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); -static WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; +static WCHAR spoolerW[] = L"Spooler"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Alexandre Julliard : makefiles: List all possible targets in the stub makefiles.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

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

Julian Rüger : German translation for release 5.16.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 29e7d8480ef2dcd729b7279e8cf95fae3ecd3f87 URL: https://source.winehq.org/git/website.git/?a=commit;h=29e7d8480ef2dcd729b72… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:07:09 2020 +0200 German translation for release 5.16. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020082801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020082801.xml b/news/de/2020082801.xml new file mode 100644 index 00000000..a16488a1 --- /dev/null +++ b/news/de/2020082801.xml @@ -0,0 +1,15 @@ +<news> +<date>28. August 2020</date> +<title>Wine 5.16 freigegeben</title> +<body> + Die Entwicklungsversion 5.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von x86 AVX-Registern.</li> + <li>Einige ARM64-Korrekturen für macOS.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.17.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 28864993d22d47b5db2c852db31128adf43809e5 URL: https://source.winehq.org/git/website.git/?a=commit;h=28864993d22d47b5db2c8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:08:34 2020 +0200 German translation for release 5.17. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020091101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020091101.xml b/news/de/2020091101.xml new file mode 100644 index 00000000..cb3e5d59 --- /dev/null +++ b/news/de/2020091101.xml @@ -0,0 +1,15 @@ +<news> +<date>11. September 2020</date> +<title>Wine 5.17 freigegeben</title> +<body> + Die Entwicklungsversion 5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>ADVAPI32-Bibliothek nach PE konvertiert.</li> + <li>Anfänge eines NDIS-Netzwerktreibers.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.19.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 4276e96426fe0743a617d6304fb6a0756d9190ac URL: https://source.winehq.org/git/website.git/?a=commit;h=4276e96426fe0743a617d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:31:29 2020 +0200 German translation for release 5.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020100901.xml b/news/de/2020100901.xml new file mode 100644 index 00000000..6eb8a4ba --- /dev/null +++ b/news/de/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Oktober 2020</date> +<title>Wine 5.19 freigegeben</title> +<body> + Die Entwicklungsversion 5.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Wine-Mono-Engine auf 5.1.1 aktualisiert, inkl. WPF-Textformatierungs-Unterstützung.</li> + <li>KERNEL32-Bibliothek nach PE konvertiert.</li> + <li>DSS-Kryptographieanbieter.</li> + <li>Fenstermodus-Unterstützung im neuen Konsolenhost.</li> + <li>Eine Anzahl an Ausnahmebehandlungs-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.18.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: ae3a9c7ed64c29347320b26f5200be0aa5efaff7 URL: https://source.winehq.org/git/website.git/?a=commit;h=ae3a9c7ed64c29347320b… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:27:19 2020 +0200 German translation for release 5.18. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2020092501.xml b/news/de/2020092501.xml new file mode 100644 index 00000000..d1c73778 --- /dev/null +++ b/news/de/2020092501.xml @@ -0,0 +1,18 @@ +<news> +<date>25. September 2020</date> +<title>Wine 5.18 freigegeben</title> +<body> + Die Entwicklungsversion 5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Vulkan-Shaderkompilation mit der neuen Vkd3d-Shader-Bibliothek.</li> + <li>USER32-Bibliothek nach PE konvertiert.</li> + <li>Die Konsole ist nicht länger auf die Curses-Bibliothek angewiesen.</li> + <li>Unterstützung von Anzeigemodi mit diversen Orientierungen.</li> + <li>Eine Anzahl an Syntaxkorrekturen im WIDL-Compiler.</li> + <li>Nicht-rekursive Makefiles.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for vkd3d 1.2.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 710910ecf8b0112b6209352e526171b25ce97ed7 URL: https://source.winehq.org/git/website.git/?a=commit;h=710910ecf8b0112b62093… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:17:59 2020 +0200 German translation for vkd3d 1.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020092201.xml b/news/de/2020092201.xml new file mode 100644 index 00000000..6f8a5a60 --- /dev/null +++ b/news/de/2020092201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. September 2020</date> +<title>Vkd3d 1.2 freigegeben</title> +<body> +Das Wine-Team ist stolz, die Veröffentlichung von Vkd3d 1.2, der Direct3D-zu-Vulkan-Übersetzungsbibliothek, verkünden zu können. + +Dieses Release enthält Verbesserungen, die in den <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.2:/ANNOUNCE">Release-Notes (en)</a> aufgeführt sind. +Die Höhepunkte lauten: +<ul> + <li>Verfügbarkeit von libvkd3d-shader als öffentliche Bibliothek.</li> + <li>Unterstützung von Tessellations-Shadern.</li> + <li>Version 1.1 Stammsignaturen.</li> + <li>Stream-Ausgabeunterstützung.</li> +</ul> + +Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz">verfügbar</a>. +</body></news>

1 0

Zebediah Figura : vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 5fb9bcdd148ed728d90a420f209cdfcc03af24ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fb9bcdd148ed728d90a420… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:03 2020 -0500 vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 ++---- libs/vkd3d-shader/trace.c | 6 +----- libs/vkd3d-shader/vkd3d_shader_main.c | 35 ++++++++++---------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 3ddca1e..9977d1a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2781,8 +2781,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); @@ -3346,8 +3345,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro *messages = NULL; memset(&context, 0, sizeof(context)); - if (!vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL); if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index a510f3a..9b49ca1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1579,11 +1579,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code enum vkd3d_result result = VKD3D_OK; void *code; - if (!vkd3d_string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return VKD3D_ERROR; - } + vkd3d_string_buffer_init(&buffer); shader_sm4_read_header(data, &ptr, &shader_version); shader_addline(&buffer, "%s_%u_%u\n", diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8d33859..7c3885e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -23,23 +23,9 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; -} - -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) -{ - buffer->buffer_size = 32; - if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size))) - { - ERR("Failed to allocate shader buffer memory.\n"); - return false; - } - - vkd3d_string_buffer_clear(buffer); - return true; + memset(buffer, 0, sizeof(*buffer)); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -52,6 +38,7 @@ static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int r unsigned int new_buffer_size = buffer->buffer_size * 2; char *new_buffer; + new_buffer_size = max(new_buffer_size, 32); while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) new_buffer_size *= 2; if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) @@ -71,6 +58,9 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; + if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) + return -1; + for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -118,7 +108,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, } } -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) { context->log_level = log_level; @@ -126,7 +116,7 @@ bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *cont context->line = 0; context->column = 0; - return vkd3d_string_buffer_init(&context->messages); + vkd3d_string_buffer_init(&context->messages); } void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) @@ -845,8 +835,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); ret = scan_dxbc(compile_info, &message_context); @@ -947,8 +936,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); switch (compile_info->source_type) { @@ -1050,8 +1038,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 98b5fbc..5ae5724 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -836,7 +836,7 @@ struct vkd3d_string_buffer enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; struct vkd3d_shader_message_context @@ -850,7 +850,7 @@ struct vkd3d_shader_message_context void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) DECLSPEC_HIDDEN; -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 0072fb213a9b4ee7647b68db760a5b27d89e2abd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0072fb213a9b4ee7647b68d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:01 2020 -0500 vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 93e7eaf..3ddca1e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2786,7 +2786,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); @@ -3390,7 +3390,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro done: vkd3d_shader_message_context_trace_messages(&context.message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + if (!vkd3d_shader_message_context_copy_messages(&context.message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&context.message_context); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c2fe2c8..d3d86ed 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -140,14 +140,20 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_string_buffer_trace_(&context->messages, function); } -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size + 1))) - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + if (!out) + return true; - return messages; + *out = NULL; + + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) + return false; + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + *out = messages; + return true; } void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, @@ -842,7 +848,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = scan_dxbc(compile_info, &message_context); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -956,7 +962,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -1046,7 +1052,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f88ea69..98b5fbc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -848,7 +848,8 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, + char **out) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context,

1 0

Zebediah Figura : vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 05cf9a54043eb5138ac503ef205427458435760f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=05cf9a54043eb5138ac503e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:02 2020 -0500 vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ tests/shader_runner_d3d12.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d3d86ed..8d33859 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -149,6 +149,9 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont *out = NULL; + if (!context->messages.content_size) + return true; + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) return false; memcpy(messages, context->messages.buffer, context->messages.content_size + 1); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index df7076c..787e90a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -335,6 +335,8 @@ START_TEST(shader_runner_d3d12) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!blob, "Expected no compiled shader blob.\n"); ok(!!errors, "Expected non-NULL error blob.\n"); + if (!errors) + return; if (vkd3d_test_state.debug_level) trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors));

1 0

Alexandre Julliard : Wine release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: website Branch: master Commit: 2bcb1bd8dba0ffb1e6adbfe2253981df902b3568 URL: https://source.winehq.org/git/website.git/?a=commit;h=2bcb1bd8dba0ffb1e6adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 23:01:02 2020 +0200 Wine release 5.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020100901.xml b/news/en/2020100901.xml new file mode 100644 index 00000000..75cd37b3 --- /dev/null +++ b/news/en/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>October 9, 2020</date> +<title>Wine 5.19 Released</title> +<body> + The Wine development release 5.19 is now available. + <a href="{$root}/announce/5.19">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.1, with WPF text formatting support.</li> + <li>KERNEL32 library converted to PE.</li> + <li>DSS cryptographic provider.</li> + <li>Windowing support in the new console host.</li> + <li>A number of exception handling fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 5.19.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: f7d815089580cebe2682683345272858def6358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d815089580cebe26826833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 886 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 505 insertions(+), 401 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7d815089580cebe2682…

1 0

Jacek Caban : conhost: Import menu handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 83b52b19b5324adf8782cb3b1fd23c9bbe86c8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b52b19b5324adf8782cb3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:12 2020 +0200 conhost: Import menu handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a36f0469b9..8ab639f329 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1011,6 +1011,44 @@ static void copy_selection( struct console *console ) CloseClipboard(); } +static void paste_clipboard( struct console *console ) +{ + WCHAR *ptr; + HANDLE h; + + if (!OpenClipboard( console->win )) return; + h = GetClipboardData( CF_UNICODETEXT ); + if (h && (ptr = GlobalLock( h ))) + { + unsigned int i, len = GlobalSize(h) / sizeof(WCHAR); + INPUT_RECORD ir[2]; + SHORT sh; + + ir[0].EventType = KEY_EVENT; + ir[0].Event.KeyEvent.wRepeatCount = 0; + ir[0].Event.KeyEvent.dwControlKeyState = 0; + ir[0].Event.KeyEvent.bKeyDown = TRUE; + + /* generate the corresponding input records */ + for (i = 0; i < len; i++) + { + /* FIXME: the modifying keys are not generated (shift, ctrl...) */ + sh = VkKeyScanW( ptr[i] ); + ir[0].Event.KeyEvent.wVirtualKeyCode = LOBYTE(sh); + ir[0].Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW( LOBYTE(sh), 0 ); + ir[0].Event.KeyEvent.uChar.UnicodeChar = ptr[i]; + + ir[1] = ir[0]; + ir[1].Event.KeyEvent.bKeyDown = FALSE; + + write_console_input( console, ir, 2, i == len - 1 ); + } + GlobalUnlock( h ); + } + + CloseClipboard(); +} + /* handle keys while selecting an area */ static void handle_selection_key( struct console *console, BOOL down, WPARAM wparam, LPARAM lparam ) { @@ -2256,6 +2294,53 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } break; + case WM_COMMAND: + switch (wparam) + { + case IDS_DEFAULT: + config_dialog( console, FALSE ); + break; + case IDS_PROPERTIES: + config_dialog( console, TRUE ); + break; + case IDS_MARK: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->window->selection_end.Y = 0; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_COPY: + if (console->window->in_selection) + { + console->window->in_selection = FALSE; + update_selection( console, 0 ); + copy_selection( console ); + } + break; + case IDS_PASTE: + paste_clipboard( console ); + break; + case IDS_SELECTALL: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->active->width - 1; + console->window->selection_end.Y = console->active->height - 1; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_SCROLL: + case IDS_SEARCH: + FIXME( "Unhandled yet command: %lx\n", wparam ); + break; + default: + return DefWindowProcW( hwnd, msg, wparam, lparam ); + } + break; + + case WM_INITMENUPOPUP: + if (!HIWORD(lparam)) return DefWindowProcW( hwnd, msg, wparam, lparam ); + set_menu_details( console, GetSystemMenu(console->win, FALSE) ); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import config dialog from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 627ae12d2de39695d244aead531a91d1a5fbf79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=627ae12d2de39695d244aead… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:04 2020 +0200 conhost: Import config dialog from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 348 +++++++++--------- po/ast.po | 328 ++++++++--------- po/bg.po | 348 +++++++++--------- po/ca.po | 328 ++++++++--------- po/cs.po | 328 ++++++++--------- po/da.po | 348 +++++++++--------- po/de.po | 328 ++++++++--------- po/el.po | 344 +++++++++--------- po/en.po | 328 ++++++++--------- po/en_US.po | 328 ++++++++--------- po/eo.po | 348 +++++++++--------- po/es.po | 348 +++++++++--------- po/fa.po | 340 ++++++++--------- po/fi.po | 328 ++++++++--------- po/fr.po | 328 ++++++++--------- po/he.po | 358 +++++++++--------- po/hi.po | 330 ++++++++--------- po/hr.po | 348 +++++++++--------- po/hu.po | 348 +++++++++--------- po/it.po | 348 +++++++++--------- po/ja.po | 328 ++++++++--------- po/ko.po | 328 ++++++++--------- po/lt.po | 328 ++++++++--------- po/ml.po | 330 ++++++++--------- po/nb_NO.po | 328 ++++++++--------- po/nl.po | 348 +++++++++--------- po/or.po | 330 ++++++++--------- po/pa.po | 330 ++++++++--------- po/pl.po | 328 ++++++++--------- po/pt_BR.po | 328 ++++++++--------- po/pt_PT.po | 328 ++++++++--------- po/rm.po | 334 ++++++++--------- po/ro.po | 328 ++++++++--------- po/ru.po | 328 ++++++++--------- po/si.po | 328 ++++++++--------- po/sk.po | 344 +++++++++--------- po/sl.po | 348 +++++++++--------- po/sr_RS(a)cyrillic.po | 362 +++++++++--------- po/sr_RS(a)latin.po | 374 +++++++++---------- po/sv.po | 328 ++++++++--------- po/ta.po | 328 ++++++++--------- po/te.po | 330 ++++++++--------- po/th.po | 342 ++++++++--------- po/tr.po | 328 ++++++++--------- po/uk.po | 328 ++++++++--------- po/wa.po | 346 +++++++++--------- po/wine.pot | 328 ++++++++--------- po/zh_CN.po | 328 ++++++++--------- po/zh_TW.po | 348 +++++++++--------- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.h | 39 ++ programs/conhost/conhost.rc | 82 +++++ programs/conhost/window.c | 849 +++++++++++++++++++++++++++++++++++++++++++ 53 files changed, 9267 insertions(+), 8198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627ae12d2de39695d244…

1 0

Tag wine-5.19 : Alexandre Julliard : Release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: refs/tags/wine-5.19 Tag: 6467cd3f3a97132b4888a1aa28f8b5752f9d0718 URL: https://source.winehq.org/git/wine.git/?a=tag;h=6467cd3f3a97132b4888a1aa28f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19

1 0

Jacek Caban : conhost: Import mouse event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 91be31b28ad5ae4852d2cc3cc3bcfc3e2ee01895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91be31b28ad5ae4852d2cc3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:48 2020 +0200 conhost: Import mouse event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 863d3e6ee1..b4891fb67d 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -840,6 +840,15 @@ static void update_console_font( struct console *console, const WCHAR *font, ERR( "Couldn't find a decent font" ); } +/* get a cell from a relative coordinate in window (takes into account the scrolling) */ +static COORD get_cell( struct console *console, LPARAM lparam ) +{ + COORD c; + c.X = console->active->win.left + (short)LOWORD(lparam) / console->active->font.width; + c.Y = console->active->win.left + (short)HIWORD(lparam) / console->active->font.height; + return c; +} + /* get the console bit mask equivalent to the VK_ status in key state */ static DWORD get_ctrl_state( BYTE *key_state) { @@ -1091,6 +1100,29 @@ static void record_key_input( struct console *console, BOOL down, WPARAM wparam, write_console_input( console, &ir, 1, TRUE ); } +static void record_mouse_input( struct console *console, COORD c, WPARAM wparam, DWORD event ) +{ + BYTE key_state[256]; + INPUT_RECORD ir; + + /* MOUSE_EVENTs shouldn't be sent unless ENABLE_MOUSE_INPUT is active */ + if (!(console->mode & ENABLE_MOUSE_INPUT)) return; + + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwMousePosition = c; + ir.Event.MouseEvent.dwButtonState = 0; + if (wparam & MK_LBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_1ST_BUTTON_PRESSED; + if (wparam & MK_MBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED; + if (wparam & MK_RBUTTON) ir.Event.MouseEvent.dwButtonState |= RIGHTMOST_BUTTON_PRESSED; + if (wparam & MK_CONTROL) ir.Event.MouseEvent.dwButtonState |= LEFT_CTRL_PRESSED; + if (wparam & MK_SHIFT) ir.Event.MouseEvent.dwButtonState |= SHIFT_PRESSED; + if (event == MOUSE_WHEELED) ir.Event.MouseEvent.dwButtonState |= wparam & 0xFFFF0000; + ir.Event.MouseEvent.dwControlKeyState = get_ctrl_state( key_state ); + ir.Event.MouseEvent.dwEventFlags = event; + + write_console_input( console, &ir, 1, TRUE ); +} + static void apply_config( struct console *console, const struct console_config *config ) { if (console->active->width != config->sb_width || console->active->height != config->sb_height) @@ -1157,6 +1189,17 @@ static void apply_config( struct console *console, const struct console_config * update_window( console ); } +/* grays / ungrays the menu items according to their state */ +static void set_menu_details( struct console *console, HMENU menu ) +{ + EnableMenuItem( menu, IDS_COPY, MF_BYCOMMAND | + (console->window->in_selection ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_PASTE, MF_BYCOMMAND | + (IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_SCROLL, MF_BYCOMMAND | MF_GRAYED ); + EnableMenuItem( menu, IDS_SEARCH, MF_BYCOMMAND | MF_GRAYED ); +} + static BOOL fill_menu( HMENU menu, BOOL sep ) { HINSTANCE module = GetModuleHandleW( NULL ); @@ -1244,6 +1287,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp console->active->win.left * console->active->font.width, console->active->win.top * console->active->font.height, SRCCOPY ); + if (console->window->in_selection) update_selection( console, ps.hdc ); EndPaint( console->win, &ps ); break; } @@ -1261,6 +1305,108 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp record_key_input( console, msg == WM_SYSKEYDOWN, wparam, lparam ); break; + case WM_LBUTTONDOWN: + if (console->window->quick_edit || console->window->in_selection) + { + if (console->window->in_selection) + update_selection( console, 0 ); + + if (console->window->quick_edit && console->window->in_selection) + { + console->window->in_selection = FALSE; + } + else + { + console->window->selection_end = get_cell( console, lparam ); + console->window->selection_start = console->window->selection_end; + SetCapture( console->win ); + update_selection( console, 0 ); + console->window->in_selection = TRUE; + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_MOUSEMOVE: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection && + (wparam & MK_LBUTTON)) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, MOUSE_MOVED ); + } + break; + + case WM_LBUTTONUP: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + ReleaseCapture(); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONDOWN: + if ((wparam & (MK_CONTROL|MK_SHIFT)) == console->window->menu_mask) + { + POINT pt; + pt.x = (short)LOWORD(lparam); + pt.y = (short)HIWORD(lparam); + ClientToScreen( hwnd, &pt ); + set_menu_details( console, console->window->popup_menu ); + TrackPopupMenu( console->window->popup_menu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hwnd, NULL ); + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONUP: + /* no need to track for rbutton up when opening the popup... the event will be + * swallowed by TrackPopupMenu */ + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + break; + + case WM_LBUTTONDBLCLK: + case WM_MBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: + record_mouse_input( console, get_cell(console, lparam), wparam, DOUBLE_CLICK ); + break; + + case WM_SETFOCUS: + if (console->active->cursor_visible) + { + CreateCaret( console->win, console->window->cursor_bitmap, + console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } + break; + + case WM_KILLFOCUS: + if (console->active->cursor_visible) + DestroyCaret(); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import keyboard event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 7148521305b161129c43b806d83c9a46aa42cbca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7148521305b161129c43b806… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:39 2020 +0200 conhost: Import keyboard event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 +- programs/conhost/conhost.h | 2 + programs/conhost/window.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 271 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7148521305b161129c43…

1 0

Jacek Caban : conhost: Import menus from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 6323e36f0f1b85180314027f84cb3c37140bcb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6323e36f0f1b85180314027f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:29 2020 +0200 conhost: Import menus from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 118 +++++++++++++++++++------------------- po/ast.po | 114 +++++++++++++++++++------------------ po/bg.po | 120 ++++++++++++++++++++------------------- po/ca.po | 118 +++++++++++++++++++------------------- po/cs.po | 118 +++++++++++++++++++------------------- po/da.po | 118 +++++++++++++++++++------------------- po/de.po | 116 +++++++++++++++++++------------------- po/el.po | 118 +++++++++++++++++++------------------- po/en.po | 118 +++++++++++++++++++------------------- po/en_US.po | 118 +++++++++++++++++++------------------- po/eo.po | 120 ++++++++++++++++++++------------------- po/es.po | 122 ++++++++++++++++++++-------------------- po/fa.po | 118 +++++++++++++++++++------------------- po/fi.po | 114 +++++++++++++++++++------------------ po/fr.po | 118 +++++++++++++++++++------------------- po/he.po | 120 ++++++++++++++++++++------------------- po/hi.po | 114 +++++++++++++++++++------------------ po/hr.po | 114 +++++++++++++++++++------------------ po/hu.po | 120 ++++++++++++++++++++------------------- po/it.po | 122 ++++++++++++++++++++-------------------- po/ja.po | 114 +++++++++++++++++++------------------ po/ko.po | 114 +++++++++++++++++++------------------ po/lt.po | 116 +++++++++++++++++++------------------- po/ml.po | 114 +++++++++++++++++++------------------ po/nb_NO.po | 116 +++++++++++++++++++------------------- po/nl.po | 118 +++++++++++++++++++------------------- po/or.po | 114 +++++++++++++++++++------------------ po/pa.po | 114 +++++++++++++++++++------------------ po/pl.po | 114 +++++++++++++++++++------------------ po/pt_BR.po | 114 +++++++++++++++++++------------------ po/pt_PT.po | 116 +++++++++++++++++++------------------- po/rm.po | 114 +++++++++++++++++++------------------ po/ro.po | 118 +++++++++++++++++++------------------- po/ru.po | 114 +++++++++++++++++++------------------ po/si.po | 114 +++++++++++++++++++------------------ po/sk.po | 114 +++++++++++++++++++------------------ po/sl.po | 118 +++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 124 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 134 ++++++++++++++++++++++---------------------- po/sv.po | 118 +++++++++++++++++++------------------- po/ta.po | 114 +++++++++++++++++++------------------ po/te.po | 114 +++++++++++++++++++------------------ po/th.po | 118 +++++++++++++++++++------------------- po/tr.po | 114 +++++++++++++++++++------------------ po/uk.po | 114 +++++++++++++++++++------------------ po/wa.po | 118 +++++++++++++++++++------------------- po/wine.pot | 114 +++++++++++++++++++------------------ po/zh_CN.po | 114 +++++++++++++++++++------------------ po/zh_TW.po | 118 +++++++++++++++++++------------------- programs/conhost/conhost.h | 21 +++++++ programs/conhost/conhost.rc | 30 ++++++++++ programs/conhost/window.c | 45 +++++++++++++++ 52 files changed, 3009 insertions(+), 2815 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6323e36f0f1b85180314…

1 0

Owen Rudge : wsdapi/tests: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 0c723b7dec7269118236eb20a8922d5e0672ba46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c723b7dec7269118236eb20… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:57 2020 +0100 wsdapi/tests: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 25 ++++------ dlls/wsdapi/tests/discovery.c | 98 ++++++++++++-------------------------- dlls/wsdapi/tests/msgparams.c | 6 +-- dlls/wsdapi/tests/xml.c | 106 ++++++++++++++++++------------------------ 4 files changed, 84 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c723b7dec7269118236…

1 0

Owen Rudge : wsdapi: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 683cdf558fe003bfb13061279a5698cd3d8165f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683cdf558fe003bfb1306127… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:54 2020 +0100 wsdapi: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 137 ++++++++++++++++------------------------------------- dlls/wsdapi/xml.c | 3 +- 2 files changed, 43 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=683cdf558fe003bfb130…

1 0

Zhiyi Zhang : dxgi: Support Alt+Enter for d3d12 swapchains.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: e62b6fa12d33b7d8c79f7ed97c5025afb7c9a634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62b6fa12d33b7d8c79f7ed9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:42 2020 +0800 dxgi: Support Alt+Enter for d3d12 swapchains. Signed-off-by: Zhiyi Zhang <zzhang(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 | 32 +++++++++++--- dlls/dxgi/tests/dxgi.c | 1 - dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 19 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 99 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 5 ++- include/wine/wined3d.h | 4 +- 8 files changed, 95 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e62b6fa12d33b7d8c79f…

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs in a few of the table functions.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 1bda5913fcc709f3500ac29fcbedf0ac9fae5cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bda5913fcc709f3500ac29f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:22 2020 +0100 riched20: Use ME_Paragraph ptrs in a few of the table functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.h | 8 ++++--- dlls/riched20/paint.c | 4 ++-- dlls/riched20/para.c | 13 ++++++++++++ dlls/riched20/table.c | 57 ++++++++++++++++++++++---------------------------- dlls/riched20/wrap.c | 9 ++++---- dlls/riched20/writer.c | 4 ++-- 7 files changed, 54 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bda5913fcc709f3500a…

1 0

Huw Davies : riched20: Move the marked paragraph list to a rbtree.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

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 Oct. 9, 2020

Oct. 9, 2020

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 Oct. 9, 2020

Oct. 9, 2020

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

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

Oct. 9, 2020

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

Zhiyi Zhang : dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 9288f310155a0eb5e1d8c56860332fcc4a075699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9288f310155a0eb5e1d8c568… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:53 2020 +0800 dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/swapchain.c | 16 ++++++++++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/swapchain.c | 16 ++++++++++-- dlls/ddraw/ddraw.c | 16 ++++++++++-- dlls/ddraw/ddraw_private.h | 1 + dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 57 +++++++++++++++++++++++++++++++++++++++--- dlls/dxgi/tests/dxgi.c | 13 +++++----- dlls/wined3d/adapter_gl.c | 9 ++++--- dlls/wined3d/adapter_vk.c | 10 +++++--- dlls/wined3d/directx.c | 10 +++++--- dlls/wined3d/swapchain.c | 52 +++++++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 4 +-- dlls/wined3d/wined3d_private.h | 16 ++++++++---- include/wine/wined3d.h | 20 ++++++++++++--- 16 files changed, 187 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9288f310155a0eb5e1d8…

1 0