Update CsWin32 version

JeremyKuhne · Nov 20, 2024 · 891f9bd · 891f9bd
1 parent c54532b
commit 891f9bd
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 31 deletions.
diff --git a/src/thirtytwo/DeviceContext.cs b/src/thirtytwo/DeviceContext.cs
@@ -143,7 +143,7 @@ public unsafe void Dispose()
     }
 
     public static implicit operator HDC(DeviceContext context) => context.Handle;
-    public static unsafe explicit operator DeviceContext(WPARAM wparam) => Create(new(new(wparam)));
+    public static unsafe explicit operator DeviceContext(WPARAM wparam) => Create(new((nint)wparam));
 
     [Flags]
     private enum ContextState

diff --git a/src/thirtytwo/Wdk/Interop.NtQueryKey.cs b/src/thirtytwo/Wdk/Interop.NtQueryKey.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Runtime.InteropServices;
-using Windows.Wdk.System.SystemServices;
+using Windows.Wdk.System.Registry;
 using Windows.Win32.System.Registry;
 
 namespace Windows.Wdk;

diff --git a/src/thirtytwo/Win32/Foundation/HANDLE.cs b/src/thirtytwo/Win32/Foundation/HANDLE.cs
@@ -10,7 +10,7 @@ namespace Windows.Win32.Foundation;
 {
     public unsafe void Dispose()
     {
-        if (Value != 0 && Value != -1)
+        if ((nint)Value != 0 && (nint)Value != -1)
         {
             Interop.CloseHandle(this).ThrowLastErrorIfFalse();
         }

diff --git a/src/thirtytwo/Win32/Foundation/LRESULT.cs b/src/thirtytwo/Win32/Foundation/LRESULT.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Jeremy W. Kuhne. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Windows.Win32.Foundation;
+
+public unsafe readonly partial struct LRESULT
+{
+    public static explicit operator void*(LRESULT value) => (void*)value.Value;
+    public static explicit operator LRESULT(void* value) => new((nint)value);
+}
diff --git a/src/thirtytwo/Win32/Foundation/WPARAM.cs b/src/thirtytwo/Win32/Foundation/WPARAM.cs
@@ -5,10 +5,10 @@
 
 namespace Windows.Win32.Foundation;
 
-public readonly partial struct WPARAM
+public unsafe readonly partial struct WPARAM
 {
-    public static unsafe implicit operator void*(WPARAM value) => (void*)value.Value;
-    public static unsafe implicit operator WPARAM(void* value) => new((nuint)value);
+    public static implicit operator void*(WPARAM value) => (void*)value.Value;
+    public static implicit operator WPARAM(void* value) => new((nuint)value);
 
     public static explicit operator HWND(WPARAM value) => (HWND)(nint)value.Value;
     public static explicit operator WPARAM(HWND value) => new((nuint)value.Value);

diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HBRUSH.cs b/src/thirtytwo/Win32/Graphics/Gdi/HBRUSH.cs
@@ -24,7 +24,7 @@ public static explicit operator HBRUSH(HGDIOBJ handle)
 
     public void Dispose()
     {
-        if (Value != 0 && Value != -1)
+        if ((nint)Value != 0 && (nint)Value != -1)
         {
             Interop.DeleteObject(this);
             Unsafe.AsRef(in this) = default;

diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HDC.cs b/src/thirtytwo/Win32/Graphics/Gdi/HDC.cs
@@ -5,13 +5,11 @@
 
 namespace Windows.Win32.Graphics.Gdi;
 
-public partial struct HDC : IHandle<HDC>
+public unsafe partial struct HDC : IHandle<HDC>
 {
     HDC IHandle<HDC>.Handle => this;
     object? IHandle<HDC>.Wrapper => null;
 
-    public bool IsNull => Value == 0;
-
     public static explicit operator HDC(HGDIOBJ handle)
     {
         Debug.Assert(handle.IsNull || (OBJ_TYPE)Interop.GetObjectType(handle) == OBJ_TYPE.OBJ_DC);

diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HGDIOBJ.cs b/src/thirtytwo/Win32/Graphics/Gdi/HGDIOBJ.cs
@@ -7,9 +7,9 @@ public unsafe partial struct HGDIOBJ
 {
     public OBJ_TYPE GetObjectType() => (OBJ_TYPE)Interop.GetObjectType(this);
 
-    public static implicit operator HGDIOBJ(StockFont font) => new(Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)font));
-    public static implicit operator HGDIOBJ(StockBrush brush) => new(Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)brush));
-    public static implicit operator HGDIOBJ(SystemColor color) => new(Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)color));
-    public static implicit operator HGDIOBJ(StockPen pen) => new(Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)pen));
-    public static implicit operator HGDIOBJ(GET_STOCK_OBJECT_FLAGS stockObject) => new(Interop.GetStockObject(stockObject));
+    public static implicit operator HGDIOBJ(StockFont font) => new((nint)Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)font));
+    public static implicit operator HGDIOBJ(StockBrush brush) => new((nint)Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)brush));
+    public static implicit operator HGDIOBJ(SystemColor color) => new((nint)Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)color));
+    public static implicit operator HGDIOBJ(StockPen pen) => new((nint)Interop.GetStockObject((GET_STOCK_OBJECT_FLAGS)pen));
+    public static implicit operator HGDIOBJ(GET_STOCK_OBJECT_FLAGS stockObject) => new((nint)Interop.GetStockObject(stockObject));
 }
diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HPEN.cs b/src/thirtytwo/Win32/Graphics/Gdi/HPEN.cs
@@ -21,7 +21,7 @@ public static explicit operator HPEN(HGDIOBJ handle)
 
     public void Dispose()
     {
-        if (Value != 0 && Value != -1)
+        if ((nint)Value != 0 && (nint)Value != -1)
         {
             Interop.DeleteObject(this);
             Unsafe.AsRef(in this) = default;

diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HRGN.cs b/src/thirtytwo/Win32/Graphics/Gdi/HRGN.cs
@@ -26,7 +26,7 @@ public void Dispose()
     /// <summary>
     ///  Special <see cref="HRGN"/> sent during WM_NCPAINT to indicate the entire window.
     /// </summary>
-    public static HRGN Full { get; } = (HRGN)1;
+    public static HRGN Full { get; } = (HRGN)(nint)1;
 
     /// <summary>
     ///  Is special <see cref="HRGN.Full"/> value.

diff --git a/src/thirtytwo/Win32/System/Registry/HKEY.cs b/src/thirtytwo/Win32/System/Registry/HKEY.cs
@@ -5,7 +5,7 @@
 
 namespace Windows.Win32.System.Registry;
 
-public partial struct HKEY : IDisposable
+public unsafe partial struct HKEY : IDisposable
 {
     private const uint REMOTE_HANDLE_TAG = 0x00000001;
     private const uint REG_CLASSES_SPECIAL_TAG = 0x00000002;
@@ -16,13 +16,13 @@ public bool IsPerfKey()
     /// <summary>
     ///  Returns true if the key is from the local machine.
     /// </summary>
-    public bool IsLocalKey => (Value & REMOTE_HANDLE_TAG) == 0;
+    public bool IsLocalKey => ((nuint)Value & REMOTE_HANDLE_TAG) == 0;
 
     /// <summary>
     ///  Returns true if the key is special (notably in <see cref="HKEY.HKEY_CLASSES_ROOT"/>, where
     ///  it might be redirected to per user settings).
     /// </summary>
-    public bool IsSpecialKey => (Value & REG_CLASSES_SPECIAL_TAG) != 0;
+    public bool IsSpecialKey => ((nuint)Value & REG_CLASSES_SPECIAL_TAG) != 0;
 
     public void Dispose()
     {

diff --git a/src/thirtytwo/Win32/System/Registry/Registry.cs b/src/thirtytwo/Win32/System/Registry/Registry.cs
@@ -4,6 +4,7 @@
 using System.Buffers.Binary;
 using System.Runtime.InteropServices;
 using Windows.Support;
+using Windows.Wdk.System.Registry;
 using Windows.Wdk.System.SystemServices;
 
 namespace Windows.Win32.System.Registry;

diff --git a/src/thirtytwo/Win32/UI/HiDpi/DPI_AWARENESS_CONTEXT.cs b/src/thirtytwo/Win32/UI/HiDpi/DPI_AWARENESS_CONTEXT.cs
diff --git a/src/thirtytwo/thirtytwo.csproj b/src/thirtytwo/thirtytwo.csproj
@@ -13,15 +13,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.151">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Win32\UI\HiDpi\" />
   </ItemGroup>
 
 </Project>