July 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : opengl32: Correctly interpret glMapBuffer() access in wow64 mapping.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 59ecdbd43e9a839979f54a7ac2db8a213362f048 URL: https://gitlab.winehq.org/wine/wine/-/commit/59ecdbd43e9a839979f54a7ac2db8a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 13 18:12:40 2023 -0500 opengl32: Correctly interpret glMapBuffer() access in wow64 mapping. --- dlls/opengl32/unix_wgl.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 92a77b78f18..a03f8337fbf 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1857,6 +1857,19 @@ static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *p return STATUS_INVALID_ADDRESS; } +static GLbitfield map_range_flags_from_map_flags( GLenum flags ) +{ + switch (flags) + { + case GL_READ_ONLY: return GL_MAP_READ_BIT; + case GL_WRITE_ONLY: return GL_MAP_WRITE_BIT; + case GL_READ_WRITE: return GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + default: + ERR( "invalid map flags %#x\n", flags ); + return GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + } +} + static NTSTATUS wow64_unmap_buffer( void *ptr, SIZE_T size, GLbitfield access ) { void *wow_ptr; @@ -1968,7 +1981,8 @@ static NTSTATUS wow64_gl_map_buffer( void *args, NTSTATUS (*gl_map_buffer64)(voi if (params32->ret) params.ret = get_buffer_pointer( params.teb, params.target ); else if ((status = gl_map_buffer64( &params ))) return status; - status = wow64_map_buffer( params.teb, 0, params.target, params.ret, 0, params.access, &params32->ret ); + status = wow64_map_buffer( params.teb, 0, params.target, params.ret, 0, + map_range_flags_from_map_flags( params.access ), &params32->ret ); if (!status || status == STATUS_INVALID_ADDRESS) return status; unmap_buffer( params.teb, params.target ); @@ -2038,7 +2052,8 @@ static NTSTATUS wow64_gl_map_named_buffer( void *args, NTSTATUS (*gl_map_named_b if (params32->ret) params.ret = get_named_buffer_pointer( params.teb, params.buffer ); else if ((status = gl_map_named_buffer64( &params ))) return status; - status = wow64_map_buffer( params.teb, params.buffer, 0, params.ret, 0, params.access, &params32->ret ); + status = wow64_map_buffer( params.teb, params.buffer, 0, params.ret, 0, + map_range_flags_from_map_flags( params.access ), &params32->ret ); if (!status || status == STATUS_INVALID_ADDRESS) return status; unmap_named_buffer( params.teb, params.buffer );

1 0

Alexandre Julliard : ndis.sys: Use nameless unions/structs.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 240df39c1cbc3ec8992e8efda94f15c4dd0ac6aa URL: https://gitlab.winehq.org/wine/wine/-/commit/240df39c1cbc3ec8992e8efda94f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:19 2023 +0200 ndis.sys: Use nameless unions/structs. --- dlls/ndis.sys/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index b5ce2fd8f5b..bdfe7aa4742 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -48,7 +47,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(oid)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } oid = *(DWORD *)irp->AssociatedIrp.SystemBuffer; @@ -60,19 +59,19 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) { if (len < sizeof(NDIS_MEDIUM)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; } *(NDIS_MEDIUM *)response = netdev->MediaType; irp->IoStatus.Information = sizeof(netdev->MediaType); - irp->IoStatus.u.Status = STATUS_SUCCESS; + irp->IoStatus.Status = STATUS_SUCCESS; break; } case OID_802_3_PERMANENT_ADDRESS: { irp->IoStatus.Information = netdev->PhysicalAddressLength; if (len < netdev->PhysicalAddressLength) - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; else memcpy( response, netdev->PermanentPhysicalAddress, sizeof(netdev->PermanentPhysicalAddress) ); break; @@ -81,7 +80,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) { irp->IoStatus.Information = netdev->PhysicalAddressLength; if (len < netdev->PhysicalAddressLength) - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; else memcpy( response, netdev->PhysicalAddress, sizeof(netdev->PhysicalAddress) ); break; @@ -89,7 +88,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: FIXME( "Unsupported OID %lx\n", oid ); - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; } } @@ -112,11 +111,11 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) break; default: FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; } - status = irp->IoStatus.u.Status; + status = irp->IoStatus.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); return status; }

1 0

Zebediah Figura : opengl32: Copy to the wow64 buffer even for write maps.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 77981d45488d2d4458b90eee5e8acb7a17e84100 URL: https://gitlab.winehq.org/wine/wine/-/commit/77981d45488d2d4458b90eee5e8acb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 13 18:01:28 2023 -0500 opengl32: Copy to the wow64 buffer even for write maps. GL_MAP_WRITE_BIT does not mean that the buffer will be filled, unless an INVALIDATE bit is explicitly set. The application is free to partially update the buffer, even if it does not read from it. Thanks to Aida Jonikienė for doing most of the debugging here. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55045 --- dlls/opengl32/unix_wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index e58e5b5d9b5..92a77b78f18 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1827,7 +1827,7 @@ static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *p { if (*ret) /* wow64 pointer provided, map buffer to it */ { - if (access & GL_MAP_READ_BIT) + if (!(access & (GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT))) { TRACE( "Copying %#zx from buffer at %p to wow64 buffer %p\n", size, ptr, UlongToPtr(*ret) ); memcpy( UlongToPtr(*ret), ptr, size );

1 0

Jinoh Kang : msi: Make insertion order of line controls consistent with other controls.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 3eceda2f2a77754f0bf93ea33018e8ef49e82669 URL: https://gitlab.winehq.org/wine/wine/-/commit/3eceda2f2a77754f0bf93ea33018e8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 22:32:16 2023 +0900 msi: Make insertion order of line controls consistent with other controls. Fixes: 2c5bd49297f79d9941a256d8ec61e0eb2bf9bf9c --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 061bca9a6c9..11d6af75846 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1190,7 +1190,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_OUTOFMEMORY; lstrcpyW( control->name, name ); - list_add_head( &dialog->controls, &control->entry ); + list_add_tail( &dialog->controls, &control->entry ); control->handler = NULL; control->update = NULL; control->property = NULL;

1 0

Jinoh Kang : msi: Don't open code dialog_add_control() in dialog_line_control().
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 1fca47b724b3835ac0267f58c5b3486fc222fc71 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fca47b724b3835ac0267f58c5b348… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 22:47:18 2023 +0900 msi: Don't open code dialog_add_control() in dialog_line_control(). Commit b1cc87cb656 ("msi: The line control has a height of exactly 2 device units.", 2007-12-16) open-coded the body of (msi_)dialog_add_control() inside dialog_line_control() modulo the height override. Except the fixed height, line controls have nothing special compared to other controls. Thus, there is little merit in open-coding it. Also, dialog_line_control() has bit-rotted over time; it already missed a few changes that were done to any other controls. Fix this by just using dialog_add_control(). Also, add a special case logic just for line controls. --- dlls/msi/dialog.c | 61 +++++-------------------------------------------------- 1 file changed, 5 insertions(+), 56 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 11d6af75846..6c1b9ebf2a8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -419,6 +419,9 @@ static struct control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, font = dialog_get_style( title_font, &title ); } + if (!wcsicmp( MSI_RecordGetString( rec, 3 ), L"Line" )) + height = 2; /* line is exactly 2 units in height */ + control->hwnd = CreateWindowExW( exstyle, szCls, title, style, x, y, width, height, parent, NULL, NULL, NULL ); @@ -1163,62 +1166,8 @@ static UINT dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) { - DWORD attributes; - LPCWSTR name; - DWORD style, exstyle = 0; - DWORD x, y, width, height; - struct control *control; - - TRACE("%p %p\n", dialog, rec); - - style = WS_CHILD | SS_ETCHEDHORZ | SS_SUNKEN; - - name = MSI_RecordGetString( rec, 2 ); - attributes = MSI_RecordGetInteger( rec, 8 ); - - if( attributes & msidbControlAttributesVisible ) - style |= WS_VISIBLE; - if( ~attributes & msidbControlAttributesEnabled ) - style |= WS_DISABLED; - if( attributes & msidbControlAttributesSunken ) - exstyle |= WS_EX_CLIENTEDGE; - - dialog_map_events( dialog, name ); - - control = malloc( offsetof( struct control, name[wcslen( name ) + 1] ) ); - if (!control) - return ERROR_OUTOFMEMORY; - - lstrcpyW( control->name, name ); - list_add_tail( &dialog->controls, &control->entry ); - control->handler = NULL; - control->update = NULL; - control->property = NULL; - control->value = NULL; - control->hBitmap = NULL; - control->hIcon = NULL; - control->hImageList = NULL; - control->hDll = NULL; - control->tabnext = wcsdup( MSI_RecordGetString( rec, 11 ) ); - control->type = wcsdup( MSI_RecordGetString( rec, 3 ) ); - control->progress_current = 0; - control->progress_max = 100; - control->progress_backwards = FALSE; - - x = MSI_RecordGetInteger( rec, 4 ); - y = MSI_RecordGetInteger( rec, 5 ); - width = MSI_RecordGetInteger( rec, 6 ); - - x = dialog_scale_unit( dialog, x ); - y = dialog_scale_unit( dialog, y ); - width = dialog_scale_unit( dialog, width ); - height = 2; /* line is exactly 2 units in height */ - - control->hwnd = CreateWindowExW( exstyle, L"Static", NULL, style, - x, y, width, height, dialog->hwnd, NULL, NULL, NULL ); - - TRACE("Dialog %s control %s hwnd %p\n", - debugstr_w(dialog->name), debugstr_w(name), control->hwnd ); + if (!dialog_add_control( dialog, rec, L"Static", SS_ETCHEDHORZ | SS_SUNKEN)) + return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS; }

1 0

Jinoh Kang : msi: Fully initialize the control structure in dialog_line_control().
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 735584076efafc29673e0c9418a64343634f9aa5 URL: https://gitlab.winehq.org/wine/wine/-/commit/735584076efafc29673e0c9418a643… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 22:07:28 2023 +0900 msi: Fully initialize the control structure in dialog_line_control(). Fixes: 76606eaea034c51a73190aac92e75d8b20e82164 Fixes: 174b7b51ac9e57c6cfa8f48e62bbf468ae3b1f24 --- dlls/msi/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1374f3b6274..061bca9a6c9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1192,10 +1192,12 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) lstrcpyW( control->name, name ); list_add_head( &dialog->controls, &control->entry ); control->handler = NULL; + control->update = NULL; control->property = NULL; control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = wcsdup( MSI_RecordGetString( rec, 11 ) ); control->type = wcsdup( MSI_RecordGetString( rec, 3 ) );

1 0

Jinoh Kang : riched20: Factor out device context acquisition from ME_MakeFirstParagraph.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 03036f42e1afa9c79246dcee6b9fe876286b1aa4 URL: https://gitlab.winehq.org/wine/wine/-/commit/03036f42e1afa9c79246dcee6b9fe8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 20:47:52 2023 +0900 riched20: Factor out device context acquisition from ME_MakeFirstParagraph. This lets ME_MakeEditor() reuse the device context throughout the editor initialization process. --- dlls/riched20/editor.c | 6 +++++- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 201c4435453..d1819482b28 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2931,6 +2931,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) int i; LONG selbarwidth; HRESULT hr; + HDC hdc; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; if (ITextHost_QueryInterface( texthost, &IID_ITextHost2, (void **)&ed->texthost ) == S_OK) @@ -2957,7 +2958,10 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ list_init( &ed->style_list ); - ME_MakeFirstParagraph(ed); + + hdc = ITextHost_TxGetDC( ed->texthost ); + ME_MakeFirstParagraph( ed, hdc ); + ITextHost_TxReleaseDC( ed->texthost, hdc ); /* The four cursors are for: * 0 - The position where the caret is shown * 1 - The anchored end of the selection (for normal selection) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index da7d3bd35fd..1ad8f4adef4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -209,7 +209,7 @@ void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ); void editor_mark_rewrap_all( ME_TextEditor *editor ); void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt); BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ); -void ME_MakeFirstParagraph(ME_TextEditor *editor); +void ME_MakeFirstParagraph(ME_TextEditor *editor, HDC hdc); void ME_DumpParaStyle(ME_Paragraph *s); void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]); int get_total_width(ME_TextEditor *editor); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6085816f315..50a1073397a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -148,7 +148,7 @@ ME_Row *para_end_row( ME_Paragraph *para ) return &item->member.row; } -void ME_MakeFirstParagraph(ME_TextEditor *editor) +void ME_MakeFirstParagraph(ME_TextEditor *editor, HDC hdc) { ME_Context c; CHARFORMAT2W cf; @@ -160,7 +160,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Run *run; ME_Style *style; int eol_len; - HDC hdc = ITextHost_TxGetDC( editor->texthost ); ME_InitContext( &c, editor, hdc ); @@ -223,7 +222,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) para_mark_add( editor, para ); ME_DestroyContext(&c); wrap_marked_paras_dc( editor, hdc, FALSE ); - ITextHost_TxReleaseDC( editor->texthost, hdc ); } static void para_mark_rewrap_paras( ME_TextEditor *editor, ME_Paragraph *first, const ME_Paragraph *end )

1 0

Jinoh Kang : riched20: Don't call wrap_marked_paras_dc() before the editor is fully initialized.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 548d7179e3b2b9961321a4df50644c9b3874a295 URL: https://gitlab.winehq.org/wine/wine/-/commit/548d7179e3b2b9961321a4df50644c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 20:50:27 2023 +0900 riched20: Don't call wrap_marked_paras_dc() before the editor is fully initialized. Today, CreateTextServices() sometimes triggers an assertion failure in select_style(). When ME_MakeEditor() calls ME_MakeFirstParagraph(), the editor (ME_TextEditor) is not in a fully initialized state. For example, the font cache (pFontCache) is not fully initialized, which sometimes makes select_style() believe that the cache slots are fully occupied. Fix this by delaying the call to wrap_marked_paras_dc() until the editor is fully initialized. Also, delay the call to ITextHost::TxReleaseDC() until after wrap_marked_paras_dc(), since we need the device context a bit longer. Fixes: b70eb32c5f3e506181d9e1e9fbef62e9baf3674d --- dlls/riched20/editor.c | 4 +++- dlls/riched20/para.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d1819482b28..2b0d6533659 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2961,7 +2961,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) hdc = ITextHost_TxGetDC( ed->texthost ); ME_MakeFirstParagraph( ed, hdc ); - ITextHost_TxReleaseDC( ed->texthost, hdc ); /* The four cursors are for: * 0 - The position where the caret is shown * 1 - The anchored end of the selection (for normal selection) @@ -3061,6 +3060,9 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) list_init( &ed->reobj_list ); OleInitialize(NULL); + wrap_marked_paras_dc( ed, hdc, FALSE ); + ITextHost_TxReleaseDC( ed->texthost, hdc ); + return ed; } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 50a1073397a..a380f45e556 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -221,7 +221,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor, HDC hdc) wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, para ); ME_DestroyContext(&c); - wrap_marked_paras_dc( editor, hdc, FALSE ); } static void para_mark_rewrap_paras( ME_TextEditor *editor, ME_Paragraph *first, const ME_Paragraph *end )

1 0

Jinoh Kang : ntdll: Fail loudly if RtlActivateActivationContextEx fails to allocate memory.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 86893ce299223d6dbb2a58cd06d2b8ca8dec26c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/86893ce299223d6dbb2a58cd06d2b8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 13 23:17:11 2023 +0900 ntdll: Fail loudly if RtlActivateActivationContextEx fails to allocate memory. Many built-in callers of ActivateActCtx() just assume that it will always succeed. If it ever fails, then DeactivateActCtx() will notice that the cookie is invalid and raise an exception anyway. --- dlls/ntdll/actctx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 73f852f2547..853ac34d12e 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5423,9 +5423,7 @@ NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE ha ACTIVATION_CONTEXT_STACK *actctx_stack = teb->ActivationContextStackPointer; RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; - if (!(frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*frame) ))) - return STATUS_NO_MEMORY; - + frame = RtlAllocateHeap( GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(*frame) ); frame->Previous = actctx_stack->ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0;

1 0

Giovanni Mascellani : dxgi: Wait before acquiring the Vulkan queue for presenting.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: e77a9eda74fde4a81467843c0030dadba8e9bbbb URL: https://gitlab.winehq.org/wine/wine/-/commit/e77a9eda74fde4a81467843c0030da… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jul 2 22:32:23 2023 +0200 dxgi: Wait before acquiring the Vulkan queue for presenting. The reason is explained in upstream commit b2a1f6b5e4f59fbc7f91ada7e565639dcf4e8e7f, which also applies to earlier vkd3d versions. --- dlls/dxgi/swapchain.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d3140c83c39..64c5958f780 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1056,6 +1056,8 @@ struct d3d12_swapchain VkPresentModeKHR present_mode; DXGI_SWAP_CHAIN_DESC1 backend_desc; + ID3D12Fence *present_fence; + uint32_t vk_image_index; struct dxgi_vk_funcs vk_funcs; @@ -1930,6 +1932,9 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); + if (swapchain->present_fence) + ID3D12Fence_Release(swapchain->present_fence); + if (swapchain->frame_latency_event) CloseHandle(swapchain->frame_latency_event); @@ -2068,7 +2073,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_create_vulkan_resources(swapchain); } -static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image) +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image, + uint64_t frame_number) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; @@ -2077,6 +2083,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_dst_image; VkQueue vk_queue; VkResult vr; + HRESULT hr; if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX) { @@ -2099,6 +2106,12 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 ) return vr; + if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->present_fence, frame_number + 1, NULL))) + { + ERR("Failed to wait for present event, hr %#lx.\n", hr); + return VK_ERROR_UNKNOWN; + } + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -2145,7 +2158,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) return hr; - vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image); + vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image, op->present.frame_number); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { TRACE("Recreating Vulkan swapchain.\n"); @@ -2154,7 +2167,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; - if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image)) < 0) + if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image, op->present.frame_number)) < 0) ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } @@ -2233,6 +2246,13 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, } } + if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, + swapchain->present_fence, swapchain->frame_number))) + { + ERR("Failed to signal present fence, hf %#lx.\n", hr); + return hr; + } + swapchain->current_buffer_index = (swapchain->current_buffer_index + 1) % swapchain->desc.BufferCount; return S_OK; } @@ -3236,6 +3256,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } } + if (FAILED(hr = ID3D12Device_CreateFence(device, 0, 0, + &IID_ID3D12Fence, (void **)&swapchain->present_fence))) + { + WARN("Failed to create present fence, hr %#lx.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); if (!(swapchain->worker_thread = CreateThread(NULL, 0, d3d12_swapchain_worker_proc, swapchain, 0, NULL)))

1 0