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

Józef Kucia : vulkan-1/tests: Add a test for destroying a command pool.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 29d49fb8a3ee8a72310c0b4d1f314a11dc39efc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d49fb8a3ee8a72310c0b4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:33 2018 +0200 vulkan-1/tests: Add a test for destroying a command pool. The Vulkan spec says: "When a pool is destroyed, all command buffers allocated from the pool are implicitly freed and become invalid. Command buffers allocated from a given pool do not need to be freed before destroying that command pool." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d2f66f..20a2452 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -232,6 +232,45 @@ static void test_physical_device_groups(void) vkDestroyInstance(vk_instance, NULL); } +static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) +{ + VkCommandBufferAllocateInfo allocate_info; + VkCommandPoolCreateInfo pool_info; + VkCommandBuffer vk_cmd_buffers[4]; + uint32_t queue_family_index; + VkCommandPool vk_cmd_pool; + VkDevice vk_device; + VkResult vr; + + if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + return; + } + + find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_family_index); + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + vr = vkCreateCommandPool(vk_device, &pool_info, NULL, &vk_cmd_pool); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = ARRAY_SIZE(vk_cmd_buffers); + vr = vkAllocateCommandBuffers(vk_device, &allocate_info, vk_cmd_buffers); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vkDestroyCommandPool(vk_device, vk_cmd_pool, NULL); + vkDestroyCommandPool(vk_device, VK_NULL_HANDLE, NULL); + + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -272,4 +311,5 @@ START_TEST(vulkan) for_each_device(enumerate_physical_device); for_each_device(enumerate_device_queues); test_physical_device_groups(); + for_each_device(test_destroy_command_pool); }

1 0

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

30 Aug '18

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

Nikolay Sivov : include: Add IOpcFactory and related definitions.
by Alexandre Julliard 30 Aug '18

30 Aug '18

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

Nikolay Sivov : opcservices: Add a stub IOpcFactory.
by Alexandre Julliard 30 Aug '18

30 Aug '18

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

Alex Henrie : shell32: Add video file icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 627c34fff765abfb055b0c8fd8a3c3f21d8835c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=627c34fff765abfb055b0c8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:40 2018 -0600 shell32: Add video file icon. Adapted from video-x-generic 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/video.ico | Bin 0 -> 64272 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627c34fff765abfb055b…

1 0

Alex Henrie : shell32: Add audio file icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 47c35b2ef1d450361e388ec855a2927d7648ef2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c35b2ef1d450361e388ec8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:41 2018 -0600 shell32: Add audio file icon. Adapted from audio-x-generic 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/audio.ico | Bin 0 -> 48131 bytes dlls/shell32/resources/audio.svg | 679 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 684 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47c35b2ef1d450361e38…

1 0

Alex Henrie : shell32: Rename floppy.svg to disk_drive.svg.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 336ced48faa3122a80a5225ac02582d5a7285e05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=336ced48faa3122a80a5225a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:44 2018 -0600 shell32: Rename floppy.svg to disk_drive.svg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{floppy.ico => disk_drive.ico} | Bin dlls/shell32/resources/{floppy.svg => disk_drive.svg} | 0 dlls/shell32/shell32.rc | 12 ++++++------ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7f549ca..a61775e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,11 +68,11 @@ SVG_SRCS = \ resources/copy.svg \ resources/delete.svg \ resources/desktop.svg \ + resources/disk_drive.svg \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ resources/favorites.svg \ - resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ diff --git a/dlls/shell32/resources/floppy.ico b/dlls/shell32/resources/disk_drive.ico similarity index 100% rename from dlls/shell32/resources/floppy.ico rename to dlls/shell32/resources/disk_drive.ico diff --git a/dlls/shell32/resources/floppy.svg b/dlls/shell32/resources/disk_drive.svg similarity index 100% rename from dlls/shell32/resources/floppy.svg rename to dlls/shell32/resources/disk_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f086aa4..f6defb2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -443,15 +443,15 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON resources/folder_open.ico IDI_SHELL_FOLDER_SMALL_XP ICON resources/folder_open.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_5_12_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_5_12_FLOPPY ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_3_14_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_3_14_FLOPPY ICON resources/disk_drive.ico -/* @makedep: resources/floppy.ico */ -IDI_SHELL_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_FLOPPY ICON resources/disk_drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DRIVE ICON resources/drive.ico

1 0

Alex Henrie : shell32: Add card reader icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: c34a39e37a6fece2600659f9b11ce306a1b98a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34a39e37a6fece2600659f9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:45 2018 -0600 shell32: Add card reader 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 f6defb2..69465da 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -814,6 +814,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_CARD_READER 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 19a5850..c21d849 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -296,6 +296,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 +#define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add zip drive icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: a2e2b5ba1da2277053aef9cf9f9e996223012805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e2b5ba1da2277053aef9cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:46 2018 -0600 shell32: Add zip drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 69465da..251d1f0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -818,6 +818,10 @@ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -918,6 +922,10 @@ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_DVD_RW ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c21d849..cf18347 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -297,6 +297,7 @@ #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 +#define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -323,6 +324,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320

1 0

Alex Henrie : shell32: Add download icons.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 042b9cc23f64e023b8d0f415f73e179dc39015e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=042b9cc23f64e023b8d0f415… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:47 2018 -0600 shell32: Add download icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 251d1f0..e28d51c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -822,6 +822,14 @@ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD ICON resources/blank.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.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 cf18347..6bf9b99 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -298,6 +298,8 @@ #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 +#define IDI_SHELL_DOWNLOAD 231 +#define IDI_SHELL_DOWNLOAD_EMBLEM 232 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0