Commit 2b6c4c0b authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

crypt32: Replace long with a better type.

parent 7faa2cb7
...@@ -197,7 +197,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, ...@@ -197,7 +197,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet,
struct OIDFunctionSet *set = hFuncSet; struct OIDFunctionSet *set = hFuncSet;
char *keyName; char *keyName;
HKEY key; HKEY key;
long rc; LSTATUS rc;
TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList, TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList,
pcchDllList); pcchDllList);
...@@ -299,7 +299,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID, ...@@ -299,7 +299,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID,
char *keyName; char *keyName;
const char *funcName; const char *funcName;
HKEY key; HKEY key;
long rc; LSTATUS rc;
keyName = CRYPT_GetKeyName(dwEncodingType, szFuncName, pszOID); keyName = CRYPT_GetKeyName(dwEncodingType, szFuncName, pszOID);
rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key);
......
...@@ -384,7 +384,7 @@ static void test_registerDefaultOIDFunction(void) ...@@ -384,7 +384,7 @@ static void test_registerDefaultOIDFunction(void)
static const char func[] = "CertDllOpenStoreProv"; static const char func[] = "CertDllOpenStoreProv";
char buf[MAX_PATH]; char buf[MAX_PATH];
BOOL ret; BOOL ret;
long rc; LSTATUS rc;
HKEY key; HKEY key;
ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL); ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL);
...@@ -419,7 +419,7 @@ static void test_registerDefaultOIDFunction(void) ...@@ -419,7 +419,7 @@ static void test_registerDefaultOIDFunction(void)
ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError());
sprintf(buf, fmt, 0, func); sprintf(buf, fmt, 0, func);
rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key); 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) if (rc == 0)
{ {
static const CHAR dllA[] = "Dll"; static const CHAR dllA[] = "Dll";
...@@ -432,7 +432,7 @@ static void test_registerDefaultOIDFunction(void) ...@@ -432,7 +432,7 @@ static void test_registerDefaultOIDFunction(void)
size = sizeof(dllBuf) / sizeof(dllBuf[0]); size = sizeof(dllBuf) / sizeof(dllBuf[0]);
rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size); rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size);
ok(rc == 0, 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); ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n", type);
/* bogusDll was registered first, so that should be first */ /* bogusDll was registered first, so that should be first */
ptr = dllBuf; ptr = dllBuf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment