March 2018 - Wine-devel - list.winehq.org

[PATCH 2/8] mstask: Switch to using ITaskDefinition instead of IRegisteredTask.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Testing under Windows revealed that task definition on disk should be created only when IPersistFile::Save() is called, and until that ITask should stay as a task description in memory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_private.h | 15 ++++++++++++++- dlls/mstask/task.c | 37 ++++++++++--------------------------- dlls/mstask/task_scheduler.c | 14 +------------- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 511019ded6..038c6c84c1 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -19,6 +19,9 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ +#include "wine/heap.h" +#include "wine/unicode.h" + extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; @@ -26,6 +29,16 @@ extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; -extern HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) DECLSPEC_HIDDEN; + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 095431cb04..e77a959e0f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -36,7 +36,8 @@ typedef struct ITask ITask_iface; IPersistFile IPersistFile_iface; LONG ref; - IRegisteredTask *regtask; + ITaskDefinition *task; + LPWSTR task_name; LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; @@ -57,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + ITaskDefinition_Release(This->task); + HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This->parameters); @@ -762,49 +765,29 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(ITaskFolder *folder, const WCHAR *task_name, ITask **task, BOOL create) +HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) { TaskImpl *This; - IRegisteredTask *regtask; - BSTR bstr; + ITaskDefinition *taskdef; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); - bstr = SysAllocString(task_name); - if (!bstr) return E_OUTOFMEMORY; - - if (create) - { - static const char xml_tmplate[] = - "<?xml version=\"1.0\"?>\n" - "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" - "</Task>\n"; - WCHAR xmlW[sizeof(xml_tmplate)]; - VARIANT v_null; - - MultiByteToWideChar(CP_ACP, 0, xml_tmplate, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); - - V_VT(&v_null) = VT_NULL; - hr = ITaskFolder_RegisterTask(folder, bstr, xmlW, TASK_CREATE | TASK_UPDATE, - v_null, v_null, TASK_LOGON_NONE, v_null, &regtask); - } - else - hr = ITaskFolder_GetTask(folder, bstr, &regtask); - SysFreeString(bstr); + hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - IRegisteredTask_Release(regtask); + ITaskDefinition_Release(taskdef); return E_OUTOFMEMORY; } This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; - This->regtask = regtask; + This->task = taskdef; + This->task_name = heap_strdupW(task_name); This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index e9b8727633..6e17a57908 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -37,7 +37,6 @@ typedef struct ITaskScheduler ITaskScheduler_iface; LONG ref; ITaskService *service; - ITaskFolder *root; } TaskSchedulerImpl; typedef struct @@ -59,7 +58,6 @@ static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); - ITaskFolder_Release(This->root); ITaskService_Release(This->service); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); @@ -308,7 +306,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( if (!IsEqualGUID(riid, &IID_ITask)) return E_NOINTERFACE; - return TaskConstructor(This->root, task_name, (ITask **)task, TRUE); + return TaskConstructor(This->service, task_name, (ITask **)task); } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( @@ -349,7 +347,6 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) { TaskSchedulerImpl *This; ITaskService *service; - ITaskFolder *root; VARIANT v_null; HRESULT hr; @@ -366,24 +363,15 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } - hr = ITaskService_GetFolder(service, NULL, &root); - if (hr != S_OK) - { - ITaskService_Release(service); - return hr; - } - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) { - ITaskFolder_Release(root); ITaskService_Release(service); return E_OUTOFMEMORY; } This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; This->service = service; - This->root = root; This->ref = 1; *ppObj = &This->ITaskScheduler_iface; -- 2.16.2

1 0

[PATCH 1/8] taskschd: Implement ExecAction::put_Id and ExecAction::get_Id.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 27 +++++++++++++++++++++++---- dlls/taskschd/tests/scheduler.c | 24 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1b6a7015ee..19546c0d71 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1679,6 +1679,7 @@ typedef struct WCHAR *path; WCHAR *directory; WCHAR *args; + WCHAR *id; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1703,6 +1704,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) heap_free(action->path); heap_free(action->directory); heap_free(action->args); + heap_free(action->id); heap_free(action); } @@ -1759,14 +1761,30 @@ static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFII static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) { - FIXME("%p,%p: stub\n", iface, id); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, id); + + if (!id) return E_POINTER; + + if (!action->id) *id = NULL; + else if (!(*id = SysAllocString(action->id))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) { - FIXME("%p,%s: stub\n", iface, debugstr_w(id)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(id)); + + if (id && !(str = heap_strdupW((id)))) return E_OUTOFMEMORY; + heap_free(action->id); + action->id = str; + + return S_OK; } static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) @@ -1896,6 +1914,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->path = NULL; action->directory = NULL; action->args = NULL; + action->id = NULL; *obj = &action->IExecAction_iface; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 80bc1c9034..c0f691a53d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1306,12 +1306,13 @@ static void create_action(ITaskDefinition *taskdef) static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; + static WCHAR comment[] = { 'c','o','m','m','e','n','t',0 }; HRESULT hr; IActionCollection *actions; IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; - BSTR path; + BSTR path, str; hr = ITaskDefinition_get_Actions(taskdef, NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -1384,7 +1385,7 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "put_Arguments error %#x\n", hr); hr = IExecAction_put_Arguments(exec_action, args); - ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); path = NULL; hr = IExecAction_get_Arguments(exec_action, &path); @@ -1393,6 +1394,25 @@ static void create_action(ITaskDefinition *taskdef) ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); + + str = (BSTR)0xdeadbeef; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str == NULL, "id should be NULL\n"); + + hr = IExecAction_put_Id(exec_action, NULL); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + hr = IExecAction_put_Id(exec_action, comment); + ok(hr == S_OK, "put_Id error %#x\n", hr); + + str = NULL; + hr = IExecAction_get_Id(exec_action, &str); + ok(hr == S_OK, "get_Id error %#x\n", hr); + ok(str != NULL, "should not be NULL\n"); + ok(!lstrcmpW(str, comment), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions); -- 2.16.2

1 0

[PATCH 01/11] winex11: Print error message when libvulkan cannot be loaded.
by Józef Kucia 30 Mar '18

30 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c633579286eb..58ba5d71b1ef 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -134,7 +134,11 @@ static BOOL wine_vk_init(void) if (init_done) return (vulkan_handle != NULL); init_done = TRUE; - if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) return FALSE; + if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) + { + ERR("Failed to load " SONAME_LIBVULKAN); + return FALSE; + } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkAcquireNextImageKHR) -- 2.16.1

2 21

[PATCH 1/4] wusa: create temp directories for installer
by Vijay Kiran Kamuju 29 Mar '18

29 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/wusa/main.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 5 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index aa7a38fe178..77dd46d8bd4 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1,5 +1,7 @@ /* * Copyright 2012 Austin English + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,17 +19,176 @@ */ #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wusa); +struct installer_tempdir { + struct list entry; + WCHAR *path; +}; + +struct installer_state { + BOOL norestart; + BOOL quiet; + struct list tempdirs; +}; + +static const WCHAR *path_combine(const WCHAR *path, const WCHAR *filename) +{ + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *result; + DWORD length; + + if (!path || !filename) + return NULL; + length = strlenW(path) + strlenW(filename) + 2; + if (!(result = heap_alloc(length * sizeof(WCHAR)))) + return NULL; + + strcpyW(result,path); + if (result[0] && result[strlenW(result) - 1] != '\\') + strcatW(result, backslashW); + strcatW(result,filename); + return result; +} + +static BOOL delete_directory(const WCHAR *path) +{ + static const WCHAR starW[] = {'*',0}; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WIN32_FIND_DATAW data; + WCHAR *full_path; + HANDLE search; + + if (!(full_path = (WCHAR *)path_combine(path, starW))) + return FALSE; + search = FindFirstFileW(full_path, &data); + heap_free(full_path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (!strcmpW(data.cFileName, dotW)) + continue; + if (!strcmpW(data.cFileName, dotdotW)) + continue; + if (!(full_path = (WCHAR *)path_combine(path, data.cFileName))) + continue; + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + delete_directory(full_path); + else + DeleteFileW(full_path); + heap_free(full_path); + } while (FindNextFileW(search, &data)); + FindClose(search); + } + + return RemoveDirectoryW(full_path); +} + +static const WCHAR *create_temp_directory(struct installer_state *state) +{ + static const WCHAR msuW[] = {'m','s','u',0}; + static UINT id; + struct installer_tempdir *entry; + WCHAR tmp[MAX_PATH]; + + if (!GetTempPathW(sizeof(tmp)/sizeof(WCHAR), tmp)) + return NULL; + if (!(entry = heap_alloc(sizeof(*entry)))) + return NULL; + if (!(entry->path = heap_alloc((MAX_PATH+20)*sizeof(WCHAR)))) + { + heap_free(entry); + return NULL; + } + + for(;;) + { + if (!GetTempFileNameW(tmp, msuW, ++id, entry->path)) + { + heap_free(entry->path); + heap_free(entry); + return NULL; + } + if (CreateDirectoryW(entry->path, NULL)) + break; + } + + list_add_tail(&state->tempdirs, &entry->entry); + return entry->path; +} + +static void installer_cleanup(struct installer_state *state) +{ + struct installer_tempdir *tempdir, *tempdir2; + + LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) + { + list_remove(&tempdir->entry); + delete_directory(tempdir->path); + heap_free(tempdir->path); + heap_free(tempdir); + } +} + +static BOOL install_msu(WCHAR *filename, struct installer_state *state) +{ + const WCHAR *temp_path; + + list_init(&state->tempdirs); + + WINE_TRACE("Processing msu file %s\n", wine_dbgstr_w(filename)); + if (!(temp_path = create_temp_directory(state))) + return FALSE; + + installer_cleanup(state); + return TRUE; +} + int wmain(int argc, WCHAR *argv[]) { + static const WCHAR norestartW[] = {'/','n','o','r','e','s','t','a','r','t',0}; + static const WCHAR quietW[] = {'/','q','u','i','e','t',0}; + struct installer_state state; + WCHAR *filename = NULL; int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (TRACE_ON(wusa)) + { + WINE_TRACE("Command line :"); + for (i = 0; i < argc; i++) + WINE_TRACE(" %s", wine_dbgstr_w(argv[i])); + WINE_TRACE("\n"); + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + if (!strcmpW(argv[i], norestartW)) + state.norestart = TRUE; + else if (!strcmpW(argv[i], quietW)) + state.quiet = TRUE; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + else if (!filename) + filename = argv[i]; + else + WINE_FIXME("Unknown option: %s\n", wine_dbgstr_w(argv[i])); + } + + if (!filename) + { + WINE_FIXME("Missing filename argument\n"); + return 1; + } - return 0; + return !install_msu(filename, &state); } -- 2.16.2

3 6

[PATCH 5/5] wsdapi/tests: Add test for Hello message Any body element.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] wsdapi: Create Body and Hello elements in Hello message.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 29 ++++++++++++++++++++++++++--- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 30 insertions(+), 5 deletions(-)

1 0

[PATCH 3/5] wsdapi: Register default namespaces when creating publisher.
by Owen Rudge 29 Mar '18

29 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 9 +++++++++ dlls/wsdapi/soap.c | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 20 insertions(+)

1 0

[PATCH 2/2] wiaservc: add some tests for SelectDeviceDlg
by Stefan Leichter 29 Mar '18

29 Mar '18

Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/wiaservc/tests/wia.c | 16 ++++++++++++++++ include/wiadef.h | 6 ++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH 1/2] include: fix declaration of SelectDeviceDlg
by Stefan Leichter 29 Mar '18

29 Mar '18

fixes https://bugs.winehq.org/show_bug.cgi?id=43930 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- include/wia_lh.idl | 2 +- include/wia_xp.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH vkd3d 1/3] libs/vkd3d: Add support for custom PRESENT state transitions.
by Józef Kucia 29 Mar '18

29 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This should be the last feature needed to implement D3D12 swapchains in Wine. Vulkan swapchains are quite limited, e.g. * Vulkan implementations support very limited set of formats for swapchains, * views with a different format cannot be created for swapchains, * swapchains are not multisampled (AFAIK it's the same in D3D12). This patch adds flexibility needed to emulate support for missing swapchain features, e.g. additional swapchain formats. --- demos/demo_xcb.h | 31 ++++++++++++++++--------------- include/vkd3d.h | 20 ++++++++++++++------ libs/vkd3d/command.c | 28 +++++++++++++++++++--------- libs/vkd3d/resource.c | 16 +++++++++++----- libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 62 insertions(+), 36 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 9980b506ffb6..053db0df9bab 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -307,13 +307,13 @@ static inline void demo_set_idle_func(struct demo *demo, static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue, struct demo_window *window, const struct demo_swapchain_desc *desc) { + struct vkd3d_image_resource_create_info resource_create_info; struct VkSwapchainCreateInfoKHR vk_swapchain_desc; struct VkXcbSurfaceCreateInfoKHR surface_desc; VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; uint32_t format_count, queue_family_index; VkSurfaceCapabilitiesKHR surface_caps; VkPhysicalDevice vk_physical_device; - D3D12_RESOURCE_DESC resource_desc; VkFence vk_fence = VK_NULL_HANDLE; struct demo_swapchain *swapchain; unsigned int image_count, i, j; @@ -446,22 +446,23 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); vkResetFences(vk_device, 1, &vk_fence); - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_desc.Alignment = 0; - resource_desc.Width = desc->width; - resource_desc.Height = desc->height; - resource_desc.DepthOrArraySize = 1; - resource_desc.MipLevels = 1; - resource_desc.Format = desc->format; - resource_desc.SampleDesc.Count = 1; - resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_create_info.desc.Alignment = 0; + resource_create_info.desc.Width = desc->width; + resource_create_info.desc.Height = desc->height; + resource_create_info.desc.DepthOrArraySize = 1; + resource_create_info.desc.MipLevels = 1; + resource_create_info.desc.Format = desc->format; + resource_create_info.desc.SampleDesc.Count = 1; + resource_create_info.desc.SampleDesc.Quality = 0; + resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_create_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; + resource_create_info.present_state = D3D12_RESOURCE_STATE_PRESENT; for (i = 0; i < image_count; ++i) { - if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_desc, vk_images[i], - VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_SWAPCHAIN_IMAGE, - &swapchain->buffers[i]))) + resource_create_info.vk_image = vk_images[i]; + if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_create_info, &swapchain->buffers[i]))) { for (j = 0; j < i; ++j) { diff --git a/include/vkd3d.h b/include/vkd3d.h index 6ec85dbf2ffb..692b58d70065 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -73,9 +73,17 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* resource flags */ +/* vkd3d_image_resource_create_info flags */ #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 -#define VKD3D_RESOURCE_SWAPCHAIN_IMAGE 0x00000002 +#define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002 + +struct vkd3d_image_resource_create_info +{ + VkImage vk_image; + D3D12_RESOURCE_DESC desc; + unsigned int flags; + D3D12_RESOURCE_STATES present_state; +}; #ifndef VKD3D_NO_PROTOTYPES @@ -96,8 +104,8 @@ uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); -HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +HRESULT vkd3d_create_image_resource(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); ULONG vkd3d_resource_decref(ID3D12Resource *resource); ULONG vkd3d_resource_incref(ID3D12Resource *resource); @@ -131,8 +139,8 @@ typedef uint32_t (*PFN_vkd3d_get_vk_queue_family_index)(ID3D12CommandQueue *queu typedef VkQueue (*PFN_vkd3d_acquire_vk_queue)(ID3D12CommandQueue *queue); typedef void (*PFN_vkd3d_release_vk_queue)(ID3D12CommandQueue *queue); -typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); typedef ULONG (*PFN_vkd3d_resource_decref)(ID3D12Resource *resource); typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1c0a18ae09e7..39094c24e913 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1150,7 +1150,8 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } } -static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, bool is_swapchain_image, +static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, + bool is_swapchain_image, D3D12_RESOURCE_STATES present_state, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { switch (state) @@ -1164,10 +1165,18 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - *access_mask = VK_ACCESS_MEMORY_READ_BIT; - *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + if (present_state == D3D12_RESOURCE_STATE_PRESENT) + { + *access_mask = VK_ACCESS_MEMORY_READ_BIT; + *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + } + else + { + vk_barrier_parameters_from_d3d12_resource_state(present_state, + false, 0, access_mask, stage_flags, image_layout); + } } else { @@ -1353,7 +1362,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); @@ -2877,14 +2886,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE, + resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); @@ -2905,7 +2914,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource && (resource->flags & VKD3D_RESOURCE_SWAPCHAIN_IMAGE), + resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION), + resource ? resource->present_state : 0, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 81135d373ae7..4746ee2cf59b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -797,28 +797,34 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return S_OK; } -HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, - VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource) +HRESULT vkd3d_create_image_resource(ID3D12Device *device, + const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; - object->desc = *desc; - object->u.vk_image = vk_image; + object->desc = create_info->desc; + object->u.vk_image = create_info->vk_image; object->vk_memory = VK_NULL_HANDLE; object->flags = VKD3D_RESOURCE_EXTERNAL; - object->flags |= resource_flags & VKD3D_RESOURCE_PUBLIC_FLAGS; + object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; object->map_count = 0; object->map_data = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; + if (create_info->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) + object->present_state = create_info->present_state; + else + object->present_state = D3D12_RESOURCE_STATE_COMMON; object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 988522f99e70..cf3112e845b3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -175,7 +175,7 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; #define VKD3D_RESOURCE_PUBLIC_FLAGS \ - (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_SWAPCHAIN_IMAGE) + (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 /* ID3D12Resource */ @@ -202,6 +202,7 @@ struct d3d12_resource D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; D3D12_RESOURCE_STATES initial_state; + D3D12_RESOURCE_STATES present_state; struct d3d12_device *device; }; -- 2.16.1

2 5