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
1 changed files with 13 additions and 11 deletions

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;
}
@ -83,7 +85,7 @@ bool BLI_windows_update_pinned_launcher(const char *launcher_path)
PROPVARIANT app_model;
PropVariantInit(&app_model);
if (property_store->GetValue(PKEY_AppUserModel_ID, &app_model) == S_OK) {
if (std::wstring(BLENDER_WIN_APPID_16) == app_model.bstrVal) {
if (app_model.vt == VT_LPWSTR && std::wstring(BLENDER_WIN_APPID_16) == app_model.pwszVal) {
shell_link->SetPath(launcher_path_w);
persist_file->Save(NULL, TRUE);
}