December 2020 - Wine-Devel - list.winehq.org

[PATCH] include: Add ExecuteOptionEnum typedef
by Alistair Leslie-Hughes Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e5d0f5ecfe9..fedaf557066 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -513,6 +513,17 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum; +typedef [uuid(0000051e-0000-0010-8000-00aa006d2ea4)] enum ExecuteOptionEnum +{ + adOptionUnspecified = -1, + adAsyncExecute = 16, + adAsyncFetch = 32, + adAsyncFetchNonBlocking = 64, + adExecuteNoRecords = 128, + adExecuteStream = 1024, + [hidden] adExecuteRecord = 2048 +} ExecuteOptionEnum; + typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum { adConnectUnspecified = -1, -- 2.29.2

1 0

[PATCH] include: Add DB_LRESERVE type
by Alistair Leslie-Hughes Dec. 21, 2020

Dec. 21, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oledb.idl b/include/oledb.idl index 5609e219320..4e333353a5e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,7 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; +typedef LONG_PTR DB_LRESERVE; #include "dbs.idl" -- 2.29.2

1 0

[PATCH] comctl32: Avoid incorrect data read by user callback function during sorting.
by Jiangyi Chen Dec. 21, 2020

Dec. 21, 2020

2 1

[PATCH] winebuild: Pass -m options to dlltool for arm and arm64
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

This allows using the arch independent llvm-dlltool without the llvm-mingw specific <triple>-dlltool wrappers. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fb5c26da07f..bd25ec5ee70 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1856,6 +1856,14 @@ static void build_windows_import_lib( DLLSPEC *spec ) m_flag = "i386:x86-64"; as_flags = "--as-flags=--64"; break; + case CPU_ARM: + m_flag = "arm"; + as_flags = NULL; + break; + case CPU_ARM64: + m_flag = "arm64"; + as_flags = NULL; + break; default: m_flag = NULL; break; -- 2.17.1

2 1

[PATCH] include: Fix the signature of _InterlockedCompareExchange128
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

Clang 12 doesn't consider a function with an inconsistent signature as matching the intrinsic. This fixes InterlockedCompareExchange128 with clang 12 in MSVC mode. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 01402d211fe..6d76e5e49e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6923,7 +6923,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #if defined(_MSC_VER) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); #pragma intrinsic(_InterlockedCompareExchange128) #elif defined(__x86_64__) -- 2.17.1

2 1

[PATCH] asm: Use SEH assembly when building with clang in MSVC mode
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

In MSVC mode, the __SEH__ macro isn't defined, but the .seh directives are supported in assembly. In these cases, we have to hardcode which architectures we know clang supports SEH directives in as it's not exposed otherwise. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- This is admittedly rather ugly, but fixes a few unwinding cases with a wine in PE mode, built with clang in MSVC mode. --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index ed44a7dd6dd..236b35cf8fe 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -41,7 +41,7 @@ # define __ASM_CFI(str) #endif -#ifdef __SEH__ +#if defined(__SEH__) || (defined(_MSC_VER) && defined(__clang__) && (defined(__x86_64__) || defined(__aarch64__))) # if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) /* Clang got support for aarch64 SEH assembly directives in Clang 12, * before that, only .seh_startproc/.seh_endproc but nothing else was -- 2.17.1

2 1

[PATCH] asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons
by Martin Storsjo Dec. 20, 2020

Dec. 20, 2020

When targeting arm64 in MSVC mode, LLVM treats semicolons in assembly as comment char, instead of as statement separator (contrary to in mingw mode, where semicolons still work as separator). In generated code, there's no need to keep these directives on one single line though, so just separate them with newlines. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- (There's no reference for how msvc should interpret gas-style assembly, so one could also think LLVM should change and treat semicolons as statement separator there, like for other architectures. But when I suggested fixing that a couple years ago, it was suggested to only change it for GNU style targets, see [1]. I guess the matter could be brought up again though.) [1] https://reviews.llvm.org/D36366#833185 --- include/wine/asm.h | 2 +- tools/winebuild/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b5e6c6efd3d..ed44a7dd6dd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -56,7 +56,7 @@ #endif #ifdef _WIN32 -# define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" +# define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" #elif defined(__arm__) || defined(__arm64__) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1af42f10005..5cffc74accd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -686,7 +686,7 @@ void output_standard_file_header(void) output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); if (safe_seh) { - output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.def @feat.00\n\t.scl 3\n\t.type 0\n\t.endef\n" ); output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } @@ -1119,7 +1119,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); break; default: free( buffer ); -- 2.17.1

2 1

[PATCH] include: Don't use the MSVC intrinsic _InterlockedCompareExchange128 on clang in MSVC mode
by Martin Storsjo Dec. 19, 2020

Dec. 19, 2020

Clang doesn't consider the currently declared function as the proper intrinsic function (a few parameters differ vaguely), and even if declared properly, clang requires building for a target with the cx16 flag enabled to be able to use that intrinsic. Instead just use the inline assembly or GCC builtin version instead. This fixes building in PE mode with Clang in MSVC mode for both x86_64 and aarch64. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04353d9405d..9d797a85099 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6894,7 +6894,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #ifdef _WIN64 -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); @@ -6913,7 +6913,7 @@ static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 return ret; } -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) { -- 2.17.1

2 2

[PATCH] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel Dec. 19, 2020

Dec. 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/debugger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0a43fe91e64..962b308b6dc 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1332,8 +1332,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread, NULL); @@ -1350,8 +1350,8 @@ static void test_debugger(const char *argv0) ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); de = ctx.ev; - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1462,8 +1462,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread_b, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1485,8 +1485,8 @@ static void test_debugger(const char *argv0) { status = pNtSuspendProcess(pi.hProcess); ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread_b, NULL); -- 2.25.1

2 1

[PATCH] opengl32/tests: Don't test function directly when reporting GetLastError()
by André Hentschel Dec. 19, 2020

Dec. 19, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/opengl32/tests/opengl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db5ad0ad765..90f06492e81 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -235,9 +235,10 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt pf = ChoosePixelFormat( hdc, pfd ); if (pf && fmt) { + INT ret; memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); + ret = DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ); + ok(ret, "DescribePixelFormat failed with error: %u\n", GetLastError()); } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); -- 2.25.1

1 0