diff options
| author | Mark Young <marky@lunarg.com> | 2016-01-13 13:47:16 -0700 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2016-01-25 11:01:48 -0700 |
| commit | cda9d8450dd0d15f5f017a47aa3ebb778ea9a2da (patch) | |
| tree | 31b8ed27f32332ab4bb1203e1eb1f5969a5a75bd /loader | |
| parent | 0a6dd5230a9e5d0c9a9039c204f0ebb317accd60 (diff) | |
| download | usermoji-cda9d8450dd0d15f5f017a47aa3ebb778ea9a2da.tar.xz | |
Win32: Get 32-bit Windows build working
Also includes changes to allow simultaneous 32-bit and 64-bit Windows builds.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/debug_report.c | 2 | ||||
| -rw-r--r-- | loader/loader.c | 14 | ||||
| -rw-r--r-- | loader/wsi.c | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c index 9a581688..4345b4ec 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -259,7 +259,7 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( * This is the instance chain terminator function * for DestroyDebugReportCallback */ -VKAPI_ATTR void loader_DestroyDebugReportCallback(VkInstance instance, +VKAPI_ATTR void VKAPI_CALL loader_DestroyDebugReportCallback(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *pAllocator) { uint32_t storage_idx; 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); diff --git a/loader/wsi.c b/loader/wsi.c index 584e3e69..d482d54f 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -203,7 +203,7 @@ VKAPI_ATTR void VKAPI_CALL loader_DestroySurfaceKHR( { struct loader_instance *ptr_instance = loader_get_instance(instance); - loader_heap_free(ptr_instance, surface); + loader_heap_free(ptr_instance, (void *)surface); } /* |