Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

find_visual_studio_and_windows_sdk() now returns the newest available version of Visual Studio instead of the first found #4085

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

find_visual_studio_and_windows_sdk() now returns the newest available version of Visual Studio instead of the first found #4085

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba1dc2
find_visual_studio_and_windows_sdk() now returns the newest available…
lilulo Aug 16, 2024
28ab944
Changed name of the variable to be in line with the rest of the code
ikozhurin Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 46 additions & 10 deletions src/microsoft_craziness.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
//
// I don't claim that this is the absolute best way to solve this problem,
// and so far we punt on things (if you have multiple versions of Visual Studio
// installed, we return the first one, rather than the newest). But it
// will solve the basic problem for you as simply as I know how to do it,
// installed, we return the newest one, which may not be compatible with Odin's codebase).
// But it will solve the basic problem for you as simply as I know how to do it,
// and because there isn't too much code here, it's easy to modify and expand.
//
//
Expand Down Expand Up @@ -387,6 +387,8 @@ gb_internal bool find_visual_studio_by_fighting_through_microsoft_craziness(Find
if (!instances) return false;
defer (instances->Release());

// First, find the newest Visual Studio version by looping through all existing instances.
int vs_newest_version = 0;
for (;;) {
ULONG found = 0;
ISetupInstance *instance = NULL;
Expand All @@ -395,6 +397,47 @@ gb_internal bool find_visual_studio_by_fighting_through_microsoft_craziness(Find

defer (instance->Release());

wchar_t* inst_version_wide;
hr = instance->GetInstallationVersion(&inst_version_wide);
if (hr != S_OK) continue;
defer (SysFreeString(inst_version_wide));

int i0, i1, i2, i3;
auto success = swscanf_s(inst_version_wide, L"%d.%d.%d.%d", &i0, &i1, &i2, &i3);
if (success < 4) continue;

// We only interested in major version number.
if (i0 > vs_newest_version) {
vs_newest_version = i0;
}
}

// Reset the enumerator to start from the beginning.
instances->Reset();

// Now loop through all instances again to find the chosen version and read its properties.
for (;;) {
ULONG found = 0;
ISetupInstance *instance = NULL;
auto hr = instances->Next(1, &instance, &found);
if (hr != S_OK) break;

defer (instance->Release());

wchar_t* inst_version_wide;
hr = instance->GetInstallationVersion(&inst_version_wide);
if (hr != S_OK) continue;
defer (SysFreeString(inst_version_wide));

int i0, i1, i2, i3;
auto success = swscanf_s(inst_version_wide, L"%d.%d.%d.%d", &i0, &i1, &i2, &i3);
if (success < 4) continue;

if (i0 != vs_newest_version) {
// Skip until we find the newest version.
continue;
}

wchar_t* inst_path_wide;
hr = instance->GetInstallationPath(&inst_path_wide);
if (hr != S_OK) continue;
Expand Down Expand Up @@ -438,13 +481,6 @@ gb_internal bool find_visual_studio_by_fighting_through_microsoft_craziness(Find
result->vs_library_path = library_path;
return true;
}
/*
Ryan Saunderson said:
"Clang uses the 'SetupInstance->GetInstallationVersion' / ISetupHelper->ParseVersion to find the newest version
and then reads the tools file to define the tools path - which is definitely better than what i did."

So... @Incomplete: Should probably pick the newest version...
*/
}
}

Expand Down Expand Up @@ -785,4 +821,4 @@ gb_internal Find_Result find_visual_studio_and_windows_sdk() {
#endif

return r;
}
}