More test and product fixes

dotnet · Sep 10, 2022 · ce2d380 · ce2d380
1 parent 6553e58
commit ce2d380
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Windows.Core.Tests/NTStatusFacts.cs b/src/Windows.Core.Tests/NTStatusFacts.cs
@@ -1,4 +1,4 @@
-// Copyright © .NET Foundation and Contributors. All rights reserved.
+// Copyright © .NET Foundation and Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
@@ -139,7 +139,7 @@ public void EqualOperators()
     [Fact]
     public void Severity()
     {
-        Assert.Equal((NTSTATUS.SeverityCode)0xc, new NTSTATUS(0xffffffff).Severity);
+        Assert.Equal((NTSTATUS.SeverityCode)0x3, new NTSTATUS(0xffffffff).Severity);
     }
 
     [Fact]

diff --git a/src/Windows.Core/HResult+FacilityCode.cs b/src/Windows.Core/HResult+FacilityCode.cs
@@ -140,7 +140,7 @@ public enum FacilityCode : uint
             FACILITY_ACTION_QUEUE = 44,
             FACILITY_ACS = 20,
             FACILITY_AAF = 18,
-            FACILITY_NT_BIT = 4096,
+            FACILITY_NT_BIT = 0x10000000,
         }
     }
 }
diff --git a/src/Windows.Core/PInvokeExtensions.cs b/src/Windows.Core/PInvokeExtensions.cs
@@ -35,7 +35,7 @@ public static HResult ToHResult(this Win32ErrorCode error)
             //  (HRESULT)(x) <= 0 ? (HRESULT)(x) : (HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)
             return error <= 0
                 ? (HResult)(int)error
-                : (HResult)(int)(((int)error & 0x0000ffff) | ((int)FACILITY_WIN32 /*<< 16*/) | 0x80000000);
+                : (HResult)(int)(((int)error & 0x0000ffff) | ((int)FACILITY_WIN32 << 16) | 0x80000000);
         }
 
         /// <summary>

diff --git a/src/Windows.Core/PublicAPI.Shipped.txt b/src/Windows.Core/PublicAPI.Shipped.txt
@@ -88,7 +88,7 @@ PInvoke.HResult.FacilityCode.FACILITY_MOBILE = 1793 -> PInvoke.HResult.FacilityC
 PInvoke.HResult.FacilityCode.FACILITY_MSMQ = 14 -> PInvoke.HResult.FacilityCode
 PInvoke.HResult.FacilityCode.FACILITY_NAP = 39 -> PInvoke.HResult.FacilityCode
 PInvoke.HResult.FacilityCode.FACILITY_NDIS = 52 -> PInvoke.HResult.FacilityCode
-PInvoke.HResult.FacilityCode.FACILITY_NT_BIT = 4096 -> PInvoke.HResult.FacilityCode
+PInvoke.HResult.FacilityCode.FACILITY_NT_BIT = 268435456 -> PInvoke.HResult.FacilityCode
 PInvoke.HResult.FacilityCode.FACILITY_NULL = 0 -> PInvoke.HResult.FacilityCode
 PInvoke.HResult.FacilityCode.FACILITY_ONLINE_ID = 134 -> PInvoke.HResult.FacilityCode
 PInvoke.HResult.FacilityCode.FACILITY_OPC = 81 -> PInvoke.HResult.FacilityCode