Fixes #587 - Wasn't picking up TEXT("..") defines

microsoft · Jan 18, 2022 · abf8d16 · abf8d16
1 parent 8f6ce5e
commit abf8d16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
diff --git a/sources/MetadataUtils/ConstantsScraper.cs b/sources/MetadataUtils/ConstantsScraper.cs
@@ -725,7 +725,12 @@ private void ScrapeConstantsFromTraversedFiles(Dictionary<string, string> traver
 
                             if (valueText.StartsWith("__TEXT("))
                             {
-                                valueText = valueText.Substring("__TEXT(".Length);
+                                valueText = valueText.Substring(2);
+                            }
+
+                            if (valueText.StartsWith("TEXT("))
+                            {
+                                valueText = valueText.Substring("TEXT(".Length);
                                 if (valueText.EndsWith(')'))
                                 {
                                     valueText = valueText.Substring(0, valueText.Length - 1);