October 2020 - Wine-Commits

Huw Davies : richedit: Use the correct ptr to the cell.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: db6c55490964eb33ae6dc96f8205cb029886c618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6c55490964eb33ae6dc96f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:20 2020 +0100 richedit: Use the correct ptr to the cell. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6f5bb4e1f83..bdbf022a405 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -337,7 +337,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (item->member.run.para->fmt.wNumbering) add_font_to_fonttbl( pStream, item->member.run.para->para_num.style ); - if ((pCell = item->member.para.pCell)) + if ((pCell = item->member.run.para->pCell)) { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left,

1 0

Huw Davies : riched20: Pass a run ptr to the run drawing function.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 87c4d217edd14969f556949f5709c5fb7e3137e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c4d217edd14969f556949f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:18 2020 +0100 riched20: Pass a run ptr to the run drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 7ac7d83c9a9..5a0432a9eed 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -440,17 +440,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { SetTextColor(hDC, color); } -static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) +static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para ) { - ME_Run *run = &rundi->member.run; ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; - + if (run->nFlags & MERF_HIDDEN) return; - start = ME_FindItemBack(rundi, diStartRow); + start = ME_FindItemBack( run_get_di( run ), diStartRow ); ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -1003,8 +1002,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) - ME_DrawRun(c, c->pt.x + run->pt.x, - c->pt.y + para->pt.y + run->pt.y + baseline, p, para); + ME_DrawRun( c, c->pt.x + run->pt.x, + c->pt.y + para->pt.y + run->pt.y + baseline, run, para ); if (me_debug) { static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0};

1 0

Huw Davies : riched20: Pass a paragraph ptr to a couple of the drawing helpers.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 7875a77b2322e5fe4da7ac1306360a9419e3b071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7875a77b2322e5fe4da7ac13… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:17 2020 +0100 riched20: Pass a paragraph ptr to a couple of the drawing helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6187fb74f1b..7ac7d83c9a9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -696,9 +696,8 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT } } -static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) +static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) { - ME_Paragraph *para = &paragraph->member.para; if (!c->editor->bEmulateVersion10) /* v4.1 */ { if (para->pCell) @@ -778,7 +777,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) if (atBottom) { int oldLeft = rc.left; width = max(ME_twips2pointsY(c, cell->border.bottom.width), 1); - paraAfterRow = table_row_end( &paragraph->member.para )->next_para; + paraAfterRow = table_row_end( para )->next_para; if (paraAfterRow->member.para.nFlags & MEPF_ROWSTART) { ME_DisplayItem *nextEndCell; nextEndCell = ME_FindItemBack( para_get_di( table_row_end( &paraAfterRow->member.para ) ), diCell ); @@ -845,7 +844,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) oldpen = SelectObject(c->hDC, pen); /* Find the start relative to the text */ - firstX = c->pt.x + ME_FindItemFwd(paragraph, diRun)->member.run.pt.x; + firstX = c->pt.x + para_first_run( para )->pt.x; /* Go back by the horizontal gap, which is stored in dxOffset */ firstX -= ME_twips2pointsX(c, para->fmt.dxOffset); /* The left edge, stored in dxStartIndent affected just the first edge */ @@ -853,7 +852,7 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd(paragraph, diStartRow)->member.row.nHeight; + nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */ @@ -892,9 +891,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) } } -static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) +static void draw_para_number( ME_Context *c, ME_Paragraph *para ) { - ME_Paragraph *para = &p->member.para; int x, y; COLORREF old_text; @@ -1034,8 +1032,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) no++; } - ME_DrawTableBorders(c, paragraph); - draw_para_number(c, paragraph); + ME_DrawTableBorders( c, para ); + draw_para_number( c, para ); SetTextAlign(c->hDC, align); }

1 0

Nikolay Sivov : include: Fix typo in IDirectXVideoProcessor argument name.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: c336b96a9b1236a2de29348aee9f0a887353c63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c336b96a9b1236a2de29348a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 13:39:53 2020 +0300 include: Fix typo in IDirectXVideoProcessor argument name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 04e620b7be8..99c93518428 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -777,7 +777,7 @@ interface IDirectXVideoProcessor : IUnknown [in] const DXVA2_VideoProcessBltParams* pBltParams, [in] const DXVA2_VideoSample* pSamples, [in] UINT NumSamples, - [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); + [out] HANDLE* pHandleComplete); } /*****************************************************************************

1 0

Nikolay Sivov : comsvcs: Create MTA without initialization thread.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: c9cc098ccd7f0cdb82b8e52d00c415042c5ff717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9cc098ccd7f0cdb82b8e52d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 12:43:04 2020 +0300 comsvcs: Create MTA without initialization thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49679 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 9ab77dfceda..74704077ecb 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -40,7 +40,7 @@ typedef struct dispensermanager { IDispenserManager IDispenserManager_iface; LONG ref; - HANDLE mta_thread, mta_stop_event; + CO_MTA_USAGE_COOKIE mta_cookie; } dispensermanager; typedef struct holder @@ -285,27 +285,14 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) if (!ref) { - if (This->mta_thread) - { - SetEvent(This->mta_stop_event); - WaitForSingleObject(This->mta_thread, INFINITE); - CloseHandle(This->mta_stop_event); - CloseHandle(This->mta_thread); - } + if (This->mta_cookie) + CoDecrementMTAUsage(This->mta_cookie); heap_free(This); } return ref; } -static DWORD WINAPI mta_thread_proc(void *arg) -{ - CoInitializeEx(NULL, COINIT_MULTITHREADED); - WaitForSingleObject(arg, INFINITE); - CoUninitialize(); - return 0; -} - static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDispenserDriver *driver, LPCOLESTR name, IHolder **dispenser) { @@ -319,11 +306,8 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi hr = create_holder(driver, dispenser); - if (!This->mta_thread) - { - This->mta_stop_event = CreateEventA(NULL, TRUE, FALSE, NULL); - This->mta_thread = CreateThread(NULL, 0, mta_thread_proc, This->mta_stop_event, 0, NULL); - } + if (!This->mta_cookie) + CoIncrementMTAUsage(&This->mta_cookie); TRACE("<-- 0x%08x, %p\n", hr, *dispenser);

1 0

Nikolay Sivov : dxva2: Add video processor stub.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6194f506720231c176d3b37bf1b5d054222dc7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6194f506720231c176d3b37b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 17:10:40 2020 +0300 dxva2: Add video processor stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/dxva2/tests/dxva2.c | 108 ++++++++++++++++++++++++++++++++++-- 2 files changed, 241 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6194f506720231c176d3…

1 0

Huw Davies : riched20: Use helpers in the cursor to start/end functions.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 53959eb7d4fdf652dcbccc00366efccd06abde72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53959eb7d4fdf652dcbccc00… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 19 12:21:19 2020 +0100 riched20: Use helpers in the cursor to start/end functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 6 ++++++ dlls/riched20/editor.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 22da616731f..eb7ad7f1899 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -26,15 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) { - cursor->pPara = editor->pBuffer->pFirst->member.para.next_para; - cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->pPara = para_get_di( editor_first_para( editor ) ); + cursor->pRun = run_get_di( para_first_run( &cursor->pPara->member.para ) ); cursor->nOffset = 0; } static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL final_eop) { - cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; - cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + cursor->pPara = para_get_di( para_prev( editor_end_para( editor ) ) ); + cursor->pRun = run_get_di( para_end_run( &cursor->pPara->member.para ) ); cursor->nOffset = final_eop ? cursor->pRun->member.run.len : 0; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e988eb9a014..51a6e33aef4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -285,6 +285,12 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) return para_next( &editor->pBuffer->pFirst->member.para ); } +/* Note, returns the diTextEnd sentinel paragraph */ +ME_Paragraph *editor_end_para( ME_TextEditor *editor ) +{ + return &editor->pBuffer->pLast->member.para; +} + static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { WCHAR *pText; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4412a574262..c79fa0e18f0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -273,6 +273,7 @@ void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int l int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, int count, IDataObject **data_out ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */

1 0

Nikolay Sivov : server: Handle duplicate handles when inheriting them for the new process.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 2a7a1bbee2116d1ec242920c68fa12dfdf747347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a7a1bbee2116d1ec242920c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 12:39:35 2020 +0300 server: Handle duplicate handles when inheriting them for the new process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50004 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index 15382256f10..2556a03901e 100644 --- a/server/handle.c +++ b/server/handle.c @@ -363,8 +363,9 @@ static void inherit_handle( struct process *parent, const obj_handle_t handle, s src = get_handle( parent, handle ); if (!src || !(src->access & RESERVED_INHERIT)) return; - grab_object_for_handle( src->ptr ); index = handle_to_index( handle ); + if (dst[index].ptr) return; + grab_object_for_handle( src->ptr ); dst[index] = *src; table->last = max( table->last, index ); }

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.158.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 02458faa43b0c4b63ac248b7714135255e9518b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02458faa43b0c4b63ac248b7… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Oct 19 10:10:16 2020 -0700 winevulkan: Update to VK spec version 1.2.158. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 50 + dlls/winevulkan/vulkan_thunks.h | 4 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2570 ++++++++++++++++++++------------------- 5 files changed, 1391 insertions(+), 1240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02458faa43b0c4b63ac2…

1 0

Piotr Caban : ucrtbase: Support UTF8 codepage in wctomb.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 5fcc3771681c0c8747f59d3ffe1a278b01f2a1df URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcc3771681c0c8747f59d3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 19 19:35:50 2020 +0200 ucrtbase: Support UTF8 codepage in wctomb. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ed843d6e58d..858ecbd7ed0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1996,15 +1996,18 @@ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) { char out; - BOOL error; + BOOL error = FALSE; + BOOL *perror; UINT codepage = get_locinfo()->lc_codepage; + perror = (codepage != CP_UTF8 ? &error : NULL); + if(!codepage) { if (wchar < 0xff) return (signed char)wchar; else return MSVCRT_EOF; - } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) + } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, perror ) && !error) return (INT)out; return MSVCRT_EOF; }

1 0