Hans Leidekker : msv1_0: Build without -DWINE_NO_LONG_TYPES.
Alexandre Julliard
julliard at winehq.org
Fri Feb 11 14:33:57 CST 2022
Module: wine
Branch: master
Commit: 9b11f6fd7d8a5ca2ea1fc50e62ad187210cf7818
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b11f6fd7d8a5ca2ea1fc50e62ad187210cf7818
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Feb 11 09:59:44 2022 +0100
msv1_0: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msv1_0/Makefile.in | 1 -
dlls/msv1_0/main.c | 50 ++++++++++++++++++++++++-------------------------
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in
index 8367caede9c..439d74d7bb9 100644
--- a/dlls/msv1_0/Makefile.in
+++ b/dlls/msv1_0/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msv1_0.dll
UNIXLIB = msv1_0.so
IMPORTS = netapi32 advapi32
diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c
index 32783f2f6cf..77dcfa3b67d 100644
--- a/dlls/msv1_0/main.c
+++ b/dlls/msv1_0/main.c
@@ -111,7 +111,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC
LSA_STRING *str;
char *ptr;
- TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality),
+ TRACE( "%#lx, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality),
package_name );
if (ntlm_check_version())
@@ -135,7 +135,7 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC
static NTSTATUS NTAPI ntlm_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( "%#Ix, %p, %p\n", package_id, params, lsa_function_table );
if (ntlm_check_version())
{
@@ -192,7 +192,7 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal
WCHAR *domain = NULL, *user = NULL, *password = NULL;
SEC_WINNT_AUTH_IDENTITY_W *id = NULL;
- TRACE( "%s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data,
+ TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data,
get_key_fn, get_key_arg, cred, expiry );
switch (cred_use & ~SECPKG_CRED_RESERVED)
@@ -298,7 +298,7 @@ static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle )
{
struct ntlm_cred *cred = (struct ntlm_cred *)handle;
- TRACE( "%lx\n", handle );
+ TRACE( "%#Ix\n", handle );
if (!cred) return SEC_E_OK;
@@ -589,7 +589,7 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA
unsigned int len, bin_len;
int idx;
- TRACE( "%lx, %lx, %s, 0x%08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target),
+ TRACE( "%#Ix, %#Ix, %s, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, debugstr_us(target),
ctx_req, data_rep, input, new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data );
/* when communicating with the client there can be the following reply packets:
@@ -875,7 +875,7 @@ done:
free( bin );
free( want_flags );
- TRACE( "returning %08x\n", status );
+ TRACE( "returning %#lx\n", status );
return status;
}
@@ -890,9 +890,9 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L
char *buf, *bin, *want_flags = NULL;
unsigned int len, bin_len;
- TRACE( "%lx, %lx, %08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input,
+ TRACE( "%#Ix, %#Ix, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input,
new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data );
- if (ctx_req) FIXME( "ignoring flags %08x\n", ctx_req );
+ if (ctx_req) FIXME( "ignoring flags %#lx\n", ctx_req );
if (!(buf = malloc( NTLM_MAX_BUF ))) return SEC_E_INSUFFICIENT_MEMORY;
if (!(bin = malloc( NTLM_MAX_BUF ))) goto done;
@@ -1088,7 +1088,7 @@ done:
free( bin );
free( want_flags );
- TRACE( "returning %08x\n", status );
+ TRACE( "returning %#lx\n", status );
return status;
}
@@ -1096,7 +1096,7 @@ static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle )
{
struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle;
- TRACE( "%lx\n", handle );
+ TRACE( "%#Ix\n", handle );
if (!ctx) return SEC_E_INVALID_HANDLE;
ntlm_cleanup( ctx );
@@ -1124,7 +1124,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info )
static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULONG attr, void *buf )
{
- TRACE( "%lx, %u, %p\n", handle, attr, buf );
+ TRACE( "%#Ix, %lu, %p\n", handle, attr, buf );
if (!handle) return SEC_E_INVALID_HANDLE;
@@ -1171,7 +1171,7 @@ static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULON
}
#undef X
default:
- FIXME( "unknown attribute %u\n", attr );
+ FIXME( "unknown attribute %lu\n", attr );
break;
}
@@ -1221,7 +1221,7 @@ static SECPKG_FUNCTION_TABLE ntlm_table =
NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_FUNCTION_TABLE **table,
ULONG *table_count )
{
- TRACE( "%08x, %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 = &ntlm_table;
@@ -1231,7 +1231,7 @@ NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, S
static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS *dll_functions, void **user_functions )
{
- TRACE( "%08x, %p, %p\n", version, dll_functions, user_functions );
+ TRACE( "%#lx, %p, %p\n", version, dll_functions, user_functions );
return STATUS_SUCCESS;
}
@@ -1400,9 +1400,9 @@ static NTSTATUS NTAPI ntlm_SpMakeSignature( LSA_SEC_HANDLE handle, ULONG qop, Se
struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle;
int idx;
- TRACE( "%lx, 0x%08x, %p, %u\n", handle, qop, msg, msg_seq_no );
- if (qop) FIXME( "ignoring quality of protection %08x\n", qop );
- if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no );
+ TRACE( "%#Ix, %#lx, %p, %lu\n", handle, qop, msg, msg_seq_no );
+ if (qop) FIXME( "ignoring quality of protection %#lx\n", qop );
+ if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no );
if (!handle) return SEC_E_INVALID_HANDLE;
if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1)
@@ -1456,8 +1456,8 @@ static NTSTATUS NTAPI ntlm_SpVerifySignature( LSA_SEC_HANDLE handle, SecBufferDe
struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle;
int idx;
- TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop );
- if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no );
+ TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop );
+ if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no );
if (!handle) return SEC_E_INVALID_HANDLE;
if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1)
@@ -1472,9 +1472,9 @@ static NTSTATUS NTAPI ntlm_SpSealMessage( LSA_SEC_HANDLE handle, ULONG qop, SecB
int token_idx, data_idx;
struct ntlm_ctx *ctx;
- TRACE( "%lx, %08x, %p %u\n", handle, qop, msg, msg_seq_no );
- if (qop) FIXME( "ignoring quality of protection %08x\n", qop );
- if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no );
+ TRACE( "%#Ix, %#lx, %p %lu\n", handle, qop, msg, msg_seq_no );
+ if (qop) FIXME( "ignoring quality of protection %#lx\n", qop );
+ if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no );
if (!handle) return SEC_E_INVALID_HANDLE;
@@ -1514,8 +1514,8 @@ static NTSTATUS NTAPI ntlm_SpUnsealMessage( LSA_SEC_HANDLE handle, SecBufferDesc
int token_idx, data_idx;
struct ntlm_ctx *ctx;
- TRACE( "%lx, %p, %u, %p\n", handle, msg, msg_seq_no, qop );
- if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no );
+ TRACE( "%#Ix, %p, %lu, %p\n", handle, msg, msg_seq_no, qop );
+ if (msg_seq_no) FIXME( "ignoring message sequence number %lu\n", msg_seq_no );
if (!handle) return SEC_E_INVALID_HANDLE;
@@ -1559,7 +1559,7 @@ static SECPKG_USER_FUNCTION_TABLE ntlm_user_table =
NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_USER_FUNCTION_TABLE **table,
ULONG *table_count )
{
- TRACE( "%08x, %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 = &ntlm_user_table;
More information about the wine-cvs
mailing list