November 2022 - Wine-Commits

Connor McAdams : uiautomationcore: Partially implement UiaFind.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 76f20d6a4b1ed779a725ef7278f867d27da4e2a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f20d6a4b1ed779a725ef7278f867… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Nov 6 13:04:10 2022 -0500 uiautomationcore: Partially implement UiaFind. Implement UiaFind for single node searches. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 29 ++- dlls/uiautomationcore/uia_client.c | 274 ++++++++++++++++++++++++++++- 2 files changed, 285 insertions(+), 18 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for ExcludeRoot parameter in UiaFind.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 67dd36095f12baa39f54919ca8fb65f22778242b URL: https://gitlab.winehq.org/wine/wine/-/commit/67dd36095f12baa39f54919ca8fb65… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Nov 11 15:57:40 2022 -0500 uiautomationcore: Add support for ExcludeRoot parameter in UiaFind. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 44 ++++++++++++++---------------- dlls/uiautomationcore/uia_client.c | 43 +++++++++++++++++------------ 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 3636a0746e4..01f74cb4f3f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -8800,35 +8800,31 @@ static void test_UiaFind(void) AutomationElementMode_Full); set_find_params(&find_params, 1, TRUE, TRUE, (struct UiaCondition *)&UiaTrueCondition); hr = UiaFind(node, &find_params, &cache_req, &out_req, &offsets, &tree_structs); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); - node2 = NULL; - if (SUCCEEDED(hr)) - { - add_provider_desc(&exp_node_desc[0], L"Main", L"Provider_child", TRUE); - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider_child", TRUE); + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; - idx[0] = idx[1] = 0; - hr = SafeArrayGetElement(out_req, idx, &v); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + idx[0] = idx[1] = 0; + hr = SafeArrayGetElement(out_req, idx, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - /* node2 is now set as Provider_child. */ - hr = UiaHUiaNodeFromVariant(&v, &node2); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - IUnknown_AddRef((IUnknown *)node2); + /* node2 is now set as Provider_child. */ + hr = UiaHUiaNodeFromVariant(&v, &node2); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + IUnknown_AddRef((IUnknown *)node2); - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - for (i = 0; i < exp_elems[0]; i++) - { - exp_offset[i] = i; - exp_tree_struct[i] = L"P)"; - } - test_find_sa_results(tree_structs, offsets, exp_elems[0], exp_tree_struct, exp_offset); - ok_method_sequence(find_seq4, "find_seq4"); + for (i = 0; i < exp_elems[0]; i++) + { + exp_offset[i] = i; + exp_tree_struct[i] = L"P)"; } + test_find_sa_results(tree_structs, offsets, exp_elems[0], exp_tree_struct, exp_offset); + ok_method_sequence(find_seq4, "find_seq4"); SafeArrayDestroy(out_req); SafeArrayDestroy(offsets); @@ -8910,7 +8906,7 @@ static void test_UiaFind(void) SafeArrayDestroy(offsets); SafeArrayDestroy(tree_structs); - todo_wine ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); + ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); initialize_provider_tree(FALSE); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 49c59f45b34..d2f7ea66414 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -967,8 +967,8 @@ 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, int max_depth, int *cur_depth, - HUIANODE *out_node) + struct UiaCondition *ascending_stop_cond, int traversal_opts, BOOL at_root_level, BOOL *root_found, + int max_depth, int *cur_depth, HUIANODE *out_node) { HUIANODE node = huianode; HRESULT hr; @@ -990,17 +990,23 @@ static HRESULT traverse_uia_node_tree(HUIANODE huianode, struct UiaCondition *vi * our current depth within the tree. */ incr_depth = TRUE; - hr = uia_condition_check(node, search_cond); - if (FAILED(hr)) - break; - if (uia_condition_matched(hr)) + if (*root_found) { - IWineUiaNode_AddRef(&node_data->IWineUiaNode_iface); - *out_node = node; - hr = S_FALSE; - break; + hr = uia_condition_check(node, search_cond); + if (FAILED(hr)) + break; + + if (uia_condition_matched(hr)) + { + IWineUiaNode_AddRef(&node_data->IWineUiaNode_iface); + *out_node = node; + hr = S_FALSE; + break; + } } + + *root_found = TRUE; } if (incr_depth) @@ -1016,7 +1022,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, max_depth, cur_depth, out_node); + traversal_opts, FALSE, root_found, max_depth, cur_depth, out_node); if (FAILED(hr) || hr == S_FALSE) break; @@ -2752,6 +2758,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str struct UiaCondition *sibling_stop_cond; int cur_depth = 0; BSTR tree_struct; + BOOL root_found; HUIANODE node2; HRESULT hr; LONG idx; @@ -2769,12 +2776,6 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str return E_NOTIMPL; } - if (find_params->ExcludeRoot) - { - FIXME("ExcludeRoot currently unimplemented.\n"); - return E_NOTIMPL; - } - /* * If the initial node has a runtime ID, we'll use it as a stop * condition. @@ -2789,10 +2790,16 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str else sibling_stop_cond = (struct UiaCondition *)&UiaFalseCondition; + if (find_params->ExcludeRoot) + root_found = FALSE; + 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, find_params->MaxDepth, &cur_depth, &node2); + cache_req->pViewCondition, TreeTraversalOptions_Default, TRUE, &root_found, find_params->MaxDepth, + &cur_depth, &node2); if (FAILED(hr) || !node2) goto exit;

1 0

Nikolay Sivov : d3drm: Use CRT allocation functions.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 55fbd32b166144f437ecc5ffc71d41d4df8d4d8a URL: https://gitlab.winehq.org/wine/wine/-/commit/55fbd32b166144f437ecc5ffc71d41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 11 09:52:30 2022 +0300 d3drm: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/d3drm.c | 4 +-- dlls/d3drm/d3drm_main.c | 12 ++++---- dlls/d3drm/d3drm_private.h | 1 - dlls/d3drm/device.c | 4 +-- dlls/d3drm/face.c | 4 +-- dlls/d3drm/frame.c | 52 +++++++++++++++---------------- dlls/d3drm/light.c | 4 +-- dlls/d3drm/material.c | 4 +-- dlls/d3drm/meshbuilder.c | 76 +++++++++++++++++++++++----------------------- dlls/d3drm/texture.c | 32 +++++++++---------- dlls/d3drm/viewport.c | 4 +-- 11 files changed, 98 insertions(+), 99 deletions(-)

1 0

Nikolay Sivov : d3drm/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 1de01fcaa6e32474d7988b3068a76ed6aac5382e URL: https://gitlab.winehq.org/wine/wine/-/commit/1de01fcaa6e32474d7988b3068a76e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 11 11:07:09 2022 +0300 d3drm/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2166c8eaf2a..a65a03c5b49 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6163,7 +6163,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) ret = GetTempPathA(MAX_PATH, path); ok(ret, "Failed to get temporary file path.\n"); - filename = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + filename = malloc(MAX_PATH); ret = GetTempFileNameA(path, "d3d", 0, filename); ok(ret, "Failed to get filename.\n"); file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -6178,7 +6178,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) ret = WriteFile(file, &file_header, sizeof(file_header), &written, NULL); ok(ret && written == sizeof(file_header), "Failed to write file header.\n"); - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + info = calloc(1, size); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biBitCount = bpp; info->bmiHeader.biPlanes = 1; @@ -6196,10 +6196,10 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } ret = WriteFile(file, info, size, &written, NULL); ok(ret && written == size, "Failed to write bitmap info.\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); size = w * h * (bpp / 8); - buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + buffer = calloc(1, size); for (i = 0, j = 0; i < size;) { if (palettized) @@ -6216,7 +6216,7 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } ret = WriteFile(file, buffer, size, &written, NULL); ok(ret && written == size, "Failed to write bitmap data.\n"); - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); CloseHandle(file); @@ -6515,7 +6515,7 @@ static void test_load_texture(void) ret = DeleteFileA(filename); ok(ret, "Failed to delete bitmap \"%s\".\n", filename); - HeapFree(GetProcessHeap(), 0, filename); + free(filename); winetest_pop_context(); } @@ -6647,7 +6647,7 @@ static void test_texture_qi(void) IDirect3DRM_Release(d3drm1); check = DeleteFileA(filename); ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError()); - HeapFree(GetProcessHeap(), 0, filename); + free(filename); } static void test_viewport_qi(void)

1 0

Alexandre Julliard : configure: Don't use LDFLAGS to initialize PE flags.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 463af41f9c51512a8a73716f9bcf56d385fa6fc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/463af41f9c51512a8a73716f9bcf56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 14 11:41:44 2022 +0100 configure: Don't use LDFLAGS to initialize PE flags. Essentially reapply c7bd6865e7e9149aea3dfe56a407f6c5bcfcb0a3 which was lost in b1f59bc679a8c2dea18a6789a5b9b1a1ae825129. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bdd17ecb234..b21cc96dec0 100755 --- a/configure +++ b/configure @@ -10795,7 +10795,7 @@ fi CFLAGS=${CROSSCFLAGS:-"-g -O2"} eval CC=\$${wine_arch}_CC eval ${wine_arch}_CFLAGS=\$CFLAGS - eval ${wine_arch}_LDFLAGS=\$LDFLAGS + eval ${wine_arch}_LDFLAGS=\$CROSSLDFLAGS eval "${wine_arch}_EXTRACFLAGS=\"-D__WINE_PE_BUILD -Wall\"" target="" diff --git a/configure.ac b/configure.ac index 7725c87bd99..51a02d3e876 100644 --- a/configure.ac +++ b/configure.ac @@ -914,7 +914,7 @@ do CFLAGS=${CROSSCFLAGS:-"-g -O2"} AS_VAR_COPY([CC],[${wine_arch}_CC]) AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) - AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS]) + AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS]) AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"]) target=""

1 0

Alexandre Julliard : winex11: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

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 : opengl32: Fix parsing of the DisabledExtensions option.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

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 : winemac: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

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

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

Nov. 14, 2022

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 : win32u: Use RtlGetLastWin32Error() instead of GetLastError().
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

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