August 2018 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Move formats from gl_info to wined3d_adapter.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 5080d3c1c1e6ae05d549c13adcb666b9abc3d3e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5080d3c1c1e6ae05d549c13a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:49 2018 +0200 wined3d: Move formats from gl_info to wined3d_adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +- dlls/wined3d/texture.c | 1 - dlls/wined3d/utils.c | 236 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 127 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5080d3c1c1e6ae05d549…

1 0

Alex Henrie : shell32: Add play icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 4213781ae0f8b45c7ef01e8f4c28a47d8c348e3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4213781ae0f8b45c7ef01e8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:54 2018 -0600 shell32: Add play icon. Adapted from media-playback-start in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/play.ico | Bin 0 -> 37047 bytes dlls/shell32/resources/play.svg | 454 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 459 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4213781ae0f8b45c7ef0…

1 0

Józef Kucia : dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 8c6e8d6c82c6bfa71ca6abcaeac97f2a261f9b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c6e8d6c82c6bfa71ca6abca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:24 2018 +0200 dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b285f3d..6eda235 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -917,6 +917,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return DXGI_FORMAT_UNKNOWN; @@ -929,6 +930,7 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return VK_FORMAT_UNDEFINED;

1 0

Alex Henrie : shell32: Add upload icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: d721c454e66d28429acbcfb231d70f035347b3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d721c454e66d28429acbcfb2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:52 2018 -0600 shell32: Add upload icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e4df5c5..f630a73 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -868,6 +868,10 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e443c2e..248e5b5 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -311,6 +311,7 @@ #define IDI_SHELL_MOVE 241 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

Alex Henrie : shell32: Add removable disk icons.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 8b59c7fc5afdaf3dcb57afb52b1a26da8680b8fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b59c7fc5afdaf3dcb57afb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:48 2018 -0600 shell32: Add removable disk icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 7 +++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e28d51c..73786ea 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -830,6 +830,13 @@ IDI_SHELL_DOWNLOAD ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_REMOVABLE_DISK ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_BAD_REMOVABLE_DISK ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6bf9b99..ba0c0fa 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -300,6 +300,8 @@ #define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_DOWNLOAD 231 #define IDI_SHELL_DOWNLOAD_EMBLEM 232 +#define IDI_SHELL_REMOVABLE_DISK 233 +#define IDI_SHELL_BAD_REMOVABLE_DISK 234 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Nikolay Sivov : opcservices: Add a stub IOpcFactory.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: d2c5d0171aef8f74cfaf134b9848dfcb611b48a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c5d0171aef8f74cfaf134b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 30 14:54:37 2018 +0300 opcservices: Add a stub IOpcFactory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/opcservices/Makefile.in | 8 ++ dlls/opcservices/factory.c | 225 ++++++++++++++++++++++++++++++++++++++ dlls/opcservices/opcservices.idl | 21 ++++ dlls/opcservices/opcservices.spec | 4 + 6 files changed, 261 insertions(+) diff --git a/configure b/configure index 2a611bd..023a164 100755 --- a/configure +++ b/configure @@ -1463,6 +1463,7 @@ enable_oledlg enable_olepro32 enable_olesvr32 enable_olethk32 +enable_opcservices enable_openal32 enable_opencl enable_opengl32 @@ -19713,6 +19714,7 @@ wine_fn_config_makefile dlls/olepro32 enable_olepro32 wine_fn_config_makefile dlls/olesvr.dll16 enable_win16 wine_fn_config_makefile dlls/olesvr32 enable_olesvr32 wine_fn_config_makefile dlls/olethk32 enable_olethk32 +wine_fn_config_makefile dlls/opcservices enable_opcservices wine_fn_config_makefile dlls/openal32 enable_openal32 wine_fn_config_makefile dlls/opencl enable_opencl wine_fn_config_makefile dlls/opengl32 enable_opengl32 diff --git a/configure.ac b/configure.ac index ddf7ee3..2b63d6a 100644 --- a/configure.ac +++ b/configure.ac @@ -3573,6 +3573,7 @@ WINE_CONFIG_MAKEFILE(dlls/olepro32) WINE_CONFIG_MAKEFILE(dlls/olesvr.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/olesvr32) WINE_CONFIG_MAKEFILE(dlls/olethk32) +WINE_CONFIG_MAKEFILE(dlls/opcservices) WINE_CONFIG_MAKEFILE(dlls/openal32) WINE_CONFIG_MAKEFILE(dlls/opencl) WINE_CONFIG_MAKEFILE(dlls/opengl32) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in new file mode 100644 index 0000000..20d8eb5 --- /dev/null +++ b/dlls/opcservices/Makefile.in @@ -0,0 +1,8 @@ +MODULE = opcservices.dll +IMPORTS = uuid + +C_SRCS = \ + factory.c + +IDL_SRCS = \ + opcservices.idl diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c new file mode 100644 index 0000000..dd6556d --- /dev/null +++ b/dlls/opcservices/factory.c @@ -0,0 +1,225 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "initguid.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "msopc.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msopc); + +static HRESULT WINAPI opc_factory_QueryInterface(IOpcFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IOpcFactory) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcFactory_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_factory_AddRef(IOpcFactory *iface) +{ + return 2; +} + +static ULONG WINAPI opc_factory_Release(IOpcFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcUri **uri) +{ + FIXME("iface %p, uri %p stub!\n", iface, uri); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **part_uri) +{ + FIXME("iface %p, uri %s, part_uri %p stub!\n", iface, debugstr_w(uri), part_uri); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename, + OPC_STREAM_IO_MODE io_mode, SECURITY_ATTRIBUTES *sa, DWORD flags, IStream **stream) +{ + FIXME("iface %p, filename %s, io_mode %d, sa %p, flags %#x, stream %p stub!\n", iface, debugstr_w(filename), + io_mode, sa, flags, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_CreatePackage(IOpcFactory *iface, IOpcPackage **package) +{ + FIXME("iface %p, package %p.\n", iface, package); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_ReadPackageFromStream(IOpcFactory *iface, IStream *stream, + OPC_READ_FLAGS flags, IOpcPackage **package) +{ + FIXME("iface %p, stream %p, flags %#x, package %p stub!\n", iface, stream, flags, package); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_WritePackageToStream(IOpcFactory *iface, IOpcPackage *package, OPC_WRITE_FLAGS flags, + IStream *stream) +{ + FIXME("iface %p, package %p, flags %#x, stream %p stub!\n", iface, package, flags, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_factory_CreateDigitalSignatureManager(IOpcFactory *iface, IOpcPackage *package, + IOpcDigitalSignatureManager **signature_manager) +{ + FIXME("iface %p, package %p, signature_manager %p stub!\n", iface, package, signature_manager); + + return E_NOTIMPL; +} + +static const IOpcFactoryVtbl opc_factory_vtbl = +{ + opc_factory_QueryInterface, + opc_factory_AddRef, + opc_factory_Release, + opc_factory_CreatePackageRootUri, + opc_factory_CreatePartUri, + opc_factory_CreateStreamOnFile, + opc_factory_CreatePackage, + opc_factory_ReadPackageFromStream, + opc_factory_WritePackageToStream, + opc_factory_CreateDigitalSignatureManager, +}; + +static IOpcFactory opc_factory = { &opc_factory_vtbl }; + +static HRESULT WINAPI opc_class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IClassFactory) || + IsEqualGUID(iid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI opc_class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI opc_class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + if (outer) + return CLASS_E_NOAGGREGATION; + + return IOpcFactory_QueryInterface(&opc_factory, iid, out); +} + +static HRESULT WINAPI opc_class_factory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("iface %p, dolock %d stub!\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl opc_class_factory_vtbl = +{ + opc_class_factory_QueryInterface, + opc_class_factory_AddRef, + opc_class_factory_Release, + opc_class_factory_CreateInstance, + opc_class_factory_LockServer +}; + +static IClassFactory opc_class_factory = { &opc_class_factory_vtbl }; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + TRACE("clsid %s, iid %s, out %p\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualCLSID(clsid, &CLSID_OpcFactory)) + return IClassFactory_QueryInterface(&opc_class_factory, iid, out); + + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + return E_NOTIMPL; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +static HINSTANCE OPC_hInstance; + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, void *reserved) +{ + OPC_hInstance = hInstDLL; + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("\n"); + return __wine_register_resources( OPC_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( OPC_hInstance ); +} diff --git a/dlls/opcservices/opcservices.idl b/dlls/opcservices/opcservices.idl new file mode 100644 index 0000000..689131b --- /dev/null +++ b/dlls/opcservices/opcservices.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "msopc.idl" diff --git a/dlls/opcservices/opcservices.spec b/dlls/opcservices/opcservices.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/opcservices/opcservices.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Józef Kucia : winevulkan: Fix potential memory leaks when a command pool is destroyed.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 079d2ec40d0587a886390585408a172c0a8a7b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=079d2ec40d0587a886390585… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:32 2018 +0200 winevulkan: Fix potential memory leaks when a command pool is destroyed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 22 ++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 886ef0b..f500602 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -165,6 +165,7 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, continue; device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); + list_remove(&buffers[i]->pool_link); heap_free(buffers[i]); } } @@ -528,9 +529,8 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, allocate_info_host.level = allocate_info->level; allocate_info_host.commandBufferCount = 1; - TRACE("Creating command buffer %u, pool 0x%s, level %#x\n", i, - wine_dbgstr_longlong(allocate_info_host.commandPool), - allocate_info_host.level); + TRACE("Allocating command buffer %u from pool 0x%s.\n", + i, wine_dbgstr_longlong(allocate_info_host.commandPool)); if (!(buffers[i] = heap_alloc_zero(sizeof(**buffers)))) { @@ -544,9 +544,11 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { - ERR("Failed to allocate command buffer, res=%d\n", res); + ERR("Failed to allocate command buffer, res=%d.\n", res); break; } + + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) @@ -1132,6 +1134,8 @@ VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCre if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; + list_init(&object->command_buffers); + res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); if (res == VK_SUCCESS) @@ -1146,6 +1150,7 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const VkAllocationCallbacks *allocator) { struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); + struct VkCommandBuffer_T *buffer, *cursor; TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); @@ -1155,6 +1160,15 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + /* The Vulkan spec says: + * + * "When a pool is destroyed, all command buffers allocated from the pool are freed." + */ + LIST_FOR_EACH_ENTRY_SAFE(buffer, cursor, &pool->command_buffers, struct VkCommandBuffer_T, pool_link) + { + heap_free(buffer); + } + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); heap_free(pool); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f31d4d5..17072d2 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -27,6 +27,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" #include "wine/vulkan_driver.h" @@ -62,6 +63,8 @@ struct VkCommandBuffer_T struct wine_vk_base base; struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ + + struct list pool_link; }; struct VkDevice_T @@ -113,6 +116,8 @@ struct VkQueue_T struct wine_cmd_pool { VkCommandPool command_pool; + + struct list command_buffers; }; static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle)

1 0

Józef Kucia : winevulkan: Wrap VkCommandPools.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 6f8d02b0f3099651928afd609dc4ed3fc84d7a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8d02b0f3099651928afd60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:31 2018 +0200 winevulkan: Wrap VkCommandPools. We need to wrap VkCommandPools to track allocated VkCommandBuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 50 +++++++++++++++-------------- dlls/winevulkan/vulkan.c | 68 +++++++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan_private.h | 15 +++++++++ dlls/winevulkan/vulkan_thunks.c | 18 ++--------- dlls/winevulkan/vulkan_thunks.h | 2 ++ 5 files changed, 103 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f8d02b0f3099651928a…

1 0

Nikolay Sivov : include: Add IOpcFactory and related definitions.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: d504b02acadf3206a21a3b98bb62c2858c745828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d504b02acadf3206a21a3b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 30 14:54:36 2018 +0300 include: Add IOpcFactory and related definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 4 +++ include/msopc.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++ include/opcbase.idl | 27 ++++++++++++++ include/opcobjectmodel.idl | 34 ++++++++++++++++++ include/opcparturi.idl | 71 ++++++++++++++++++++++++++++++++++++ 5 files changed, 225 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a89fef6..ffecb98 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -399,6 +399,7 @@ SOURCES = \ msident.idl \ msinkaut.idl \ msiquery.h \ + msopc.idl \ mssip.h \ msstkppg.h \ mstask.idl \ @@ -493,6 +494,9 @@ SOURCES = \ oledberr.h \ oledlg.h \ oleidl.idl \ + opcbase.idl \ + opcobjectmodel.idl \ + opcparturi.idl \ opnrst.idl \ optary.idl \ patchapi.h \ diff --git a/include/msopc.idl b/include/msopc.idl new file mode 100644 index 0000000..12404e5 --- /dev/null +++ b/include/msopc.idl @@ -0,0 +1,89 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#include "opcbase.idl" +#include "opcobjectmodel.idl" +#include "opcparturi.idl" + +#ifndef __WIDL__ +#define threading(model) +#endif + +interface IOpcUri; +interface IOpcPartUri; +interface IOpcPackage; +interface IOpcDigitalSignatureManager; + +[ + object, + uuid(6d0b4446-cd73-4ab3-94f4-8ccdf6116154), + pointer_default(ref) +] +interface IOpcFactory : IUnknown +{ + HRESULT CreatePackageRootUri( + [out, retval] IOpcUri **uri + ); + + HRESULT CreatePartUri( + [in, string] LPCWSTR uri, + [out, retval] IOpcPartUri **part_uri + ); + + [local] + HRESULT CreateStreamOnFile( + [in, string] LPCWSTR filename, + [in] OPC_STREAM_IO_MODE io_mode, + [in, unique] SECURITY_ATTRIBUTES *sa, + [in] DWORD flags, + [out, retval] IStream **stream + ); + + HRESULT CreatePackage( + [out, retval] IOpcPackage **package + ); + + HRESULT ReadPackageFromStream( + [in] IStream *stream, + [in] OPC_READ_FLAGS flags, + [out, retval] IOpcPackage **package + ); + + HRESULT WritePackageToStream( + [in] IOpcPackage *package, + [in] OPC_WRITE_FLAGS flags, + [in] IStream *stream + ); + + HRESULT CreateDigitalSignatureManager( + [in] IOpcPackage *package, + [out, retval] IOpcDigitalSignatureManager **signature_manager + ); +} + +[ + threading(both), + uuid(6b2d6Ba0-9f3e-4f27-920b-313cc426a39e) +] +coclass OpcFactory +{ + interface IOpcFactory; +}; diff --git a/include/opcbase.idl b/include/opcbase.idl new file mode 100644 index 0000000..fc92675 --- /dev/null +++ b/include/opcbase.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_STREAM_IO_READ = 1, + OPC_STREAM_IO_WRITE = 2, +} OPC_STREAM_IO_MODE; diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl new file mode 100644 index 0000000..e5370d2 --- /dev/null +++ b/include/opcobjectmodel.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_READ_DEFAULT = 0, + OPC_VALIDATE_ON_LOAD = 1, + OPC_CACHE_ON_ACCESS = 2, +} OPC_READ_FLAGS; + +typedef [v1_enum] enum +{ + OPC_WRITE_DEFAULT = 0, + OPC_WRITE_FORCE_ZIP32 = 1, +} OPC_WRITE_FLAGS; diff --git a/include/opcparturi.idl b/include/opcparturi.idl new file mode 100644 index 0000000..00b21b9 --- /dev/null +++ b/include/opcparturi.idl @@ -0,0 +1,71 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#if 0 +#pragma makedep install +#endif + +interface IOpcPartUri; + +[ + object, + uuid(bc9c1b9b-d62c-49eb-aef0-3b4e0b28ebed), + nonextensible, + pointer_default(ref) +] +interface IOpcUri : IUri +{ + HRESULT GetRelationshipsPartUri( + [out, retval] IOpcPartUri **part_uri + ); + + HRESULT GetRelativeUri( + [in] IOpcPartUri *part_uri, + [out, retval] IUri **relative_uri + ); + + HRESULT CombinePartUri( + [in] IUri *relative_uri, + [out, retval] IOpcPartUri **combined + ); +} + +[ + object, + uuid(7d3babe7-88b2-46ba-85cb-4203cb016c87), + nonextensible, + pointer_default(ref) +] +interface IOpcPartUri : IOpcUri +{ + HRESULT ComparePartUri( + [in] IOpcPartUri *part_uri, + [out, retval] INT32 *result + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **source_uri + ); + + HRESULT IsRelationshipsPartUri( + [out, retval] BOOL *result + ); +}

1 0

Józef Kucia : winevulkan: Free all command buffers when vkAllocateCommandBuffers() fails.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: b62d4ea6ed49f9e9aaa7e6303741c0274df03ab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b62d4ea6ed49f9e9aaa7e630… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:34 2018 +0200 winevulkan: Free all command buffers when vkAllocateCommandBuffers() fails. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f500602..4e0d999 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -540,25 +540,24 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, buffers[i]->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; buffers[i]->device = device; + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); res = device->funcs.p_vkAllocateCommandBuffers(device->device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { ERR("Failed to allocate command buffer, res=%d.\n", res); + buffers[i]->command_buffer = VK_NULL_HANDLE; break; } - - list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) { - wine_vk_free_command_buffers(device, pool, i, buffers); + wine_vk_free_command_buffers(device, pool, i + 1, buffers); memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers)); - return res; } - return VK_SUCCESS; + return res; } void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count,

1 0