November 2022 - Wine-commits

Connor McAdams : uiautomationcore: Store traverse_uia_node_tree() results in a dynamic array.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 8719b8dee2a66de446053902ceed01ef5e20a511 URL: https://gitlab.winehq.org/wine/wine/-/commit/8719b8dee2a66de446053902ceed01… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Nov 11 16:02:34 2022 -0500 uiautomationcore: Store traverse_uia_node_tree() results in a dynamic array. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 85 +++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 10 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index d2f7ea66414..3179d6b7b5f 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -25,6 +25,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; +static BOOL uia_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = heap_alloc_zero(new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + +struct uia_node_array { + HUIANODE *nodes; + int node_count; + SIZE_T node_arr_size; +}; + +static void clear_node_array(struct uia_node_array *nodes) +{ + if (nodes->nodes) + { + int i; + + for (i = 0; i < nodes->node_count; i++) + UiaNodeRelease(nodes->nodes[i]); + + heap_free(nodes->nodes); + } + + memset(nodes, 0, sizeof(*nodes)); +} + +static HRESULT add_node_to_node_array(struct uia_node_array *out_nodes, HUIANODE node) +{ + if (!uia_array_reserve((void **)&out_nodes->nodes, &out_nodes->node_arr_size, out_nodes->node_count + 1, + sizeof(node))) + return E_OUTOFMEMORY; + + IWineUiaNode_AddRef((IWineUiaNode *)node); + out_nodes->nodes[out_nodes->node_count] = node; + out_nodes->node_count++; + + return S_OK; +} + static HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) { LONG ubound; @@ -968,7 +1032,7 @@ static HRESULT traverse_uia_node_tree_siblings(HUIANODE huianode, struct UiaCond static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *view_cond, struct UiaCondition *search_cond, struct UiaCondition *pre_sibling_nav_stop_cond, struct UiaCondition *ascending_stop_cond, int traversal_opts, BOOL at_root_level, BOOL *root_found, - int max_depth, int *cur_depth, HUIANODE *out_node) + int max_depth, int *cur_depth, struct uia_node_array *out_nodes) { HUIANODE node = huianode; HRESULT hr; @@ -999,8 +1063,10 @@ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *vi if (uia_condition_matched(hr)) { - IWineUiaNode_AddRef(&node_data->IWineUiaNode_iface); - *out_node = node; + hr = add_node_to_node_array(out_nodes, node); + if (FAILED(hr)) + break; + hr = S_FALSE; break; } @@ -1022,7 +1088,7 @@ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *vi if (SUCCEEDED(hr) && node2) hr = traverse_uia_node_tree(node2, view_cond, search_cond, pre_sibling_nav_stop_cond, ascending_stop_cond, - traversal_opts, FALSE, root_found, max_depth, cur_depth, out_node); + traversal_opts, FALSE, root_found, max_depth, cur_depth, out_nodes); if (FAILED(hr) || hr == S_FALSE) break; @@ -2756,10 +2822,10 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); SAFEARRAY *runtime_id, *req, *offsets, *tree_structs; struct UiaCondition *sibling_stop_cond; + struct uia_node_array nodes = { 0 }; int cur_depth = 0; BSTR tree_struct; BOOL root_found; - HUIANODE node2; HRESULT hr; LONG idx; @@ -2795,12 +2861,11 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str else root_found = TRUE; - node2 = NULL; IWineUiaNode_AddRef(&node->IWineUiaNode_iface); hr = traverse_uia_node_tree(huianode, cache_req->pViewCondition, find_params->pFindCondition, sibling_stop_cond, cache_req->pViewCondition, TreeTraversalOptions_Default, TRUE, &root_found, find_params->MaxDepth, - &cur_depth, &node2); - if (FAILED(hr) || !node2) + &cur_depth, &nodes); + if (FAILED(hr) || !nodes.node_count) goto exit; if (!(offsets = SafeArrayCreateVector(VT_I4, 0, 1))) @@ -2815,8 +2880,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str goto exit; } - hr = UiaGetUpdatedCache(node2, cache_req, NormalizeState_None, NULL, &req, &tree_struct); - UiaNodeRelease(node2); + hr = UiaGetUpdatedCache(nodes.nodes[0], cache_req, NormalizeState_None, NULL, &req, &tree_struct); if (FAILED(hr)) goto exit; @@ -2836,6 +2900,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str exit: VariantClear(&prop_cond.Value); + clear_node_array(&nodes); if (FAILED(hr)) {

1 0

Connor McAdams : uiautomationcore: Add support for returning multiple HUIANODEs from UiaFind.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: b4f9954641dcb1cd8ac58e7cc4d56500c1b13945 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4f9954641dcb1cd8ac58e7cc4d565… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Nov 11 16:46:59 2022 -0500 uiautomationcore: Add support for returning multiple HUIANODEs from UiaFind. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 339 +++++++++++++---------------- dlls/uiautomationcore/uia_client.c | 180 +++++++++++---- 2 files changed, 297 insertions(+), 222 deletions(-)

1 0

Anton Baskanov : wined3d: Introduce a new flag to indicate that indirect draws won't be used.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: c7f6dc641dca60bd618c123147fed11ae573e7f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7f6dc641dca60bd618c123147fed1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Nov 11 10:39:05 2022 +0700 wined3d: Introduce a new flag to indicate that indirect draws won't be used. --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- include/wine/wined3d.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index bd375aa58a4..973c7fea779 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -476,7 +476,7 @@ BOOL d3d8_init(struct d3d8 *d3d8) DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART - | WINED3D_LEGACY_CUBEMAP_FILTERING; + | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NO_DRAW_INDIRECT; unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; struct wined3d_adapter *wined3d_adapter; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index f9d4d68cdd8..64291c586bb 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -685,7 +685,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING - | WINED3D_NORMALIZED_DEPTH_BIAS; + | WINED3D_NORMALIZED_DEPTH_BIAS | WINED3D_NO_DRAW_INDIRECT; unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; struct wined3d_adapter *wined3d_adapter; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 159ce987dc3..1edc459ed79 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,7 +66,7 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ - | WINED3D_LEGACY_CUBEMAP_FILTERING) + | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NO_DRAW_INDIRECT) #define DDRAW_MAX_ACTIVE_LIGHTS 32 #define DDRAW_MAX_TEXTURES 8 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d1147e03f66..a18dcda45be 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1322,6 +1322,7 @@ enum wined3d_memory_segment_group #define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 #define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000 #define WINED3D_NORMALIZED_DEPTH_BIAS 0x00002000 +#define WINED3D_NO_DRAW_INDIRECT 0x00004000 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Anton Baskanov : wined3d: Use the chunk allocator for GL element array buffers.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: bb6482686b154055a64e9cc3aac00f6a6cbb3bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb6482686b154055a64e9cc3aac00f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 9 13:06:02 2022 +0700 wined3d: Use the chunk allocator for GL element array buffers. --- dlls/wined3d/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 913376ee3ee..1f9774767ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1084,7 +1084,8 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct return block; } -static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding) +static bool use_buffer_chunk_suballocation(struct wined3d_device_gl *device_gl, + const struct wined3d_gl_info *gl_info, GLenum binding) { switch (binding) { @@ -1095,6 +1096,12 @@ static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info case GL_UNIFORM_BUFFER: return true; + case GL_ELEMENT_ARRAY_BUFFER: + /* There is no way to specify an element array buffer offset for + * indirect draws in OpenGL. */ + return device_gl->d.wined3d->flags & WINED3D_NO_DRAW_INDIRECT + || !gl_info->supported[ARB_DRAW_INDIRECT]; + case GL_TEXTURE_BUFFER: return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]; @@ -1117,7 +1124,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if (gl_info->supported[ARB_BUFFER_STORAGE]) { - if (use_buffer_chunk_suballocation(gl_info, binding)) + if (use_buffer_chunk_suballocation(device_gl, gl_info, binding)) { if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset;

1 0

Alexandre Julliard : winecrt0: Don't build with WINE_UNIX_LIB.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 3efc0fbf1a3151faa79b44dae52c412c5400232d URL: https://gitlab.winehq.org/wine/wine/-/commit/3efc0fbf1a3151faa79b44dae52c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:01:23 2022 +0100 winecrt0: Don't build with WINE_UNIX_LIB. These files end up in a .exe.so module, not in a real Unix library. --- dlls/winecrt0/exe_entry.c | 3 +++ dlls/winecrt0/exe_main.c | 3 +++ dlls/winecrt0/exe_wentry.c | 3 +++ dlls/winecrt0/exe_wmain.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index d4d1d7d6757..432c598286c 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 8861cbf1449..2465c83bdf0 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index a4c1a0897fb..e15a39996fd 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index e576a8baceb..4a567661ea5 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -22,6 +22,9 @@ #pragma makedep unix #endif +/* this is actually part of a static lib linked into a .exe.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : opengl32: Fix parsing of the DisabledExtensions option.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: e037822581933f2a3db70f8eb3fd4730fb119642 URL: https://gitlab.winehq.org/wine/wine/-/commit/e037822581933f2a3db70f8eb3fd47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 15:37:54 2022 +0100 opengl32: Fix parsing of the DisabledExtensions option. --- dlls/opengl32/unix_wgl.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 7a6b3bb0ca4..54f4b0709dd 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -234,6 +234,11 @@ static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } +static inline void unicode_to_ascii( char *dst, const WCHAR *src, size_t len ) +{ + while (len--) *dst++ = *src++; +} + static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; @@ -281,16 +286,12 @@ static HKEY open_hkcu_key( const char *name ) return reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) ); } -static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +static NTSTATUS query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; - if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - info, size, &size )) - return 0; - - return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + return NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); } /* build the extension string by filtering out the disabled extensions */ @@ -310,7 +311,14 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; static WCHAR disabled_extensionsW[] = {'D','i','s','a','b','l','e','d','E','x','t','e','n','s','i','o','n','s',0}; - if (query_reg_value( hkey, disabled_extensionsW, value, sizeof(buffer) )) str = strdup( buffer ); + if (!query_reg_value( hkey, disabled_extensionsW, value, sizeof(buffer) )) + { + ULONG len = value->DataLength / sizeof(WCHAR); + + unicode_to_ascii( buffer, (WCHAR *)value->Data, len ); + buffer[len] = 0; + str = strdup( buffer ); + } NtClose( hkey ); } if (str)

1 0

Alexandre Julliard : opengl32: Consistently use RtlSetLastWin32Error() everywhere.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: cc0ac7b43049f5a4eeaf5917b5f97cd12963a894 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc0ac7b43049f5a4eeaf5917b5f97c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:02:18 2022 +0100 opengl32: Consistently use RtlSetLastWin32Error() everywhere. --- dlls/opengl32/unix_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h index eb8adf00090..cab4b8fc502 100644 --- a/dlls/opengl32/unix_private.h +++ b/dlls/opengl32/unix_private.h @@ -45,7 +45,7 @@ extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - if (!funcs) SetLastError( ERROR_INVALID_HANDLE ); + if (!funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else if (funcs == (void *)-1) funcs = &null_opengl_funcs; return funcs; }

1 0

Alexandre Julliard : win32u: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 1d6b3e1434dd8544fad441062d3ba310be754191 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d6b3e1434dd8544fad441062d3ba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:02:57 2022 +0100 win32u: Use RtlGetLastWin32Error() instead of GetLastError(). --- dlls/ntdll/unix/env.c | 8 ++++++++ dlls/win32u/clipboard.c | 2 +- dlls/win32u/spy.c | 8 ++++---- dlls/win32u/window.c | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6e5004a6e11..062da7600b1 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2391,6 +2391,14 @@ ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) return map_status( status ); } +/********************************************************************** + * RtlGetLastWin32Error (ntdll.so) + */ +DWORD WINAPI RtlGetLastWin32Error(void) +{ + return NtCurrentTeb()->LastErrorValue; +} + /********************************************************************** * RtlSetLastWin32Error (ntdll.so) */ diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index dfc0b629763..23d83863bbb 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -56,7 +56,7 @@ static struct list formats_to_free = LIST_INIT( formats_to_free ); static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; - DWORD le = GetLastError(); + DWORD le = RtlGetLastWin32Error(); BOOL r = NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) ); RtlSetLastWin32Error(le); diff --git a/dlls/win32u/spy.c b/dlls/win32u/spy.c index 05d740eb883..1489c84f372 100644 --- a/dlls/win32u/spy.c +++ b/dlls/win32u/spy.c @@ -2213,7 +2213,7 @@ static void SPY_GetWndName( SPY_INSTANCE *sp_e ) const char *debugstr_msg_name( UINT msg, HWND hWnd ) { SPY_INSTANCE ext_sp_e; - DWORD save_error = GetLastError(); + DWORD save_error = RtlGetLastWin32Error(); ext_sp_e.msgnum = msg; ext_sp_e.msg_hwnd = hWnd; @@ -2504,7 +2504,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) /* for CUSTOMDRAW, dump all the data for TOOLBARs */ if (pnmh->code == NM_CUSTOMDRAW) { /* save and restore error code over the next call */ - save_error = GetLastError(); + save_error = RtlGetLastWin32Error(); NtUserGetClassName( pnmh->hwndFrom, FALSE, &str ); RtlSetLastWin32Error(save_error); if (wcscmp(TOOLBARCLASSNAMEW, from_class) == 0) @@ -2597,7 +2597,7 @@ void spy_enter_message( INT iFlag, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP { SPY_INSTANCE sp_e; int indent; - DWORD save_error = GetLastError(); + DWORD save_error = RtlGetLastWin32Error(); if (!spy_init() || exclude_msg(msg)) return; @@ -2652,7 +2652,7 @@ void spy_exit_message( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, { SPY_INSTANCE sp_e; int indent; - DWORD save_error = GetLastError(); + DWORD save_error = RtlGetLastWin32Error(); if (!TRACE_ON(message) || exclude_msg(msg) || (exclude_dwp() && iFlag == SPY_RESULT_DEFWND)) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 27d4f63272d..d92c09689ed 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -852,7 +852,7 @@ BOOL is_window_enabled( HWND hwnd ) RtlSetLastWin32Error( NO_ERROR ); ret = get_window_long( hwnd, GWL_STYLE ); - if (!ret && GetLastError() != NO_ERROR) return FALSE; + if (!ret && RtlGetLastWin32Error() != NO_ERROR) return FALSE; return !(ret & WS_DISABLED); } @@ -4879,7 +4879,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, if (!handle) { - WARN( "error %d creating window\n", GetLastError() ); + WARN( "error %d creating window\n", RtlGetLastWin32Error() ); return NULL; }

1 0

Alexandre Julliard : winex11: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 191b8d010e64cd83c88c761605b76ef63ab4ebdf URL: https://gitlab.winehq.org/wine/wine/-/commit/191b8d010e64cd83c88c761605b76e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:03:15 2022 +0100 winex11: Use RtlGetLastWin32Error() instead of GetLastError(). --- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4570e849d3d..cd04823a719 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1655,7 +1655,7 @@ static UINT *get_clipboard_formats( UINT *size ) if (!(ids = malloc( *size * sizeof(*ids) ))) return NULL; if (NtUserGetUpdatedClipboardFormats( ids, *size, size )) break; free( ids ); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + if (RtlGetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER) return NULL; } register_win32_formats( ids, *size ); return ids; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6bd028abb61..d54bfe1bd87 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2067,7 +2067,7 @@ HWND create_foreign_window( Display *display, Window xwin ) class.lpszClassName = classW; RtlInitUnicodeString( &class_name, classW ); if (!NtUserRegisterClassExWOW( &class, &class_name, &version, NULL, 0, 0, NULL ) && - GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + RtlGetLastWin32Error() != ERROR_CLASS_ALREADY_EXISTS) { ERR( "Could not register foreign window class\n" ); return FALSE;

1 0

Alexandre Julliard : winemac: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 02972b5347300118c0b491c8e1ead036dafe2e4a URL: https://gitlab.winehq.org/wine/wine/-/commit/02972b5347300118c0b491c8e1ead0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 21:15:17 2022 +0100 winemac: Use RtlGetLastWin32Error() instead of GetLastError(). --- dlls/winemac.drv/clipboard.c | 4 ++-- dlls/winemac.drv/dllmain.c | 4 ++-- dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/systray.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index af8d99b59a3..4e6f4ac44ca 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -285,7 +285,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) if (!NtUserGetClipboardFormatName(format->format_id, buffer, ARRAY_SIZE(buffer))) { - WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), RtlGetLastWin32Error()); free(format); return NULL; } @@ -1428,7 +1428,7 @@ static UINT *get_clipboard_formats(UINT *size) if (!(ids = malloc(*size * sizeof(*ids)))) return NULL; if (NtUserGetUpdatedClipboardFormats(ids, *size, size)) break; free(ids); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + if (RtlGetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER) return NULL; } register_win32_formats(ids, *size); return ids; diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 083c539dd26..7a1481f7c48 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -138,7 +138,7 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT quit_callback, (ULONG_PTR)qi)) { WARN("failed to send WM_ENDSESSION to win %p; error 0x%08x\n", - qi->wins[i], GetLastError()); + qi->wins[i], RtlGetLastWin32Error()); quit_callback(qi->wins[i], WM_ENDSESSION, (ULONG_PTR)qi, 0); } } @@ -197,7 +197,7 @@ NTSTATUS WINAPI macdrv_app_quit_request(void *arg, ULONG size) if (!SendMessageCallbackW(qi->wins[i], WM_QUERYENDSESSION, 0, qi->flags, quit_callback, (ULONG_PTR)qi)) { - DWORD error = GetLastError(); + DWORD error = RtlGetLastWin32Error(); BOOL invalid = (error == ERROR_INVALID_WINDOW_HANDLE); if (invalid) TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n", diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 3f79dda2073..6dd90978a93 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -957,6 +957,6 @@ void macdrv_release_capture(HWND hwnd, const macdrv_event *event) { NtUserReleaseCapture(); if (!NtUserPostMessage(capture, WM_CANCELMODE, 0, 0)) - WARN("failed to post WM_CANCELMODE; error 0x%08x\n", GetLastError()); + WARN("failed to post WM_CANCELMODE; error 0x%08x\n", RtlGetLastWin32Error()); } } diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 9d660d0287e..8b3452e7540 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -298,7 +298,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); if (!NtUserMessageCall(icon->owner, icon->callback_message, wp, lp, 0, NtUserSendNotifyMessage, FALSE) && - (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + (RtlGetLastWin32Error() == ERROR_INVALID_WINDOW_HANDLE)) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); delete_icon(icon); @@ -343,7 +343,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) msg += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; if (!send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + RtlGetLastWin32Error() == ERROR_INVALID_WINDOW_HANDLE) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); delete_icon(icon);

1 0