Alexandre Julliard : api-ms-*: Forward to cryptsp instead of advapi32.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b331ffcded6cb7b9e66f3f7ae6756ddaa5af5263
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b331ffcded6cb7b9e66f3f7ae6756ddaa5af5263

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 15 17:33:10 2022 +0100

api-ms-*: Forward to cryptsp instead of advapi32.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 .../api-ms-win-security-cryptoapi-l1-1-0.spec      | 78 +++++++++++-----------
 tools/make_specfiles                               |  5 +-
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec
index 357af4c79d1..6c1a412f534 100644
--- a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec
+++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec
@@ -1,39 +1,39 @@
-@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA
-@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW
-@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef
-@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash
-@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt
-@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey
-@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash
-@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey
-@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash
-@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey
-@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt
-@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA
-@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW
-@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA
-@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW
-@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey
-@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey
-@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom
-@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA
-@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW
-@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam
-@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam
-@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam
-@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey
-@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData
-@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey
-@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey
-@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext
-@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam
-@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam
-@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam
-@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA
-@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA
-@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW
-@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW
-@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA
-@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW
-@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA
-@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW
+@ stdcall CryptAcquireContextA(ptr str str long long) cryptsp.CryptAcquireContextA
+@ stdcall CryptAcquireContextW(ptr wstr wstr long long) cryptsp.CryptAcquireContextW
+@ stdcall CryptContextAddRef(long ptr long) cryptsp.CryptContextAddRef
+@ stdcall CryptCreateHash(long long long long ptr) cryptsp.CryptCreateHash
+@ stdcall CryptDecrypt(long long long long ptr ptr) cryptsp.CryptDecrypt
+@ stdcall CryptDeriveKey(long long long long ptr) cryptsp.CryptDeriveKey
+@ stdcall CryptDestroyHash(long) cryptsp.CryptDestroyHash
+@ stdcall CryptDestroyKey(long) cryptsp.CryptDestroyKey
+@ stdcall CryptDuplicateHash(long ptr long ptr) cryptsp.CryptDuplicateHash
+@ stdcall CryptDuplicateKey(long ptr long ptr) cryptsp.CryptDuplicateKey
+@ stdcall CryptEncrypt(long long long long ptr ptr long) cryptsp.CryptEncrypt
+@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesA
+@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesW
+@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersA
+@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersW
+@ stdcall CryptExportKey(long long long long ptr ptr) cryptsp.CryptExportKey
+@ stdcall CryptGenKey(long long long ptr) cryptsp.CryptGenKey
+@ stdcall CryptGenRandom(long long ptr) cryptsp.CryptGenRandom
+@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderA
+@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderW
+@ stdcall CryptGetHashParam(long long ptr ptr long) cryptsp.CryptGetHashParam
+@ stdcall CryptGetKeyParam(long long ptr ptr long) cryptsp.CryptGetKeyParam
+@ stdcall CryptGetProvParam(long long ptr ptr long) cryptsp.CryptGetProvParam
+@ stdcall CryptGetUserKey(long long ptr) cryptsp.CryptGetUserKey
+@ stdcall CryptHashData(long ptr long long) cryptsp.CryptHashData
+@ stdcall CryptHashSessionKey(long long long) cryptsp.CryptHashSessionKey
+@ stdcall CryptImportKey(long ptr long long long ptr) cryptsp.CryptImportKey
+@ stdcall CryptReleaseContext(long long) cryptsp.CryptReleaseContext
+@ stdcall CryptSetHashParam(long long ptr long) cryptsp.CryptSetHashParam
+@ stdcall CryptSetKeyParam(long long ptr long) cryptsp.CryptSetKeyParam
+@ stdcall CryptSetProvParam(long long ptr long) cryptsp.CryptSetProvParam
+@ stdcall CryptSetProviderA(str long) cryptsp.CryptSetProviderA
+@ stdcall CryptSetProviderExA(str long ptr long) cryptsp.CryptSetProviderExA
+@ stdcall CryptSetProviderExW(wstr long ptr long) cryptsp.CryptSetProviderExW
+@ stdcall CryptSetProviderW(wstr long) cryptsp.CryptSetProviderW
+@ stdcall CryptSignHashA(long long str long ptr ptr) cryptsp.CryptSignHashA
+@ stdcall CryptSignHashW(long long wstr long ptr ptr) cryptsp.CryptSignHashW
+@ stdcall CryptVerifySignatureA(long ptr long long str long) cryptsp.CryptVerifySignatureA
+@ stdcall CryptVerifySignatureW(long ptr long long wstr long) cryptsp.CryptVerifySignatureW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index a374867f938..8f83034f160 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -123,7 +123,6 @@ my @dll_groups =
   "api-ms-win-eventlog-legacy-l1-1-0",
   "api-ms-win-perf-legacy-l1-1-0",
   "api-ms-win-security-base-private-l1-1-1",
-  "api-ms-win-security-cryptoapi-l1-1-0",
   "api-ms-win-security-lsalookup-ansi-l2-1-0",
   "api-ms-win-security-provider-l1-1-0",
   "api-ms-win-security-systemfunctions-l1-1-0",
@@ -150,6 +149,10 @@ my @dll_groups =
   "api-ms-win-service-winsvc-l1-1-0",
   "api-ms-win-service-winsvc-l1-2-0",
  ],
+ [
+  "cryptsp",
+  "api-ms-win-security-cryptoapi-l1-1-0",
+ ],
  [
   "authz",
   "ext-ms-win-authz-context-l1-1-0",