system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

secur32: Win64 printf format warning fixes.

Browse source
This commit is contained in:
Hans Leidekker 2006-10-15 14:51:52 +02:00 committed by Alexandre Julliard
parent 21ff87bf50
commit 2638e9d467
9 changed files with 161 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/secur32/Makefile.in
View file

@ -6,7 +6,6 @@ MODULE = secur32.dll
IMPORTLIB = libsecur32.$(IMPLIBEXT) IMPORTLIB = libsecur32.$(IMPLIBEXT)
IMPORTS = netapi32 user32 advapi32 kernel32 ntdll IMPORTS = netapi32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = crypt32 DELAYIMPORTS = crypt32
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
base64_codec.c \ base64_codec.c \

24
dlls/secur32/negotiate.c
View file

@ -55,7 +55,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryCredentialsAttributesA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
switch(ulAttribute) switch(ulAttribute)
{ {
@ -78,7 +78,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryCredentialsAttributesW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
switch(ulAttribute) switch(ulAttribute)
{ {
@ -102,7 +102,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA(
PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
{ {
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p) stub\n",
debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
return SEC_E_UNSUPPORTED_FUNCTION; return SEC_E_UNSUPPORTED_FUNCTION;
@ -116,7 +116,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW(
PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
{ {
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p) stub\n",
debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
return SEC_E_UNSUPPORTED_FUNCTION; return SEC_E_UNSUPPORTED_FUNCTION;
@ -133,7 +133,7 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if(phCredential){ if(phCredential){
@ -157,7 +157,7 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)
@ -181,7 +181,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %p %ld %ld %p %p %p %p\n", phCredential, phContext, pInput, TRACE("%p %p %p %d %d %p %p %p %p\n", phCredential, phContext, pInput,
fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr,
ptsExpiry); ptsExpiry);
if (phCredential) if (phCredential)
@ -258,7 +258,7 @@ static SECURITY_STATUS SEC_ENTRY nego_ApplyControlToken(PCtxtHandle phContext,
* QueryContextAttributesW * QueryContextAttributesW
*/ */
static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
@ -266,7 +266,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW(PCtxtHandle phCont
* the SecurePackage part and the dwLower part is the actual context * the SecurePackage part and the dwLower part is the actual context
* handle. It should be easy to extract the context attributes from that. * handle. It should be easy to extract the context attributes from that.
*/ */
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (phContext) if (phContext)
{ {
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;
@ -282,7 +282,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW(PCtxtHandle phCont
* QueryContextAttributesA * QueryContextAttributesA
*/ */
static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
return nego_QueryContextAttributesW(phContext, ulAttribute, pBuffer); return nego_QueryContextAttributesW(phContext, ulAttribute, pBuffer);
} }
@ -333,7 +333,7 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, ULONG
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo);
if (phContext) if (phContext)
{ {
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;
@ -353,7 +353,7 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP);
if (phContext) if (phContext)
{ {
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;

32
dlls/secur32/ntlm.c
View file

@ -43,7 +43,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryCredentialsAttributesA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
if(ulAttribute == SECPKG_ATTR_NAMES) if(ulAttribute == SECPKG_ATTR_NAMES)
{ {
@ -64,7 +64,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryCredentialsAttributesW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
if(ulAttribute == SECPKG_ATTR_NAMES) if(ulAttribute == SECPKG_ATTR_NAMES)
{ {
@ -100,7 +100,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(
server_helper_protocol, server_helper_protocol,
NULL }; NULL };
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n",
debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
@ -273,7 +273,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleA(
PSEC_WINNT_AUTH_IDENTITY_W pAuthDataW = NULL; PSEC_WINNT_AUTH_IDENTITY_W pAuthDataW = NULL;
PSEC_WINNT_AUTH_IDENTITY_A identity = NULL; PSEC_WINNT_AUTH_IDENTITY_A identity = NULL;
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n",
debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
@ -384,7 +384,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(
PBYTE bin; PBYTE bin;
int buffer_len, bin_len, max_len = NTLM_MAX_BUF; int buffer_len, bin_len, max_len = NTLM_MAX_BUF;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
@ -731,7 +731,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
@ -776,7 +776,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(
ULONG ctxt_attr = 0; ULONG ctxt_attr = 0;
PNegoHelper helper; PNegoHelper helper;
TRACE("%p %p %p %ld %ld %p %p %p %p\n", phCredential, phContext, pInput, TRACE("%p %p %p %d %d %p %p %p %p\n", phCredential, phContext, pInput,
fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr,
ptsExpiry); ptsExpiry);
@ -1101,9 +1101,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContex
* QueryContextAttributesW * QueryContextAttributesW
*/ */
static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (!phContext) if (!phContext)
return SEC_E_INVALID_HANDLE; return SEC_E_INVALID_HANDLE;
@ -1146,7 +1146,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phCont
_x(SECPKG_ATTR_TARGET_INFORMATION); _x(SECPKG_ATTR_TARGET_INFORMATION);
#undef _x #undef _x
default: default:
TRACE("Unknown value %ld passed for ulAttribute\n", ulAttribute); TRACE("Unknown value %d passed for ulAttribute\n", ulAttribute);
} }
return SEC_E_UNSUPPORTED_FUNCTION; return SEC_E_UNSUPPORTED_FUNCTION;
@ -1156,7 +1156,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phCont
* QueryContextAttributesA * QueryContextAttributesA
*/ */
static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
return ntlm_QueryContextAttributesW(phContext, ulAttribute, pBuffer); return ntlm_QueryContextAttributesW(phContext, ulAttribute, pBuffer);
} }
@ -1208,12 +1208,12 @@ static SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, ULONG
PNegoHelper helper; PNegoHelper helper;
ULONG sign_version = 1; ULONG sign_version = 1;
TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo);
if (!phContext) if (!phContext)
return SEC_E_INVALID_HANDLE; return SEC_E_INVALID_HANDLE;
if(fQOP) if(fQOP)
FIXME("Ignoring fQOP 0x%08lx\n", fQOP); FIXME("Ignoring fQOP 0x%08x\n", fQOP);
if(MessageSeqNo) if(MessageSeqNo)
FIXME("Ignoring MessageSeqNo\n"); FIXME("Ignoring MessageSeqNo\n");
@ -1287,7 +1287,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext,
PNegoHelper helper; PNegoHelper helper;
ULONG fQOP = 0; ULONG fQOP = 0;
TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP);
if(!phContext) if(!phContext)
return SEC_E_INVALID_HANDLE; return SEC_E_INVALID_HANDLE;
@ -1390,7 +1390,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext,
ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo)
{ {
PNegoHelper helper; PNegoHelper helper;
TRACE("(%p %ld %p %ld)\n", phContext, fQOP, pMessage, MessageSeqNo); TRACE("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo);
if(!phContext) if(!phContext)
return SEC_E_INVALID_HANDLE; return SEC_E_INVALID_HANDLE;
@ -1460,7 +1460,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext,
SECURITY_STATUS ret; SECURITY_STATUS ret;
ULONG ntlmssp_flags_save; ULONG ntlmssp_flags_save;
PNegoHelper helper; PNegoHelper helper;
TRACE("(%p %p %ld %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); TRACE("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP);
if(!phContext) if(!phContext)
return SEC_E_INVALID_HANDLE; return SEC_E_INVALID_HANDLE;

18
dlls/secur32/schannel.c
View file

@ -39,7 +39,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes(
if (pBuffer) if (pBuffer)
{ {
/* FIXME: get from CryptoAPI */ /* FIXME: get from CryptoAPI */
FIXME("%ld: stub\n", ulAttribute); FIXME("%d: stub\n", ulAttribute);
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;
} }
else else
@ -49,7 +49,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes(
if (pBuffer) if (pBuffer)
{ {
/* FIXME: get from CryptoAPI */ /* FIXME: get from CryptoAPI */
FIXME("%ld: stub\n", ulAttribute); FIXME("%d: stub\n", ulAttribute);
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;
} }
else else
@ -59,7 +59,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes(
if (pBuffer) if (pBuffer)
{ {
/* FIXME: get from OpenSSL? */ /* FIXME: get from OpenSSL? */
FIXME("%ld: stub\n", ulAttribute); FIXME("%d: stub\n", ulAttribute);
ret = SEC_E_UNSUPPORTED_FUNCTION; ret = SEC_E_UNSUPPORTED_FUNCTION;
} }
else else
@ -76,7 +76,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
switch (ulAttribute) switch (ulAttribute)
{ {
@ -96,7 +96,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer);
switch (ulAttribute) switch (ulAttribute)
{ {
@ -212,7 +212,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleA(
PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
{ {
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n",
debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
return schan_AcquireCredentialsHandle(fCredentialUse, return schan_AcquireCredentialsHandle(fCredentialUse,
@ -224,7 +224,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleW(
PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn,
PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry)
{ {
TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n",
debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse,
pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry);
return schan_AcquireCredentialsHandle(fCredentialUse, return schan_AcquireCredentialsHandle(fCredentialUse,
@ -249,7 +249,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if(phCredential) if(phCredential)
@ -275,7 +275,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)

12
dlls/secur32/secur32.c
View file

@ -745,7 +745,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages,
memcpy(pkgInfo, &package->infoW, sizeof(SecPkgInfoW)); memcpy(pkgInfo, &package->infoW, sizeof(SecPkgInfoW));
if (package->infoW.Name) if (package->infoW.Name)
{ {
TRACE("Name[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Name)); TRACE("Name[%d] = %s\n", i - 1, debugstr_w(package->infoW.Name));
pkgInfo->Name = nextString; pkgInfo->Name = nextString;
lstrcpyW(nextString, package->infoW.Name); lstrcpyW(nextString, package->infoW.Name);
nextString += lstrlenW(nextString) + 1; nextString += lstrlenW(nextString) + 1;
@ -754,7 +754,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages,
pkgInfo->Name = NULL; pkgInfo->Name = NULL;
if (package->infoW.Comment) if (package->infoW.Comment)
{ {
TRACE("Comment[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Comment)); TRACE("Comment[%d] = %s\n", i - 1, debugstr_w(package->infoW.Comment));
pkgInfo->Comment = nextString; pkgInfo->Comment = nextString;
lstrcpyW(nextString, package->infoW.Comment); lstrcpyW(nextString, package->infoW.Comment);
nextString += lstrlenW(nextString) + 1; nextString += lstrlenW(nextString) + 1;
@ -768,7 +768,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages,
} }
} }
LeaveCriticalSection(&cs); LeaveCriticalSection(&cs);
TRACE("<-- 0x%08lx\n", ret); TRACE("<-- 0x%08x\n", ret);
return ret; return ret;
} }
@ -943,7 +943,7 @@ BOOLEAN WINAPI GetComputerObjectNameW(
if (ntStatus != STATUS_SUCCESS) if (ntStatus != STATUS_SUCCESS)
{ {
SetLastError(LsaNtStatusToWinError(ntStatus)); SetLastError(LsaNtStatusToWinError(ntStatus));
WARN("LsaOpenPolicy failed with NT status %lx\n", GetLastError()); WARN("LsaOpenPolicy failed with NT status %x\n", GetLastError());
return FALSE; return FALSE;
} }
@ -953,7 +953,7 @@ BOOLEAN WINAPI GetComputerObjectNameW(
if (ntStatus != STATUS_SUCCESS) if (ntStatus != STATUS_SUCCESS)
{ {
SetLastError(LsaNtStatusToWinError(ntStatus)); SetLastError(LsaNtStatusToWinError(ntStatus));
WARN("LsaQueryInformationPolicy failed with NT status %lx\n", WARN("LsaQueryInformationPolicy failed with NT status %x\n",
GetLastError()); GetLastError());
LsaClose(policyHandle); LsaClose(policyHandle);
return FALSE; return FALSE;
@ -1050,7 +1050,7 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(
ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength, ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength,
PNTSTATUS ProtocolStatus) PNTSTATUS ProtocolStatus)
{ {
FIXME("%p %ld %p %ld %p %p %p\n", LsaHandle, AuthenticationPackage, FIXME("%p %d %p %d %p %p %p\n", LsaHandle, AuthenticationPackage,
ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer, ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer,
ReturnBufferLength, ProtocolStatus); ReturnBufferLength, ProtocolStatus);
return 0; return 0;

68
dlls/secur32/thunks.c
View file

@ -38,7 +38,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_a(pszPrincipal),
debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn,
pvGetKeyArgument, phCredential, ptsExpiry); pvGetKeyArgument, phCredential, ptsExpiry);
if (pszPackage) if (pszPackage)
@ -65,7 +65,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_w(pszPrincipal),
debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn,
pvGetKeyArgument, phCredential, ptsExpiry); pvGetKeyArgument, phCredential, ptsExpiry);
if (pszPackage) if (pszPackage)
@ -89,11 +89,11 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW(
* so we have to know about every type the caller does * so we have to know about every type the caller does
*/ */
SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA( SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer) PCredHandle phCredential, ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer);
if (phCredential) if (phCredential)
{ {
SecurePackage *package = (SecurePackage *)phCredential->dwUpper; SecurePackage *package = (SecurePackage *)phCredential->dwUpper;
@ -125,7 +125,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA(
break; break;
} }
default: default:
WARN("attribute type %ld unknown\n", ulAttribute); WARN("attribute type %d unknown\n", ulAttribute);
ret = SEC_E_INTERNAL_ERROR; ret = SEC_E_INTERNAL_ERROR;
} }
} }
@ -142,11 +142,11 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA(
} }
SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW( SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer) PCredHandle phCredential, ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer);
if (phCredential) if (phCredential)
{ {
SecurePackage *package = (SecurePackage *)phCredential->dwUpper; SecurePackage *package = (SecurePackage *)phCredential->dwUpper;
@ -178,7 +178,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW(
break; break;
} }
default: default:
WARN("attribute type %ld unknown\n", ulAttribute); WARN("attribute type %d unknown\n", ulAttribute);
ret = SEC_E_INTERNAL_ERROR; ret = SEC_E_INTERNAL_ERROR;
} }
} }
@ -196,14 +196,14 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW(
SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA( SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_CHAR *pszTargetName, unsigned long fContextReq, SEC_CHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry) ULONG *pfContextAttr, PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)
@ -236,14 +236,14 @@ SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA(
SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW( SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_WCHAR *pszTargetName, unsigned long fContextReq, SEC_WCHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry) ULONG *pfContextAttr, PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)
@ -274,13 +274,13 @@ SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW(
} }
SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials,
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry) PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal),
debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn,
pvGetKeyArgument, ptsExpiry); pvGetKeyArgument, ptsExpiry);
if (hCredentials) if (hCredentials)
@ -314,13 +314,13 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials,
} }
SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials,
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry) PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal),
debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn,
pvGetKeyArgument, ptsExpiry); pvGetKeyArgument, ptsExpiry);
if (hCredentials) if (hCredentials)
@ -404,7 +404,7 @@ static PSecPkgInfoA _copyPackageInfoFlatWToA(PSecPkgInfoW infoW)
} }
static SECURITY_STATUS thunk_ContextAttributesWToA(SecurePackage *package, static SECURITY_STATUS thunk_ContextAttributesWToA(SecurePackage *package,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret = SEC_E_OK; SECURITY_STATUS ret = SEC_E_OK;
@ -536,7 +536,7 @@ static SECURITY_STATUS thunk_ContextAttributesWToA(SecurePackage *package,
case SECPKG_ATTR_TARGET_INFORMATION: case SECPKG_ATTR_TARGET_INFORMATION:
break; break;
default: default:
WARN("attribute type %ld unknown\n", ulAttribute); WARN("attribute type %d unknown\n", ulAttribute);
ret = SEC_E_INTERNAL_ERROR; ret = SEC_E_INTERNAL_ERROR;
} }
} }
@ -546,11 +546,11 @@ static SECURITY_STATUS thunk_ContextAttributesWToA(SecurePackage *package,
} }
SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -629,7 +629,7 @@ static PSecPkgInfoW _copyPackageInfoFlatAToW(PSecPkgInfoA infoA)
} }
static SECURITY_STATUS thunk_ContextAttributesAToW(SecurePackage *package, static SECURITY_STATUS thunk_ContextAttributesAToW(SecurePackage *package,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret = SEC_E_OK; SECURITY_STATUS ret = SEC_E_OK;
@ -762,7 +762,7 @@ static SECURITY_STATUS thunk_ContextAttributesAToW(SecurePackage *package,
case SECPKG_ATTR_TARGET_INFORMATION: case SECPKG_ATTR_TARGET_INFORMATION:
break; break;
default: default:
WARN("attribute type %ld unknown\n", ulAttribute); WARN("attribute type %d unknown\n", ulAttribute);
ret = SEC_E_INTERNAL_ERROR; ret = SEC_E_INTERNAL_ERROR;
} }
} }
@ -772,11 +772,11 @@ static SECURITY_STATUS thunk_ContextAttributesAToW(SecurePackage *package,
} }
SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -804,11 +804,11 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW(PCtxtHandle phContext,
} }
SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer) ULONG ulAttribute, void *pBuffer, ULONG cbBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -837,11 +837,11 @@ SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext,
} }
SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer) ULONG ulAttribute, void *pBuffer, ULONG cbBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;

32
dlls/secur32/thunks.h
View file

@ -34,16 +34,16 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW(
PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA( SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_CHAR *pszTargetName, unsigned long fContextReq, SEC_CHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry); ULONG *pfContextAttr, PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW( SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_WCHAR *pszTargetName, unsigned long fContextReq, SEC_WCHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry); ULONG *pfContextAttr, PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextA( SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextA(
SEC_CHAR *pszPackage, PSecBuffer pPackedContext, void *Token, SEC_CHAR *pszPackage, PSecBuffer pPackedContext, void *Token,
PCtxtHandle phContext); PCtxtHandle phContext);
@ -51,24 +51,24 @@ SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextW(
SEC_WCHAR *pszPackage, PSecBuffer pPackedContext, void *Token, SEC_WCHAR *pszPackage, PSecBuffer pPackedContext, void *Token,
PCtxtHandle phContext); PCtxtHandle phContext);
SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials,
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry); PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials,
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry); PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA( SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); PCredHandle phCredential, ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW( SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); PCredHandle phCredential, ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA( SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(
PCtxtHandle phContext, unsigned long ulAttribute, void *pBuffer); PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW( SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW(
PCtxtHandle phContext, unsigned long ulAttribute, void *pBuffer); PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); ULONG ulAttribute, void *pBuffer, ULONG cbBuffer);
SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); ULONG ulAttribute, void *pBuffer, ULONG cbBuffer);
#endif /* ndef __SECUR32_THUNKS_H__ */ #endif /* ndef __SECUR32_THUNKS_H__ */

73
dlls/secur32/wrapper.c
View file

@ -68,7 +68,7 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleA(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_a(pszPrincipal),
debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn,
pvGetKeyArgument, phCredential, ptsExpiry); pvGetKeyArgument, phCredential, ptsExpiry);
if (pszPackage) if (pszPackage)
@ -114,7 +114,7 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleW(
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_w(pszPrincipal),
debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn,
pvGetKeyArgument, phCredential, ptsExpiry); pvGetKeyArgument, phCredential, ptsExpiry);
if (pszPackage) if (pszPackage)
@ -180,11 +180,11 @@ SECURITY_STATUS WINAPI FreeCredentialsHandle(
* QueryCredentialsAttributesA (SECUR32.@) * QueryCredentialsAttributesA (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI QueryCredentialsAttributesA( SECURITY_STATUS WINAPI QueryCredentialsAttributesA(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer) PCredHandle phCredential, ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer);
if (phCredential) if (phCredential)
{ {
SecurePackage *package = (SecurePackage *)phCredential->dwUpper; SecurePackage *package = (SecurePackage *)phCredential->dwUpper;
@ -210,11 +210,11 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesA(
* QueryCredentialsAttributesW (SECUR32.@) * QueryCredentialsAttributesW (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI QueryCredentialsAttributesW( SECURITY_STATUS WINAPI QueryCredentialsAttributesW(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer) PCredHandle phCredential, ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer);
if (phCredential) if (phCredential)
{ {
SecurePackage *package = (SecurePackage *)phCredential->dwUpper; SecurePackage *package = (SecurePackage *)phCredential->dwUpper;
@ -241,14 +241,14 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesW(
*/ */
SECURITY_STATUS WINAPI InitializeSecurityContextA( SECURITY_STATUS WINAPI InitializeSecurityContextA(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_CHAR *pszTargetName, unsigned long fContextReq, SEC_CHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry) ULONG *pfContextAttr, PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)
@ -298,14 +298,14 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA(
*/ */
SECURITY_STATUS WINAPI InitializeSecurityContextW( SECURITY_STATUS WINAPI InitializeSecurityContextW(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_WCHAR *pszTargetName, unsigned long fContextReq, SEC_WCHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry) ULONG *pfContextAttr, PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext,
debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput,
Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);
if (phCredential) if (phCredential)
@ -355,13 +355,12 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW(
*/ */
SECURITY_STATUS WINAPI AcceptSecurityContext( SECURITY_STATUS WINAPI AcceptSecurityContext(
PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput,
unsigned long fContextReq, unsigned long TargetDataRep, ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext,
PCtxtHandle phNewContext, PSecBufferDesc pOutput, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry)
unsigned long *pfContextAttr, PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %p %ld %ld %p %p %p %p\n", phCredential, phContext, pInput, TRACE("%p %p %p %d %d %p %p %p %p\n", phCredential, phContext, pInput,
fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr,
ptsExpiry); ptsExpiry);
if (phCredential) if (phCredential)
@ -495,11 +494,11 @@ SECURITY_STATUS WINAPI ApplyControlToken(PCtxtHandle phContext,
* QueryContextAttributesA (SECUR32.@) * QueryContextAttributesA (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -525,11 +524,11 @@ SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext,
* QueryContextAttributesW (SECUR32.@) * QueryContextAttributesW (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer) ULONG ulAttribute, void *pBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -617,7 +616,7 @@ SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle phContext, ULONG fQOP,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -647,7 +646,7 @@ SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle phContext,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -802,7 +801,7 @@ SECURITY_STATUS WINAPI ExportSecurityContext(PCtxtHandle phContext,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %p\n", phContext, fFlags, pPackedContext, pToken); TRACE("%p %d %p %p\n", phContext, fFlags, pPackedContext, pToken);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -897,13 +896,13 @@ SECURITY_STATUS WINAPI ImportSecurityContextW(SEC_WCHAR *pszPackage,
* AddCredentialsA (SECUR32.@) * AddCredentialsA (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials, SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials,
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry) PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal),
debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn,
pvGetKeyArgument, ptsExpiry); pvGetKeyArgument, ptsExpiry);
if (hCredentials) if (hCredentials)
@ -932,13 +931,13 @@ SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials,
* AddCredentialsW (SECUR32.@) * AddCredentialsW (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials, SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials,
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry) PTimeStamp ptsExpiry)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal),
debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn,
pvGetKeyArgument, ptsExpiry); pvGetKeyArgument, ptsExpiry);
if (hCredentials) if (hCredentials)
@ -1001,7 +1000,7 @@ SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -1031,7 +1030,7 @@ SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext,
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -1057,11 +1056,11 @@ SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext,
* SetContextAttributesA (SECUR32.@) * SetContextAttributesA (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer) ULONG ulAttribute, void *pBuffer, ULONG cbBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;
@ -1087,11 +1086,11 @@ SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext,
* SetContextAttributesW (SECUR32.@) * SetContextAttributesW (SECUR32.@)
*/ */
SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer) ULONG ulAttribute, void *pBuffer, ULONG cbBuffer)
{ {
SECURITY_STATUS ret; SECURITY_STATUS ret;
TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer);
if (phContext) if (phContext)
{ {
SecurePackage *package = (SecurePackage *)phContext->dwUpper; SecurePackage *package = (SecurePackage *)phContext->dwUpper;

66
include/sspi.h
View file

@ -172,15 +172,15 @@ typedef SECURITY_STATUS (SEC_ENTRY *ENUMERATE_SECURITY_PACKAGES_FN_W)(PULONG,
#define ENUMERATE_SECURITY_PACKAGES_FN WINELIB_NAME_AW(ENUMERATE_SECURITY_PACKAGES_FN_) #define ENUMERATE_SECURITY_PACKAGES_FN WINELIB_NAME_AW(ENUMERATE_SECURITY_PACKAGES_FN_)
SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA( SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); PCredHandle phCredential, ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW( SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW(
PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); PCredHandle phCredential, ULONG ulAttribute, void *pBuffer);
#define QueryCredentialsAttributes WINELIB_NAME_AW(QueryCredentialsAttributes) #define QueryCredentialsAttributes WINELIB_NAME_AW(QueryCredentialsAttributes)
typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_A) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_A)
(PCredHandle, unsigned long, PVOID); (PCredHandle, ULONG, PVOID);
typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W) typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W)
(PCredHandle, unsigned long, PVOID); (PCredHandle, ULONG, PVOID);
#define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_) #define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_)
/* values for QueryCredentialsAttributes ulAttribute */ /* values for QueryCredentialsAttributes ulAttribute */
@ -237,26 +237,24 @@ typedef SECURITY_STATUS (SEC_ENTRY *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle);
SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA( SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_CHAR *pszTargetName, unsigned long fContextReq, SEC_CHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry); ULONG *pfContextAttr, PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW( SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW(
PCredHandle phCredential, PCtxtHandle phContext, PCredHandle phCredential, PCtxtHandle phContext,
SEC_WCHAR *pszTargetName, unsigned long fContextReq, SEC_WCHAR *pszTargetName, ULONG fContextReq,
unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput,
unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry); ULONG *pfContextAttr, PTimeStamp ptsExpiry);
#define InitializeSecurityContext WINELIB_NAME_AW(InitializeSecurityContext) #define InitializeSecurityContext WINELIB_NAME_AW(InitializeSecurityContext)
typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_A) typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_A)
(PCredHandle, PCtxtHandle, SEC_CHAR *, unsigned long, unsigned long, (PCredHandle, PCtxtHandle, SEC_CHAR *, ULONG, ULONG, ULONG, PSecBufferDesc,
unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp);
unsigned long *, PTimeStamp);
typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_W) typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_W)
(PCredHandle, PCtxtHandle, SEC_WCHAR *, unsigned long, unsigned long, (PCredHandle, PCtxtHandle, SEC_WCHAR *, ULONG, ULONG, ULONG, PSecBufferDesc,
unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp);
unsigned long *, PTimeStamp);
#define INITIALIZE_SECURITY_CONTEXT_FN WINELIB_NAME_AW(INITIALIZE_SECURITY_CONTEXT_FN_) #define INITIALIZE_SECURITY_CONTEXT_FN WINELIB_NAME_AW(INITIALIZE_SECURITY_CONTEXT_FN_)
/* flags for InitializeSecurityContext fContextReq and pfContextAttr */ /* flags for InitializeSecurityContext fContextReq and pfContextAttr */
@ -308,13 +306,13 @@ typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_W)
SECURITY_STATUS SEC_ENTRY AcceptSecurityContext( SECURITY_STATUS SEC_ENTRY AcceptSecurityContext(
PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput,
unsigned long fContextReq, unsigned long TargetDataRep, ULONG fContextReq, ULONG TargetDataRep,
PCtxtHandle phNewContext, PSecBufferDesc pOutput, PCtxtHandle phNewContext, PSecBufferDesc pOutput,
unsigned long *pfContextAttr, PTimeStamp ptsExpiry); ULONG *pfContextAttr, PTimeStamp ptsExpiry);
typedef SECURITY_STATUS (SEC_ENTRY *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle, typedef SECURITY_STATUS (SEC_ENTRY *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle,
PCtxtHandle, PSecBufferDesc, unsigned long, unsigned long, PCtxtHandle, PCtxtHandle, PSecBufferDesc, ULONG, ULONG, PCtxtHandle,
PSecBufferDesc, unsigned long *, PTimeStamp); PSecBufferDesc, ULONG *, PTimeStamp);
/* flags for AcceptSecurityContext fContextReq and pfContextAttr */ /* flags for AcceptSecurityContext fContextReq and pfContextAttr */
#define ASC_REQ_DELEGATE 0x00000001 #define ASC_REQ_DELEGATE 0x00000001
@ -384,15 +382,15 @@ typedef SECURITY_STATUS (SEC_ENTRY *APPLY_CONTROL_TOKEN_FN)(PCtxtHandle,
PSecBufferDesc); PSecBufferDesc);
SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer); ULONG ulAttribute, void *pBuffer);
SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer); ULONG ulAttribute, void *pBuffer);
#define QueryContextAttributes WINELIB_NAME_AW(QueryContextAttributes) #define QueryContextAttributes WINELIB_NAME_AW(QueryContextAttributes)
typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle,
unsigned long, void *); ULONG, void *);
typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle,
unsigned long, void *); ULONG, void *);
#define QUERY_CONTEXT_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CONTEXT_ATTRIBUTES_FN_) #define QUERY_CONTEXT_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CONTEXT_ATTRIBUTES_FN_)
/* values for QueryContextAttributes/SetContextAttributes ulAttribute */ /* values for QueryContextAttributes/SetContextAttributes ulAttribute */
@ -678,20 +676,20 @@ typedef SECURITY_STATUS (SEC_ENTRY *IMPORT_SECURITY_CONTEXT_FN_W)(SEC_WCHAR *,
#define IMPORT_SECURITY_CONTEXT_FN WINELIB_NAME_AW(IMPORT_SECURITY_CONTEXT_FN_) #define IMPORT_SECURITY_CONTEXT_FN WINELIB_NAME_AW(IMPORT_SECURITY_CONTEXT_FN_)
SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials,
SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry); PTimeStamp ptsExpiry);
SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials, SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials,
SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse,
void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
PTimeStamp ptsExpiry); PTimeStamp ptsExpiry);
#define AddCredentials WINELIB_NAME_AW(AddCredentials) #define AddCredentials WINELIB_NAME_AW(AddCredentials)
typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_A)(PCredHandle, typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_A)(PCredHandle,
SEC_CHAR *, SEC_CHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, SEC_CHAR *, SEC_CHAR *, ULONG, void *, SEC_GET_KEY_FN, void *,
PTimeStamp); PTimeStamp);
typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_W)(PCredHandle, typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_W)(PCredHandle,
SEC_WCHAR *, SEC_WCHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, SEC_WCHAR *, SEC_WCHAR *, ULONG, void *, SEC_GET_KEY_FN, void *,
PTimeStamp); PTimeStamp);
SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext,
@ -714,15 +712,15 @@ typedef SECURITY_STATUS (SEC_ENTRY *DECRYPT_MESSAGE_FN)(PCtxtHandle,
PSecBufferDesc, ULONG, PULONG); PSecBufferDesc, ULONG, PULONG);
SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); ULONG ulAttribute, void *pBuffer, ULONG cbBuffer);
SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext,
unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); ULONG ulAttribute, void *pBuffer, ULONG cbBuffer);
#define SetContextAttributes WINELIB_NAME_AW(SetContextAttributes) #define SetContextAttributes WINELIB_NAME_AW(SetContextAttributes)
typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle,
unsigned long, void *, unsigned long); ULONG, void *, ULONG);
typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle,
unsigned long, void *, unsigned long); ULONG, void *, ULONG);
#define SECURITY_ENTRYPOINT_ANSIA "InitSecurityInterfaceA" #define SECURITY_ENTRYPOINT_ANSIA "InitSecurityInterfaceA"
#define SECURITY_ENTRYPOINT_ANSIW "InitSecurityInterfaceW" #define SECURITY_ENTRYPOINT_ANSIW "InitSecurityInterfaceW"