Correct NIN flag type

microsoft · May 3, 2024 · 579cc3e · 579cc3e
1 parent bfce736
commit 579cc3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/generation/WinSDK/ConstantsScraper.settings.rsp b/generation/WinSDK/ConstantsScraper.settings.rsp
@@ -237,8 +237,8 @@ NIN_BALLOONUSERCLICK=int
 NIN_POPUPCLOSE=int
 NIN_POPUPOPEN=int
 NIN_SELECT=int
-NIN_KEY=int
 NIN_KEYSELECT=int
+NINF_KEY=int
 NULLREGION=int
 PDH_ACCESS_DENIED=uint
 PDH_ASYNC_QUERY_TIMEOUT=uint

diff --git a/generation/WinSDK/manual/Shell.cs b/generation/WinSDK/manual/Shell.cs
@@ -16,7 +16,7 @@ public static unsafe partial class Apis
         [NativeTypeName("HRESULT")]
         public const int HLINK_S_FIRST = OLE_S_LAST + 1;
 
-        public const uint NIN_KEYSELECT = NIN_SELECT | NINF_KEY;
+        public const int NIN_KEYSELECT = NIN_SELECT | NINF_KEY;
 
         [DllImport("SHELL32.dll", EntryPoint = "#660", CallingConvention = CallingConvention.StdCall, ExactSpelling = true)]
         public static extern BOOL FileIconInit([In]BOOL fRestoreCache)

diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -302,3 +302,12 @@ Windows.Win32.UI.Shell.Apis.NIN_POPUPCLOSE...System.UInt32 => System.Int32
 Windows.Win32.UI.Shell.Apis.NIN_POPUPOPEN...System.UInt32 => System.Int32
 Windows.Win32.UI.Shell.Apis.NIN_SELECT...System.UInt32 => System.Int32
 Windows.Win32.UI.WindowsAndMessaging.Apis.WM_USER...System.UInt32 => System.Int32
+# Adjust NOTIFYICONDATA flags, types
+Windows.Win32.UI.Shell.NOTIFY_ICON_INFOTIP_FLAGS :  => [Flags]
+Windows.Win32.UI.Shell.NOTIFY_ICON_STATE :  => [Flags]
+Windows.Win32.UI.Shell.NOTIFYICONDATAA.dwStateMask(X64, Arm64)...System.UInt32 => Windows.Win32.UI.Shell.NOTIFY_ICON_STATE
+Windows.Win32.UI.Shell.NOTIFYICONDATAA.dwStateMask(X86)...System.UInt32 => Windows.Win32.UI.Shell.NOTIFY_ICON_STATE
+Windows.Win32.UI.Shell.NOTIFYICONDATAW.dwStateMask(X64, Arm64)...System.UInt32 => Windows.Win32.UI.Shell.NOTIFY_ICON_STATE
+Windows.Win32.UI.Shell.NOTIFYICONDATAW.dwStateMask(X86)...System.UInt32 => Windows.Win32.UI.Shell.NOTIFY_ICON_STATE
+# Correct NIN flag type
+Windows.Win32.UI.Shell.Apis.NINF_KEY...System.UInt32 => System.Int32