diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-04-28 15:57:32 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-29 14:41:47 -0600 |
| commit | 52d30fa5cf4c1ef5ecab52e83097c2dd48551016 (patch) | |
| tree | aa7d0a37ee20e7699c727d43be6caf024f1b790e /loader/loader.c | |
| parent | 8ccaebdf2ed194a27a97be3b8f987275123c3469 (diff) | |
| download | usermoji-52d30fa5cf4c1ef5ecab52e83097c2dd48551016.tar.xz | |
loader: Eliminate compiler warnings on Windows.
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/loader/loader.c b/loader/loader.c index fc5fc6eb..a30ddf38 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -125,7 +125,7 @@ char *loader_get_registry_string(const HKEY hive, DWORD access_flags = KEY_QUERY_VALUE; DWORD value_type; HKEY key; - LONG rtn_value; + VkResult rtn_value; char *rtn_str = NULL; DWORD rtn_len = 0; size_t allocated_len = 0; @@ -143,14 +143,14 @@ char *loader_get_registry_string(const HKEY hive, } rtn_value = RegQueryValueEx(key, value, NULL, &value_type, - (PVOID) rtn_str, &rtn_len); + (PVOID) rtn_str, (LPDWORD) &rtn_len); if (rtn_value == ERROR_SUCCESS) { // If we get to here, we found the key, and need to allocate memory // large enough for rtn_str, and query again: allocated_len = rtn_len + 4; rtn_str = malloc(allocated_len); rtn_value = RegQueryValueEx(key, value, NULL, &value_type, - (PVOID) rtn_str, &rtn_len); + (PVOID) rtn_str, (LPDWORD) &rtn_len); if (rtn_value == ERROR_SUCCESS) { // We added 4 extra bytes to rtn_str, so that we can ensure that // the string is NULL-terminated (albeit, in a brute-force manner): @@ -184,7 +184,7 @@ static char *loader_get_registry_and_env(const char *env_var, registry_str = loader_get_registry_string(HKEY_LOCAL_MACHINE, "Software\\Vulkan", registry_value); - registry_len = (registry_str) ? strlen(registry_str) : 0; + registry_len = (registry_str) ? (DWORD) strlen(registry_str) : 0; rtn_len = env_len + registry_len + 1; if (rtn_len <= 2) { |