February 2022 - Wine-devel - list.winehq.org

[PATCH] msvcrt: Use InitOnceExecuteOnce to allocate TLS index.
by Piotr Caban 02 Feb '22

02 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)

3 2

[PATCH] kernel32: Add messages for some of the WSA error codes.
by Nikolay Sivov 02 Feb '22

02 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/winerror.mc | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc index 5359e07173c..6b5dadc8f76 100644 --- a/dlls/kernel32/winerror.mc +++ b/dlls/kernel32/winerror.mc @@ -3740,6 +3740,36 @@ SymbolicName=ERROR_NOT_CONNECTED Language=ENU This network connection does not exist. . +MessageId=10004 +SymbolicName=WSAEINTR +Language=ENU +Call interrupted. +. +MessageId=10009 +SymbolicName=WSAEBADF +Language=ENU +Invalid file handle. +. +MessageId=10013 +SymbolicName=WSAEACCES +Language=ENU +Access denied. +. +MessageId=10014 +SymbolicName=WSAEFAULT +Language=ENU +Invalid pointer address. +. +MessageId=10022 +SymbolicName=WSAEFAULT +Language=ENU +Invalid argument. +. +MessageId=10024 +SymbolicName=WSAEMFILE +Language=ENU +Too many open files. +. MessageId=10054 SymbolicName=WSAECONNRESET Language=ENU @@ -3750,6 +3780,26 @@ SymbolicName=WSAECONNREFUSED Language=ENU Connection refused. . +MessageId=11001 +SymbolicName=WSAHOST_NOT_FOUND +Language=ENU +Host not found. +. +MessageId=11002 +SymbolicName=WSATRY_AGAIN +Language=ENU +Nonauthoritative host not found. +. +MessageId=11003 +SymbolicName=WSANO_RECOVERY +Language=ENU +Nonrecoverable error. +. +MessageId=11004 +SymbolicName=WSANO_DATA +Language=ENU +Name valid, no data record. +. MessageId=0x100 Severity=CoError Facility=Trust -- 2.34.1

2 2

[v2 PATCH] kernel32: Add messages for some of the WSA error codes.
by Nikolay Sivov 02 Feb '22

02 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed copy-paste mistake dlls/kernel32/winerror.mc | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc index 5359e07173c..da36b0f59bc 100644 --- a/dlls/kernel32/winerror.mc +++ b/dlls/kernel32/winerror.mc @@ -3740,6 +3740,36 @@ SymbolicName=ERROR_NOT_CONNECTED Language=ENU This network connection does not exist. . +MessageId=10004 +SymbolicName=WSAEINTR +Language=ENU +Call interrupted. +. +MessageId=10009 +SymbolicName=WSAEBADF +Language=ENU +Invalid file handle. +. +MessageId=10013 +SymbolicName=WSAEACCES +Language=ENU +Access denied. +. +MessageId=10014 +SymbolicName=WSAEFAULT +Language=ENU +Invalid pointer address. +. +MessageId=10022 +SymbolicName=WSAEINVAL +Language=ENU +Invalid argument. +. +MessageId=10024 +SymbolicName=WSAEMFILE +Language=ENU +Too many open files. +. MessageId=10054 SymbolicName=WSAECONNRESET Language=ENU @@ -3750,6 +3780,26 @@ SymbolicName=WSAECONNREFUSED Language=ENU Connection refused. . +MessageId=11001 +SymbolicName=WSAHOST_NOT_FOUND +Language=ENU +Host not found. +. +MessageId=11002 +SymbolicName=WSATRY_AGAIN +Language=ENU +Nonauthoritative host not found. +. +MessageId=11003 +SymbolicName=WSANO_RECOVERY +Language=ENU +Nonrecoverable error. +. +MessageId=11004 +SymbolicName=WSANO_DATA +Language=ENU +Name valid, no data record. +. MessageId=0x100 Severity=CoError Facility=Trust -- 2.34.1

1 0

[PATCH V2 0/7] Some bug fixes to programs/cmd in interactive mode
by Eric Pouech 02 Feb '22

02 Feb '22

The following series: - extends current test harness by adding interactive tests capability - fixes a couple of bugs (with tests in interactive mode) A+ V1->V2: moved some changes across individual patch to let every step succeeeds --- Eric Pouech (7): programs/cmd/tests: don't output more data than available programs/cmd/tests: added ability to run tests in interactive mode programs/cmd/tests: some interactive test about input echo programs/cmd/tests: added support for multi-line input programs/cmd: handle white space only lines within ( ) block programs/cmd: expand commandline before parsing it (interactive mode) programs/cmd: detect badly quoted operand in 'if' statement programs/cmd/builtins.c | 10 ++ programs/cmd/tests/batch.c | 111 ++++++++++++++---- programs/cmd/tests/interactive_builtins.cmd | 42 +++++++ .../cmd/tests/interactive_builtins.cmd.exp | 67 +++++++++++ programs/cmd/tests/rsrc.rc | 10 ++ programs/cmd/wcmdmain.c | 34 ++++-- 6 files changed, 244 insertions(+), 30 deletions(-) create mode 100644 programs/cmd/tests/interactive_builtins.cmd create mode 100644 programs/cmd/tests/interactive_builtins.cmd.exp

1 7

[PATCH vkd3d v5 1/5] vkd3d-shader/hlsl: Cast round() input to float.
by Matteo Bruni 02 Feb '22

02 Feb '22

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v5: Rebased on top of current git. libs/vkd3d-shader/hlsl.y | 19 ++++++++++++++++++- tests/round.shader_test | 13 +++++++++++++ tests/shader_runner.c | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index be24a749..8d7b1243 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = arg->data_type; + + if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF) + return arg; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return add_implicit_conversion(ctx, params->instrs, arg, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], loc); + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } static bool intrinsic_saturate(struct hlsl_ctx *ctx, diff --git a/tests/round.shader_test b/tests/round.shader_test index d8eb11b7..cc5a6975 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 8.0, 0.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 int4 -1 0 2 10 +draw quad +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 5af4628e..558d074d 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -368,6 +368,14 @@ static void parse_test_directive(struct shader_context *context, const char *lin fatal_error("Malformed float constant '%s'.\n", line); set_uniforms(context, offset, 1, &f); } + else if (match_string(line, "int4", &line)) + { + int v[4]; + + if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed int4 constant '%s'.\n", line); + set_uniforms(context, offset, 4, v); + } else if (match_string(line, "int", &line)) { int i; -- 2.34.1

2 9

[RFC PATCH] ntdll: Implement NtFlushProcessWriteBuffers.
by Jinoh Kang 02 Feb '22

02 Feb '22

NtFlushProcessWriteBuffers is the NT equivalent of Linux membarrier() system call. The .NET Framework garbage collector uses it to synchronize with other threads, and thus is required to avoid silent memory corruption. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: This is a naive implementation of the barrier system call. The memory overhead for each NtFlushProcessWriteBuffers call is: - 1 event object - N APC objects (where N = <number of threads in process> - 1) Possible directions for improvements include: - Don't allocate any memory, so that it won't fail on out-of-memory conditions. - This also means we don't allocate APC objects. Currently - Use membarrier() on Linux. - Use TLB shootdown IPI instead of APC. (Is this a correct method?) dlls/ntdll/unix/server.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 10 ------- server/protocol.def | 16 +++++++++- server/thread.c | 59 ++++++++++++++++++++++++++++++++---- 4 files changed, 131 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 9d0594d3374..26e2c288440 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -108,6 +108,15 @@ static int initial_cwd = -1; static pid_t server_pid; static pthread_mutex_t fd_cache_mutex = PTHREAD_MUTEX_INITIALIZER; +#define PROC_MEM_BARRIER_MAGIC 0x626d654dUL + +struct proc_mem_barrier_cb +{ + ULONG magic; + volatile LONG count; + HANDLE event; +}; + /* atomically exchange a 64-bit value */ static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val ) { @@ -574,6 +583,18 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (!self) NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); break; } + case APC_MEMORY_BARRIER: + { + struct proc_mem_barrier_cb *cb = wine_server_get_ptr( call->memory_barrier.cb ); + + assert( cb->magic == PROC_MEM_BARRIER_MAGIC ); + + MemoryBarrier(); + result->type = call->type; + if (!InterlockedDecrement( &cb->count )) + NtSetEvent( cb->event, NULL ); + break; + } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; @@ -603,6 +624,9 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); for (;;) { + /* ensure writes so far are visible to other threads */ + MemoryBarrier(); + SERVER_START_REQ( select ) { req->flags = flags; @@ -1729,3 +1753,42 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) } return ret; } + + +/********************************************************************** + * NtFlushProcessWriteBuffers (NTDLL.@) + */ +void WINAPI NtFlushProcessWriteBuffers(void) +{ + for (;;) + { + NTSTATUS ret; + LARGE_INTEGER timeout; + struct proc_mem_barrier_cb cb = { PROC_MEM_BARRIER_MAGIC }; + + ret = NtCreateEvent( &cb.event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE ); + if (ret == STATUS_SUCCESS) + { + MemoryBarrier(); + SERVER_START_REQ( flush_process_write_buffers ) + { + req->cb = wine_server_client_ptr( &cb ); + ret = wine_server_call( req ); + InterlockedAdd( &cb.count, reply->count ); + } + SERVER_END_REQ; + + while (cb.count) + NtWaitForSingleObject( cb.event, FALSE, NULL ); + MemoryBarrier(); /* read cb.count before end of barrier */ + + NtClose( cb.event ); + memset( &cb, 0, sizeof(cb) ); + if (ret == STATUS_SUCCESS) break; + } + + /* NtFlushProcessWriteBuffers cannot fail */ + timeout.QuadPart = -100 * (ULONGLONG)10000; + NtDelayExecution( FALSE, &timeout ); + } +} diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..3e2d985f8d0 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4935,16 +4935,6 @@ NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T } -/********************************************************************** - * NtFlushProcessWriteBuffers (NTDLL.@) - */ -void WINAPI NtFlushProcessWriteBuffers(void) -{ - static int once = 0; - if (!once++) FIXME( "stub\n" ); -} - - /********************************************************************** * NtCreatePagingFile (NTDLL.@) */ diff --git a/server/protocol.def b/server/protocol.def index 02e73047f9b..907cb2f5298 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -502,7 +502,8 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, - APC_DUP_HANDLE + APC_DUP_HANDLE, + APC_MEMORY_BARRIER }; typedef struct @@ -611,6 +612,11 @@ typedef union unsigned int attributes; /* object attributes */ unsigned int options; /* duplicate options */ } dup_handle; + struct + { + enum apc_type type; /* APC_MEMORY_BARRIER */ + client_ptr_t cb; /* address of control block */ + } memory_barrier; } apc_call_t; typedef union @@ -1592,6 +1598,14 @@ enum server_fd_type @END +/* Issue APC_MEMORY_BARRIER on other threads in the same process */ +(a)REQ(flush_process_write_buffers) + client_ptr_t cb; /* address of control block */ +(a)REPLY + data_size_t count; /* number of threads signaled */ +(a)END + + struct thread_info { timeout_t start_time; diff --git a/server/thread.c b/server/thread.c index 467ccd1f0db..4f02f6a5118 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1151,6 +1151,21 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr return 1; } +static void withdraw_apc( struct thread_apc *apc ) +{ + if (apc->call.type == APC_MEMORY_BARRIER && apc->result.type != apc->call.type && apc->owner) + { + struct process *process = (struct process *)apc->owner; + + /* Re-queue APC to another thread to balance the proc_mem_barrier_cb counter */ + if (queue_apc( process, NULL, apc )) + return; + } + + apc->executed = 1; + wake_up( &apc->obj, 0 ); +} + /* queue an async procedure call */ int thread_queue_apc( struct process *process, struct thread *thread, struct object *owner, const apc_call_t *call_data ) { @@ -1175,8 +1190,7 @@ void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_ty { if (apc->owner != owner) continue; list_remove( &apc->entry ); - apc->executed = 1; - wake_up( &apc->obj, 0 ); + withdraw_apc( apc ); release_object( apc ); return; } @@ -1205,8 +1219,7 @@ static void clear_apc_queue( struct list *queue ) { struct thread_apc *apc = LIST_ENTRY( ptr, struct thread_apc, entry ); list_remove( &apc->entry ); - apc->executed = 1; - wake_up( &apc->obj, 0 ); + withdraw_apc( apc ); release_object( apc ); } } @@ -1669,8 +1682,7 @@ DECL_HANDLER(select) reply->call = apc->call; else { - apc->executed = 1; - wake_up( &apc->obj, 0 ); + withdraw_apc( apc ); } release_object( apc ); } @@ -2011,3 +2023,38 @@ DECL_HANDLER(get_next_thread) set_error( STATUS_NO_MORE_ENTRIES ); release_object( process ); } + +/* issue APC_MEMORY_BARRIER on other threads in the same process */ +DECL_HANDLER(flush_process_write_buffers) +{ + struct process *process = current->process; + struct thread *thread; + apc_call_t call; + + memset( &call, 0, sizeof(call) ); + call.memory_barrier.type = APC_MEMORY_BARRIER; + call.memory_barrier.cb = req->cb; + + reply->count = 0; + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + struct thread_apc *apc; + int success; + + if (thread == current || thread->state == TERMINATED) continue; + + if (!(apc = create_apc( &process->obj, &call ))) break; + + if ((success = queue_apc( NULL, thread, apc ))) + reply->count++; + + release_object( apc ); + + if (!success) + { + set_error( STATUS_UNSUCCESSFUL ); + break; + } + } +} -- 2.34.1

1 0

[PATCH] ntdll: Fix some spec file entries (try 2)
by André Zwing 02 Feb '22

02 Feb '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/ntdll/ntdll.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index afb945d4665..29174965394 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,7 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) -@ stdcall EtwEventWriteString(int64 long int64 ptr) +@ stdcall EtwEventWriteString(int64 long int64 wstr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) @@ -594,7 +594,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long ptr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -1089,7 +1089,7 @@ @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) @ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long ptr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) -- 2.25.1

1 0

[PATCH 2/2] bcrypt: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 02 Feb '22

02 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/Makefile.in | 1 - dlls/bcrypt/bcrypt_main.c | 127 ++++++++++++++++++++------------------ dlls/bcrypt/gnutls.c | 14 ++--- 3 files changed, 73 insertions(+), 69 deletions(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 3396c872df9..9f3510361c4 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = bcrypt.dll IMPORTS = advapi32 IMPORTLIB = bcrypt diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6319a26dd4d..9fb9b6adf87 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -39,34 +39,37 @@ static unixlib_handle_t bcrypt_handle; #define UNIX_CALL( func, params ) __wine_unix_call( bcrypt_handle, unix_ ## func, params ) -NTSTATUS WINAPI BCryptAddContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, ULONG pos) +NTSTATUS WINAPI BCryptAddContextFunction( ULONG table, const WCHAR *ctx, ULONG iface, const WCHAR *func, ULONG pos ) { - FIXME("%08x, %s, %08x, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), pos); + FIXME( "%#lx, %s, %#lx, %s, %lu: stub\n", table, debugstr_w(ctx), iface, debugstr_w(func), pos ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptAddContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider, ULONG pos) +NTSTATUS WINAPI BCryptAddContextFunctionProvider( ULONG table, const WCHAR *ctx, ULONG iface, const WCHAR *func, + const WCHAR *provider, ULONG pos ) { - FIXME("%08x, %s, %08x, %s, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider), pos); + FIXME( "%#lx, %s, %#lx, %s, %s, %lu: stub\n", table, debugstr_w(ctx), iface, debugstr_w(func), + debugstr_w(provider), pos ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptRemoveContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function) +NTSTATUS WINAPI BCryptRemoveContextFunction( ULONG table, const WCHAR *ctx, ULONG iface, const WCHAR *func ) { - FIXME("%08x, %s, %08x, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function)); + FIXME( "%#lx, %s, %#lx, %s: stub\n", table, debugstr_w(ctx), iface, debugstr_w(func) ); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider) +NTSTATUS WINAPI BCryptRemoveContextFunctionProvider( ULONG table, const WCHAR *ctx, ULONG iface, const WCHAR *func, + const WCHAR *provider ) { - FIXME("%08x, %s, %08x, %s, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider)); + FIXME( "%#lx, %s, %#lx, %s, %s: stub\n", table, debugstr_w(ctx), iface, debugstr_w(func), debugstr_w(provider) ); return STATUS_NOT_IMPLEMENTED; } NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG iface, ULONG *buflen, CRYPT_CONTEXT_FUNCTIONS **buffer ) { - FIXME( "%u, %s, %u, %p, %p\n", table, debugstr_w(ctx), iface, buflen, buffer ); + FIXME( "%#lx, %s, %#lx, %p, %p\n", table, debugstr_w(ctx), iface, buflen, buffer ); return STATUS_NOT_IMPLEMENTED; } @@ -75,15 +78,15 @@ void WINAPI BCryptFreeBuffer( void *buffer ) FIXME( "%p\n", buffer ); } -NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) +NTSTATUS WINAPI BCryptRegisterProvider( const WCHAR *provider, ULONG flags, CRYPT_PROVIDER_REG *reg ) { - FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); + FIXME( "%s, %#lx, %p: stub\n", debugstr_w(provider), flags, reg ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptUnregisterProvider(LPCWSTR provider) +NTSTATUS WINAPI BCryptUnregisterProvider( const WCHAR *provider ) { - FIXME("%s: stub\n", debugstr_w(provider)); + FIXME( "%s: stub\n", debugstr_w(provider) ); return STATUS_NOT_IMPLEMENTED; } @@ -146,7 +149,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR BCRYPT_ALGORITHM_IDENTIFIER *list; ULONG i, count = 0; - TRACE( "%08x, %p, %p, %08x\n", type, ret_count, ret_list, flags ); + TRACE( "%#lx, %p, %p, %#lx\n", type, ret_count, ret_list, flags ); if (!ret_count || !ret_list || (type & ~supported)) return STATUS_INVALID_PARAMETER; @@ -175,7 +178,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; struct algorithm *algorithm = handle; - TRACE("%p, %p, %u, %08x - semi-stub\n", handle, buffer, count, flags); + TRACE("%p, %p, %lu, %#lx - semi-stub\n", handle, buffer, count, flags); if (!algorithm) { @@ -192,7 +195,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c return STATUS_INVALID_PARAMETER; if (flags & ~supported_flags) - FIXME("unsupported flags %08x\n", flags & ~supported_flags); + FIXME("unsupported flags %#lx\n", flags & ~supported_flags); if (algorithm) FIXME("ignoring selected algorithm\n"); @@ -211,19 +214,20 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) +NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, const WCHAR *id, const WCHAR *implementation, + DWORD flags ) { const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG | BCRYPT_HASH_REUSABLE_FLAG; struct algorithm *alg; enum alg_id alg_id; ULONG i; - TRACE( "%p, %s, %s, %08x\n", handle, wine_dbgstr_w(id), wine_dbgstr_w(implementation), flags ); + TRACE( "%p, %s, %s, %#lx\n", handle, wine_dbgstr_w(id), wine_dbgstr_w(implementation), flags ); if (!handle || !id) return STATUS_INVALID_PARAMETER; if (flags & ~supported_flags) { - FIXME( "unsupported flags %08x\n", flags & ~supported_flags); + FIXME( "unsupported flags %#lx\n", flags & ~supported_flags ); return STATUS_NOT_IMPLEMENTED; } @@ -261,7 +265,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl { struct algorithm *alg = handle; - TRACE( "%p, %08x\n", handle, flags ); + TRACE( "%p, %#lx\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; alg->hdr.magic = 0; @@ -729,11 +733,12 @@ static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHA } } -NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) +NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *buffer, ULONG count, ULONG *res, + ULONG flags ) { struct object *object = handle; - TRACE( "%p, %s, %p, %u, %p, %08x\n", handle, wine_dbgstr_w(prop), buffer, count, res, flags ); + TRACE( "%p, %s, %p, %lu, %p, %#lx\n", handle, wine_dbgstr_w(prop), buffer, count, res, flags ); if (!object) return STATUS_INVALID_HANDLE; if (!prop || !res) return STATUS_INVALID_PARAMETER; @@ -756,7 +761,7 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu return get_hash_property( hash, prop, buffer, count, res ); } default: - WARN( "unknown magic %08x\n", object->magic ); + WARN( "unknown magic %#lx\n", object->magic ); return STATUS_INVALID_HANDLE; } } @@ -829,11 +834,10 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, - secret, secret_len, flags ); + TRACE( "%p, %p, %p, %lu, %p, %lu, %#lx\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) { - FIXME( "unimplemented flags %08x\n", flags ); + FIXME( "unimplemented flags %#lx\n", flags ); return STATUS_NOT_IMPLEMENTED; } @@ -851,7 +855,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND struct hash *hash_orig = handle; struct hash *hash_copy; - TRACE( "%p, %p, %p, %u, %u\n", handle, handle_copy, object, objectlen, flags ); + TRACE( "%p, %p, %p, %lu, %#lx\n", handle, handle_copy, object, objectlen, flags ); if (!hash_orig || hash_orig->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!handle_copy) return STATUS_INVALID_PARAMETER; @@ -894,7 +898,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s { struct hash *hash = handle; - TRACE( "%p, %p, %u, %08x\n", handle, input, size, flags ); + TRACE( "%p, %p, %lu, %#lx\n", handle, input, size, flags ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!input) return STATUS_SUCCESS; @@ -928,7 +932,7 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON { struct hash *hash = handle; - TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags ); + TRACE( "%p, %p, %lu, %#lx\n", handle, output, size, flags ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!output) return STATUS_INVALID_PARAMETER; @@ -943,7 +947,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secret_len, input, input_len, output, output_len ); + TRACE( "%p, %p, %lu, %p, %lu, %p, %lu\n", algorithm, secret, secret_len, input, input_len, output, output_len ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; @@ -1037,7 +1041,7 @@ static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRY if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) { - FIXME( "unknown key data blob version %u\n", header->dwVersion ); + FIXME( "unknown key data blob version %lu\n", header->dwVersion ); return STATUS_INVALID_PARAMETER; } len = header->cbKeyData; @@ -1533,7 +1537,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ ULONG block_size, size; struct key *key; - TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); + TRACE( "%p, %p, %p, %lu, %p, %lu, %#lx\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); @@ -1550,17 +1554,17 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ { if (secret_len > (size = key_lengths.dwMaxLength / 8)) { - WARN( "secret_len %u exceeds key max length %u, setting to maximum.\n", secret_len, size ); + WARN( "secret_len %lu exceeds key max length %lu, setting to maximum\n", secret_len, size ); secret_len = size; } else if (secret_len < (size = key_lengths.dwMinLength / 8)) { - WARN( "secret_len %u is less than minimum key length %u.\n", secret_len, size ); + WARN( "secret_len %lu is less than minimum key length %lu\n", secret_len, size ); return STATUS_INVALID_PARAMETER; } else if (key_lengths.dwIncrement && (secret_len * 8 - key_lengths.dwMinLength) % key_lengths.dwIncrement) { - WARN( "secret_len %u is not a valid key length.\n", secret_len ); + WARN( "secret_len %lu is not a valid key length\n", secret_len ); return STATUS_INVALID_PARAMETER; } } @@ -1592,7 +1596,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H NTSTATUS status; ULONG size; - TRACE( "%p, %p, %u, %08x\n", algorithm, handle, key_len, flags ); + TRACE( "%p, %p, %lu, %#lx\n", algorithm, handle, key_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (!handle) return STATUS_INVALID_PARAMETER; @@ -1626,20 +1630,20 @@ NTSTATUS WINAPI BCryptFinalizeKeyPair( BCRYPT_KEY_HANDLE handle, ULONG flags ) { struct key *key = handle; - TRACE( "%p, %08x\n", key, flags ); + TRACE( "%p, %#lx\n", key, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; return UNIX_CALL( key_asymmetric_generate, key ); } -NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, - BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, +NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, + BCRYPT_KEY_HANDLE *key, UCHAR *object, ULONG object_len, UCHAR *input, ULONG input_len, ULONG flags ) { struct algorithm *alg = algorithm; - TRACE("%p, %p, %s, %p, %p, %u, %p, %u, %u\n", algorithm, decrypt_key, debugstr_w(type), key, object, - object_len, input, input_len, flags); + TRACE( "%p, %p, %s, %p, %p, %lu, %p, %lu, %#lx\n", algorithm, decrypt_key, debugstr_w(type), key, object, + object_len, input, input_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (!key || !type || !input) return STATUS_INVALID_PARAMETER; @@ -1653,12 +1657,12 @@ NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE return key_import( algorithm, type, key, object, object_len, input, input_len ); } -NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, - PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) +NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, const WCHAR *type, + UCHAR *output, ULONG output_len, ULONG *size, ULONG flags ) { struct key *key = export_key; - TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); + TRACE( "%p, %p, %s, %p, %lu, %p, %#lx\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (!type || !size) return STATUS_INVALID_PARAMETER; @@ -1738,7 +1742,7 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE struct key *key_copy; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %08x\n", handle, handle_copy, object, object_len, flags ); + TRACE( "%p, %p, %p, %lu, %#lx\n", handle, handle_copy, object, object_len, flags ); if (object) FIXME( "ignoring object buffer\n" ); if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; @@ -1760,7 +1764,7 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN { struct algorithm *alg = algorithm; - TRACE( "%p, %p, %s, %p, %p, %u, %08x\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, + TRACE( "%p, %p, %s, %p, %p, %lu, %#lx\n", algorithm, decrypt_key, debugstr_w(type), ret_key, input, input_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; @@ -1780,7 +1784,7 @@ NTSTATUS WINAPI BCryptSignHash( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR * struct key_asymmetric_sign_params params; struct key *key = handle; - TRACE( "%p, %p, %p, %u, %p, %u, %p, %08x\n", handle, padding, input, input_len, output, output_len, + TRACE( "%p, %p, %p, %lu, %p, %lu, %p, %#lx\n", handle, padding, input, input_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; @@ -1807,7 +1811,7 @@ NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, struct key_asymmetric_verify_params params; struct key *key = handle; - TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", handle, padding, hash, hash_len, signature, signature_len, flags ); + TRACE( "%p, %p, %p, %lu, %p, %lu, %#lx\n", handle, padding, hash, hash_len, signature, signature_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (!hash || !hash_len || !signature || !signature_len) return STATUS_INVALID_PARAMETER; @@ -1841,7 +1845,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp struct key *key = handle; NTSTATUS ret; - TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, + TRACE( "%p, %p, %lu, %p, %p, %lu, %p, %lu, %p, %#lx\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; @@ -1852,7 +1856,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp } if (flags & ~BCRYPT_BLOCK_PADDING) { - FIXME( "flags %08x not implemented\n", flags ); + FIXME( "flags %#lx not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } @@ -1868,13 +1872,13 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp struct key_asymmetric_decrypt_params params; struct key *key = handle; - TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, + TRACE( "%p, %p, %lu, %p, %p, %lu, %p, %lu, %p, %#lx\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (flags & ~BCRYPT_BLOCK_PADDING) { - FIXME( "flags %08x not supported\n", flags ); + FIXME( "flags %#lx not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } @@ -1900,7 +1904,7 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA { struct object *object = handle; - TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); + TRACE( "%p, %s, %p, %lu, %#lx\n", handle, debugstr_w(prop), value, size, flags ); if (!object) return STATUS_INVALID_HANDLE; @@ -1917,7 +1921,7 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA return set_key_property( key, prop, value, size, flags ); } default: - WARN( "unknown magic %08x\n", object->magic ); + WARN( "unknown magic %#lx\n", object->magic ); return STATUS_INVALID_HANDLE; } } @@ -1930,7 +1934,7 @@ NTSTATUS WINAPI BCryptDeriveKeyCapi( BCRYPT_HASH_HANDLE handle, BCRYPT_ALG_HANDL NTSTATUS status; ULONG len; - TRACE( "%p, %p, %p, %u, %08x\n", handle, halg, key, keylen, flags ); + TRACE( "%p, %p, %p, %lu, %#lx\n", handle, halg, key, keylen, flags ); if (!key || !keylen) return STATUS_INVALID_PARAMETER; if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; @@ -2025,7 +2029,7 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO UCHAR *partial; NTSTATUS status; - TRACE( "%p, %p, %u, %p, %u, %s, %p, %u, %08x\n", handle, pwd, pwd_len, salt, salt_len, + TRACE( "%p, %p, %lu, %p, %lu, %s, %p, %lu, %#lx\n", handle, pwd, pwd_len, salt, salt_len, wine_dbgstr_longlong(iterations), dk, dk_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; @@ -2068,13 +2072,14 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_HANDLE publickey, BCRYPT_SECRET_HANDLE *handle, ULONG flags) +NTSTATUS WINAPI BCryptSecretAgreement( BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_HANDLE publickey, + BCRYPT_SECRET_HANDLE *handle, ULONG flags ) { struct key *privkey = privatekey; struct key *pubkey = publickey; struct secret *secret; - FIXME( "%p, %p, %p, %08x\n", privatekey, publickey, handle, flags ); + FIXME( "%p, %p, %p, %#lx\n", privatekey, publickey, handle, flags ); if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; @@ -2099,12 +2104,12 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE handle) return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCryptBufferDesc *parameter, - PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) +NTSTATUS WINAPI BCryptDeriveKey( BCRYPT_SECRET_HANDLE handle, const WCHAR *kdf, BCryptBufferDesc *parameter, + UCHAR *derived, ULONG derived_size, ULONG *result, ULONG flags ) { struct secret *secret = handle; - FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + FIXME( "%p, %s, %p, %p, %lu, %p, %#lx\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE; if (!kdf) return STATUS_INVALID_PARAMETER; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 56479197bf5..e1b32be32a4 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -688,7 +688,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ if (*pubkey_len < sizeof(*ecc_blob) + size * 2) { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, (ULONG)sizeof(*ecc_blob) + size * 2 ); + FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); pgnutls_perror( ret ); free( x.data ); free( y.data ); return STATUS_BUFFER_TOO_SMALL; @@ -730,7 +730,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit if (*pubkey_len < sizeof(*dsa_blob) + bitlen / 8 * 3) { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, (ULONG)sizeof(*dsa_blob) + bitlen / 8 * 3 ); + FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); pgnutls_perror( ret ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); return STATUS_NO_MEMORY; @@ -1506,7 +1506,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: { - if (flags) FIXME( "flags %08x not supported\n", flags ); + if (flags) FIXME( "flags %#x not supported\n", flags ); /* only the hash size must match, not the actual hash function */ switch (params->hash_len) @@ -1540,7 +1540,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) } case ALG_ID_DSA: { - if (flags) FIXME( "flags %08x not supported\n", flags ); + if (flags) FIXME( "flags %#x not supported\n", flags ); if (params->hash_len != 20) { FIXME( "hash size %u not supported\n", params->hash_len ); @@ -1674,7 +1674,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) } else if (key->alg_id == ALG_ID_DSA) { - if (flags) FIXME( "flags %08x not supported\n", flags ); + if (flags) FIXME( "flags %#x not supported\n", flags ); if (params->input_len != 20) { FIXME( "hash size %u not supported\n", params->input_len ); @@ -1698,12 +1698,12 @@ static NTSTATUS key_asymmetric_sign( void *args ) } else if (!flags) { - WARN( "invalid flags %08x\n", flags ); + WARN( "invalid flags %#x\n", flags ); return STATUS_INVALID_PARAMETER; } else { - FIXME( "flags %08x not implemented\n", flags ); + FIXME( "flags %#x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } -- 2.30.2

1 0

[PATCH 1/2] kerberos: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 02 Feb '22

02 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/Makefile.in | 1 - dlls/kerberos/krb5_ap.c | 48 +++++++++++++++++++-------------------- dlls/kerberos/unixlib.c | 40 ++++++++++++++++---------------- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index 91d40a2f0b0..8dcd4f9c7da 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = kerberos.dll UNIXLIB = kerberos.so EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 2e47c23bb69..efd425dc0ee 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -181,7 +181,7 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req { KERB_PROTOCOL_MESSAGE_TYPE msg; - TRACE("%p,%p,%p,%u,%p,%p,%p\n", req, in_buf, client_buf_base, in_buf_len, out_buf, out_buf_len, ret_status); + TRACE("%p, %p, %p, %lu, %p, %p, %p\n", req, in_buf, client_buf_base, in_buf_len, out_buf, out_buf_len, ret_status); if (!in_buf || in_buf_len < sizeof(msg)) return STATUS_INVALID_PARAMETER; @@ -287,7 +287,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( NTSTATUS status = SEC_E_INSUFFICIENT_MEMORY; ULONG exptime; - TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, expiry ); if (principal_us && !(principal = get_str_unixcp( principal_us ))) return SEC_E_INSUFFICIENT_MEMORY; @@ -319,7 +319,7 @@ done: static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) { - TRACE( "(%lx)\n", credential ); + TRACE( "%Ix\n", credential ); if (!credential) return SEC_E_INVALID_HANDLE; return KRB5_CALL( free_credentials_handle, (void *)credential ); } @@ -336,10 +336,10 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, NTSTATUS status; ULONG exptime; - TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + TRACE( "%Ix, %Ix, %s, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", credential, context, debugstr_us(target_name), context_req, target_data_rep, input, new_context, output, context_attr, expiry, mapped_context, context_data ); - if (context_req & ~supported) FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); + if (context_req & ~supported) FIXME( "flags %#lx not supported\n", context_req & ~supported ); if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; if (target_name && !(target = get_str_unixcp( target_name ))) return SEC_E_INSUFFICIENT_MEMORY; @@ -366,9 +366,9 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential NTSTATUS status = SEC_E_INVALID_HANDLE; ULONG exptime; - TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, target_data_rep, input, - new_context, output, context_attr, expiry, mapped_context, context_data ); - if (context_req) FIXME( "ignoring flags 0x%08x\n", context_req ); + TRACE( "%Ix, %Ix, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", credential, context, context_req, target_data_rep, + input, new_context, output, context_attr, expiry, mapped_context, context_data ); + if (context_req) FIXME( "ignoring flags %#lx\n", context_req ); if (context || input || credential) { @@ -386,7 +386,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) { - TRACE( "(%lx)\n", context ); + TRACE( "%Ix\n", context ); if (!context) return SEC_E_INVALID_HANDLE; return KRB5_CALL( delete_context, (void *)context ); } @@ -411,7 +411,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) { - TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + TRACE( "%Ix, %lu, %p\n", context, attribute, buffer ); if (!context) return SEC_E_INVALID_HANDLE; @@ -444,7 +444,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, } #undef X default: - FIXME( "unknown attribute %u\n", attribute ); + FIXME( "unknown attribute %lu\n", attribute ); break; } @@ -454,7 +454,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { - TRACE("%lu,%p,%p\n", package_id, params, lsa_function_table); + TRACE("%Iu, %p, %p\n", package_id, params, lsa_function_table); if (!krb5_handle) { @@ -516,7 +516,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, PSECPKG_FUNCTION_TABLE *table, PULONG table_count) { - TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + TRACE("%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count); *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_table; @@ -526,16 +526,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { - TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); + TRACE("%#lx, %p, %p\n", version, dll_function_table, user_functions); return STATUS_SUCCESS; } static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no ) { - TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); + TRACE( "%Ix, %#lx, %p, %lu\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection %#lx\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %lu\n", message_seq_no ); if (context) { @@ -548,8 +548,8 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { - TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); + TRACE( "%Ix, %p, %lu, %p\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %lu\n", message_seq_no ); if (context) { @@ -562,8 +562,8 @@ static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBuf static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no ) { - TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); + TRACE( "%Ix, %#lx, %p, %lu\n", context, quality_of_protection, message, message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %lu\n", message_seq_no ); if (context) { @@ -576,8 +576,8 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { - TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); + TRACE( "%Ix, %p, %lu, %p\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %lu\n", message_seq_no ); if (context) { @@ -608,7 +608,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) { - TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + TRACE("%#lx, %p, %p, %p\n", lsa_version, package_version, table, table_count); *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_user_table; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index d83dd37592d..10d2628b794 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -452,7 +452,7 @@ static NTSTATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_FAILURE: return SEC_E_INTERNAL_ERROR; default: - FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); + FIXME( "couldn't convert status %#x to NTSTATUS\n", status ); return SEC_E_INTERNAL_ERROR; } } @@ -468,10 +468,10 @@ static void trace_gss_status_ex( OM_uint32 code, int type ) ret = pgss_display_status( &minor_status, code, type, GSS_C_NULL_OID, &msg_ctx, &buf ); if (GSS_ERROR( ret )) { - TRACE( "gss_display_status(0x%08x,%d) returned %08x minor status %08x\n", code, type, ret, minor_status ); + TRACE( "gss_display_status(%#x, %d) returned %#x minor status %#x\n", code, type, ret, minor_status ); return; } - TRACE( "GSS-API error: 0x%08x: %s\n", code, debugstr_an(buf.value, buf.length) ); + TRACE( "GSS-API error: %#x: %s\n", code, debugstr_an(buf.value, buf.length) ); pgss_release_buffer( &minor_status, &buf ); if (!msg_ctx) return; } @@ -544,13 +544,14 @@ static NTSTATUS accept_context( void *args ) ret = pgss_accept_sec_context( &minor_status, &ctx_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, NULL, NULL, &output_token, &ret_flags, &expiry_time, NULL ); - TRACE( "gss_accept_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + TRACE( "gss_accept_sec_context returned %#x minor status %#x ret_flags %#x\n", ret, minor_status, ret_flags ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > params->output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ { - TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, params->output->pBuffers[idx].cbBuffer ); + TRACE( "buffer too small %lu > %u\n", + (SIZE_T)output_token.length, (unsigned int)params->output->pBuffers[idx].cbBuffer ); pgss_release_buffer( &minor_status, &output_token ); pgss_delete_sec_context( &minor_status, &ctx_handle, GSS_C_NO_BUFFER ); return SEC_E_BUFFER_TOO_SMALL; @@ -605,7 +606,7 @@ static NTSTATUS import_name( const char *src, gss_name_t *dst ) buf.length = strlen( src ); buf.value = (void *)src; ret = pgss_import_name( &minor_status, &buf, GSS_C_NO_OID, dst ); - TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_import_name returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); } @@ -639,7 +640,7 @@ static NTSTATUS acquire_credentials_handle( void *args ) ret = pgss_acquire_cred( &minor_status, name, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); - TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_acquire_cred returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { @@ -657,7 +658,7 @@ static NTSTATUS delete_context( void *args ) gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( (LSA_SEC_HANDLE)args ); ret = pgss_delete_sec_context( &minor_status, &ctx_handle, GSS_C_NO_BUFFER ); - TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_delete_sec_context returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); } @@ -668,7 +669,7 @@ static NTSTATUS free_credentials_handle( void *args ) gss_cred_id_t cred = credhandle_sspi_to_gss( (LSA_SEC_HANDLE)args ); ret = pgss_release_cred( &minor_status, &cred ); - TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_release_cred returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); } @@ -730,13 +731,14 @@ static NTSTATUS initialize_context( void *args ) ret = pgss_init_sec_context( &minor_status, cred_handle, &ctx_handle, target, GSS_C_NO_OID, req_flags, 0, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, &expiry_time ); - TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + TRACE( "gss_init_sec_context returned %#x minor status %#x ret_flags %#x\n", ret, minor_status, ret_flags ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > params->output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ { - TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, params->output->pBuffers[idx].cbBuffer ); + TRACE( "buffer too small %lu > %u\n", + (SIZE_T)output_token.length, (unsigned int)params->output->pBuffers[idx].cbBuffer ); pgss_release_buffer( &minor_status, &output_token ); pgss_delete_sec_context( &minor_status, &ctx_handle, GSS_C_NO_BUFFER ); return SEC_E_INCOMPLETE_MESSAGE; @@ -773,7 +775,7 @@ static NTSTATUS make_signature( void *args ) token_buffer.value = NULL; ret = pgss_get_mic( &minor_status, ctx_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); - TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_get_mic returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { @@ -837,7 +839,7 @@ static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsig conf_flag = 0; /* only integrity */ else { - FIXME( "QOP %08x not supported\n", qop ); + FIXME( "QOP %#x not supported\n", qop ); return SEC_E_UNSUPPORTED_FUNCTION; } @@ -862,7 +864,7 @@ static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsig iov[3].buffer.value = NULL; ret = pgss_wrap_iov( &minor_status, ctx, conf_flag, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); - TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_wrap_iov returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { @@ -886,7 +888,7 @@ static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, un conf_flag = 0; /* only integrity */ else { - FIXME( "QOP %08x not supported\n", qop ); + FIXME( "QOP %#x not supported\n", qop ); return SEC_E_UNSUPPORTED_FUNCTION; } @@ -898,7 +900,7 @@ static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, un input.value = msg->pBuffers[data_idx].pvBuffer; ret = pgss_wrap( &minor_status, ctx, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); - TRACE( "gss_wrap returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_wrap returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { @@ -953,7 +955,7 @@ static NTSTATUS unseal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULO iov[3].buffer.value = msg->pBuffers[token_idx].pvBuffer; ret = pgss_unwrap_iov( &minor_status, ctx, &conf_state, NULL, iov, 4 ); - TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_unwrap_iov returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && qop) { @@ -982,7 +984,7 @@ static NTSTATUS unseal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ret = pgss_unwrap( &minor_status, ctx, &input, &output, &conf_state, NULL ); free( input.value ); - TRACE( "gss_unwrap returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_unwrap returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { @@ -1021,7 +1023,7 @@ static NTSTATUS verify_signature( void *args ) token_buffer.value = msg->pBuffers[token_idx].pvBuffer; ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL ); - TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + TRACE( "gss_verify_mic returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && params->qop) *params->qop = 0; -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Don't wait for the reboot after SetWinLocale.
by Francois Gouget 02 Feb '22

02 Feb '22

SetWinLocale already waits for Windows to be ready to check that the locales changed as expected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 70dfd34634..0635f5ff51 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -680,21 +680,6 @@ sub Revert() FatalError("Could not set the $VMKey locale to $SetLocale\n"); } - Debug(Elapsed($Start), " Wait for the $VMKey locale-setting reboot to complete\n"); - LogMsg "Wait for the $VMKey locale-setting reboot to complete\n"; - while (1) - { - my $TA = $VM->GetAgent(); - my $Count = $TA->GetProperties("start.count"); - $TA->Disconnect(); - - # SetupTestAgentd() has reset start.count to zero. - # It will only change after the reboot. - last if (defined $Count and $Count != 0); - - sleep(1); - } - $DomainSnapshot .= "-$SetLocale"; CreateSnapshot($Domain, $DomainSnapshot); } -- 2.30.2

1 0