wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Connor McAdams : uiautomationcore: Add UiaFind stub.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: af0c9d0b7c99c24d74350fc5578b0d01c6a441b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/af0c9d0b7c99c24d74350fc5578b0d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Aug 26 10:05:10 2022 -0500 uiautomationcore: Add UiaFind stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 1007 +++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 10 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 9 + 4 files changed, 1027 insertions(+), 1 deletion(-)

1 0

Mohamad Al-Jaf : mscoree: Add StrongNameTokenFromAssembly stub.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 7e60043fa2f7f3fdf804fe2ccef8a25736c6ef06 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e60043fa2f7f3fdf804fe2ccef8a2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Nov 10 21:39:29 2022 -0500 mscoree: Add StrongNameTokenFromAssembly stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53296 --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ dlls/mscorwks/mscorwks.spec | 2 +- include/strongname.h | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 92dcfd89677..92e0f60b718 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -108,7 +108,7 @@ @ stdcall StrongNameSignatureVerification(wstr long ptr) @ stdcall StrongNameSignatureVerificationEx(wstr long ptr) @ stub StrongNameSignatureVerificationFromImage -@ stub StrongNameTokenFromAssembly +@ stdcall StrongNameTokenFromAssembly(wstr ptr ptr) @ stub StrongNameTokenFromAssemblyEx @ stub StrongNameTokenFromPublicKey @ stub TranslateSecurityAttributes diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e19d50595b4..a6134f0226b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -625,6 +625,12 @@ BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN force return TRUE; } +BOOLEAN WINAPI StrongNameTokenFromAssembly(LPCWSTR path, BYTE **token, ULONG *size) +{ + FIXME("(%s, %p, %p): stub\n", debugstr_w(path), token, size); + return FALSE; +} + HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv) { static const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec index 617cde3173d..cf7cfdee47f 100644 --- a/dlls/mscorwks/mscorwks.spec +++ b/dlls/mscorwks/mscorwks.spec @@ -101,7 +101,7 @@ @ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification @ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx @ stub StrongNameSignatureVerificationFromImage -@ stub StrongNameTokenFromAssembly +@ stdcall StrongNameTokenFromAssembly(wstr ptr ptr) mscoree.StrongNameTokenFromAssembly @ stub StrongNameTokenFromAssemblyEx @ stub StrongNameTokenFromPublicKey @ stub TranslateSecurityAttributes diff --git a/include/strongname.h b/include/strongname.h index f05861ad28d..1134d63d3b3 100644 --- a/include/strongname.h +++ b/include/strongname.h @@ -35,5 +35,6 @@ BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags); BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified); +BOOLEAN __stdcall StrongNameTokenFromAssembly(const WCHAR *path, BYTE **token, ULONG *size); #endif

1 0

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

14 Nov '22

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

Nikolay Sivov : d3drm: Use CRT allocation functions.
by Alexandre Julliard 14 Nov '22

14 Nov '22

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

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

14 Nov '22

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 : include: Disable some inline kernelbase functions when building Unix libraries.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 81cba2af81c96632014b62d7a6b88f3d86c272af URL: https://gitlab.winehq.org/wine/wine/-/commit/81cba2af81c96632014b62d7a6b88f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:03:27 2022 +0100 include: Disable some inline kernelbase functions when building Unix libraries. --- include/winbase.h | 9 ++++++++- include/winternl.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 7c0d8afd36c..71b5d4569cd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2950,7 +2950,14 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -#ifdef __WINESRC__ +#ifdef WINE_UNIX_LIB + +#define GetCurrentProcess() NtCurrentProcess() +#define GetCurrentThread() NtCurrentThread() +#define GetCurrentProcessId() HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess) +#define GetCurrentThreadId() HandleToULong(NtCurrentTeb()->ClientId.UniqueThread) + +#elif defined(__WINESRC__) static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) { diff --git a/include/winternl.h b/include/winternl.h index 54c8903c534..3a62ff0b268 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4712,7 +4712,8 @@ NTSYSAPI NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buf (p)->SecurityQualityOfService = NULL; \ } while (0) -#define NtCurrentProcess() ((HANDLE)-1) +#define NtCurrentProcess() ((HANDLE)~(ULONG_PTR)0) +#define NtCurrentThread() ((HANDLE)~(ULONG_PTR)1) #define RtlFillMemory(Destination,Length,Fill) memset((Destination),(Fill),(Length)) #define RtlMoveMemory(Destination,Source,Length) memmove((Destination),(Source),(Length))

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

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 : 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 : 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022