Fixed #1323.

microsoft · Oct 26, 2022 · ec687d3 · ec687d3
1 parent 076ce3c
commit ec687d3
Show file tree

Hide file tree

Showing 2 changed files with 237 additions and 4 deletions.
diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
@@ -3233,6 +3233,7 @@
   {
     "type": "uint",
     "name": "CERT_QUERY_ENCODING_TYPE",
+    "flags": true,
     "members": [
       {
         "name": "X509_ASN_ENCODING",
@@ -3245,17 +3246,197 @@
     ],
     "uses": [
       {
-        "method": "CryptQueryObject",
-        "parameter": "pdwMsgAndCertEncodingType"
+        "struct": "CERT_CONTEXT",
+        "field": "dwCertEncodingType"
       },
       {
-        "method": "CertOpenStore",
-        "parameter": "dwEncodingType"
+        "method": "CertAddEncodedCertificateToStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertAddEncodedCRLToStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertCompareCertificate",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertCompareCertificateName",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertComparePublicKeyInfo",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertCreateCertificateContext",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertCreateCRLContext",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertFindCertificateInStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertFindChainInStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertFindCRLInStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertGetIntendedKeyUsage",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertGetPublicKeyLength",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertGetSubjectCertificateFromStore",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertIsRDNAttrsInCertificateName",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertNameToStrA",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertNameToStrW",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertStrToNameA",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertStrToNameW",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CertVerifyCRLRevocation",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "struct": "CRL_CONTEXT",
+        "field": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptCreateKeyIdentifierFromCSP",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptDecodeObject",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptDecodeObjectEx",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptEncodeObject",
+        "parameter": "dwCertEncodingType"
       },
       {
         "method": "CryptEncodeObjectEx",
         "parameter": "dwCertEncodingType"
       },
+      {
+        "method": "CryptExportPublicKeyInfo",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptExportPublicKeyInfoEx",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptExportPublicKeyInfoFromBCryptKeyHandle",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptFormatObject",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptHashPublicKeyInfo",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptHashToBeSigned",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptImportPublicKeyInfo",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptImportPublicKeyInfoEx",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptImportPublicKeyInfoEx2",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptSignAndEncodeCertificate",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptSignCertificate",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptVerifyCertificateSignature",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptVerifyCertificateSignatureEx",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_FROM_BCRYPT_HANDLE_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_EXTRACT_ENCODED_SIGNATURE_PARAMETERS_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_GET_SIGNER_CERTIFICATE",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_CRYPT_VERIFY_ENCODED_SIGNATURE_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "PFN_IMPORT_PUBLIC_KEY_INFO_EX2_FUNC",
+        "parameter": "dwCertEncodingType"
+      },
+      {
+        "method": "CryptQueryObject",
+        "parameter": "pdwMsgAndCertEncodingType"
+      },
+      {
+        "method": "CertOpenStore",
+        "parameter": "dwEncodingType"
+      },
       {
         "method": "CryptSIPGetSignedDataMsg",
         "parameter": "pdwEncodingType"
@@ -3275,6 +3456,10 @@
       {
         "struct": "CRYPT_KEY_SIGN_MESSAGE_PARA",
         "field": "dwMsgAndCertEncodingType"
+      },
+      {
+        "method": "CertAddEncodedCTLToStore",
+        "parameter": "dwMsgAndCertEncodingType"
       }
     ]
   },

diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -2156,3 +2156,51 @@ Windows.Win32.System.SystemServices.DEVMODE_DISPLAY_ORIENTATION.DMDO_180 added
 Windows.Win32.System.SystemServices.DEVMODE_DISPLAY_ORIENTATION.DMDO_270 added
 Windows.Win32.System.SystemServices.DEVMODE_DISPLAY_ORIENTATION.DMDO_90 added
 Windows.Win32.System.SystemServices.DEVMODE_DISPLAY_ORIENTATION.DMDO_DEFAULT added
+# Fixed #1323.
+Windows.Win32.Security.Cryptography.Apis.CertAddEncodedCertificateToStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertAddEncodedCRLToStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertAddEncodedCTLToStore : dwMsgAndCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertCompareCertificate : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertCompareCertificateName : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertComparePublicKeyInfo : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertCreateCertificateContext : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertCreateCRLContext : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertFindCertificateInStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertFindChainInStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertFindCRLInStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertGetIntendedKeyUsage : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertGetPublicKeyLength : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertGetSubjectCertificateFromStore : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertIsRDNAttrsInCertificateName : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertNameToStrA : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertNameToStrW : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertStrToNameA : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertStrToNameW : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CertVerifyCRLRevocation : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptCreateKeyIdentifierFromCSP : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptDecodeObject : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptDecodeObjectEx : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptEncodeObject : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptExportPublicKeyInfo : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptExportPublicKeyInfoEx : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptExportPublicKeyInfoFromBCryptKeyHandle : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptFormatObject : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptHashPublicKeyInfo : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptHashToBeSigned : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptImportPublicKeyInfo : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptImportPublicKeyInfoEx : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptImportPublicKeyInfoEx2 : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptSignAndEncodeCertificate : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptSignCertificate : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptVerifyCertificateSignature : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.Apis.CryptVerifyCertificateSignatureEx : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.CERT_CONTEXT.dwCertEncodingType...System.UInt32 => Windows.Win32.Security.Cryptography.CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.CERT_QUERY_ENCODING_TYPE :  => [Flags]
+Windows.Win32.Security.Cryptography.CRL_CONTEXT.dwCertEncodingType...System.UInt32 => Windows.Win32.Security.Cryptography.CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_EX2_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_EXPORT_PUBLIC_KEY_INFO_FROM_BCRYPT_HANDLE_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_EXTRACT_ENCODED_SIGNATURE_PARAMETERS_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_GET_SIGNER_CERTIFICATE.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_SIGN_AND_ENCODE_HASH_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_CRYPT_VERIFY_ENCODED_SIGNATURE_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE
+Windows.Win32.Security.Cryptography.PFN_IMPORT_PUBLIC_KEY_INFO_EX2_FUNC.Invoke : dwCertEncodingType...UInt32 => CERT_QUERY_ENCODING_TYPE