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

Zhiyi Zhang : winex11.drv: Handle X errors from glXCopyContext().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: ed546bf190cf5570df3086e4c7c42f7083c2a5a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed546bf190cf5570df3086e4c7c42f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 22 17:21:15 2022 +0800 winex11.drv: Handle X errors from glXCopyContext(). glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect rendering contexts. When Xorg receives such requests, it rejects them because they're for direct rendering contexts and reports an X error. We also can't use indirect rendering context because it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before graphics drivers implement the support. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8d6afba9a6f..7ceaeb7c2df 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1711,9 +1711,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con { TRACE("%p -> %p mask %#x\n", src, dst, mask); - pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); + pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); + XSync( gdi_display, False ); + if (X11DRV_check_error()) + { + static unsigned int once; + + if (!once++) + { + ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " + "implemented in the host graphics driver?\n"); + } + return FALSE; + } - /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE; }

1 0

Zhiyi Zhang : winex11.drv: Lock display when expecting error events.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 18ae96e5fb3cbbd53f1a022ba81203de6b431228 URL: https://gitlab.winehq.org/wine/wine/-/commit/18ae96e5fb3cbbd53f1a022ba81203… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 25 17:22:16 2022 +0800 winex11.drv: Lock display when expecting error events. If the display is not locked, another thread could take the error event and handle it with the default error handlers and thus not handled by the current thread with the specified error handlers. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index cd2ea87190a..4fe450237d3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -273,6 +273,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { pthread_mutex_lock( &error_mutex ); + XLockDisplay( display ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -291,6 +292,7 @@ int X11DRV_check_error(void) { int res = err_callback_result; err_callback = NULL; + XUnlockDisplay( err_callback_display ); pthread_mutex_unlock( &error_mutex ); return res; }

1 0

Zhiyi Zhang : winex11.drv: Don't compare error event serial if it's zero.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: d328af75fee0f10dab67ab64fee78e2e2da7a447 URL: https://gitlab.winehq.org/wine/wine/-/commit/d328af75fee0f10dab67ab64fee78e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 16:45:58 2022 +0800 winex11.drv: Don't compare error event serial if it's zero. Sometimes error event serial is zero. For example, NVIDIA driver may send X_GLXCopyContext errors with the event serial set to zero. When it's zero, previously the error handler passes the error to the default error handler and cause application crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4fe450237d3..44d4763b316 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -304,7 +304,7 @@ int X11DRV_check_error(void) static int error_handler( Display *display, XErrorEvent *error_evt ) { if (err_callback && display == err_callback_display && - (long)(error_evt->serial - err_serial) >= 0) + (!error_evt->serial || error_evt->serial >= err_serial)) { if ((err_callback_result = err_callback( display, error_evt, err_callback_arg ))) {

1 0

Alexandre Julliard : include: Remove wine/unicode.h.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 348eebae872e90a735041a153635d00b01178cfa URL: https://gitlab.winehq.org/wine/wine/-/commit/348eebae872e90a735041a153635d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 12:49:45 2022 +0200 include: Remove wine/unicode.h. --- include/wine/test.h | 7 -- include/wine/unicode.h | 174 ------------------------------------------------- 2 files changed, 181 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 01ba81f4857..6d18dfa3915 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -27,13 +27,6 @@ #include <winbase.h> #include <wine/debug.h> -#ifdef __WINE_CONFIG_H -#error config.h should not be used in Wine tests -#endif -#ifdef __WINE_WINE_UNICODE_H -#error wine/unicode.h should not be used in Wine tests -#endif - #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES (~0u) #endif diff --git a/include/wine/unicode.h b/include/wine/unicode.h deleted file mode 100644 index cb97d62ce40..00000000000 --- a/include/wine/unicode.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Wine internal Unicode definitions - * - * Copyright 2000 Alexandre Julliard - * - * 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_WINE_UNICODE_H -#define __WINE_WINE_UNICODE_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winternl.h> - -#ifdef __WINE_USE_MSVCRT -#error This file should not be used with msvcrt headers -#endif - -#ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE static FORCEINLINE -#endif - -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) -{ - return RtlDowncaseUnicodeChar( ch ); -} - -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) -{ - return RtlUpcaseUnicodeChar( ch ); -} - -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) -{ - unsigned short type; - GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); - return type & C1_SPACE; -} - -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return s - str; -} - -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) -{ - WCHAR *p = dst; - while ((*p++ = *src++)); - return dst; -} - -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) -{ - strcpyW( dst + strlenW(dst), src ); - return dst; -} - -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) -{ - WCHAR *ret = NULL; - do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); - return ret; -} - -WINE_UNICODE_INLINE int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) -{ - for (;;) - { - int ret = tolowerW(*str1) - tolowerW(*str2); - if (ret || !*str1) return ret; - str1++; - str2++; - } -} - -WINE_UNICODE_INLINE int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - int ret = 0; - for ( ; n > 0; n--, str1++, str2++) - if ((ret = tolowerW(*str1) - tolowerW(*str2)) || !*str1) break; - return ret; -} - -WINE_UNICODE_INLINE LONG strtolW( LPCWSTR s, LPWSTR *end, INT base ) -{ - BOOL negative = FALSE, empty = TRUE; - LONG ret = 0; - - if (base < 0 || base == 1 || base > 36) return 0; - if (end) *end = (WCHAR *)s; - while (isspaceW(*s)) s++; - - if (*s == '-') - { - negative = TRUE; - s++; - } - else if (*s == '+') s++; - - if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - { - base = 16; - s += 2; - } - if (base == 0) base = s[0] != '0' ? 10 : 8; - - while (*s) - { - int v; - - if ('0' <= *s && *s <= '9') v = *s - '0'; - else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; - else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; - else break; - if (v >= base) break; - if (negative) v = -v; - s++; - empty = FALSE; - - if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) - ret = MAXLONG; - else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) - ret = MINLONG; - else - ret = ret * base + v; - } - - if (end && !empty) *end = (WCHAR *)s; - return ret; -} - -NTSYSAPI int __cdecl _vsnwprintf(WCHAR*,size_t,const WCHAR*,__ms_va_list); - -static inline int WINAPIV snprintfW( WCHAR *str, size_t len, const WCHAR *format, ...) -{ - int retval; - __ms_va_list valist; - __ms_va_start(valist, format); - retval = _vsnwprintf(str, len, format, valist); - __ms_va_end(valist); - return retval; -} - -static inline int WINAPIV sprintfW( WCHAR *str, const WCHAR *format, ...) -{ - int retval; - __ms_va_list valist; - __ms_va_start(valist, format); - retval = _vsnwprintf(str, MAXLONG, format, valist); - __ms_va_end(valist); - return retval; -} - -#undef WINE_UNICODE_INLINE - -#endif /* __WINE_WINE_UNICODE_H */

1 0

Zebediah Figura : d3d8: Upload sysmem vertex buffers into the streaming buffer in d3d8_device_DrawPrimitive().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: fc0f0090f6ba24cc68d2b04503977fbcebc1f96d URL: https://gitlab.winehq.org/wine/wine/-/commit/fc0f0090f6ba24cc68d2b04503977f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 7 18:40:17 2022 -0500 d3d8: Upload sysmem vertex buffers into the streaming buffer in d3d8_device_DrawPrimitive(). Bloodrayne: Terminal Cut (and Bloodrayne 2: Terminal Cut, and probably other games in the series) streams from a SYSTEMMEM index buffer, updating it and drawing from it every frame. This is currently slow on Wine, since each map needs to wait for the previous upload (on the CS) to complete. There are a few ways to avoid waiting, but this patch takes the approach of effectively uploading from the SYSTEMMEM buffer on the client side, while using a dynamic buffer to avoid client/CS synchronization. This brings performance from 20-30 FPS to a (locked) 60, on NVidia GL drivers. --- dlls/d3d8/buffer.c | 29 ++++----------------- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 65 ++++++++++++++++++++++++++++-------------------- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 0692dbde6e7..463ea93e17c 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -377,10 +377,7 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) if (refcount == 1) { IDirect3DDevice8_AddRef(buffer->parent_device); - if (buffer->draw_buffer) - wined3d_buffer_incref(buffer->draw_buffer); - else - wined3d_buffer_incref(buffer->wined3d_buffer); + wined3d_buffer_incref(buffer->wined3d_buffer); } return refcount; @@ -395,13 +392,9 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) if (!refcount) { - struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; - if (draw_buffer) - wined3d_buffer_decref(draw_buffer); - else - wined3d_buffer_decref(buffer->wined3d_buffer); + wined3d_buffer_decref(buffer->wined3d_buffer); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice8_Release(device); @@ -584,8 +577,6 @@ static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *pa { struct d3d8_indexbuffer *buffer = parent; - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -598,7 +589,6 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - const struct wined3d_parent_ops *parent_ops = &d3d8_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -620,26 +610,17 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.structure_byte_stride = 0; if (desc.access & WINED3D_RESOURCE_ACCESS_GPU) - { desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - parent_ops = &d3d8_indexbuffer_wined3d_parent_ops; - } buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); buffer->usage = usage; + buffer->sysmem = !(desc.access & WINED3D_RESOURCE_ACCESS_GPU); wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer); - if (SUCCEEDED(hr) && !(desc.access & WINED3D_RESOURCE_ACCESS_GPU)) - { - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d8_indexbuffer_wined3d_parent_ops, &buffer->draw_buffer))) - wined3d_buffer_decref(buffer->wined3d_buffer); - } + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 33238e19b1a..da701a2a8d3 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -229,9 +229,9 @@ struct d3d8_indexbuffer struct d3d8_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice8 *parent_device; - struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; DWORD usage; + bool sysmem; }; HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 269ddda17cf..068f53d8fdf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -913,7 +913,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) { index_buffer = wined3d_resource_get_parent(resource); - if (index_buffer && index_buffer->draw_buffer) + if (index_buffer && index_buffer->sysmem) return D3D_OK; } @@ -2452,34 +2452,41 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, } } -static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, - unsigned int start_idx, unsigned int idx_count) +static HRESULT d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, + unsigned int *start_idx, unsigned int idx_count) { const struct wined3d_stateblock_state *state = device->stateblock_state; - struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct wined3d_resource *dst_resource; - struct d3d8_indexbuffer *d3d8_buffer; - struct wined3d_buffer *dst_buffer; - struct wined3d_resource_desc desc; - enum wined3d_format_id format; - unsigned int idx_size; + unsigned int src_offset, idx_size, buffer_size, pos; + struct wined3d_resource_desc resource_desc; + struct wined3d_resource *index_buffer; + struct wined3d_map_desc map_desc; + struct wined3d_box box; HRESULT hr; if (!device->sysmem_ib) - return; + return S_OK; - dst_buffer = state->index_buffer; - format = state->index_format; - d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); - dst_resource = wined3d_buffer_get_resource(dst_buffer); - wined3d_resource_get_desc(dst_resource, &desc); - idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; - box.left = start_idx * idx_size; - box.right = min(box.left + idx_count * idx_size, desc.size); - if (FAILED(hr = wined3d_device_context_copy_sub_resource_region(device->immediate_context, - dst_resource, 0, box.left, 0, 0, - wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) - ERR("Failed to update buffer.\n"); + index_buffer = wined3d_buffer_get_resource(state->index_buffer); + wined3d_resource_get_desc(index_buffer, &resource_desc); + idx_size = (state->index_format == WINED3DFMT_R16_UINT) ? 2 : 4; + + src_offset = (*start_idx) * idx_size; + buffer_size = min(idx_count * idx_size, resource_desc.size - src_offset); + + wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1); + if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ))) + { + wined3d_mutex_unlock(); + return hr; + } + wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer, + map_desc.data, buffer_size, idx_size, &pos); + wined3d_resource_unmap(index_buffer, 0); + + wined3d_device_context_set_index_buffer(device->immediate_context, + device->index_buffer.buffer, state->index_format, pos); + *start_idx = 0; + return S_OK; } static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, @@ -2510,6 +2517,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int index_count; int base_vertex_index; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, start_idx, primitive_count); @@ -2524,11 +2532,16 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, } base_vertex_index = device->stateblock_state->base_vertex_index; d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); - d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); + if (FAILED(hr = d3d8_device_upload_sysmem_index_buffer(device, &start_idx, index_count))) + { + wined3d_mutex_unlock(); + return hr; + } wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_index, start_idx, index_count, 0, 0); + wined3d_mutex_unlock(); return D3D_OK; @@ -3022,8 +3035,6 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, if (!ib) wined3d_buffer = NULL; - else if (ib->draw_buffer) - wined3d_buffer = ib->draw_buffer; else wined3d_buffer = ib->wined3d_buffer; @@ -3037,7 +3048,7 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, wined3d_stateblock_set_base_vertex_index(device->update_state, base_vertex_idx); wined3d_stateblock_set_index_buffer(device->update_state, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN); if (!device->recording) - device->sysmem_ib = ib && ib->draw_buffer; + device->sysmem_ib = ib && ib->sysmem; wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8/tests: Use a nonzero start index in test_sysmem_draw().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 50b67f98181ecd62bdb69408c72cc5c9a2c984c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/50b67f98181ecd62bdb69408c72cc5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 19:04:41 2022 -0500 d3d8/tests: Use a nonzero start index in test_sysmem_draw(). This uncovered a bug in the previous patch. --- dlls/d3d8/tests/visual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 71f6a8662c8..f77152e1e52 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10720,7 +10720,7 @@ static void test_sysmem_draw(void) 0xff443322, 0xff443322, }; - static const short indices[] = {0, 1, 2, 3}; + static const short indices[] = {5, 6, 7, 8, 0, 1, 2, 3}; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -10822,7 +10822,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -10860,7 +10860,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -10876,7 +10876,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 5, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 5, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -10905,7 +10905,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -10923,7 +10923,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Zebediah Figura : d3d9: Upload sysmem vertex buffers into the streaming buffer in d3d9_device_DrawPrimitive().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 66f37aae7e25740857aeb8ea9c2f0395781389f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66f37aae7e25740857aeb8ea9c2f03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 18:33:33 2022 -0500 d3d9: Upload sysmem vertex buffers into the streaming buffer in d3d9_device_DrawPrimitive(). As for d3d8. --- dlls/d3d9/buffer.c | 29 ++++-------------------- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 59 ++++++++++++++++++++++++++---------------------- 3 files changed, 38 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index bcb97011fe5..0ffb48a66c8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -384,10 +384,7 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); - if (buffer->draw_buffer) - wined3d_buffer_incref(buffer->draw_buffer); - else - wined3d_buffer_incref(buffer->wined3d_buffer); + wined3d_buffer_incref(buffer->wined3d_buffer); } return refcount; @@ -402,13 +399,9 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) if (!refcount) { - struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; - if (draw_buffer) - wined3d_buffer_decref(draw_buffer); - else - wined3d_buffer_decref(buffer->wined3d_buffer); + wined3d_buffer_decref(buffer->wined3d_buffer); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); @@ -589,8 +582,6 @@ static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *pa { struct d3d9_indexbuffer *buffer = parent; - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -603,7 +594,6 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - const struct wined3d_parent_ops *parent_ops = &d3d9_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -631,26 +621,17 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.structure_byte_stride = 0; if (desc.access & WINED3D_RESOURCE_ACCESS_GPU) - { desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - parent_ops = &d3d9_indexbuffer_wined3d_parent_ops; - } buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); buffer->usage = usage; + buffer->sysmem = !(desc.access & WINED3D_RESOURCE_ACCESS_GPU); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer); - if (SUCCEEDED(hr) && !(desc.access & WINED3D_RESOURCE_ACCESS_GPU)) - { - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d9_indexbuffer_wined3d_parent_ops, &buffer->draw_buffer))) - wined3d_buffer_decref(buffer->wined3d_buffer); - } + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c3eb9728f6e..eb01b15338a 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -206,9 +206,9 @@ struct d3d9_indexbuffer struct d3d9_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice9Ex *parent_device; - struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; DWORD usage; + bool sysmem; }; HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0995eb7f2c4..9f071d7a8d2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1002,7 +1002,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) { index_buffer = wined3d_resource_get_parent(resource); - if (index_buffer && index_buffer->draw_buffer) + if (index_buffer && index_buffer->sysmem) return D3D_OK; } @@ -2969,34 +2969,41 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, } } -static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, - unsigned int start_idx, unsigned int idx_count) +static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, + unsigned int *start_idx, unsigned int idx_count) { const struct wined3d_stateblock_state *state = device->stateblock_state; - struct wined3d_box box = {0, 0, 0, 1, 0, 1}; - struct wined3d_resource *dst_resource; - struct d3d9_indexbuffer *d3d9_buffer; - struct wined3d_buffer *dst_buffer; - struct wined3d_resource_desc desc; - enum wined3d_format_id format; - unsigned int idx_size; + unsigned int src_offset, idx_size, buffer_size, pos; + struct wined3d_resource_desc resource_desc; + struct wined3d_resource *index_buffer; + struct wined3d_map_desc map_desc; + struct wined3d_box box; HRESULT hr; if (!device->sysmem_ib) - return; + return S_OK; - dst_buffer = state->index_buffer; - format = state->index_format; - d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); - dst_resource = wined3d_buffer_get_resource(dst_buffer); - wined3d_resource_get_desc(dst_resource, &desc); - idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; - box.left = start_idx * idx_size; - box.right = min(box.left + idx_count * idx_size, desc.size); - if (FAILED(hr = wined3d_device_context_copy_sub_resource_region(device->immediate_context, - dst_resource, 0, box.left, 0, 0, - wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) - ERR("Failed to update buffer.\n"); + index_buffer = wined3d_buffer_get_resource(state->index_buffer); + wined3d_resource_get_desc(index_buffer, &resource_desc); + idx_size = (state->index_format == WINED3DFMT_R16_UINT) ? 2 : 4; + + src_offset = (*start_idx) * idx_size; + buffer_size = min(idx_count * idx_size, resource_desc.size - src_offset); + + wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1); + if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ))) + { + wined3d_mutex_unlock(); + return hr; + } + wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer, + map_desc.data, buffer_size, idx_size, &pos); + wined3d_resource_unmap(index_buffer, 0); + + wined3d_device_context_set_index_buffer(device->immediate_context, + device->index_buffer.buffer, state->index_format, pos); + *start_idx = 0; + return S_OK; } static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, @@ -3055,11 +3062,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface } index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); - d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); + d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3745,15 +3752,13 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 if (!ib) wined3d_buffer = NULL; - else if (ib->draw_buffer) - wined3d_buffer = ib->draw_buffer; else wined3d_buffer = ib->wined3d_buffer; wined3d_mutex_lock(); wined3d_stateblock_set_index_buffer(device->update_state, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN); if (!device->recording) - device->sysmem_ib = ib && ib->draw_buffer; + device->sysmem_ib = ib && ib->sysmem; wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9/tests: Use a nonzero start index in test_sysmem_draw().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: e386cc8f87c87878b7c661f0e235eed4931394be URL: https://gitlab.winehq.org/wine/wine/-/commit/e386cc8f87c87878b7c661f0e235ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 18:59:54 2022 -0500 d3d9/tests: Use a nonzero start index in test_sysmem_draw(). This uncovered a bug in the previous patch. --- dlls/d3d9/tests/visual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 034cfeef55c..665702f3206 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25667,7 +25667,7 @@ static void test_sysmem_draw(void) 0xff443322, 0xff443322, }; - static const short indices[] = {0, 1, 2, 3}; + static const short indices[] = {5, 6, 7, 8, 0, 1, 2, 3}; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -25745,7 +25745,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -25783,7 +25783,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -25796,7 +25796,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 5, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 5, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -25825,7 +25825,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); @@ -25843,7 +25843,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 4, 2); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Hans Leidekker : secur32: Simplify nego_AcquireCredentialsHandleA() and fix an invalid free.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 4c9d30a12150679bbfecd2fbfe6dff83eff5512a URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9d30a12150679bbfecd2fbfe6dff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 12 16:58:21 2022 +0200 secur32: Simplify nego_AcquireCredentialsHandleA() and fix an invalid free. --- dlls/secur32/negotiate.c | 69 +++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index d01419ce9c7..a63e458750f 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -117,8 +117,9 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { SECURITY_STATUS ret = SEC_E_INSUFFICIENT_MEMORY; - SEC_WCHAR *user = NULL, *domain = NULL, *passwd = NULL, *package = NULL; - SEC_WINNT_AUTH_IDENTITY_W *identityW = NULL; + SEC_WCHAR *package = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = pAuthData; + SEC_WINNT_AUTH_IDENTITY_W idW = {}; TRACE("%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, @@ -130,60 +131,28 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA( if (!(package = malloc( package_len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; MultiByteToWideChar( CP_ACP, 0, pszPackage, -1, package, package_len ); } - if (pAuthData) + if (id && id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) { - SEC_WINNT_AUTH_IDENTITY_A *identity = pAuthData; - int user_len, domain_len, passwd_len; + idW.UserLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->User, id->UserLength, NULL, 0 ); + if (!(idW.User = malloc( idW.UserLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->User, id->UserLength, idW.User, idW.UserLength ); - if (identity->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) - { - if (!(identityW = malloc( sizeof(*identityW) ))) goto done; - - if (!identity->UserLength) user_len = 0; - else - { - user_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->User, - identity->UserLength, NULL, 0 ); - if (!(user = malloc( user_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->User, identity->UserLength, - user, user_len ); - } - if (!identity->DomainLength) domain_len = 0; - else - { - domain_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Domain, - identity->DomainLength, NULL, 0 ); - if (!(domain = malloc( domain_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Domain, identity->DomainLength, - domain, domain_len ); - } - if (!identity->PasswordLength) passwd_len = 0; - else - { - passwd_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Password, - identity->PasswordLength, NULL, 0 ); - if (!(passwd = malloc( passwd_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Password, identity->PasswordLength, - passwd, passwd_len ); - } - identityW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; - identityW->User = user; - identityW->UserLength = user_len; - identityW->Domain = domain; - identityW->DomainLength = domain_len; - identityW->Password = passwd; - identityW->PasswordLength = passwd_len; - } - else identityW = (SEC_WINNT_AUTH_IDENTITY_W *)identity; + idW.DomainLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(idW.Domain = malloc( idW.DomainLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->Domain, id->DomainLength, idW.Domain, idW.DomainLength ); + + idW.PasswordLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(idW.Password = malloc( idW.PasswordLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->Password, id->PasswordLength, idW.Password, idW.PasswordLength ); + + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + pAuthData = &idW; } - ret = nego_AcquireCredentialsHandleW( NULL, package, fCredentialUse, pLogonID, identityW, + + ret = nego_AcquireCredentialsHandleW( NULL, package, fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry ); done: free( package ); - free( user ); - free( domain ); - free( passwd ); - free( identityW ); return ret; }

1 0

Hans Leidekker : secur32: Simplify lsa_AcquireCredentialsHandleA().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: ea930bec2bde8c58549f389c5388645da9bf3807 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea930bec2bde8c58549f389c538864… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 12 16:59:23 2022 +0200 secur32: Simplify lsa_AcquireCredentialsHandleA(). --- dlls/secur32/lsa.c | 68 ++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index f69a2a74511..9368d3728e4 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -349,13 +349,12 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) { SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; - int len_user = 0, len_domain = 0, len_passwd = 0; - SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; - SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; - SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + SEC_WCHAR *principalW = NULL, *packageW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = auth_data; + SEC_WINNT_AUTH_IDENTITY_W idW = {}; TRACE("%s %s %#lx %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), - credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); if (principal) { @@ -369,51 +368,38 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( if (!(packageW = malloc( len * sizeof(SEC_WCHAR) ))) goto done; MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); } - if (auth_data) + if (id && (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI)) { - id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; - - if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + if (id->UserLength) { - if (!(auth_dataW = malloc( sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; - if (id->UserLength) - { - len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); - if (!(user = malloc( len_user * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); - } - if (id->DomainLength) - { - len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); - if (!(domain = malloc( len_domain * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); - } - if (id->PasswordLength) - { - len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); - if (!(passwd = malloc( len_passwd * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); - } - auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; - auth_dataW->User = user; - auth_dataW->UserLength = len_user; - auth_dataW->Domain = domain; - auth_dataW->DomainLength = len_domain; - auth_dataW->Password = passwd; - auth_dataW->PasswordLength = len_passwd; + idW.UserLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(idW.User = malloc( idW.UserLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, idW.User, idW.UserLength ); + } + if (id->DomainLength) + { + idW.DomainLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(idW.Domain = malloc( idW.DomainLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, idW.Domain, idW.DomainLength ); + } + if (id->PasswordLength) + { + idW.PasswordLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(idW.Password = malloc( idW.PasswordLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, idW.Password, idW.PasswordLength ); } - else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_data = &idW; } - status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); done: - if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) free( auth_dataW ); free( packageW ); free( principalW ); - free( user ); - free( domain ); - free( passwd ); + free( idW.User ); + free( idW.Domain ); + free( idW.Password ); return status; }

1 0