[CRYPT32] Sync with Wine Staging 3.17. CORE-15127

[reactos.git] / dll / win32 / crypt32 / str.c

diff --git a/dll/win32/crypt32/str.c b/dll/win32/crypt32/str.c
index 1daf29f..4843c4f 100644 (file)
--- a/dll/win32/crypt32/str.c
+++ b/dll/win32/crypt32/str.c
@@ -26,6 +26,7 @@
 #include "wincrypt.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
+#include "crypt32_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
@@ -775,7 +776,7 @@ struct KeynameKeeper
 static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper)
 {
     keeper->keyName = keeper->buf;
-    keeper->keyLen = sizeof(keeper->buf) / sizeof(keeper->buf[0]);
+    keeper->keyLen = ARRAY_SIZE(keeper->buf);
 }
 
 static void CRYPT_FreeKeynameKeeper(struct KeynameKeeper *keeper)
@@ -1326,8 +1327,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,
         {
             PCERT_RDN_ATTR nameAttr = NULL;
 
-            for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) /
-             sizeof(simpleAttributeOIDs[0]); i++)
+            for (i = 0; !nameAttr && i < ARRAY_SIZE(simpleAttributeOIDs); i++)
                 nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], nameInfo);
             if (nameAttr)
                 ret = CertRDNValueToStrW(nameAttr->dwValueType,