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