April 2021 - Wine-commits - list.winehq.org

Hans Leidekker : wldap32: Use CRT memory allocators.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 8a52b16e0d3f407d101f073c5d1b2c0ebaa8c7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52b16e0d3f407d101f073c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:52 2021 +0200 wldap32: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/add.c | 12 +-- dlls/wldap32/ber.c | 20 ++--- dlls/wldap32/bind.c | 66 +++++++------- dlls/wldap32/compare.c | 36 ++++---- dlls/wldap32/delete.c | 12 +-- dlls/wldap32/dn.c | 12 +-- dlls/wldap32/extended.c | 8 +- dlls/wldap32/init.c | 46 +++++----- dlls/wldap32/misc.c | 18 ++-- dlls/wldap32/modify.c | 12 +-- dlls/wldap32/modrdn.c | 24 ++--- dlls/wldap32/option.c | 4 +- dlls/wldap32/page.c | 26 +++--- dlls/wldap32/rename.c | 24 ++--- dlls/wldap32/search.c | 32 +++---- dlls/wldap32/value.c | 18 ++-- dlls/wldap32/winldap_private.h | 200 +++++++++++++++++++---------------------- 17 files changed, 275 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a52b16e0d3f407d101f…

1 0

Hans Leidekker : wldap32: Use wide character string literals.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 81e418efaf5ded55311385d3868c36a01dc9e432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e418efaf5ded55311385d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:53 2021 +0200 wldap32: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 11 ++++------- dlls/wldap32/winldap_private.h | 6 ------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 28e62ba6de2..8043164ad30 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -30,9 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -/* Should eventually be determined by the algorithm documented on MSDN. */ -static const WCHAR defaulthost[] = { 'l','o','c','a','l','h','o','s','t',0 }; - /* Split a space separated string of hostnames into a string array */ static char **split_hostnames( const char *hostnames ) { @@ -256,7 +253,7 @@ WLDAP32_LDAP * CDECL cldap_openW( WCHAR *hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "cldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -342,7 +339,7 @@ WLDAP32_LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -401,7 +398,7 @@ WLDAP32_LDAP * CDECL ldap_openW( WCHAR *hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -462,7 +459,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( WCHAR *hostname, ULONG portnumber, int secur TRACE( "(%s, %d, 0x%08x)\n", debugstr_w(hostname), portnumber, secure ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (secure) url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 6777c114d81..0d528471b0c 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -220,15 +220,9 @@ typedef struct ldap_version_info #define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" #define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" -#if defined(_MSC_VER) || defined(__MINGW32__) #define LDAP_PAGED_RESULT_OID_STRING_W L"1.2.840.113556.1.4.319" #define LDAP_SERVER_RESP_SORT_OID_W L"1.2.840.113556.1.4.474" #define LDAP_CONTROL_VLVRESPONSE_W L"2.16.840.1.113730.3.4.10" -#else -static const WCHAR LDAP_PAGED_RESULT_OID_STRING_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}; -static const WCHAR LDAP_SERVER_RESP_SORT_OID_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0}; -static const WCHAR LDAP_CONTROL_VLVRESPONSE_W[] = {'2','.','1','6','.','8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0}; -#endif typedef struct ldapcontrolA {

1 0

Hans Leidekker : wldap32: Get rid of the WLDAP32_ prefix.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 8db46756ca91695c7242e05d24a3e5ec4340c10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db46756ca91695c7242e05d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:54 2021 +0200 wldap32: Get rid of the WLDAP32_ prefix. We can now include the public header without conflicts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/add.c | 45 ++-- dlls/wldap32/ber.c | 104 ++++---- dlls/wldap32/bind.c | 132 +++++------ dlls/wldap32/compare.c | 57 ++--- dlls/wldap32/control.c | 65 +++-- dlls/wldap32/delete.c | 51 ++-- dlls/wldap32/dn.c | 31 +-- dlls/wldap32/error.c | 59 ++--- dlls/wldap32/extended.c | 58 ++--- dlls/wldap32/init.c | 67 +++--- dlls/wldap32/libldap.c | 5 +- dlls/wldap32/libldap.h | 147 ++++++------ dlls/wldap32/misc.c | 106 ++++----- dlls/wldap32/modify.c | 49 ++-- dlls/wldap32/modrdn.c | 41 ++-- dlls/wldap32/option.c | 525 ++++++++++++++++++++-------------------- dlls/wldap32/page.c | 112 ++++----- dlls/wldap32/parse.c | 118 ++++----- dlls/wldap32/rename.c | 33 +-- dlls/wldap32/search.c | 76 +++--- dlls/wldap32/value.c | 31 +-- dlls/wldap32/winldap_private.h | 527 +++-------------------------------------- dlls/wldap32/wldap32.spec | 56 ++--- include/winber.h | 2 +- include/winldap.h | 10 +- 25 files changed, 1039 insertions(+), 1468 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8db46756ca91695c7242…

1 0

Rémi Bernon : user32: Remove unused heap_strdupW helper.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 63291b1593f70e1049c6de97758179804ecdb37f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63291b1593f70e1049c6de97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 19 10:22:40 2021 +0200 user32: Remove unused heap_strdupW helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index dfd52421e66..5f8059a12a0 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -381,14 +381,4 @@ struct png_funcs #define assert(expr) ((void)0) #endif -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __WINE_USER_PRIVATE_H */

1 0

Jacek Caban : winevulkan: Don't use vulkan_private.h in loader_thunks.c.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 171fe51b794f51b8d2b3811b7327aa2e730cd07e URL: https://source.winehq.org/git/wine.git/?a=commit;h=171fe51b794f51b8d2b3811b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:14:59 2021 +0200 winevulkan: Don't use vulkan_private.h in loader_thunks.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 2 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_loader.h | 43 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 19 +----------------- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/loader_thunks.c b/dlls/winevulkan/loader_thunks.c index d05429f4116..22497545b0b 100644 --- a/dlls/winevulkan/loader_thunks.c +++ b/dlls/winevulkan/loader_thunks.c @@ -9,7 +9,7 @@ * */ -#include "vulkan_private.h" +#include "vulkan_loader.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ef24cbfd262..100d233bc51 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2501,7 +2501,7 @@ class VkGenerator(object): def generate_loader_thunks_c(self, f, prefix): self._generate_copyright(f) - f.write("#include \"vulkan_private.h\"\n\n") + f.write("#include \"vulkan_loader.h\"\n\n") f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h new file mode 100644 index 00000000000..61b2d60c272 --- /dev/null +++ b/dlls/winevulkan/vulkan_loader.h @@ -0,0 +1,43 @@ +/* Wine Vulkan ICD private data structures + * + * Copyright 2017 Roderick Colenbrander + * + * 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 + */ + +#ifndef __WINE_VULKAN_LOADER_H +#define __WINE_VULKAN_LOADER_H + +#include "wine/debug.h" + +#define VK_NO_PROTOTYPES +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +#include "loader_thunks.h" + +struct vulkan_func +{ + const char *name; + void *func; +}; + +void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; + +extern const struct unix_funcs *unix_funcs; + +#endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f06e739c423..4e9c0721dcd 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -27,14 +27,10 @@ #include <pthread.h> -#include "wine/debug.h" #include "wine/list.h" -#define VK_NO_PROTOTYPES -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h" +#include "vulkan_loader.h" #include "vulkan_thunks.h" -#include "loader_thunks.h" /* Magic value defined by Vulkan ICD / Loader spec */ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE @@ -43,12 +39,6 @@ #define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 #define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 -struct vulkan_func -{ - const char *name; - void *func; -}; - /* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. * This structure MUST be the first element of a dispatchable object as the ICD * loader depends on it. For now only contains loader_magic, but over time more common @@ -235,10 +225,6 @@ static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) return (VkSurfaceKHR)(uintptr_t)surface; } -void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; - BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; @@ -246,8 +232,5 @@ BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; extern const struct unix_funcs loader_funcs; -extern const struct unix_funcs *unix_funcs; - -const struct unix_funcs *unix_vk_init(const struct vulkan_funcs *driver) DECLSPEC_HIDDEN; #endif /* __WINE_VULKAN_PRIVATE_H */

1 0

Jacek Caban : winevulkan: Don't use vulkan_private.h in loader.c.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: bd5408493a642623455c3146064880f475a2150d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd5408493a642623455c3146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:10 2021 +0200 winevulkan: Don't use vulkan_private.h in loader.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/vulkan.c | 4 ++-- dlls/winevulkan/vulkan_loader.h | 26 ++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 24 +----------------------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 769724fe20d..5f5664db3fa 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -28,7 +28,7 @@ #include "devguid.h" #include "setupapi.h" -#include "vulkan_private.h" +#include "vulkan_loader.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -159,7 +159,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/2323 * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 */ - if (device->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR + if (((struct wine_vk_device_base *)device)->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR && ((func = wine_vk_get_instance_proc_addr(name)) || (func = wine_vk_get_phys_dev_proc_addr(name)))) { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1070ccec115..d6f501b267a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -768,7 +768,7 @@ VkResult WINAPI unix_vkCreateDevice(VkPhysicalDevice phys_dev, if (!(object = calloc(1, sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; - object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->base.base.loader_magic = VULKAN_ICD_MAGIC_VALUE; object->phys_dev = phys_dev; res = wine_vk_device_convert_create_info(create_info, &create_info_host); @@ -823,7 +823,7 @@ VkResult WINAPI unix_vkCreateDevice(VkPhysicalDevice phys_dev, next_queue += queue_count; } - object->quirks = phys_dev->instance->quirks; + object->base.quirks = phys_dev->instance->quirks; *device = object; TRACE("Created device %p (native device %p).\n", object, object->device); diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 61b2d60c272..d248ff6521f 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -28,6 +28,32 @@ #include "loader_thunks.h" +/* Magic value defined by Vulkan ICD / Loader spec */ +#define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE + +#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 +#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 + +/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. + * This structure MUST be the first element of a dispatchable object as the ICD + * loader depends on it. For now only contains loader_magic, but over time more common + * functionality is expected. + */ +struct wine_vk_base +{ + /* Special section in each dispatchable object for use by the ICD loader for + * storing dispatch tables. The start contains a magical value '0x01CDC0DE'. + */ + UINT_PTR loader_magic; +}; + +struct wine_vk_device_base +{ + struct wine_vk_base base; + unsigned int quirks; +}; + struct vulkan_func { const char *name; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4e9c0721dcd..ebc1b35ba44 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -32,26 +32,6 @@ #include "vulkan_loader.h" #include "vulkan_thunks.h" -/* Magic value defined by Vulkan ICD / Loader spec */ -#define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE - -#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 -#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 - -/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. - * This structure MUST be the first element of a dispatchable object as the ICD - * loader depends on it. For now only contains loader_magic, but over time more common - * functionality is expected. - */ -struct wine_vk_base -{ - /* Special section in each dispatchable object for use by the ICD loader for - * storing dispatch tables. The start contains a magical value '0x01CDC0DE'. - */ - UINT_PTR loader_magic; -}; - /* Some extensions have callbacks for those we need to be able to * get the wine wrapper for a native handle */ @@ -74,7 +54,7 @@ struct VkCommandBuffer_T struct VkDevice_T { - struct wine_vk_base base; + struct wine_vk_device_base base; struct vulkan_device_funcs funcs; struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ @@ -82,8 +62,6 @@ struct VkDevice_T struct VkQueue_T* queues; uint32_t queue_count; - unsigned int quirks; - struct wine_vk_mapping mapping; };

1 0

Jacek Caban : winevulkan: Build with msvcrt.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 48bcb133932a7888a039dd43fdccf9b45b4d09b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48bcb133932a7888a039dd43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:20 2021 +0200 winevulkan: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index bb5248c8f73..7f5b465c9a1 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = winevulkan IMPORTS = user32 gdi32 advapi32 setupapi EXTRALIBS = $(PTHREAD_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ loader.c \ loader_thunks.c \

1 0

Jacek Caban : winevulkan: Use wide string literals.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: da5248bcfad07bb2ff092b0086ff690558ac649d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5248bcfad07bb2ff092b00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:31 2021 +0200 winevulkan: Use wide string literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 5f5664db3fa..73f09d9e303 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -276,8 +276,7 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) static HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + HANDLE mutex = CreateMutexW(NULL, FALSE, L"display_device_init"); WaitForSingleObject(mutex, INFINITE); return mutex; @@ -303,7 +302,6 @@ static void wait_graphics_driver_ready(void) static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { - static const WCHAR pci[] = {'P','C','I',0}; VkPhysicalDeviceIDProperties *id; SP_DEVINFO_DATA device_data; DWORD type, device_idx = 0; @@ -317,7 +315,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, L"PCI", NULL, 0); device_data.cbSize = sizeof(device_data); while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) { @@ -377,10 +375,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) return TRUE; } -static const WCHAR winevulkan_json_resW[] = {'w','i','n','e','v','u','l','k','a','n','_','j','s','o','n',0}; -static const WCHAR winevulkan_json_pathW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; -static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', - 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; +static const WCHAR winevulkan_json_pathW[] = L"\\winevulkan.json"; +static const WCHAR vulkan_driversW[] = L"Software\\Khronos\\Vulkan\\Drivers"; HRESULT WINAPI DllRegisterServer(void) { @@ -393,7 +389,7 @@ HRESULT WINAPI DllRegisterServer(void) /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ TRACE("\n"); - rsrc = FindResourceW(hinstance, winevulkan_json_resW, (const WCHAR *)RT_RCDATA); + rsrc = FindResourceW(hinstance, L"winevulkan_json", (const WCHAR *)RT_RCDATA); data = LockResource(LoadResource(hinstance, rsrc)); datalen = SizeofResource(hinstance, rsrc);

1 0

Nikolay Sivov : mf/evr: Set initial output window size for the presenter.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 0dbbe8da25be1b828aa4babb89fc45a9de1aa9de URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbbe8da25be1b828aa4babb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:02:01 2021 +0300 mf/evr: Set initial output window size for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/evr.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f60e337b386..e56d4c04a84 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,7 +1,7 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids -DELAYIMPORTS = evr +DELAYIMPORTS = evr user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 9cb6763da4e..79e2f57f9c5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1611,11 +1611,15 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { IMFVideoDisplayControl *control; + RECT rect = { 0 }; HRESULT hr; if (SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFVideoDisplayControl, (void **)&control))) { - IMFVideoDisplayControl_SetVideoWindow(control, renderer->window); + GetClientRect(renderer->window, &rect); + + if (SUCCEEDED(hr = IMFVideoDisplayControl_SetVideoWindow(control, renderer->window))) + hr = IMFVideoDisplayControl_SetVideoPosition(control, NULL, &rect); IMFVideoDisplayControl_Release(control); }

1 0

Nikolay Sivov : evr/presenter: Set MF_MT_MINIMUM_DISPLAY_APERTURE when configuring mixer output.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: e10e4795d251a20ceddd4ebb1d5995e37bf6fb2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10e4795d251a20ceddd4ebb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:06 2021 +0300 evr/presenter: Set MF_MT_MINIMUM_DISPLAY_APERTURE when configuring mixer output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 868a265e3ee..42c4c81d9d3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -309,12 +309,25 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, return hr; } +static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, + IMFMediaType *media_type) +{ + HRESULT hr; + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + + return hr; +} + static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { IMFMediaType *media_type, *candidate_type; + MFVideoArea aperture = {{ 0 }}; unsigned int idx = 0; - UINT64 frame_size; - MFVideoArea aperture; RECT rect; HRESULT hr; @@ -332,11 +345,6 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre aperture.Area.cx = rect.right - rect.left; aperture.Area.cy = rect.bottom - rect.top; - aperture.OffsetX.value = 0; - aperture.OffsetX.fract = 0; - aperture.OffsetY.value = 0; - aperture.OffsetY.fract = 0; - frame_size = (UINT64)aperture.Area.cx << 32 | aperture.Area.cy; while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &candidate_type))) { @@ -346,10 +354,10 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre WARN("Failed to clone a media type, hr %#x.\n", hr); IMFMediaType_Release(candidate_type); - IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, frame_size); - IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + hr = video_presenter_configure_output_type(presenter, &aperture, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type);

1 0