ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1809 from Kelimion/ms_craziness

Browse Source 
Refactor ms_craziness.h
This commit is contained in:
Jeroen van Rijn
2022-05-27 15:53:49 +02:00
committed by GitHub
parent 337780497d f137b927b6
commit 34f1bda57c
2 changed files with 402 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+1 -7
View File
@@ -1227,6 +1227,7 @@ bool init_build_paths(String init_filename) {
if ((bc->command_kind & Command__does_build) && (!bc->ignore_microsoft_magic)) { if ((bc->command_kind & Command__does_build) && (!bc->ignore_microsoft_magic)) {
// NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest.
Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8();
defer (mc_free_all());
if (find_result.windows_sdk_version == 0) { if (find_result.windows_sdk_version == 0) {
gb_printf_err("Windows SDK not found.\n"); gb_printf_err("Windows SDK not found.\n");
@@ -1256,13 +1257,6 @@ bool init_build_paths(String init_filename) {
bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path); bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path);
} }
} }
gb_free(ha, find_result.windows_sdk_root.text);
gb_free(ha, find_result.windows_sdk_um_library_path.text);
gb_free(ha, find_result.windows_sdk_ucrt_library_path.text);
gb_free(ha, find_result.vs_exe_path.text);
gb_free(ha, find_result.vs_library_path.text);
} }
#endif #endif
src/microsoft_craziness.h
+131 -113
View File
@@ -45,8 +45,6 @@
// //
// Here is the API you need to know about: // Here is the API you need to know about:
// //
gb_global gbAllocator mc_allocator = heap_allocator(); gb_global gbAllocator mc_allocator = heap_allocator();
struct Find_Result { struct Find_Result {
@@ -71,27 +69,68 @@ struct Find_Result_Utf8 {
String vs_library_path; String vs_library_path;
}; };
Find_Result find_visual_studio_and_windows_sdk();
Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8(); Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8();
void free_resources(Find_Result *result) { String mc_wstring_to_string(wchar_t const *str) {
// free(result->windows_sdk_root); return string16_to_string(mc_allocator, make_string16_c(str));
// free(result->windows_sdk_um_library_path);
// free(result->windows_sdk_ucrt_library_path);
// free(result->vs_exe_path);
// free(result->vs_library_path);
} }
void free_resources(Find_Result_Utf8 *result) { String16 mc_string_to_wstring(String str) {
// gbAllocator a = heap_allocator(); return string_to_string16(mc_allocator, str);
// gb_free(a, result->windows_sdk_root.text);
// gb_free(a, result->windows_sdk_um_library_path.text);
// gb_free(a, result->windows_sdk_ucrt_library_path.text);
// gb_free(a, result->vs_exe_path.text);
// gb_free(a, result->vs_library_path.text);
} }
String mc_concat(String a, String b) {
return concatenate_strings(mc_allocator, a, b);
}
String mc_concat(String a, String b, String c) {
return concatenate3_strings(mc_allocator, a, b, c);
}
void mc_free(String str) {
gb_free(mc_allocator, str.text);
}
void mc_free(String16 str) {
gb_free(mc_allocator, str.text);
}
void mc_free_all() {
gb_free_all(mc_allocator);
}
typedef struct _MC_Find_Data {
DWORD file_attributes;
String filename;
} MC_Find_Data;
HANDLE mc_find_first(String wildcard, MC_Find_Data *find_data) {
WIN32_FIND_DATAW _find_data;
String16 wildcard_wide = mc_string_to_wstring(wildcard);
defer (mc_free(wildcard_wide));
HANDLE handle = FindFirstFileW(wildcard_wide.text, &_find_data);
if (handle == INVALID_HANDLE_VALUE) return false;
find_data->file_attributes = _find_data.dwFileAttributes;
find_data->filename = mc_wstring_to_string(_find_data.cFileName);
return handle;
}
bool mc_find_next(HANDLE handle, MC_Find_Data *find_data) {
WIN32_FIND_DATAW _find_data;
bool success = FindNextFileW(handle, &_find_data);
find_data->file_attributes = _find_data.dwFileAttributes;
find_data->filename = mc_wstring_to_string(_find_data.cFileName);
return success;
}
void mc_find_close(HANDLE handle) {
FindClose(handle);
}
// //
// Call find_visual_studio_and_windows_sdk, look at the resulting // Call find_visual_studio_and_windows_sdk, look at the resulting
@@ -214,69 +253,76 @@ wchar_t *concat(wchar_t const *a, wchar_t const *b, wchar_t const *c = nullptr,
return result; return result;
} }
typedef void (*Visit_Proc_W)(wchar_t const *short_name, wchar_t const *full_name, Version_Data *data); struct Version_Data_Utf8 {
bool visit_files_w(wchar_t const *dir_name, Version_Data *data, Visit_Proc_W proc) { i32 best_version[4]; // For Windows 8 versions, only two of these numbers are used.
String best_name;
};
typedef void (*MC_Visit_Proc)(String short_name, String full_name, Version_Data_Utf8 *data);
bool mc_visit_files(String dir_name, Version_Data_Utf8 *data, MC_Visit_Proc proc) {
// Visit everything in one folder (non-recursively). If it's a directory // Visit everything in one folder (non-recursively). If it's a directory
// that doesn't start with ".", call the visit proc on it. The visit proc // that doesn't start with ".", call the visit proc on it. The visit proc
// will see if the filename conforms to the expected versioning pattern. // will see if the filename conforms to the expected versioning pattern.
auto wildcard_name = concat(dir_name, L"\\*"); String wildcard_name = mc_concat(dir_name, str_lit("\\*"));
defer (free(wildcard_name)); defer (mc_free(wildcard_name));
WIN32_FIND_DATAW find_data; MC_Find_Data find_data;
auto handle = FindFirstFileW(wildcard_name, &find_data);
HANDLE handle = mc_find_first(wildcard_name, &find_data);
if (handle == INVALID_HANDLE_VALUE) return false; if (handle == INVALID_HANDLE_VALUE) return false;
while (true) { bool success = true;
if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (find_data.cFileName[0] != '.')) { while (success) {
auto full_name = concat(dir_name, L"\\", find_data.cFileName); if ((find_data.file_attributes & FILE_ATTRIBUTE_DIRECTORY) && (find_data.filename[0] != '.')) {
defer (free(full_name)); String full_name = mc_concat(dir_name, str_lit("\\"), find_data.filename);
defer (mc_free(full_name));
proc(find_data.cFileName, full_name, data); proc(find_data.filename, full_name, data);
} }
auto success = FindNextFileW(handle, &find_data); success = mc_find_next(handle, &find_data);
if (!success) break; if (!success) break;
} }
mc_find_close(handle);
FindClose(handle);
return true; return true;
} }
String find_windows_kit_root(HKEY key, String const version) {
wchar_t *find_windows_kit_root(HKEY key, wchar_t const *version) {
// Given a key to an already opened registry entry, // Given a key to an already opened registry entry,
// get the value stored under the 'version' subkey. // get the value stored under the 'version' subkey.
// If that's not the right terminology, hey, I never do registry stuff. // If that's not the right terminology, hey, I never do registry stuff.
char *version_str = (char*)version.text;
DWORD required_length; DWORD required_length;
auto rc = RegQueryValueExW(key, version, NULL, NULL, NULL, &required_length); auto rc = RegQueryValueExA(key, version_str, NULL, NULL, NULL, &required_length);
if (rc != 0) return NULL; if (rc != 0) return {};
DWORD length = required_length + 2; // The +2 is for the maybe optional zero later on. Probably we are over-allocating. DWORD length = required_length + 2; // The +2 is for the maybe optional zero later on. Probably we are over-allocating.
wchar_t *value = (wchar_t *)calloc(1, length); char *c_str = gb_alloc_array(mc_allocator, char, length);
if (!value) return NULL;
rc = RegQueryValueExW(key, version, NULL, NULL, (LPBYTE)value, &length); // We know that version is zero-terminated... rc = RegQueryValueExA(key, version_str, NULL, NULL, (LPBYTE)c_str, &length); // We know that version is zero-terminated...
if (rc != 0) return NULL; if (rc != 0) return {};
// The documentation says that if the string for some reason was not stored // The documentation says that if the string for some reason was not stored
// with zero-termination, we need to manually terminate it. Sigh!! // with zero-termination, we need to manually terminate it. Sigh!!
if (value[length]) { if (c_str[required_length]) {
value[length+1] = 0; c_str[required_length+1] = 0;
} }
String value = make_string_c(c_str);
return value; return value;
} }
void win10_best(wchar_t const *short_name, wchar_t const *full_name, Version_Data *data) { void win10_best(String short_name, String full_name, Version_Data_Utf8 *data) {
// Find the Windows 10 subdirectory with the highest version number. // Find the Windows 10 subdirectory with the highest version number.
int i0, i1, i2, i3; int i0, i1, i2, i3;
auto success = swscanf_s(short_name, L"%d.%d.%d.%d", &i0, &i1, &i2, &i3); auto success = sscanf_s((const char *const)short_name.text, "%d.%d.%d.%d", &i0, &i1, &i2, &i3);
if (success < 4) return; if (success < 4) return;
if (i0 < data->best_version[0]) return; if (i0 < data->best_version[0]) return;
@@ -292,10 +338,11 @@ void win10_best(wchar_t const *short_name, wchar_t const *full_name, Version_Dat
// we have to copy_string and free here because visit_files free's the full_name string // we have to copy_string and free here because visit_files free's the full_name string
// after we execute this function, so Win*_Data would contain an invalid pointer. // after we execute this function, so Win*_Data would contain an invalid pointer.
if (data->best_name) free((void *)data->best_name); if (data->best_name.len > 0) mc_free(data->best_name);
data->best_name = _wcsdup(full_name);
if (data->best_name) { data->best_name = copy_string(mc_allocator, full_name);
if (data->best_name.len > 0) {
data->best_version[0] = i0; data->best_version[0] = i0;
data->best_version[1] = i1; data->best_version[1] = i1;
data->best_version[2] = i2; data->best_version[2] = i2;
@@ -303,11 +350,11 @@ void win10_best(wchar_t const *short_name, wchar_t const *full_name, Version_Dat
} }
} }
void win8_best(wchar_t const *short_name, wchar_t const *full_name, Version_Data *data) { void win8_best(String short_name, String full_name, Version_Data_Utf8 *data) {
// Find the Windows 8 subdirectory with the highest version number. // Find the Windows 8 subdirectory with the highest version number.
int i0, i1; int i0, i1;
auto success = swscanf_s(short_name, L"winv%d.%d", &i0, &i1); auto success = sscanf_s((const char *const)short_name.text, "winv%d.%d", &i0, &i1);
if (success < 2) return; if (success < 2) return;
if (i0 < data->best_version[0]) return; if (i0 < data->best_version[0]) return;
@@ -317,16 +364,16 @@ void win8_best(wchar_t const *short_name, wchar_t const *full_name, Version_Data
// we have to copy_string and free here because visit_files free's the full_name string // we have to copy_string and free here because visit_files free's the full_name string
// after we execute this function, so Win*_Data would contain an invalid pointer. // after we execute this function, so Win*_Data would contain an invalid pointer.
if (data->best_name) free((void *)data->best_name); if (data->best_name.len > 0) mc_free(data->best_name);
data->best_name = _wcsdup(full_name); data->best_name = copy_string(mc_allocator, full_name);
if (data->best_name) { if (data->best_name.len > 0) {
data->best_version[0] = i0; data->best_version[0] = i0;
data->best_version[1] = i1; data->best_version[1] = i1;
} }
} }
void find_windows_kit_root(Find_Result *result) { void find_windows_kit_root(Find_Result_Utf8 *result) {
// Information about the Windows 10 and Windows 8 development kits // Information about the Windows 10 and Windows 8 development kits
// is stored in the same place in the registry. We open a key // is stored in the same place in the registry. We open a key
// to that place, first checking preferntially for a Windows 10 kit, // to that place, first checking preferntially for a Windows 10 kit,
@@ -340,48 +387,45 @@ void find_windows_kit_root(Find_Result *result) {
defer (RegCloseKey(main_key)); defer (RegCloseKey(main_key));
// Look for a Windows 10 entry. // Look for a Windows 10 entry.
auto windows10_root = find_windows_kit_root(main_key, L"KitsRoot10"); String windows10_root = find_windows_kit_root(main_key, str_lit("KitsRoot10"));
if (windows10_root.len > 0) {
defer (mc_free(windows10_root));
if (windows10_root) { String windows10_lib = mc_concat(windows10_root, str_lit("Lib"));
defer (free(windows10_root)); defer (mc_free(windows10_lib));
Version_Data_Utf8 data = {0};
Version_Data data = {0}; mc_visit_files(windows10_lib, &data, win10_best);
auto windows10_lib = concat(windows10_root, L"Lib"); if (data.best_name.len > 0) {
defer (free(windows10_lib));
visit_files_w(windows10_lib, &data, win10_best);
if (data.best_name) {
result->windows_sdk_version = 10; result->windows_sdk_version = 10;
result->windows_sdk_root = concat(data.best_name, L"\\"); result->windows_sdk_root = mc_concat(data.best_name, str_lit("\\"));
return; return;
} }
mc_free(data.best_name);
} }
// Look for a Windows 8 entry. // Look for a Windows 8 entry.
auto windows8_root = find_windows_kit_root(main_key, L"KitsRoot81"); String windows8_root = find_windows_kit_root(main_key, str_lit("KitsRoot81"));
if (windows8_root) { if (windows8_root.len > 0) {
defer (free(windows8_root)); defer (mc_free(windows8_root));
auto windows8_lib = concat(windows8_root, L"Lib"); String windows8_lib = mc_concat(windows8_root, str_lit("Lib"));
defer (free(windows8_lib)); defer (mc_free(windows8_lib));
Version_Data data = {0}; Version_Data_Utf8 data = {0};
visit_files_w(windows8_lib, &data, win8_best); mc_visit_files(windows8_lib, &data, win8_best);
if (data.best_name) { if (data.best_name.len > 0) {
result->windows_sdk_version = 8; result->windows_sdk_version = 8;
result->windows_sdk_root = concat(data.best_name, L"\\"); result->windows_sdk_root = mc_concat(data.best_name, str_lit("\\"));
return; return;
} }
mc_free(data.best_name);
} }
// If we get here, we failed to find anything. // If we get here, we failed to find anything.
} }
bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *result) { bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *result) {
// The name of this procedure is kind of cryptic. Its purpose is // The name of this procedure is kind of cryptic. Its purpose is
// to fight through Microsoft craziness. The things that the fine // to fight through Microsoft craziness. The things that the fine
@@ -543,7 +587,6 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
result->vs_exe_path = concat(buffer, L"VC\\bin\\"); result->vs_exe_path = concat(buffer, L"VC\\bin\\");
} else if (build_context.metrics.arch == TargetArch_i386) { } else if (build_context.metrics.arch == TargetArch_i386) {
// result->vs_exe_path = concat(buffer, L"VC\\bin\\amd64_x86\\");
result->vs_exe_path = concat(buffer, L"VC\\bin\\x86_amd64\\"); result->vs_exe_path = concat(buffer, L"VC\\bin\\x86_amd64\\");
} else { } else {
continue; continue;
@@ -555,57 +598,33 @@ bool find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result *res
free(lib_path); free(lib_path);
} }
// If we get here, we failed to find anything. // If we get here, we failed to find anything.
} }
return false; return false;
} }
Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8() {
Find_Result_Utf8 r = {};
find_windows_kit_root(&r);
Find_Result find_visual_studio_and_windows_sdk() { if (r.windows_sdk_root.len > 0) {
Find_Result result = {};
find_windows_kit_root(&result);
if (result.windows_sdk_root) {
if (build_context.metrics.arch == TargetArch_amd64) { if (build_context.metrics.arch == TargetArch_amd64) {
result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x64\\"); r.windows_sdk_um_library_path = mc_concat(r.windows_sdk_root, str_lit("um\\x64\\"));
result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x64\\"); r.windows_sdk_ucrt_library_path = mc_concat(r.windows_sdk_root, str_lit("ucrt\\x64\\"));
} else if (build_context.metrics.arch == TargetArch_i386) { } else if (build_context.metrics.arch == TargetArch_i386) {
result.windows_sdk_um_library_path = concat(result.windows_sdk_root, L"um\\x86\\"); r.windows_sdk_um_library_path = mc_concat(r.windows_sdk_root, str_lit("um\\x86\\"));
result.windows_sdk_ucrt_library_path = concat(result.windows_sdk_root, L"ucrt\\x86\\"); r.windows_sdk_ucrt_library_path = mc_concat(r.windows_sdk_root, str_lit("ucrt\\x86\\"));
} }
} }
Find_Result result = {};
bool ok = find_visual_studio_by_fighting_through_microsoft_craziness(&result); bool ok = find_visual_studio_by_fighting_through_microsoft_craziness(&result);
if (!ok) { if (ok) {
result.vs_exe_path = concat(L"", L"");
result.vs_library_path = concat(L"", L"");
}
return result;
}
String mc_wstring_to_string(wchar_t const *str) {
return string16_to_string(mc_allocator, make_string16_c(str));
}
Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8() {
Find_Result result = find_visual_studio_and_windows_sdk();
defer (free_resources(&result));
Find_Result_Utf8 r = {};
r.windows_sdk_version = result.windows_sdk_version;
r.windows_sdk_root = mc_wstring_to_string(result.windows_sdk_root);
r.windows_sdk_um_library_path = mc_wstring_to_string(result.windows_sdk_um_library_path);
r.windows_sdk_ucrt_library_path = mc_wstring_to_string(result.windows_sdk_ucrt_library_path);
r.vs_exe_path = mc_wstring_to_string(result.vs_exe_path); r.vs_exe_path = mc_wstring_to_string(result.vs_exe_path);
r.vs_library_path = mc_wstring_to_string(result.vs_library_path); r.vs_library_path = mc_wstring_to_string(result.vs_library_path);
}
#if 0 #if 0
printf("windows_sdk_root: %.*s\n", LIT(r.windows_sdk_root)); printf("windows_sdk_root: %.*s\n", LIT(r.windows_sdk_root));
@@ -619,4 +638,3 @@ Find_Result_Utf8 find_visual_studio_and_windows_sdk_utf8() {
return r; return r;
} }