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

Piotr Caban : gdi32: Fix DIB_PAL_INDICES usage handling in EMR_CREATEMONOBRUSH playback.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: ef7b1839846d3ed3d4ebf826f92d50dbf52b29df URL: https://gitlab.winehq.org/wine/wine/-/commit/ef7b1839846d3ed3d4ebf826f92d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 7 14:17:34 2023 +0200 gdi32: Fix DIB_PAL_INDICES usage handling in EMR_CREATEMONOBRUSH playback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55177 --- dlls/gdi32/enhmetafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index b6b51e3483a..12449ecfdf0 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1848,7 +1848,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( /* Need to check if the bitmap is monochrome, and if the two colors are really black and white */ - if (is_dib_monochrome(pbi)) + if (pCreateMonoBrush->iUsage == DIB_PAL_INDICES || is_dib_monochrome(pbi)) { /* Top-down DIBs have a negative height */ LONG height = pbi->bmiHeader.biHeight;

1 0

Zebediah Figura : wined3d: Move some definitions to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 45a49d11ebd004596bafc719ecda459ecd9e8dad URL: https://gitlab.winehq.org/wine/wine/-/commit/45a49d11ebd004596bafc719ecda45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:06:52 2022 -0600 wined3d: Move some definitions to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 16 ---------------- dlls/wined3d/wined3d_vk.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22182c0507e..2330ca66204 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -341,22 +341,7 @@ extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; static const uint32_t WINED3D_READ_ONLY_BIND_MASK = WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER | WINED3D_BIND_CONSTANT_BUFFER | WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_INDIRECT_BUFFER; -static const VkAccessFlags WINED3D_READ_ONLY_ACCESS_FLAGS = VK_ACCESS_INDIRECT_COMMAND_READ_BIT - | VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_UNIFORM_READ_BIT - | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT - | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_HOST_READ_BIT - | VK_ACCESS_MEMORY_READ_BIT; - GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; -VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; -VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; -VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; -VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; -VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; -VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { @@ -4366,7 +4351,6 @@ const char *wined3d_debug_resource_access(uint32_t access) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) { diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 9135cff9143..1e7fbf57ada 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -19,6 +19,8 @@ #ifndef __WINE_WINED3D_VK_H #define __WINE_WINED3D_VK_H +#include "stdint.h" +#include "wine/wined3d.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" @@ -229,4 +231,21 @@ struct wined3d_vk_info #define VK_CALL(f) (vk_info->vk_ops.f) +static const VkAccessFlags WINED3D_READ_ONLY_ACCESS_FLAGS = VK_ACCESS_INDIRECT_COMMAND_READ_BIT + | VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_UNIFORM_READ_BIT + | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT + | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_HOST_READ_BIT + | VK_ACCESS_MEMORY_READ_BIT; + +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; +VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; +VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; +VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; +VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; +VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; +const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Gabriel Ivăncescu : mshtml: Fix text node leak in TextRange's text setter.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 8ac9be458b58dd6cd30a62d414690403d13de6e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ac9be458b58dd6cd30a62d4146904… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 6 19:57:52 2023 +0300 mshtml: Fix text node leak in TextRange's text setter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 89b1eecb8cb..1f062f5022a 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -969,6 +969,7 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetEndAfter failed: %08lx\n", nsres); + nsIDOMText_Release(text_node); return IHTMLTxtRange_collapse(&This->IHTMLTxtRange_iface, VARIANT_FALSE); }

1 0

Gabriel Ivăncescu : mshtml: Fix leak in find_prev_space.
by Alexandre Julliard July 7, 2023

July 7, 2023

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

Gabriel Ivăncescu : mshtml: Fix leak when moving to next char in range point.
by Alexandre Julliard July 7, 2023

July 7, 2023

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

Fabian Maurer : localspl: Add workaround for old versions of cups.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

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

Alistair Leslie-Hughes : dinput: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

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

Alistair Leslie-Hughes : advapi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 7, 2023

July 7, 2023

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

Gabriel Ivăncescu : mshtml: Fix leak when obtaining previous node of range point.
by Alexandre Julliard July 7, 2023

July 7, 2023

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: Introduce helper to transfer node ownership to range points when AddRef isn't needed.
by Alexandre Julliard July 7, 2023

July 7, 2023

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