Module: wine Branch: master Commit: 24592a7a62d75ea342c5947f3f716be6bff2787b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24592a7a62d75ea342c5947f3f...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue May 11 21:28:42 2010 +0200
secur32: Avoid using long.
---
dlls/secur32/ntlm.c | 12 ++++++------ dlls/secur32/schannel.c | 4 ++-- dlls/secur32/secur32.c | 2 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0ef5b51..53de199 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -880,8 +880,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( else { TRACE("Negotiated %s\n", debugstr_a(buffer)); - sscanf(buffer + 3, "%lx", &(helper->neg_flags)); - TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); + sscanf(buffer + 3, "%x", &(helper->neg_flags)); + TRACE("Stored 0x%08x as flags\n", helper->neg_flags); }
TRACE("Getting session key\n"); @@ -1269,8 +1269,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( else { TRACE("Negotiated %s\n", debugstr_a(buffer)); - sscanf(buffer + 3, "%lx", &(helper->neg_flags)); - TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); + sscanf(buffer + 3, "%x", &(helper->neg_flags)); + TRACE("Stored 0x%08x as flags\n", helper->neg_flags); }
TRACE("Getting session key\n"); @@ -1631,7 +1631,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, ULONG return SEC_E_BUFFER_TOO_SMALL;
helper = (PNegoHelper)phContext->dwLower; - TRACE("Negotiated flags are: 0x%08lx\n", helper->neg_flags); + TRACE("Negotiated flags are: 0x%08x\n", helper->neg_flags);
return ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, TRUE); } @@ -1668,7 +1668,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, FIXME("Ignoring MessageSeqNo\n");
helper = (PNegoHelper)phContext->dwLower; - TRACE("Negotiated flags: 0x%08lx\n", helper->neg_flags); + TRACE("Negotiated flags: 0x%08x\n", helper->neg_flags);
local_buff = HeapAlloc(GetProcessHeap(), 0, pMessage->cBuffers * sizeof(SecBuffer));
diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 64e08b7..7a3bb3c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1313,7 +1313,7 @@ void SECUR32_initSchannelSP(void) * even though the functions are missing, because the wrapper will * return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL. */ - static const long caps = + static const LONG caps = SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | SECPKG_FLAG_CONNECTION | @@ -1323,7 +1323,7 @@ void SECUR32_initSchannelSP(void) SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; static const short version = 1; - static const long maxToken = 16384; + static const LONG maxToken = 16384; SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W, *schannel = (SEC_WCHAR *)SCHANNEL_NAME_W; const SecPkgInfoW info[] = { diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index f626617..ae1326c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -550,7 +550,7 @@ static const WCHAR securityProvidersW[] = { static void SECUR32_initializeProviders(void) { HKEY key; - long apiRet; + LSTATUS apiRet;
TRACE("\n"); InitializeCriticalSection(&cs); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index e2b0cd0..9f2ef8c 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -64,7 +64,7 @@ typedef struct _NegoHelper { int com_buf_size; int com_buf_offset; BYTE *session_key; - unsigned long neg_flags; + ULONG neg_flags; struct { struct { ULONG seq_num;