blender/blender
141
451
Fork 651
Code Issues 6.5k Pull Requests 824 Projects 18 Wiki Activity

Fix #114906 invalid reuse of shell_link #114924

Merged
Harley Acheson merged 3 commits from LazyDodo/blender:tmp_shell_link into main 2023-11-15 18:32:55 +01:00
Conversation 0 Commits 3 Files Changed 1 +12 -10
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 74ae714982 - Show all commits

22
source/blender/blenlib/intern/winstuff_registration.cc
View File

@ -59,17 +59,19 @@ bool BLI_windows_update_pinned_launcher(const char *launcher_path)
std::wstring search_path = quick_launch_folder_path;
CoTaskMemFree(quick_launch_folder_path);
Microsoft::WRL::ComPtr<IShellLinkW> shell_link;
if (CoCreateInstance(__uuidof(ShellLink), NULL, CLSCTX_ALL, IID_PPV_ARGS(&shell_link)) != S_OK) {
return false;
}
Microsoft::WRL::ComPtr<IPersistFile> persist_file;
if (shell_link.As(&persist_file) != S_OK) {
return false;
}
for (auto const &dir_entry : std::filesystem::recursive_directory_iterator(search_path)) {
Microsoft::WRL::ComPtr<IShellLinkW> shell_link;
if (CoCreateInstance(__uuidof(ShellLink), NULL, CLSCTX_ALL, IID_PPV_ARGS(&shell_link)) != S_OK)
{
return false;
}
Microsoft::WRL::ComPtr<IPersistFile> persist_file;
if (shell_link.As(&persist_file) != S_OK) {
return false;
}
if (persist_file->Load(dir_entry.path().c_str(), STGM_READWRITE) != S_OK) {
continue;
}