From a1f4fac03c005a31b641842bdbfc5209747ed0e0 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 17 Jun 2005 21:26:53 +0000
Subject: [PATCH] Fix the CryptEncodeObjectEx() prototype. Fixes winapi_check
 warnings.

---
 dlls/crypt32/crypt32.spec | 2 +-
 dlls/crypt32/encode.c     | 8 ++++----
 include/wincrypt.h        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec
index c2976a793bd..dd5352f60ee 100644
--- a/dlls/crypt32/crypt32.spec
+++ b/dlls/crypt32/crypt32.spec
@@ -90,7 +90,7 @@
 @ stub CryptDecryptAndVerifyMessageSignature
 @ stub CryptDecryptMessage
 @ 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 CryptEnumOIDFunction
 @ stub CryptEnumOIDInfo
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index 2f93574613b..72ea561cd93 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -1211,7 +1211,7 @@ typedef BOOL (WINAPI *CryptEncodeObjectExFunc)(DWORD, LPCSTR, const void *,
 
 BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara,
- BYTE *pbEncoded, DWORD *pcbEncoded)
+ void *pvEncoded, DWORD *pcbEncoded)
 {
     BOOL ret = FALSE;
     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",
      dwCertEncodingType, HIWORD(lpszStructType) ? debugstr_a(lpszStructType) :
-     "(integer value)", pvStructInfo, dwFlags, pEncodePara, pbEncoded,
+     "(integer value)", pvStructInfo, dwFlags, pEncodePara, pvEncoded,
      pcbEncoded);
 
-    if (!pbEncoded && !pcbEncoded)
+    if (!pvEncoded && !pcbEncoded)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
@@ -1287,7 +1287,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
          lpszStructType, "CryptEncodeObjectEx", &lib);
     if (encodeFunc)
         ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo,
-         dwFlags, pEncodePara, pbEncoded, pcbEncoded);
+         dwFlags, pEncodePara, pvEncoded, pcbEncoded);
     else
         SetLastError(ERROR_FILE_NOT_FOUND);
     if (lib)
diff --git a/include/wincrypt.h b/include/wincrypt.h
index e9f0770e9b6..6eac1e6e215 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -1644,7 +1644,7 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded);
 BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara,
- BYTE *pbEncoded, DWORD *pcbEncoded);
+ void *pvEncoded, DWORD *pcbEncoded);
 
 BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo,