From 4655738add8fbd7e75b16c389fa13b2f58b6a7b9 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 30 Jan 2025 13:49:03 +0100
Subject: [PATCH] Cleanup

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

diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h
index e1c5599a..a5c7870d 100644
--- a/include/WinStd/Crypt.h
+++ b/include/WinStd/Crypt.h
@@ -55,7 +55,7 @@ template<class _Ty, class _Ax>
 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;
+    DWORD dwSize = _countof(buf);
 
     // Try with the stack buffer first.
     if (CertGetCertificateContextProperty(pCertContext, dwPropId, buf, &dwSize)) {
@@ -80,7 +80,7 @@ template<class _Ty, class _Ax>
 static _Success_(return != 0) BOOL CryptGetHashParam(_In_ HCRYPTHASH hHash, _In_ DWORD dwParam, _Out_ std::vector<_Ty, _Ax> &aData, _In_ DWORD dwFlags)
 {
     BYTE buf[WINSTD_STACK_BUFFER_BYTES];
-    DWORD dwSize = WINSTD_STACK_BUFFER_BYTES;
+    DWORD dwSize = _countof(buf);
 
     // Try with the stack buffer first.
     if (CryptGetHashParam(hHash, dwParam, buf, &dwSize, dwFlags)) {
@@ -117,7 +117,7 @@ template<class _Ty, class _Ax>
 static _Success_(return != 0) BOOL CryptGetKeyParam(_In_ HCRYPTKEY hKey, _In_ DWORD dwParam, _Out_ std::vector<_Ty, _Ax> &aData, _In_ DWORD dwFlags)
 {
     BYTE buf[WINSTD_STACK_BUFFER_BYTES];
-    DWORD dwSize = WINSTD_STACK_BUFFER_BYTES;
+    DWORD dwSize = _countof(buf);
 
     // Try with the stack buffer first.
     if (CryptGetKeyParam(hKey, dwParam, buf, &dwSize, dwFlags)) {
diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h
index bf985649..3cd509a9 100644
--- a/include/WinStd/Win.h
+++ b/include/WinStd/Win.h
@@ -34,7 +34,7 @@ static DWORD GetModuleFileNameA(_In_opt_ HMODULE hModule, _Out_ std::basic_strin
         sValue.assign(szStackBuffer, dwResult);
         return dwResult;
     } else {
-        for (DWORD dwCapacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(char);; dwCapacity *= 2) {
+        for (DWORD dwCapacity = 2*_countof(szStackBuffer);; dwCapacity *= 2) {
             // Allocate on heap and retry.
             sValue.resize(dwCapacity - 1);
             dwResult = ::GetModuleFileNameA(hModule, &sValue[0], dwCapacity);
@@ -63,7 +63,7 @@ static DWORD GetModuleFileNameW(_In_opt_ HMODULE hModule, _Out_ std::basic_strin
         sValue.assign(szStackBuffer, dwResult);
         return dwResult;
     } else {
-        for (DWORD dwCapacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(wchar_t);; dwCapacity *= 2) {
+        for (DWORD dwCapacity = 2*_countof(szStackBuffer);; dwCapacity *= 2) {
             // Allocate on heap and retry.
             sValue.resize(dwCapacity - 1);
             dwResult = ::GetModuleFileNameW(hModule, &sValue[0], dwCapacity);
@@ -951,7 +951,7 @@ static _Success_(return != 0) BOOL QueryFullProcessImageNameA(_In_ HANDLE hProce
         sExeName.assign(szStackBuffer, dwSize);
         return TRUE;
     }
-    for (DWORD dwCapacity = 2 * WINSTD_STACK_BUFFER_BYTES / sizeof(char); GetLastError() == ERROR_INSUFFICIENT_BUFFER; dwCapacity *= 2) {
+    for (DWORD dwCapacity = 2 * _countof(szStackBuffer); GetLastError() == ERROR_INSUFFICIENT_BUFFER; dwCapacity *= 2) {
         // Allocate on heap and retry.
         sExeName.resize(dwCapacity - 1);
         dwSize = dwCapacity;
@@ -980,7 +980,7 @@ static _Success_(return != 0) BOOL QueryFullProcessImageNameW(_In_ HANDLE hProce
         sExeName.assign(szStackBuffer, dwSize);
         return TRUE;
     }
-    for (DWORD dwCapacity = 2 * WINSTD_STACK_BUFFER_BYTES / sizeof(wchar_t); GetLastError() == ERROR_INSUFFICIENT_BUFFER; dwCapacity *= 2) {
+    for (DWORD dwCapacity = 2 * _countof(szStackBuffer); GetLastError() == ERROR_INSUFFICIENT_BUFFER; dwCapacity *= 2) {
         // Allocate on heap and retry.
         sExeName.resize(dwCapacity - 1);
         dwSize = dwCapacity;