Skip to content

Update the ResourceData API #105416

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
AaronRobinsonMSFT merged 8 commits into from
Jul 25, 2024
Merged

Update the ResourceData API #105416

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9465909
Update the ResourceData API
AaronRobinsonMSFT Jul 24, 2024
c70f613
More precisely implement the upper semantic
AaronRobinsonMSFT Jul 24, 2024
d763cf0
Missed namespaces
AaronRobinsonMSFT Jul 24, 2024
0bb8b65
Feedback
AaronRobinsonMSFT Jul 24, 2024
9433830
Add comment.
AaronRobinsonMSFT Jul 24, 2024
ce9630c
Fix build.
AaronRobinsonMSFT Jul 24, 2024
ff32bcc
Add test
AaronRobinsonMSFT Jul 24, 2024
9433470
Remove API and test changes.
AaronRobinsonMSFT Jul 25, 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
23 changes: 21 additions & 2 deletions src/coreclr/tools/Common/Compiler/Win32Resources/ResourceData.UpdateResourceDataModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ private void AddResourceInternal(object name, object type, ushort language, byte
}
else
{
Debug.Assert(type is string);
type = ToUpperForResource((string)type);
if (!_resTypeHeadName.TryGetValue((string)type, out resType))
{
resType = new ResType();
Expand All @@ -45,6 +47,8 @@ private void AddResourceInternal(object name, object type, ushort language, byte
}
else
{
Debug.Assert(name is string);
name = ToUpperForResource((string)name);
if (!resType.NameHeadName.TryGetValue((string)name, out resName))
{
resName = new ResName();
Expand All @@ -63,8 +67,10 @@ private byte[] FindResourceInternal(object name, object type, ushort language)
{
_resTypeHeadID.TryGetValue((ushort)type, out resType);
}
if (type is string)
else
{
Debug.Assert(type is string);
type = ToUpperForResource((string)type);
_resTypeHeadName.TryGetValue((string)type, out resType);
}

Expand All @@ -77,8 +83,10 @@ private byte[] FindResourceInternal(object name, object type, ushort language)
{
resType.NameHeadID.TryGetValue((ushort)name, out resName);
}
if (name is string)
else
{
Debug.Assert(name is string);
name = ToUpperForResource((string)name);
resType.NameHeadName.TryGetValue((string)name, out resName);
}

Expand All @@ -90,5 +98,16 @@ private byte[] FindResourceInternal(object name, object type, ushort language)

return (byte[])resLanguage.DataEntry.Clone();
}

private static string ToUpperForResource(string str)
{
// Undocumented semantic for Win32 Resource APIs
StringBuilder builder = new(str.Length);
foreach (char c in str)
{
builder.Append('a' <= c && c <= 'z' ? char.ToUpper(c) : c);
}
return builder.ToString();
}
}
}
2 changes: 1 addition & 1 deletion src/installer/managed/Microsoft.NET.HostModel/ComHost/ComHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static void Create(
if (tlbFileBytes.Length == 0)
throw new InvalidTypeLibraryException(typeLibrary.Value);

updater.AddResource(tlbFileBytes, "typelib", (IntPtr)typeLibrary.Key);
updater.AddResource(tlbFileBytes, "TYPELIB", (IntPtr)typeLibrary.Key);
}
catch (FileNotFoundException ex)
{
Expand Down