From cda9d8450dd0d15f5f017a47aa3ebb778ea9a2da Mon Sep 17 00:00:00 2001 From: Mark Young Date: Wed, 13 Jan 2016 13:47:16 -0700 Subject: Win32: Get 32-bit Windows build working Also includes changes to allow simultaneous 32-bit and 64-bit Windows builds. --- loader/loader.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'loader/loader.c') diff --git a/loader/loader.c b/loader/loader.c index 0ffc5102..83f1f5a5 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -276,15 +276,9 @@ static char *loader_get_registry_files(const struct loader_instance *inst, char access_flags = KEY_QUERY_VALUE; rtn_value = RegOpenKeyEx(hive, loc, 0, access_flags, &key); if (rtn_value != ERROR_SUCCESS) { - // We didn't find the key. Try the 32-bit hive (where we've seen the - // key end up on some people's systems): - access_flags |= KEY_WOW64_32KEY; - rtn_value = RegOpenKeyEx(hive, loc, 0, access_flags, &key); - if (rtn_value != ERROR_SUCCESS) { - // We still couldn't find the key, so give up: - loc = next; - continue; - } + // We still couldn't find the key, so give up: + loc = next; + continue; } while ((rtn_value = RegEnumValue(key, idx++, name, &name_size, NULL, NULL, (LPBYTE) &value, &value_size)) == ERROR_SUCCESS) { @@ -1570,7 +1564,7 @@ static cJSON *loader_get_json(const struct loader_instance *inst, const char *fi FILE *file; char *json_buf; cJSON *json; - uint64_t len; + size_t len; file = fopen(filename,"rb"); if (!file) { loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, "Couldn't open JSON file %s", filename); -- cgit v1.2.3