October 2020 - Wine-devel - list.winehq.org

[PATCH 2/9] server: Remove no longer used console renderer object.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 52 --------- programs/conhost/conhost.c | 5 +- server/console.c | 213 +------------------------------------ server/trace.c | 3 +- 4 files changed, 4 insertions(+), 269 deletions(-)

1 0

[PATCH 1/9] server: Remove no longer needed console_input_events_append.
by Jacek Caban 14 Oct '20

14 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 55 +----------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-)

1 0

[PATCH] mf: Unconditionally deliver NULL (EOS) samples.
by Derek Lesho 14 Oct '20

14 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- Without this, I observed the pipeline locking up when a stream had two transforms, the first with the final sample, and the second with an empty sample queue. Calling session_request_sample would end up calling session_deliver_sample_to_node() for the EOS sample, but the second transform wouldn't accept it due to there being no requests. This behavior seems to match session_deliver_sample_to_node's output node behavior, where the request count is only checked if the sample isn't NULL. --- dlls/mf/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a1b54b7080e..7c82aa42a4b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2599,11 +2599,12 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, struct sample, entry) { - if (!topo_node->u.transform.outputs[i].requests) + if (!topo_node->u.transform.outputs[i].requests && sample_entry->sample) break; session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - topo_node->u.transform.outputs[i].requests--; + if (sample_entry->sample) + topo_node->u.transform.outputs[i].requests--; transform_release_sample(sample_entry); } -- 2.28.0

1 0

[PATCH] server: Add SeTcbPrivilege (SE_TCB_NAME) to the list of admin privileges.
by Paul Gofman 14 Oct '20

14 Oct '20

Fixes Origin client update failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Origin Client Service is run as a LocalSystem service and expects AdjustTokenPrivileges() to succeed enabling this privilege. SeTcbPrivilege is available for LocalSystem account on Windows but not for admin users. But since we currently effectively have a single user for everything it looks reasonable to add the privilege. server/token.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/token.c b/server/token.c index 26d9708f2cd..30320851436 100644 --- a/server/token.c +++ b/server/token.c @@ -42,6 +42,7 @@ #define MAX_SUBAUTH_COUNT 1 const LUID SeIncreaseQuotaPrivilege = { 5, 0 }; +const LUID SeTcbPrivilege = { 7, 0 }; const LUID SeSecurityPrivilege = { 8, 0 }; const LUID SeTakeOwnershipPrivilege = { 9, 0 }; const LUID SeLoadDriverPrivilege = { 10, 0 }; @@ -865,6 +866,7 @@ struct token *token_create_admin( void ) const LUID_AND_ATTRIBUTES admin_privs[] = { { SeChangeNotifyPrivilege , SE_PRIVILEGE_ENABLED }, + { SeTcbPrivilege , 0 }, { SeSecurityPrivilege , 0 }, { SeBackupPrivilege , 0 }, { SeRestorePrivilege , 0 }, -- 2.26.2

1 0

[PATCH 1/5] evr: Add already implemented functions from mfplat.dll.
by Nikolay Sivov 14 Oct '20

14 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index aa839295658..dcf062cf5aa 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -3,14 +3,14 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub MFConvertColorInfoFromDXVA -@ stub MFConvertColorInfoToDXVA +@ stdcall -import MFConvertColorInfoToDXVA(ptr ptr) @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array -@ stub MFCopyImage +@ stdcall -import MFCopyImage(ptr long ptr long long long) @ stub MFCreateDXSurfaceBuffer @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader -@ stub MFCreateVideoMediaTypeFromSubtype +@ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @@ -20,7 +20,7 @@ @ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) @ stdcall MFCreateVideoSampleAllocator(ptr ptr) @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) -@ stub MFGetPlaneSize +@ stdcall -import MFGetPlaneSize(long long long ptr) @ stub MFGetStrideForBitmapInfoHeader @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat -- 2.28.0

1 4

[PATCH] wined3d: Use wined3d_get_primary_adapter_luid() if we didn't get a valid LUID from Vulkan.
by Henri Verbeet 14 Oct '20

14 Oct '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index beda271c32d..3fb9e4ce4b4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2242,7 +2242,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; - LUID *luid = NULL; + LUID primary_luid, *luid = NULL; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -2274,6 +2274,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (id_properties.deviceLUIDValid) luid = (LUID *)id_properties.deviceLUID; + else if (ordinal == 0 && wined3d_get_primary_adapter_luid(&primary_luid)) + luid = &primary_luid; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) { -- 2.20.1

1 0

[PATCH 5/5] riched20: Return a run ptr from the run insert function.
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 49 ++++++++++++++++++++++++------------------ dlls/riched20/undo.c | 7 +++--- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c56e5961f73..c5fa51894e8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -471,7 +471,7 @@ ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, assert(p->pRun->type == diRun); - return ME_InsertRunAtCursor(editor, p, style, str, len, flags); + return run_get_di( run_insert( editor, p, style, str, len, flags ) ); } static struct re_object* create_re_object(const REOBJECT *reo) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b41d0f7db68..1a9f3fd6fb0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -119,8 +119,8 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, - ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, + ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ @@ -133,6 +133,7 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index ed0273395c3..a5888960f38 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -57,6 +57,16 @@ ME_Run *run_next_all_paras( ME_Run *run ) return NULL; } +ME_Run *run_prev_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_PrevRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -347,56 +357,53 @@ ME_Run *run_create( ME_Style *s, int flags ) } /****************************************************************************** - * ME_InsertRunAtCursor + * run_insert * * Inserts a new run with given style, flags and content at a given position, * which is passed as a cursor structure (which consists of a run and * a run-relative character offset). */ -ME_DisplayItem * -ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, - const WCHAR *str, int len, int flags) +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, + const WCHAR *str, int len, int flags ) { - ME_DisplayItem *insert_before = cursor->pRun, *prev; - ME_Run *run; + ME_Run *insert_before = &cursor->pRun->member.run, *run, *prev; if (cursor->nOffset) { - if (cursor->nOffset == cursor->pRun->member.run.len) + if (cursor->nOffset == insert_before->len) { - insert_before = ME_FindItemFwd( cursor->pRun, diRun ); - if (!insert_before) insert_before = cursor->pRun; /* Always insert before the final eop run */ + insert_before = run_next_all_paras( insert_before ); + if (!insert_before) insert_before = &cursor->pRun->member.run; /* Always insert before the final eop run */ } else { run_split( editor, cursor ); - insert_before = cursor->pRun; + insert_before = &cursor->pRun->member.run; } } - add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + - insert_before->member.run.nCharOfs, len ); + add_undo_delete_run( editor, insert_before->para->nCharOfs + insert_before->nCharOfs, len ); run = run_create( style, flags ); - run->nCharOfs = insert_before->member.run.nCharOfs; + run->nCharOfs = insert_before->nCharOfs; run->len = len; - run->para = insert_before->member.run.para; + run->para = insert_before->para; ME_InsertString( run->para->text, run->nCharOfs, str, len ); - ME_InsertBefore( insert_before, run_get_di( run ) ); + ME_InsertBefore( run_get_di( insert_before ), run_get_di( run ) ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset( insert_before, len ); - para_mark_rewrap( editor, insert_before->member.run.para ); + ME_PropagateCharOffset( run_get_di( insert_before ), len ); + para_mark_rewrap( editor, insert_before->para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( run_get_di( run ), diRun ); + prev = run_prev_all_paras( run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; @@ -404,7 +411,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } } - return run_get_di( run ); + return run; } static BOOL run_is_splittable( const ME_Run *run ) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 55574dc412b..1f5c7ae4cd6 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -357,10 +357,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; ME_CursorFromCharOfs(editor, undo->u.insert_run.pos, &tmp); - ME_InsertRunAtCursor(editor, &tmp, undo->u.insert_run.style, - undo->u.insert_run.str, - undo->u.insert_run.len, - undo->u.insert_run.flags); + run_insert( editor, &tmp, undo->u.insert_run.style, + undo->u.insert_run.str, undo->u.insert_run.len, + undo->u.insert_run.flags ); break; } case undo_delete_run: -- 2.23.0

1 0

[PATCH 4/5] riched20: Use run ptrs in SetCharFormat().
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 38 ++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7ae0b5341b0..b41d0f7db68 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,8 +76,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; -ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; @@ -132,6 +130,9 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 3f550d8d993..ed0273395c3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -47,6 +47,16 @@ ME_Run *run_prev( ME_Run *run ) return NULL; } +ME_Run *run_next_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_NextRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -745,22 +755,22 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * * If no text is selected, then nothing is done. */ -void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) +void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *start_run = start->pRun, *end_run = NULL; + ME_Run *run, *start_run = &start->pRun->member.run, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; if (start->nOffset == start->pRun->member.run.len) - start_run = ME_FindItemFwd( start->pRun, diRun ); + start_run = run_next_all_paras( &start->pRun->member.run ); else if (start->nOffset) { /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; ME_Run *split_run = run_split( editor, start ); - start_run = start->pRun; + start_run = &start->pRun->member.run; if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; @@ -771,26 +781,26 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C if (end) { if (end->nOffset == end->pRun->member.run.len) - end_run = ME_FindItemFwd( end->pRun, diRun ); + end_run = run_next_all_paras( &end->pRun->member.run ); else { if (end->nOffset) run_split( editor, end ); - end_run = end->pRun; + end_run = &end->pRun->member.run; } } - for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) + for (run = start_run; run != end_run; run = run_next_all_paras( run )) { - ME_Style *new_style = ME_ApplyStyle(editor, run->member.run.style, pFmt); - ME_Paragraph *para = run->member.run.para; + ME_Style *new_style = ME_ApplyStyle( editor, run->style, fmt ); + ME_Paragraph *para = run->para; - add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, - run->member.run.len, &run->member.run.style->fmt ); - ME_ReleaseStyle(run->member.run.style); - run->member.run.style = new_style; + add_undo_set_char_fmt( editor, para->nCharOfs + run->nCharOfs, + run->len, &run->style->fmt ); + ME_ReleaseStyle( run->style ); + run->style = new_style; /* The para numbering style depends on the eop style */ - if ((run->member.run.nFlags & MERF_ENDPARA) && para->para_num.style) + if ((run->nFlags & MERF_ENDPARA) && para->para_num.style) { ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; -- 2.23.0

1 0

[PATCH 3/5] riched20: Don't return the diTextStart paragraph from para_prev().
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 ++---- dlls/riched20/para.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5f7d52aa4cf..c56e5961f73 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -774,12 +774,10 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { para = run->para; /* Skip empty start of table row paragraph */ - if (para_prev( para )->nFlags & MEPF_ROWSTART) + if (para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART) para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (para_get_di( para_prev( para ) )->type == diTextStart) - return FALSE; - + if (!para_prev( para )) return FALSE; para = para_prev( para ); run = para_end_run( para ); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 99ce1706631..431f89faed3 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -64,7 +64,7 @@ ME_Paragraph *para_next( ME_Paragraph *para ) ME_Paragraph *para_prev( ME_Paragraph *para ) { - if (para->prev_para) return &para->prev_para->member.para; + if (para->prev_para && para->prev_para->type == diParagraph) return &para->prev_para->member.para; return NULL; } -- 2.23.0

1 0

[PATCH 2/5] riched20: Don't mark the diTextStart paragraph as requiring repainting.
by Huw Davies 14 Oct '20

14 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/wrap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 393b1784d4e..26f1c30b83f 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1049,8 +1049,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) else totalWidth = max(totalWidth, para->nWidth); - if (!para->nCharOfs) - update_repaint( para_prev( para ), &repaint ); update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint ); -- 2.23.0

1 0