Alexandre Julliard : include: Use proper dllimports for cryptdlg functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 175887749f52d1da3cb2f14289ae13314866698c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/175887749f52d1da3cb2f14289ae133...

Author: Alexandre Julliard 
Date:   Fri Nov  3 17:03:34 2023 +0100

include: Use proper dllimports for cryptdlg functions.

---

dlls/cryptdlg/Makefile.in |  1 +
 include/cryptdlg.h        | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
index 1b71d6cf10e..7669e79e3f0 100644
--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -D_CRYPTDLG_
 MODULE    = cryptdlg.dll
 IMPORTS   = cryptui crypt32 wintrust user32 advapi32

diff --git a/include/cryptdlg.h b/include/cryptdlg.h
index 47bd9843d59..265f6e140bc 100644
--- a/include/cryptdlg.h
+++ b/include/cryptdlg.h
@@ -20,6 +20,14 @@

#include <prsht.h>

+#ifndef CRYPTDLGAPI
+#ifdef _CRYPTDLG_
+#define CRYPTDLGAPI
+#else
+#define CRYPTDLGAPI DECLSPEC_IMPORT
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -115,8 +123,8 @@ typedef struct tagCSSW

#define CERT_SELECT_STRUCT WINELIB_NAME_AW(CERT_SELECT_STRUCT_)

-BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo);
-BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo);
+CRYPTDLGAPI BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo);
+CRYPTDLGAPI BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo);
 #define CertSelectCertificate WINELIB_NAME_AW(CertSelectCertificate)

#define CM_VIEWFLAGS_MASK       0x00ffffff
@@ -196,8 +204,8 @@ typedef struct tagCERT_VIEWPROPERTIES_STRUCT_W
 #define PCERT_VIEWPROPERTIES_STRUCT \
  WINELIB_NAME_AW(PCERT_VIEWPROPERTIES_STRUCT_)

-BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo);
-BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo);
+CRYPTDLGAPI BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo);
+CRYPTDLGAPI BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo);
 #define CertViewProperties WINELIB_NAME_AW(CertViewProperties)

#define CERT_FILTER_OP_EXISTS     1
@@ -227,10 +235,8 @@ typedef struct tagCMFLTR
     DWORD                        dwCheckingFlags;
 } CERT_FILTER_DATA;

-DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer,
- DWORD cchBuffer);
-DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer,
- DWORD cchBuffer);
+CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, DWORD cchBuffer);
+CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, DWORD cchBuffer);
 #define GetFriendlyNameOfCert WINELIB_NAME_AW(GetFriendlyNameOfCert)

#define CERT_CERTIFICATE_ACTION_VERIFY \
@@ -302,7 +308,7 @@ typedef struct _CTL_MODIFY_REQUEST
     DWORD          dwError;
 } CTL_MODIFY_REQUEST, *PCTL_MODIFY_REQUEST;

-HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore,
+CRYPTDLGAPI HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore,
  PCTL_MODIFY_REQUEST rgCerts, LPCSTR szPurpose, HWND hwnd,
  HCERTSTORE hcertstoreTrust);