secur32: Avoid using long.

This commit is contained in:
Michael Stefaniuc 2010-05-11 21:28:42 +02:00 committed by Alexandre Julliard
parent 693ccc2556
commit 24592a7a62
4 changed files with 10 additions and 10 deletions

View File

@ -880,8 +880,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(
else else
{ {
TRACE("Negotiated %s\n", debugstr_a(buffer)); TRACE("Negotiated %s\n", debugstr_a(buffer));
sscanf(buffer + 3, "%lx", &(helper->neg_flags)); sscanf(buffer + 3, "%x", &(helper->neg_flags));
TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); TRACE("Stored 0x%08x as flags\n", helper->neg_flags);
} }
TRACE("Getting session key\n"); TRACE("Getting session key\n");
@ -1269,8 +1269,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(
else else
{ {
TRACE("Negotiated %s\n", debugstr_a(buffer)); TRACE("Negotiated %s\n", debugstr_a(buffer));
sscanf(buffer + 3, "%lx", &(helper->neg_flags)); sscanf(buffer + 3, "%x", &(helper->neg_flags));
TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); TRACE("Stored 0x%08x as flags\n", helper->neg_flags);
} }
TRACE("Getting session key\n"); 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; return SEC_E_BUFFER_TOO_SMALL;
helper = (PNegoHelper)phContext->dwLower; 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); 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"); FIXME("Ignoring MessageSeqNo\n");
helper = (PNegoHelper)phContext->dwLower; 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)); local_buff = HeapAlloc(GetProcessHeap(), 0, pMessage->cBuffers * sizeof(SecBuffer));

View File

@ -1313,7 +1313,7 @@ void SECUR32_initSchannelSP(void)
* even though the functions are missing, because the wrapper will * even though the functions are missing, because the wrapper will
* return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL. * return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL.
*/ */
static const long caps = static const LONG caps =
SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_INTEGRITY |
SECPKG_FLAG_PRIVACY | SECPKG_FLAG_PRIVACY |
SECPKG_FLAG_CONNECTION | SECPKG_FLAG_CONNECTION |
@ -1323,7 +1323,7 @@ void SECUR32_initSchannelSP(void)
SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_ACCEPT_WIN32_NAME |
SECPKG_FLAG_STREAM; SECPKG_FLAG_STREAM;
static const short version = 1; static const short version = 1;
static const long maxToken = 16384; static const LONG maxToken = 16384;
SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W, SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W,
*schannel = (SEC_WCHAR *)SCHANNEL_NAME_W; *schannel = (SEC_WCHAR *)SCHANNEL_NAME_W;
const SecPkgInfoW info[] = { const SecPkgInfoW info[] = {

View File

@ -550,7 +550,7 @@ static const WCHAR securityProvidersW[] = {
static void SECUR32_initializeProviders(void) static void SECUR32_initializeProviders(void)
{ {
HKEY key; HKEY key;
long apiRet; LSTATUS apiRet;
TRACE("\n"); TRACE("\n");
InitializeCriticalSection(&cs); InitializeCriticalSection(&cs);

View File

@ -64,7 +64,7 @@ typedef struct _NegoHelper {
int com_buf_size; int com_buf_size;
int com_buf_offset; int com_buf_offset;
BYTE *session_key; BYTE *session_key;
unsigned long neg_flags; ULONG neg_flags;
struct { struct {
struct { struct {
ULONG seq_num; ULONG seq_num;