From ba13a57897f25cf09e4757a10fca3e8c5a8ab36e Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 24 Jan 2025 15:06:54 +0100
Subject: [PATCH] Remove excessive WINAPI

No need to have non-default calling convention for our API.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/WinStd/Crypt.h | 2 +-
 include/WinStd/SDDL.h  | 4 ++--
 include/WinStd/Win.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h
index afbcdb1c..e1c5599a 100644
--- a/include/WinStd/Crypt.h
+++ b/include/WinStd/Crypt.h
@@ -52,7 +52,7 @@ static DWORD CertGetNameStringW(_In_ PCCERT_CONTEXT pCertContext, _In_ DWORD dwT
 /// \sa [CertGetCertificateContextProperty function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa376079.aspx)
 ///
 template<class _Ty, class _Ax>
-static _Success_(return != 0) BOOL WINAPI CertGetCertificateContextProperty(_In_ PCCERT_CONTEXT pCertContext, _In_ DWORD dwPropId, _Out_ std::vector<_Ty, _Ax> &aData)
+static _Success_(return != 0) BOOL CertGetCertificateContextProperty(_In_ PCCERT_CONTEXT pCertContext, _In_ DWORD dwPropId, _Out_ std::vector<_Ty, _Ax> &aData)
 {
     BYTE buf[WINSTD_STACK_BUFFER_BYTES];
     DWORD dwSize = WINSTD_STACK_BUFFER_BYTES;
diff --git a/include/WinStd/SDDL.h b/include/WinStd/SDDL.h
index bee071a2..eb802de1 100644
--- a/include/WinStd/SDDL.h
+++ b/include/WinStd/SDDL.h
@@ -77,7 +77,7 @@ namespace winstd
 #pragma warning(disable: 4505) // Don't warn on unused code
 
 /// @copydoc ConvertStringSecurityDescriptorToSecurityDescriptorW()
-_Success_(return != FALSE) static BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA(_In_ LPCSTR StringSecurityDescriptor, _In_ DWORD StringSDRevision, _Inout_ winstd::security_attributes &sa, _Out_opt_ PULONG SecurityDescriptorSize)
+_Success_(return != FALSE) static BOOL ConvertStringSecurityDescriptorToSecurityDescriptorA(_In_ LPCSTR StringSecurityDescriptor, _In_ DWORD StringSDRevision, _Inout_ winstd::security_attributes &sa, _Out_opt_ PULONG SecurityDescriptorSize)
 {
     PSECURITY_DESCRIPTOR sd;
     BOOL bResult = ConvertStringSecurityDescriptorToSecurityDescriptorA(StringSecurityDescriptor, StringSDRevision, &sd, SecurityDescriptorSize);
@@ -94,7 +94,7 @@ _Success_(return != FALSE) static BOOL WINAPI ConvertStringSecurityDescriptorToS
 ///
 /// \sa [ConvertStringSecurityDescriptorToSecurityDescriptor function](https://docs.microsoft.com/en-us/windows/win32/api/sddl/nf-sddl-convertstringsecuritydescriptortosecuritydescriptorw)
 ///
-_Success_(return != FALSE) static BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW(_In_ LPCWSTR StringSecurityDescriptor, _In_ DWORD StringSDRevision, _Inout_ winstd::security_attributes &sa, _Out_opt_ PULONG SecurityDescriptorSize)
+_Success_(return != FALSE) static BOOL ConvertStringSecurityDescriptorToSecurityDescriptorW(_In_ LPCWSTR StringSecurityDescriptor, _In_ DWORD StringSDRevision, _Inout_ winstd::security_attributes &sa, _Out_opt_ PULONG SecurityDescriptorSize)
 {
     PSECURITY_DESCRIPTOR sd;
     BOOL bResult = ConvertStringSecurityDescriptorToSecurityDescriptorW(StringSecurityDescriptor, StringSDRevision, &sd, SecurityDescriptorSize);
diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h
index 304ffc1c..04411fd3 100644
--- a/include/WinStd/Win.h
+++ b/include/WinStd/Win.h
@@ -704,7 +704,7 @@ static _Success_(return > 0) int NormalizeString(_In_ NORM_FORM NormForm, _In_ c
 
 /// @copydoc LoadStringW
 template<class _Traits, class _Ax>
-static _Success_(return != 0) int WINAPI LoadStringA(_In_opt_ HINSTANCE hInstance, _In_ UINT uID, _Out_ std::basic_string<char, _Traits, _Ax> &sBuffer) noexcept
+static _Success_(return != 0) int LoadStringA(_In_opt_ HINSTANCE hInstance, _In_ UINT uID, _Out_ std::basic_string<char, _Traits, _Ax> &sBuffer) noexcept
 {
     // Get read-only pointer to string resource.
     LPCSTR pszStr;
@@ -722,7 +722,7 @@ static _Success_(return != 0) int WINAPI LoadStringA(_In_opt_ HINSTANCE hInstanc
 /// \sa [LoadString function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms647486.aspx)
 ///
 template<class _Traits, class _Ax>
-static _Success_(return != 0) int WINAPI LoadStringW(_In_opt_ HINSTANCE hInstance, _In_ UINT uID, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sBuffer) noexcept
+static _Success_(return != 0) int LoadStringW(_In_opt_ HINSTANCE hInstance, _In_ UINT uID, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sBuffer) noexcept
 {
     // Get read-only pointer to string resource.
     LPCWSTR pszStr;