ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the CryptEncodeObjectEx() prototype.

Browse Source 
Fixes winapi_check warnings.
This commit is contained in:
Francois Gouget 2005-06-17 21:26:53 +00:00 committed by Alexandre Julliard
parent fd73829593
commit a1f4fac03c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/crypt32/crypt32.spec
View File

@ -90,7 +90,7 @@
@ stub CryptDecryptAndVerifyMessageSignature @ stub CryptDecryptAndVerifyMessageSignature
@ stub CryptDecryptMessage @ stub CryptDecryptMessage
@ stdcall CryptEncodeObject(long str ptr ptr ptr) @ stdcall CryptEncodeObject(long str ptr ptr ptr)
@ stdcall CryptEncodeObjectEx(long str ptr long ptr ptr) @ stdcall CryptEncodeObjectEx(long str ptr long ptr ptr ptr)
@ stub CryptEncryptMessage @ stub CryptEncryptMessage
@ stub CryptEnumOIDFunction @ stub CryptEnumOIDFunction
@ stub CryptEnumOIDInfo @ stub CryptEnumOIDInfo

8
dlls/crypt32/encode.c
View File

@ -1211,7 +1211,7 @@ typedef BOOL (WINAPI *CryptEncodeObjectExFunc)(DWORD, LPCSTR, const void *,
BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara,
BYTE *pbEncoded, DWORD *pcbEncoded) void *pvEncoded, DWORD *pcbEncoded)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
HMODULE lib = NULL; HMODULE lib = NULL;
@ -1219,10 +1219,10 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
TRACE("(0x%08lx, %s, %p, 0x%08lx, %p, %p, %p)\n", TRACE("(0x%08lx, %s, %p, 0x%08lx, %p, %p, %p)\n",
dwCertEncodingType, HIWORD(lpszStructType) ? debugstr_a(lpszStructType) : dwCertEncodingType, HIWORD(lpszStructType) ? debugstr_a(lpszStructType) :
"(integer value)", pvStructInfo, dwFlags, pEncodePara, pbEncoded, "(integer value)", pvStructInfo, dwFlags, pEncodePara, pvEncoded,
pcbEncoded); pcbEncoded);
if (!pbEncoded && !pcbEncoded) if (!pvEncoded && !pcbEncoded)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
@ -1287,7 +1287,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
lpszStructType, "CryptEncodeObjectEx", &lib); lpszStructType, "CryptEncodeObjectEx", &lib);
if (encodeFunc) if (encodeFunc)
ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo,
dwFlags, pEncodePara, pbEncoded, pcbEncoded); dwFlags, pEncodePara, pvEncoded, pcbEncoded);
else else
SetLastError(ERROR_FILE_NOT_FOUND); SetLastError(ERROR_FILE_NOT_FOUND);
if (lib) if (lib)

2
include/wincrypt.h
View File

@ -1644,7 +1644,7 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded); const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded);
BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara,
BYTE *pbEncoded, DWORD *pcbEncoded); void *pvEncoded, DWORD *pcbEncoded);
BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo,