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

Zebediah Figura : wined3d: Move struct wined3d_context_vk to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 6698ec90aa652bc6a95fe3eb7851865e4c165c96 URL: https://gitlab.winehq.org/wine/wine/-/commit/6698ec90aa652bc6a95fe3eb785186… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:16:04 2022 -0600 wined3d: Move struct wined3d_context_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 302 ----------------------------------------- dlls/wined3d/wined3d_vk.h | 302 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+), 302 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct wined3d_adapter_vk to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 45d271beed9afb02455408451ea8f96cab75b2ef URL: https://gitlab.winehq.org/wine/wine/-/commit/45d271beed9afb02455408451ea8f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:19:07 2022 -0600 wined3d: Move struct wined3d_adapter_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 35 +++++------------------------------ dlls/wined3d/wined3d_vk.h | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20fb5ea0a2d..61847e3d5cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2385,8 +2385,6 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context const struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); struct wined3d_state_entry @@ -3188,6 +3186,9 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; BOOL wined3d_get_primary_adapter_luid(LUID *luid) DECLSPEC_HIDDEN; +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_adapter_gl { struct wined3d_adapter a; @@ -3209,32 +3210,6 @@ static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const st struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -struct wined3d_adapter_vk -{ - struct wined3d_adapter a; - - struct wined3d_vk_info vk_info; - unsigned int device_extension_count; - const char **device_extensions; - VkPhysicalDevice physical_device; - - VkPhysicalDeviceLimits device_limits; - VkPhysicalDeviceMemoryProperties memory_properties; -}; - -static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) -{ - return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); -} - -struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, - unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, - uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; -void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, - const struct wined3d_bo_address *src, - unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; - struct wined3d_caps_gl_ctx { HDC dc; @@ -3254,8 +3229,6 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, - const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; @@ -3673,6 +3646,8 @@ static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_dev return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); } +#include "wined3d_vk.h" + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 9eaddbf99c4..43b40889451 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -664,4 +664,30 @@ void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_v VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, VkDescriptorSetLayout vk_set_layout) DECLSPEC_HIDDEN; +struct wined3d_adapter_vk +{ + struct wined3d_adapter a; + + struct wined3d_vk_info vk_info; + unsigned int device_extension_count; + const char **device_extensions; + VkPhysicalDevice physical_device; + + VkPhysicalDeviceLimits device_limits; + VkPhysicalDeviceMemoryProperties memory_properties; +}; + +static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); +} + +void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, + const struct wined3d_bo_address *src, + unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, + const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Alistair Leslie-Hughes : msi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 51049c95a242f1553562a442142e813e37cee233 URL: https://gitlab.winehq.org/wine/wine/-/commit/51049c95a242f1553562a442142e81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 msi: Remove DECLSPEC_HIDDEN usage. --- dlls/msi/msipriv.h | 552 ++++++++++++++++++++++++++--------------------------- 1 file changed, 276 insertions(+), 276 deletions(-)

1 0

Alistair Leslie-Hughes : advapi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 9fd2c50434243f71b963344d9df1432336fdc8ae URL: https://gitlab.winehq.org/wine/wine/-/commit/9fd2c50434243f71b963344d9df143… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 advapi32: Remove DECLSPEC_HIDDEN usage. --- dlls/advapi32/advapi32_misc.h | 12 ++++++------ dlls/advapi32/crypt.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 65bd8aa8529..c7ef2e4794e 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -25,13 +25,13 @@ #include "winnls.h" #include "wine/heap.h" -const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; -BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; -BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; +const char * debugstr_sid(PSID sid); +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); +BOOL ADVAPI_GetComputerSid(PSID sid); -BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; +BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +const WCHAR *get_wellknown_privilege_name(const LUID *); /* memory allocation functions */ diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index a4429642d24..4484b4799e5 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -87,9 +87,9 @@ typedef struct tagCRYPTHASH #define MAXPROVTYPES 999 extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ) DECLSPEC_HIDDEN; + const unsigned char *src ); extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ) DECLSPEC_HIDDEN; + const unsigned char *src ); struct ustring { DWORD Length;

1 0

Alistair Leslie-Hughes : dinput: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: f9bd79dce22e102d68678c99c78020c5dee7ed13 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9bd79dce22e102d68678c99c78020… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 7 18:38:51 2023 +1000 dinput: Remove DECLSPEC_HIDDEN usage. --- dlls/dinput/device_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 13201cc7178..feeade7def6 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -131,11 +131,11 @@ extern int dinput_device_object_index_from_id( IDirectInputDevice8W *iface, DWOR extern BOOL device_object_matches_semantic( const DIDEVICEINSTANCEW *instance, const DIOBJECTDATAFORMAT *object, DWORD semantic, BOOL exact ); -extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; -extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; -extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; -extern void queue_event( IDirectInputDevice8W *iface, int index, DWORD data, DWORD time, DWORD seq ) DECLSPEC_HIDDEN; +extern BOOL get_app_key(HKEY*, HKEY*); +extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ); +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ); +extern void queue_event( IDirectInputDevice8W *iface, int index, DWORD data, DWORD time, DWORD seq ); -extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; +extern const GUID dinput_pidvid_guid; #endif /* __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H */

1 0

Fabian Maurer : localspl: Add workaround for old versions of cups.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: cc3f61e7dd82968ffe2e90132c223adb3f8755f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc3f61e7dd82968ffe2e90132c223a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jun 30 18:14:26 2023 +0200 localspl: Add workaround for old versions of cups.h. Recent versions of cups.h have HTTP_STATUS_CONTINUE as enum, so defining it doesn't hurt Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54166 --- dlls/localspl/cups.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index cf96f1739fe..b5c26cc2626 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl); +/* cups.h before version 1.7.0 doesn't have HTTP_STATUS_CONTINUE */ +#define HTTP_STATUS_CONTINUE 100 + #ifdef SONAME_LIBCUPS static void *libcups_handle;

1 0

Gabriel Ivăncescu : mshtml: Introduce helper to transfer node ownership to range points when AddRef isn't needed.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: c0a6d2d4a1a35151a155a75ec67a21f55306476a URL: https://gitlab.winehq.org/wine/wine/-/commit/c0a6d2d4a1a35151a155a75ec67a21… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:51 2023 +0300 mshtml: Introduce helper to transfer node ownership to range points when AddRef isn't needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 23a42987841..da6b83cbc96 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -174,15 +174,19 @@ static int get_child_index(nsIDOMNode *parent, nsIDOMNode *child) return ret; } -static void init_rangepoint(rangepoint_t *rangepoint, nsIDOMNode *node, UINT32 off) +static void init_rangepoint_no_addref(rangepoint_t *rangepoint, nsIDOMNode *node, UINT32 off) { - nsIDOMNode_AddRef(node); - rangepoint->type = get_node_type(node); rangepoint->node = node; rangepoint->off = off; } +static void init_rangepoint(rangepoint_t *rangepoint, nsIDOMNode *node, UINT32 off) +{ + nsIDOMNode_AddRef(node); + init_rangepoint_no_addref(rangepoint, node, off); +} + static inline void free_rangepoint(rangepoint_t *rangepoint) { nsIDOMNode_Release(rangepoint->node); @@ -203,8 +207,7 @@ static BOOL rangepoint_next_node(rangepoint_t *iter) node = get_child_node(iter->node, iter->off); if(node) { free_rangepoint(iter); - init_rangepoint(iter, node, 0); - nsIDOMNode_Release(node); + init_rangepoint_no_addref(iter, node, 0); return TRUE; } @@ -216,8 +219,7 @@ static BOOL rangepoint_next_node(rangepoint_t *iter) off = get_child_index(node, iter->node)+1; free_rangepoint(iter); - init_rangepoint(iter, node, off); - nsIDOMNode_Release(node); + init_rangepoint_no_addref(iter, node, off); return TRUE; } @@ -266,8 +268,7 @@ static BOOL rangepoint_prev_node(rangepoint_t *iter) off = get_node_type(node) == TEXT_NODE ? get_text_length(node) : get_child_count(node); free_rangepoint(iter); - init_rangepoint(iter, node, off); - nsIDOMNode_Release(node); + init_rangepoint_no_addref(iter, node, off); return TRUE; } @@ -291,9 +292,7 @@ static void get_start_point(HTMLTxtRange *This, rangepoint_t *ret) nsIDOMRange_GetStartContainer(This->nsrange, &node); nsIDOMRange_GetStartOffset(This->nsrange, &off); - init_rangepoint(ret, node, off); - - nsIDOMNode_Release(node); + init_rangepoint_no_addref(ret, node, off); } static void get_end_point(HTMLTxtRange *This, rangepoint_t *ret) @@ -304,9 +303,7 @@ static void get_end_point(HTMLTxtRange *This, rangepoint_t *ret) nsIDOMRange_GetEndContainer(This->nsrange, &node); nsIDOMRange_GetEndOffset(This->nsrange, &off); - init_rangepoint(ret, node, off); - - nsIDOMNode_Release(node); + init_rangepoint_no_addref(ret, node, off); } static void set_start_point(HTMLTxtRange *This, const rangepoint_t *start)

1 0

Gabriel Ivăncescu : mshtml: Fix leak when obtaining previous node of range point.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 2c4a3756362aa15eb72a57b08ccf0a98afc21bd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c4a3756362aa15eb72a57b08ccf0a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:51 2023 +0300 mshtml: Fix leak when obtaining previous node of range point. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index da6b83cbc96..e88d8901268 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -280,7 +280,7 @@ static BOOL rangepoint_prev_node(rangepoint_t *iter) off = get_child_index(node, iter->node); free_rangepoint(iter); - init_rangepoint(iter, node, off); + init_rangepoint_no_addref(iter, node, off); return TRUE; }

1 0

Gabriel Ivăncescu : mshtml: Fix leak when moving to next char in range point.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 8745b3f272082ab10e1ea2b169ffd60ac6e106b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8745b3f272082ab10e1ea2b169ffd6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:51 2023 +0300 mshtml: Fix leak when moving to next char in range point. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index e88d8901268..5bd6a8414cb 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -622,6 +622,9 @@ static WCHAR move_next_char(rangepoint_t *iter) } }while(rangepoint_next_node(iter)); + if(cspace) + free_rangepoint(&last_space); + return cspace; }

1 0

Gabriel Ivăncescu : mshtml: Fix leak in find_prev_space.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 9bb0dbc1e2687ae5cdfc65ebcc0891943f09518b URL: https://gitlab.winehq.org/wine/wine/-/commit/9bb0dbc1e2687ae5cdfc65ebcc0891… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:51 2023 +0300 mshtml: Fix leak in find_prev_space. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 5bd6a8414cb..89b1eecb8cb 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -741,8 +741,10 @@ static LONG find_prev_space(rangepoint_t *iter, BOOL first_space) init_rangepoint(&prev, iter->node, iter->off); c = move_prev_char(&prev); - if(!c || (first_space && iswspace(c))) + if(!c || (first_space && iswspace(c))) { + free_rangepoint(&prev); return FALSE; + } do { free_rangepoint(iter);

1 0