rsaenh: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Oct 8 16:51:30 CDT 2006
---
dlls/rsaenh/Makefile.in | 2 +-
dlls/rsaenh/rsaenh.c | 50 ++++++++++++++++++++++++-----------------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 85cd2b4..6eccccb 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 996047d..a87cb83 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -1298,7 +1298,7 @@ static BOOL tls1_prf(HCRYPTPROV hProv, H
BOOL result = FALSE;
CRYPT_DATA_BLOB blobLabelSeed;
- TRACE("(hProv=%08lx, hSecret=%08lx, pblobLabel=%p, pblobSeed=%p, pbBuffer=%p, dwBufferLen=%ld)\n",
+ TRACE("(hProv=%08lx, hSecret=%08lx, pblobLabel=%p, pblobSeed=%p, pbBuffer=%p, dwBufferLen=%d)\n",
hProv, hSecret, pblobLabel, pblobSeed, pbBuffer, dwBufferLen);
if (!lookup_handle(&handle_table, hSecret, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pSecret)) {
@@ -1449,7 +1449,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRY
CHAR szKeyContainerName[MAX_PATH];
CHAR szRegKey[MAX_PATH];
- TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08lx, pVTable=%p)\n", phProv,
+ TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv,
debugstr_a(pszContainer), dwFlags, pVTable);
if (pszContainer && *pszContainer)
@@ -1545,7 +1545,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPR
CRYPTHASH *pCryptHash;
const PROV_ENUMALGS_EX *peaAlgidInfo;
- TRACE("(hProv=%08lx, Algid=%08x, hKey=%08lx, dwFlags=%08lx, phHash=%p)\n", hProv, Algid, hKey,
+ TRACE("(hProv=%08lx, Algid=%08x, hKey=%08lx, dwFlags=%08x, phHash=%p)\n", hProv, Algid, hKey,
dwFlags, phHash);
peaAlgidInfo = get_algid_info(hProv, Algid);
@@ -1726,7 +1726,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYP
{
CRYPTHASH *pSrcHash, *pDestHash;
- TRACE("(hUID=%08lx, hHash=%08lx, pdwReserved=%p, dwFlags=%08lx, phHash=%p)\n", hUID, hHash,
+ TRACE("(hUID=%08lx, hHash=%08lx, pdwReserved=%p, dwFlags=%08x, phHash=%p)\n", hUID, hHash,
pdwReserved, dwFlags, phHash);
if (!is_valid_handle(&handle_table, hUID, RSAENH_MAGIC_CONTAINER))
@@ -1782,7 +1782,7 @@ BOOL WINAPI RSAENH_CPDuplicateKey(HCRYPT
{
CRYPTKEY *pSrcKey, *pDestKey;
- TRACE("(hUID=%08lx, hKey=%08lx, pdwReserved=%p, dwFlags=%08lx, phKey=%p)\n", hUID, hKey,
+ TRACE("(hUID=%08lx, hKey=%08lx, pdwReserved=%p, dwFlags=%08x, phKey=%p)\n", hUID, hKey,
pdwReserved, dwFlags, phKey);
if (!is_valid_handle(&handle_table, hUID, RSAENH_MAGIC_CONTAINER))
@@ -1853,8 +1853,8 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV
BYTE *in, out[RSAENH_MAX_BLOCK_SIZE], o[RSAENH_MAX_BLOCK_SIZE];
DWORD dwEncryptedLen, i, j, k;
- TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08lx, pbData=%p, "
- "pdwDataLen=%p, dwBufLen=%ld)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen,
+ TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08x, pbData=%p, "
+ "pdwDataLen=%p, dwBufLen=%d)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen,
dwBufLen);
if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
@@ -2006,7 +2006,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV
DWORD i, j, k;
DWORD dwMax;
- TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08lx, pbData=%p, "
+ TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08x, pbData=%p, "
"pdwDataLen=%p)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
@@ -2124,7 +2124,7 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPRO
ALG_ID *pAlgid = (ALG_ID*)(pBlobHeader+1);
DWORD dwDataLen;
- TRACE("(hProv=%08lx, hKey=%08lx, hPubKey=%08lx, dwBlobType=%08lx, dwFlags=%08lx, pbData=%p,"
+ TRACE("(hProv=%08lx, hKey=%08lx, hPubKey=%08lx, dwBlobType=%08x, dwFlags=%08x, pbData=%p,"
"pdwDataLen=%p)\n", hProv, hKey, hPubKey, dwBlobType, dwFlags, pbData, pdwDataLen);
if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER))
@@ -2285,7 +2285,7 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPRO
DWORD dwKeyLen;
BOOL ret;
- TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%ld, hPubKey=%08lx, dwFlags=%08lx, phKey=%p)\n",
+ TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n",
hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER,
@@ -2442,7 +2442,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV h
KEYCONTAINER *pKeyContainer;
CRYPTKEY *pCryptKey;
- TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08lx, phKey=%p)\n", hProv, Algid, dwFlags, phKey);
+ TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08x, phKey=%p)\n", hProv, Algid, dwFlags, phKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer))
@@ -2534,7 +2534,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV h
*/
BOOL WINAPI RSAENH_CPGenRandom(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
{
- TRACE("(hProv=%08lx, dwLen=%ld, pbBuffer=%p)\n", hProv, dwLen, pbBuffer);
+ TRACE("(hProv=%08lx, dwLen=%d, pbBuffer=%p)\n", hProv, dwLen, pbBuffer);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
{
@@ -2572,7 +2572,7 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPT
{
CRYPTHASH *pCryptHash;
- TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08lx, pbData=%p, pdwDataLen=%p, dwFlags=%08lx)\n",
+ TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n",
hProv, hHash, dwParam, pbData, pdwDataLen, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
@@ -2670,7 +2670,7 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTP
{
CRYPTKEY *pCryptKey;
- TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08lx, pbData=%p, dwFlags=%08lx)\n", hProv, hKey,
+ TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hKey,
dwParam, pbData, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
@@ -2770,7 +2770,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTP
CRYPTKEY *pCryptKey;
DWORD dwBitLen;
- TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08lx, pbData=%p, pdwDataLen=%p dwFlags=%08lx)\n",
+ TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n",
hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
@@ -2880,7 +2880,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPT
0xf3, 0x81, /**/0x00,/**/ 0xfa, 0xe8, 0x26, /**/0x00,/**/ 0xca
};
- TRACE("(hProv=%08lx, dwParam=%08lx, pbData=%p, pdwDataLen=%p, dwFlags=%08lx)\n",
+ TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n",
hProv, dwParam, pbData, pdwDataLen, dwFlags);
if (!pdwDataLen) {
@@ -3039,7 +3039,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPRO
BYTE abHashValue[RSAENH_MAX_HASH_SIZE*2];
DWORD dwLen;
- TRACE("(hProv=%08lx, Algid=%d, hBaseData=%08lx, dwFlags=%08lx phKey=%p)\n", hProv, Algid,
+ TRACE("(hProv=%08lx, Algid=%d, hBaseData=%08lx, dwFlags=%08x phKey=%p)\n", hProv, Algid,
hBaseData, dwFlags, phKey);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
@@ -3182,7 +3182,7 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPR
{
KEYCONTAINER *pKeyContainer;
- TRACE("(hProv=%08lx, dwKeySpec=%08lx, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey);
+ TRACE("(hProv=%08lx, dwKeySpec=%08x, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey);
if (!lookup_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER,
(OBJECTHDR**)&pKeyContainer))
@@ -3243,7 +3243,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV
{
CRYPTHASH *pCryptHash;
- TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%ld, dwFlags=%08lx)\n",
+ TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n",
hProv, hHash, pbData, dwDataLen, dwFlags);
if (dwFlags)
@@ -3300,7 +3300,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRY
CRYPTKEY *pKey;
DWORD i;
- TRACE("(hProv=%08lx, hHash=%08lx, hKey=%08lx, dwFlags=%08lx)\n", hProv, hHash, hKey, dwFlags);
+ TRACE("(hProv=%08lx, hHash=%08lx, hKey=%08lx, dwFlags=%08x)\n", hProv, hHash, hKey, dwFlags);
if (!lookup_handle(&handle_table, (unsigned int)hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pKey) ||
(GET_ALG_CLASS(pKey->aiAlgid) != ALG_CLASS_DATA_ENCRYPT))
@@ -3341,7 +3341,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRY
*/
BOOL WINAPI RSAENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags)
{
- TRACE("(hProv=%08lx, dwFlags=%08lx)\n", hProv, dwFlags);
+ TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags);
if (!release_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
{
@@ -3386,7 +3386,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPT
CRYPTKEY *pCryptKey;
int i;
- TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08lx, pbData=%p, dwFlags=%08lx)\n",
+ TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n",
hProv, hHash, dwParam, pbData, dwFlags);
if (!is_valid_handle(&handle_table, (unsigned int)hProv, RSAENH_MAGIC_CONTAINER))
@@ -3483,7 +3483,7 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV
BYTE abHashValue[RSAENH_MAX_HASH_SIZE];
ALG_ID aiAlgid;
- TRACE("(hProv=%08lx, hHash=%08lx, dwKeySpec=%08lx, sDescription=%s, dwFlags=%08lx, "
+ TRACE("(hProv=%08lx, hHash=%08lx, dwKeySpec=%08x, sDescription=%s, dwFlags=%08x, "
"pbSignature=%p, pdwSigLen=%p)\n", hProv, hHash, dwKeySpec, debugstr_w(sDescription),
dwFlags, pbSignature, pdwSigLen);
@@ -3564,8 +3564,8 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCR
BYTE abHashValue[RSAENH_MAX_HASH_SIZE];
BOOL res = FALSE;
- TRACE("(hProv=%08lx, hHash=%08lx, pbSignature=%p, dwSigLen=%ld, hPubKey=%08lx, sDescription=%s, "
- "dwFlags=%08lx)\n", hProv, hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription),
+ TRACE("(hProv=%08lx, hHash=%08lx, pbSignature=%p, dwSigLen=%d, hPubKey=%08lx, sDescription=%s, "
+ "dwFlags=%08x)\n", hProv, hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription),
dwFlags);
if (dwFlags & ~(CRYPT_NOHASHOID|CRYPT_X931_FORMAT)) {
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/8b88362a/attachment.pgp
More information about the wine-patches
mailing list