November 2021 - Wine-Commits

Alexandre Julliard : kerberos: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 099063f0fc37ddb49d30050b1637ffe9c11b23e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099063f0fc37ddb49d30050b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 20:50:53 2021 +0100 kerberos: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 1 + dlls/kerberos/krb5_ap.c | 102 +++++++++++++++++++---------- dlls/kerberos/unixlib.c | 159 +++++++++++++++++++++++----------------------- dlls/kerberos/unixlib.h | 114 +++++++++++++++++++++++++++------ 4 files changed, 245 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=099063f0fc37ddb49d30…

1 0

Alexandre Julliard : wldap32: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: b2009d02c3412c83ef6ed9644613d071e1a9a144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2009d02c3412c83ef6ed964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 11:09:04 2021 +0100 wldap32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/add.c | 14 +- dlls/wldap32/ber.c | 109 +++++---- dlls/wldap32/bind.c | 72 ++++-- dlls/wldap32/compare.c | 15 +- dlls/wldap32/control.c | 19 +- dlls/wldap32/delete.c | 14 +- dlls/wldap32/dn.c | 45 ++-- dlls/wldap32/error.c | 16 +- dlls/wldap32/extended.c | 19 +- dlls/wldap32/init.c | 21 +- dlls/wldap32/libldap.c | 461 ++++++++++++++++++++--------------- dlls/wldap32/libldap.h | 609 ++++++++++++++++++++++++++++++++++++++++------- dlls/wldap32/main.c | 5 +- dlls/wldap32/misc.c | 101 +++++--- dlls/wldap32/modify.c | 14 +- dlls/wldap32/modrdn.c | 36 +-- dlls/wldap32/option.c | 75 +++--- dlls/wldap32/parse.c | 61 +++-- dlls/wldap32/rename.c | 16 +- dlls/wldap32/search.c | 17 +- dlls/wldap32/value.c | 37 +-- 22 files changed, 1232 insertions(+), 545 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2009d02c3412c83ef6e…

1 0

Zebediah Figura : wined3d: Separate a vk_buffer_usage_from_bind_flags() helper.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: a7dcbf3edec6819351821a1b2cdb659e43a49390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7dcbf3edec6819351821a1b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:56 2021 -0500 wined3d: Separate a vk_buffer_usage_from_bind_flags() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 55dcd9e67e8..886fb95f3e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,12 +1399,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } -static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, - struct wined3d_context_vk *context_vk) +static VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) { - struct wined3d_resource *resource = &buffer_vk->b.resource; - uint32_t bind_flags = resource->bind_flags; - VkMemoryPropertyFlags memory_type; VkBufferUsageFlags usage; usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; @@ -1424,6 +1420,14 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); + return usage; +} + +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; + VkMemoryPropertyFlags memory_type; memory_type = 0; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) @@ -1433,7 +1437,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, + vk_buffer_usage_from_bind_flags(resource->bind_flags), memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE;

1 0

Alexandre Julliard : kerberos: Move the ticket cache memory allocation to the PE side.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: de53f5682fcbfa2fbac5ee24ce8b93c7cc5586fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=de53f5682fcbfa2fbac5ee24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:37:59 2021 +0100 kerberos: Move the ticket cache memory allocation to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 102 ++++++++++++++-------------------------------- dlls/kerberos/unixlib.c | 106 ++++++++++++++++++++++++++++++++---------------- dlls/kerberos/unixlib.h | 9 +--- 3 files changed, 101 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de53f5682fcbfa2fbac5…

1 0

Alexandre Julliard : wldap32: Avoid returning pointers from the Unix interface functions.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 3cc3dd78e1fab3bd500a0510b3e78f21330406dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc3dd78e1fab3bd500a0510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 18:04:14 2021 +0100 wldap32: Avoid returning pointers from the Unix interface functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 4 ++-- dlls/wldap32/dn.c | 6 ++--- dlls/wldap32/libldap.c | 60 ++++++++++++++++++++++++++++++-------------------- dlls/wldap32/libldap.h | 24 ++++++++++---------- dlls/wldap32/misc.c | 15 +++++-------- dlls/wldap32/option.c | 5 ++--- dlls/wldap32/value.c | 4 ++-- 7 files changed, 63 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cc3dd78e1fab3bd500a…

1 0

Loïc Rebmeister : loader: Create performance\winsat\datastore on prefix creation.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 2173d2dcc8f0b77d8c4ac40e1462029610f5c72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2173d2dcc8f0b77d8c4ac40e… Author: Loïc Rebmeister <fox2code(a)gmail.com> Date: Wed Nov 3 23:06:31 2021 +0100 loader: Create performance\winsat\datastore on prefix creation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51968 Signed-off-by: Loïc Rebmeister <fox2code(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b1894dcba61..49f45e6eed3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2668,6 +2668,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 10,help, 10,logs, +10,performance\winsat\datastore, 10,tasks, 10,temp, 11,catroot,

1 0

Zebediah Figura : wined3d: Protect wined3d_bo_slab_vk map fields with a mutex.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: b1ae6fd3f4b80f4ef8de4a1e1f43fb7e8db17ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ae6fd3f4b80f4ef8de4a1e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:47:00 2021 -0500 wined3d: Protect wined3d_bo_slab_vk map fields with a mutex. So as to allow slabs to be mapped from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cbf7c94fd3a..a6b3df36002 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -845,28 +845,53 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } +static void wined3d_bo_slab_vk_lock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + wined3d_device_vk_allocator_lock(wined3d_device_vk(context_vk->c.device)); +} + +static void wined3d_bo_slab_vk_unlock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + wined3d_device_vk_allocator_unlock(wined3d_device_vk(context_vk->c.device)); +} + void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) { + void *map_ptr; + TRACE("slab_vk %p, context_vk %p.\n", slab_vk, context_vk); + wined3d_bo_slab_vk_lock(slab_vk, context_vk); + if (!slab_vk->map_ptr && !(slab_vk->map_ptr = wined3d_bo_vk_map(&slab_vk->bo, context_vk))) { + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); ERR("Failed to map slab.\n"); return NULL; } ++slab_vk->map_count; + map_ptr = slab_vk->map_ptr; - return slab_vk->map_ptr; + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); + + return map_ptr; } void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) { + wined3d_bo_slab_vk_lock(slab_vk, context_vk); + if (--slab_vk->map_count) + { + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); return; + } wined3d_bo_vk_unmap(&slab_vk->bo, context_vk); slab_vk->map_ptr = NULL; + + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); } VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage)

1 0

Zhiyi Zhang : comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 5182c46cbe6015ebf3bb9330c7f1f4263cf88015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5182c46cbe6015ebf3bb9330… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:52:03 2021 +0800 comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 00f42322399..2738a4caee5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2861,7 +2861,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2889,6 +2889,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { push_rect = rc; DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &focus_rect); } else { @@ -2909,6 +2910,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* The content rect should be the content area of the push button */ GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + focus_rect = content_rect; } if (cdrf & CDRF_NOTIFYPOSTERASE) @@ -2951,18 +2953,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - push_rect.left += margins.cxLeftWidth; - push_rect.top += margins.cyTopHeight; - push_rect.right -= margins.cxRightWidth; - push_rect.bottom -= margins.cyBottomHeight; - DrawFocusRect(hDC, &push_rect); - } + if (focused) DrawFocusRect(hDC, &focus_rect); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Zhiyi Zhang : uxtheme: Do not draw parent background when handling WM_CTLCOLORSTATIC for static controls.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 2f1bbd88edc82a41967692b8c339a4b9bb7231f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1bbd88edc82a41967692b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:39:45 2021 +0800 uxtheme: Do not draw parent background when handling WM_CTLCOLORSTATIC for static controls. SetBkMode(TRANSPARENT) already indicates that the parent background should remain untouched. Drawing parent background destroys any previous content that applications drawn and some applications rely on the content being unchanged. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51914 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 1 - dlls/uxtheme/dialog.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 269dfbb49eb..99738f7b513 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -458,7 +458,6 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); - todo_wine_if(todo) ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); ReleaseDC(child, child_hdc); diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 043346b24e2..a949bfc6579 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -101,15 +101,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa HDC controlDC = (HDC)wParam; HWND controlWnd = (HWND)lParam; WCHAR controlClass[32]; - RECT rc; GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); if (lstrcmpiW (controlClass, WC_STATICW) == 0) { - /* Static control - draw parent background and set text to - * transparent, so it looks right on tab pages. */ - GetClientRect (controlWnd, &rc); - DrawThemeParentBackground (controlWnd, controlDC, &rc); + SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); SetBkMode (controlDC, TRANSPARENT); /* Return NULL brush since we painted the BG already */

1 0

Zebediah Figura : wined3d: Separate a vk_memory_type_from_access_flags() helper.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 580fdb494cea3da765f2b3472e0d83795b1b3c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580fdb494cea3da765f2b347… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:57 2021 -0500 wined3d: Separate a vk_memory_type_from_access_flags() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 886fb95f3e5..62f84c96f96 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1423,22 +1423,27 @@ static VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) return usage; } -static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, - struct wined3d_context_vk *context_vk) +static VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) { - struct wined3d_resource *resource = &buffer_vk->b.resource; - VkMemoryPropertyFlags memory_type; + VkMemoryPropertyFlags memory_type = 0; - memory_type = 0; - if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + else if (access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + else if (!(usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + return memory_type; +} + +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, - vk_buffer_usage_from_bind_flags(resource->bind_flags), memory_type, &buffer_vk->bo))) + vk_buffer_usage_from_bind_flags(resource->bind_flags), + vk_memory_type_from_access_flags(resource->access, resource->usage), &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE;

1 0