[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 1717d481c2131eac6e4310e33a73858bdd7eae8b
Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri May 18 15:27:52 2012 -0700

    crypt32: Don't fail if HCRYPTPROV and PCRYPT_KEY_PROV_INFO parameters are both non-NULL.
    (cherry picked from commit 6ccdbab6c860546a80c7dd1eab34e8b64bdb8ec6)

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 557a17b..be7d07c 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -3201,11 +3201,6 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN
             releaseContext = TRUE;
         }
     }
-    else if (pKeyProvInfo)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return NULL;
-    }
 
     CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL,
      &pubKeySize);

-- 
Debian Wine packaging