windows:  clean up windows compile issues

Conflicts:
	layers/object_track.h
	vk-layer-generate.py
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index e6b6753..39a48bf 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1760,6 +1760,7 @@
     }
     loader_platform_thread_unlock_mutex(&globalLock);
     VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->DestroyFramebuffer(device, framebuffer);
+    return result;
 }
 
 VK_LAYER_EXPORT VkResult VKAPI vkDestroyDynamicViewportState(VkDevice device, VkDynamicViewportState dynamicViewportState)