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

Alexandre Julliard : netio.sys: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 6522c60fded7801a897cf31e0acdb7f016c711dd URL: https://gitlab.winehq.org/wine/wine/-/commit/6522c60fded7801a897cf31e0acdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:38 2023 +0200 netio.sys: Use nameless unions/structs. --- dlls/netio.sys/netio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index cad6dc32f1f..05b5d6d2a69 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -20,9 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -155,9 +152,9 @@ static void socket_init(struct wsk_socket_internal *socket) static void dispatch_irp(IRP *irp, NTSTATUS status) { - irp->IoStatus.u.Status = status; + irp->IoStatus.Status = status; --irp->CurrentLocation; - --irp->Tail.Overlay.s.u2.CurrentStackLocation; + --irp->Tail.Overlay.CurrentStackLocation; IoCompleteRequest(irp, IO_NO_INCREMENT); }

1 0

Alexandre Julliard : netprofm: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: c94e218ff44cea0eaf353b420c3ef39d37cd75b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c94e218ff44cea0eaf353b420c3ef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:25:57 2023 +0200 netprofm: Use nameless unions/structs. --- dlls/netprofm/list.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 40e03cb94f7..e6819185f22 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -18,8 +18,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include "windef.h" @@ -1769,7 +1767,7 @@ static void init_networks( struct list_manager *mgr ) struct connection *connection; NET_LUID luid; - ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceIndexToLuid(aa->IfIndex, &luid); ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */

1 0

Alexandre Julliard : oledb32: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: 1ce80d35bce08b849f2b42cdc072b8c11bf48fae URL: https://gitlab.winehq.org/wine/wine/-/commit/1ce80d35bce08b849f2b42cdc072b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:26:24 2023 +0200 oledb32: Use nameless unions/structs. --- dlls/oledb32/dslocator.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 722032bc18b..5746b51d55c 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -20,8 +20,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "objbase.h" @@ -636,22 +634,22 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[0].dwSize = sizeof(PROPSHEETPAGEW); pages[0].hInstance = instance; - pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + pages[0].pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); pages[0].pfnDlgProc = data_link_properties_dlg_proc; pages[1].dwSize = sizeof(PROPSHEETPAGEW); pages[1].hInstance = instance; - pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); + pages[1].pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); pages[1].pfnDlgProc = data_link_connection_dlg_proc; pages[2].dwSize = sizeof(PROPSHEETPAGEW); pages[2].hInstance = instance; - pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); + pages[2].pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); pages[2].pfnDlgProc = data_link_advanced_dlg_proc; pages[3].dwSize = sizeof(pages[0]); pages[3].hInstance = instance; - pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_ALL); + pages[3].pszTemplate = MAKEINTRESOURCEW(IDD_ALL); pages[3].pfnDlgProc = data_link_all_dlg_proc; memset(&hdr, 0, sizeof(hdr)); @@ -660,7 +658,7 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; hdr.hInstance = instance; hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); - hdr.u3.ppsp = pages; + hdr.ppsp = pages; hdr.nPages = ARRAY_SIZE(pages); ret = PropertySheetW(&hdr);

1 0

Alexandre Julliard : oledlg: Use nameless unions/structs.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: f082e4f216b497888f76f5fdc9ed26d2d0779072 URL: https://gitlab.winehq.org/wine/wine/-/commit/f082e4f216b497888f76f5fdc9ed26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:26:44 2023 +0200 oledlg: Use nameless unions/structs. --- dlls/oledlg/pastespl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index a502ae6c4a9..7813ecd0c5f 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> @@ -139,7 +138,7 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) fmtetc.cfFormat = cf_object_descriptor; if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) { - OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal); if(obj_desc->dwSrcOfCopy) ps_struct->source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) @@ -147,8 +146,8 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise native calls OleGetIconFromClass(obj_desc->clsid) */ - GlobalUnlock(stg.u.hGlobal); - GlobalFree(stg.u.hGlobal); + GlobalUnlock(stg.hGlobal); + GlobalFree(stg.hGlobal); } else { @@ -158,13 +157,13 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) fmtetc.cfFormat = cf_link_src_descriptor; if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) { - OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal); if(obj_desc->dwSrcOfCopy) ps_struct->link_source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) ps_struct->link_type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); - GlobalUnlock(stg.u.hGlobal); - GlobalFree(stg.u.hGlobal); + GlobalUnlock(stg.hGlobal); + GlobalFree(stg.hGlobal); } if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL)

1 0

Alexandre Julliard : gitlab: Make sure that the tags are fetched before building.
by Alexandre Julliard 14 Jul '23

14 Jul '23

Module: wine Branch: master Commit: ed4104d358c2b5f53befd9d4bd49d1656c8da5ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ed4104d358c2b5f53befd9d4bd49d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 12:54:42 2023 +0200 gitlab: Make sure that the tags are fetched before building. --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 441582a99f3..8a5d5b40ac1 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -22,6 +22,7 @@ - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" - git config --global --add safe.directory $CI_PROJECT_DIR + - git fetch --tags - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

Jinoh Kang : msi: Fully initialize the control structure in dialog_line_control().
by Alexandre Julliard 14 Jul '23

14 Jul '23

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 14 Jul '23

14 Jul '23

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 14 Jul '23

14 Jul '23

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

Giovanni Mascellani : dxgi: Introduce a worker thread for the D3D12 swapchain.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: f07859d75b39164f92b78ead7828c28924fe5c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/f07859d75b39164f92b78ead7828c2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 22 11:03:42 2023 +0200 dxgi: Introduce a worker thread for the D3D12 swapchain. In the following commits the worker thread will be used for actual presenting and buffer resizing. In this way the worker thread can wait on the vkd3d queue without blocking or even deadlocking the application. --- dlls/dxgi/swapchain.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 34678a3a3a7..8a84ea30065 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1024,6 +1024,11 @@ struct d3d12_swapchain VkDevice vk_device; VkPhysicalDevice vk_physical_device; + HANDLE worker_thread; + CRITICAL_SECTION worker_cs; + CONDITION_VARIABLE worker_cv; + bool worker_running; + /* D3D12 side of the swapchain (frontend): these objects are * visible to the IDXGISwapChain client, so they must never be * recreated, except when ResizeBuffers*() is called. */ @@ -1070,6 +1075,26 @@ struct d3d12_swapchain uint32_t frame_latency; }; +static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) +{ + struct d3d12_swapchain *swapchain = data; + + EnterCriticalSection(&swapchain->worker_cs); + + while (swapchain->worker_running) + { + if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) + { + ERR("Cannot sleep on condition variable, last error %ld.\n", GetLastError()); + break; + } + } + + LeaveCriticalSection(&swapchain->worker_cs); + + return 0; +} + static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) { switch (vk_format) @@ -1808,6 +1833,23 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + DWORD ret; + + EnterCriticalSection(&swapchain->worker_cs); + swapchain->worker_running = false; + WakeAllConditionVariable(&swapchain->worker_cv); + LeaveCriticalSection(&swapchain->worker_cs); + + if (swapchain->worker_thread) + { + if ((ret = WaitForSingleObject(swapchain->worker_thread, INFINITE)) != WAIT_OBJECT_0) + ERR("Failed to wait for worker thread, return value %ld.\n", ret); + + if (!CloseHandle(swapchain->worker_thread)) + ERR("Failed to close worker thread, last error %ld.\n", GetLastError()); + } + + DeleteCriticalSection(&swapchain->worker_cs); d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); @@ -2996,6 +3038,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI wined3d_private_store_init(&swapchain->private_store); + InitializeCriticalSection(&swapchain->worker_cs); + InitializeConditionVariable(&swapchain->worker_cv); + swapchain->worker_running = true; + surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL; surface_desc.flags = 0; @@ -3069,6 +3115,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IWineDXGIFactory_AddRef(swapchain->factory = factory); + if (!(swapchain->worker_thread = CreateThread(NULL, 0, d3d12_swapchain_worker_proc, swapchain, 0, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create worker thread, hr %#lx.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + return S_OK; }

1 0

Giovanni Mascellani : dxgi: Move presentation to the worker thread.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 8cc427978f8e5491c13bfc3952e35174cb41e924 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cc427978f8e5491c13bfc3952e351… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 22 12:52:46 2023 +0200 dxgi: Move presentation to the worker thread. The main thread still waits for the worker thread, in order to keep buffer resizing synchronized with presentation. As soon as buffer presentation is offloaded to the worker thread too the wait can be dropped. --- dlls/dxgi/swapchain.c | 156 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 128 insertions(+), 28 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8a84ea30065..f140317781e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1028,6 +1028,8 @@ struct d3d12_swapchain CRITICAL_SECTION worker_cs; CONDITION_VARIABLE worker_cv; bool worker_running; + struct list worker_ops; + HANDLE worker_event; /* D3D12 side of the swapchain (frontend): these objects are * visible to the IDXGISwapChain client, so they must never be @@ -1075,6 +1077,33 @@ struct d3d12_swapchain uint32_t frame_latency; }; +enum d3d12_swapchain_op_type +{ + D3D12_SWAPCHAIN_OP_PRESENT, +}; + +struct d3d12_swapchain_op +{ + struct list entry; + enum d3d12_swapchain_op_type type; + union + { + struct + { + unsigned int sync_interval; + VkImage vk_image; + unsigned int frame_number; + } present; + }; +}; + +static void d3d12_swapchain_op_destroy(struct d3d12_swapchain_op *op) +{ + heap_free(op); +} + +static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op); + static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) { struct d3d12_swapchain *swapchain = data; @@ -1083,7 +1112,29 @@ static DWORD WINAPI d3d12_swapchain_worker_proc(void *data) while (swapchain->worker_running) { - if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) + if (!list_empty(&swapchain->worker_ops)) + { + struct d3d12_swapchain_op *op = LIST_ENTRY(list_head(&swapchain->worker_ops), struct d3d12_swapchain_op, entry); + + list_remove(&op->entry); + + LeaveCriticalSection(&swapchain->worker_cs); + + switch (op->type) + { + case D3D12_SWAPCHAIN_OP_PRESENT: + d3d12_swapchain_op_present_execute(swapchain, op); + break; + } + + d3d12_swapchain_op_destroy(op); + + if (!SetEvent(swapchain->worker_event)) + ERR("Cannot set event, last error %ld.\n", GetLastError()); + + EnterCriticalSection(&swapchain->worker_cs); + } + else if (!SleepConditionVariableCS(&swapchain->worker_cv, &swapchain->worker_cs, INFINITE)) { ERR("Cannot sleep on condition variable, last error %ld.\n", GetLastError()); break; @@ -1833,6 +1884,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + struct d3d12_swapchain_op *op, *op2; DWORD ret; EnterCriticalSection(&swapchain->worker_cs); @@ -1849,8 +1901,16 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) ERR("Failed to close worker thread, last error %ld.\n", GetLastError()); } + if (!CloseHandle(swapchain->worker_event)) + ERR("Failed to close worker event, last error %ld.\n", GetLastError()); + DeleteCriticalSection(&swapchain->worker_cs); + LIST_FOR_EACH_ENTRY_SAFE(op, op2, &swapchain->worker_ops, struct d3d12_swapchain_op, entry) + { + d3d12_swapchain_op_destroy(op); + } + d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_d3d12_resources(swapchain); @@ -2055,29 +2115,13 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, return vr; } -static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, - unsigned int sync_interval, unsigned int flags) +static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) { - HANDLE frame_latency_event; VkQueue vk_queue; VkResult vr; HRESULT hr; - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - - if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) + if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2086,8 +2130,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return E_FAIL; } - vr = d3d12_swapchain_queue_present(swapchain, vk_queue, - swapchain->vk_images[swapchain->current_buffer_index]); + vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { vkd3d_release_vk_queue(swapchain->command_queue); @@ -2104,8 +2147,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return E_FAIL; } - if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, - swapchain->vk_images[swapchain->current_buffer_index])) < 0) + if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image)) < 0) ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } @@ -2117,12 +2159,11 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } - ++swapchain->frame_number; - if ((frame_latency_event = swapchain->frame_latency_event)) + if (swapchain->frame_latency_fence) { - /* Bias the frame number to avoid underflowing in - * SetEventOnCompletion(). */ - uint64_t number = swapchain->frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS; + /* Use the same bias as d3d12_swapchain_present(). Add one to + * account for the "++swapchain->frame_numer" there. */ + uint64_t number = op->present.frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS + 1; if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->frame_latency_fence, number))) @@ -2130,6 +2171,56 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, ERR("Failed to signal frame latency fence, hr %#lx.\n", hr); return hr; } + } + + return S_OK; +} + +static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + struct d3d12_swapchain_op *op; + HANDLE frame_latency_event; + HRESULT hr; + + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + if (!(op = heap_alloc_zero(sizeof(*op)))) + { + WARN("Cannot allocate memory.\n"); + return E_OUTOFMEMORY; + } + + op->type = D3D12_SWAPCHAIN_OP_PRESENT; + op->present.sync_interval = sync_interval; + op->present.vk_image = swapchain->vk_images[swapchain->current_buffer_index]; + op->present.frame_number = swapchain->frame_number; + + EnterCriticalSection(&swapchain->worker_cs); + list_add_tail(&swapchain->worker_ops, &op->entry); + WakeAllConditionVariable(&swapchain->worker_cv); + LeaveCriticalSection(&swapchain->worker_cs); + + WaitForSingleObject(swapchain->worker_event, INFINITE); + + ++swapchain->frame_number; + if ((frame_latency_event = swapchain->frame_latency_event)) + { + /* Bias the frame number to avoid underflowing in + * SetEventOnCompletion(). */ + uint64_t number = swapchain->frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS; if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->frame_latency_fence, number - swapchain->frame_latency, frame_latency_event))) @@ -3041,6 +3132,15 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI InitializeCriticalSection(&swapchain->worker_cs); InitializeConditionVariable(&swapchain->worker_cv); swapchain->worker_running = true; + list_init(&swapchain->worker_ops); + + if (!(swapchain->worker_event = CreateEventA(NULL, FALSE, FALSE, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create worker event, hr %#lx.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL;

1 0