Merge pull request #921 from microsoft/fix915

Update metadata to 49.0.21-preview
microsoft · Apr 27, 2023 · fb94769 · fb94769
2 parents be175b7 + 53fc6d0
commit fb94769
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
-    <MetadataVersion>46.0.5-preview</MetadataVersion>
+    <MetadataVersion>49.0.21-preview</MetadataVersion>
     <!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
     <ApiDocsVersion>0.1.12-alpha</ApiDocsVersion>
 

diff --git a/src/Microsoft.Windows.CsWin32/Generator.Invariants.cs b/src/Microsoft.Windows.CsWin32/Generator.Invariants.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Windows.CsWin32;
 
 public partial class Generator
 {
-    internal const string InteropDecorationNamespace = "Windows.Win32.Interop";
+    internal const string InteropDecorationNamespace = "Windows.Win32.Foundation.Metadata";
     internal const string NativeArrayInfoAttribute = "NativeArrayInfoAttribute";
     internal const string RAIIFreeAttribute = "RAIIFreeAttribute";
     internal const string DoNotReleaseAttribute = "DoNotReleaseAttribute";

diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -456,6 +456,12 @@ public void GenerateAllInteropTypes(CancellationToken cancellationToken)
                 continue;
             }
 
+            if (this.Reader.StringComparer.Equals(typeDef.Namespace, InteropDecorationNamespace))
+            {
+                // Ignore the attributes that describe the metadata.
+                continue;
+            }
+
             if (this.IsCompatibleWithPlatform(typeDef.GetCustomAttributes()))
             {
                 try

diff --git a/src/Microsoft.Windows.CsWin32/MetadataIndex.cs b/src/Microsoft.Windows.CsWin32/MetadataIndex.cs
@@ -94,7 +94,7 @@ private MetadataIndex(string metadataPath, Platform? platform)
                         var trh = (TypeReferenceHandle)memberReference.Parent;
                         TypeReference tr = mr.GetTypeReference(trh);
                         if (mr.StringComparer.Equals(tr.Name, "SupportedArchitectureAttribute") &&
-                            mr.StringComparer.Equals(tr.Namespace, "Windows.Win32.Interop"))
+                            mr.StringComparer.Equals(tr.Namespace, Generator.InteropDecorationNamespace))
                         {
                             this.SupportedArchitectureAttributeCtor = memberRefHandle;
                             break;

diff --git a/test/GenerationSandbox.Tests/GeneratedForm.cs b/test/GenerationSandbox.Tests/GeneratedForm.cs
@@ -35,7 +35,7 @@ private static void WPARAM_From_NInt()
 
     private static void FARPROC_InSignatureChangedToIntPtr()
     {
-        FARPROC p = PInvoke.GetProcAddress(default(HINSTANCE), default(PCSTR));
+        FARPROC p = PInvoke.GetProcAddress(default(HMODULE), default(PCSTR));
         p = PInvoke.GetProcAddress(default(SafeHandle), null);
     }
 

diff --git a/test/Microsoft.Windows.CsWin32.Tests/HandleTests.cs b/test/Microsoft.Windows.CsWin32.Tests/HandleTests.cs
@@ -111,7 +111,7 @@ public void HandleStructsHaveIsNullProperty(string handleName)
     [Theory]
     [InlineData("HANDLE")]
     [InlineData("HGDIOBJ")]
-    [InlineData("HINSTANCE")]
+    [InlineData("HMODULE")]
     public void HandleStructsHaveStaticNullMember(string handleName)
     {
         // A null HGDIOBJ has a specific meaning beyond just the concept of an invalid handle:

diff --git a/test/SpellChecker/Program.cs b/test/SpellChecker/Program.cs
@@ -29,7 +29,7 @@
     Span<PWSTR> suggestionResult = new PWSTR[1];
     while (true)
     {
-        if (errors.Next() is not ISpellingError error)
+        if (errors.Next(out ISpellingError error).ThrowOnFailure() == HRESULT.S_FALSE)
         {
             break;
         }

diff --git a/test/WinRTInteropTest/NativeMethods.txt b/test/WinRTInteropTest/NativeMethods.txt
@@ -10,8 +10,8 @@ EndPaint
 GetMessage
 GetModuleHandle
 HDC
-HINSTANCE
 HMENU
+HMODULE
 HWND
 ICompositorDesktopInterop
 IDC_ARROW