Skip to content

Fix import of x86 COM Component in ClickOnce Publish #7328

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

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Fix import of x86 COM Component in ClickOnce Publish #7328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 28 additions & 6 deletions src/Tasks/ManifestUtil/ComImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,38 @@ private void CheckForUnknownValues(RegistryKey key, string[] knownNames)
private ClassInfo GetRegisteredClassInfo(Guid clsid)
{
ClassInfo info = null;
RegistryKey userKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\CLASSES\\CLSID");
if (GetRegisteredClassInfo(userKey, clsid, ref info))

using (RegistryKey userKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\CLASSES\\CLSID"))
{
if (GetRegisteredClassInfo(userKey, clsid, ref info))
{
return info;
}
}

using (RegistryKey machineKey = Registry.ClassesRoot.OpenSubKey("CLSID"))
{
return info;
if (GetRegisteredClassInfo(machineKey, clsid, ref info))
{
return info;
}
}
RegistryKey machineKey = Registry.ClassesRoot.OpenSubKey("CLSID");
if (GetRegisteredClassInfo(machineKey, clsid, ref info))

// Check Wow6432Node of HKCR incase the COM reference is to a 32-bit binary.
if (Environment.Is64BitProcess)
{
return info;
using (RegistryKey classesRootKey = RegistryKey.OpenBaseKey(RegistryHive.ClassesRoot, RegistryView.Registry32))
{
using (RegistryKey clsidKey = classesRootKey.OpenSubKey("CLSID"))
{
if (GetRegisteredClassInfo(clsidKey, clsid, ref info))
{
return info;
}
}
}
}

return null;
}

Expand Down