diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index 0f36fd70f18..927481ff256 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -197,7 +197,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet,
     struct OIDFunctionSet *set = hFuncSet;
     char *keyName;
     HKEY key;
-    long rc;
+    LSTATUS rc;
 
     TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList,
      pcchDllList);
@@ -299,7 +299,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID,
     char *keyName;
     const char *funcName;
     HKEY key;
-    long rc;
+    LSTATUS rc;
 
     keyName = CRYPT_GetKeyName(dwEncodingType, szFuncName, pszOID);
     rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key);
diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c
index 9b50129fd1d..8b680c44a80 100644
--- a/dlls/crypt32/tests/oid.c
+++ b/dlls/crypt32/tests/oid.c
@@ -384,7 +384,7 @@ static void test_registerDefaultOIDFunction(void)
     static const char func[] = "CertDllOpenStoreProv";
     char buf[MAX_PATH];
     BOOL ret;
-    long rc;
+    LSTATUS rc;
     HKEY key;
 
     ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL);
@@ -419,7 +419,7 @@ static void test_registerDefaultOIDFunction(void)
     ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError());
     sprintf(buf, fmt, 0, func);
     rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key);
-    ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc);
+    ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %d\n", rc);
     if (rc == 0)
     {
         static const CHAR dllA[] = "Dll";
@@ -432,7 +432,7 @@ static void test_registerDefaultOIDFunction(void)
         size = sizeof(dllBuf) / sizeof(dllBuf[0]);
         rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size);
         ok(rc == 0,
-         "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc);
+         "Expected Dll value to exist, RegQueryValueExA failed: %d\n", rc);
         ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n", type);
         /* bogusDll was registered first, so that should be first */
         ptr = dllBuf;