Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct [Show|Scroll]Window statuses, commands, and flags #1473

Merged
merged 1 commit into from
Feb 18, 2023
Merged

Correct [Show|Scroll]Window statuses, commands, and flags #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 118 additions & 30 deletions generation/WinSDK/enums.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,47 +717,42 @@
},
{
"name": "SHOW_WINDOW_CMD",
"flags": true,
"autoPopulate": {
"filter": "SW_",
"header": "WinUser.h"
},
"members": [
{
"name": "SW_FORCEMINIMIZE",
"value": "11"
},
{
"name": "SW_HIDE",
"value": "0"
},
{
"name": "SW_MAXIMIZE",
"value": "3"
"name": "SW_SHOWNORMAL",
"value": "1"
},
{
"name": "SW_MINIMIZE",
"value": "6"
"name": "SW_NORMAL",
"value": "1"
},
{
"name": "SW_RESTORE",
"value": "9"
"name": "SW_SHOWMINIMIZED",
"value": "2"
},
{
"name": "SW_SHOW",
"value": "5"
"name": "SW_SHOWMAXIMIZED",
"value": "3"
},
{
"name": "SW_SHOWDEFAULT",
"value": "10"
"name": "SW_MAXIMIZE",
"value": "3"
},
{
"name": "SW_SHOWMAXIMIZED",
"value": "3"
"name": "SW_SHOWNOACTIVATE",
"value": "4"
},
{
"name": "SW_SHOWMINIMIZED",
"value": "2"
"name": "SW_SHOW",
"value": "5"
},
{
"name": "SW_MINIMIZE",
"value": "6"
},
{
"name": "SW_SHOWMINNOACTIVE",
Expand All @@ -768,12 +763,20 @@
"value": "8"
},
{
"name": "SW_SHOWNOACTIVATE",
"value": "4"
"name": "SW_RESTORE",
"value": "9"
},
{
"name": "SW_SHOWNORMAL",
"value": "1"
"name": "SW_SHOWDEFAULT",
"value": "10"
},
{
"name": "SW_FORCEMINIMIZE",
"value": "11"
},
{
"name": "SW_MAX",
"value": "11"
}
],
"uses": [
Expand All @@ -785,18 +788,103 @@
"method": "ShowWindowAsync",
"parameter": "nCmdShow"
},
{
"method": "ShellExecuteW",
"parameter": "nShowCmd"
},
{
"struct": "WINDOWPLACEMENT",
"field": "showCmd"
},
{
"interface": "ITextHost",
"method": "TxScrollWindowEx",
"parameter": "fuScroll"
"interface": "IShellLinkW",
"method": "SetShowCmd",
"parameter": "iShowCmd"
},
{
"interface": "IShellLinkW",
"method": "GetShowCmd",
"parameter": "piShowCmd"
},
{
"interface": "IShellLinkA",
"method": "SetShowCmd",
"parameter": "iShowCmd"
},
{
"interface": "IShellLinkA",
"method": "GetShowCmd",
"parameter": "piShowCmd"
},
{
"interface": "IPropertyPage",
"method": "Show",
"parameter": "nCmdShow"
},
{
"interface": "ITfFnConfigure",
"method": "Show",
"parameter": "nCmdShow"
},
{
"interface": "IVideoWindow",
"method": "get_WindowState",
"parameter": "WindowState"
}
]
},
{
"name": "SHOW_WINDOW_STATUS",
"namespace": "Windows.Win32.UI.WindowsAndMessaging",
"members": [
{
"name": "SW_PARENTCLOSING",
"value": "1"
},
{
"name": "SW_OTHERZOOM",
"value": "2"
},
{
"name": "SW_PARENTOPENING",
"value": "3"
},
{
"name": "SW_OTHERUNZOOM",
"value": "4"
}
]
},
{
"name": "SCROLL_WINDOW_FLAGS",
"flags": true,
"members": [
{
"name": "SW_SCROLLCHILDREN",
"value": "1"
},
{
"name": "SW_INVALIDATE",
"value": "2"
},
{
"name": "SW_ERASE",
"value": "4"
},
{
"name": "SW_SMOOTHSCROLL",
"value": "16"
}
],
"uses": [
{
"method": "ScrollWindowEx",
"parameter": "flags"
},
{
"interface": "ITextHost",
"method": "TxScrollWindowEx",
"parameter": "fuScroll"
}
]
},
Expand Down
28 changes: 28 additions & 0 deletions scripts/ChangesSinceLastRelease.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,31 @@ Windows.Win32.UI.Shell.IShellWindows.FindWindowSW : swClass...Int32 => ShellWind
Windows.Win32.UI.Shell.IShellWindows.FindWindowSW : swfwOptions...Int32 => ShellWindowFindWindowOptions
Windows.Win32.UI.Shell.IShellWindows.Register : swClass...Int32 => ShellWindowTypeConstants
Windows.Win32.UI.Shell.IShellWindows.RegisterPending : swClass...Int32 => ShellWindowTypeConstants
# Untangle window scroll/status enums and flags
Windows.Win32.Media.DirectShow.IVideoWindow.get_WindowState : WindowState...Int32* => SHOW_WINDOW_CMD*
Windows.Win32.System.Ole.IPropertyPage.Show : nCmdShow...UInt32 => SHOW_WINDOW_CMD
Windows.Win32.UI.Controls.RichEdit.ITextHost.TxScrollWindowEx : fuScroll...SHOW_WINDOW_CMD => SCROLL_WINDOW_FLAGS
Windows.Win32.UI.Shell.IShellLinkA.GetShowCmd : piShowCmd...Int32* => SHOW_WINDOW_CMD*
Windows.Win32.UI.Shell.IShellLinkA.SetShowCmd : iShowCmd...Int32 => SHOW_WINDOW_CMD
Windows.Win32.UI.Shell.IShellLinkW.GetShowCmd : piShowCmd...Int32* => SHOW_WINDOW_CMD*
Windows.Win32.UI.Shell.IShellLinkW.SetShowCmd : iShowCmd...Int32 => SHOW_WINDOW_CMD
Windows.Win32.UI.WindowsAndMessaging.Apis.ScrollWindowEx : flags...SHOW_WINDOW_CMD => SCROLL_WINDOW_FLAGS
Windows.Win32.UI.WindowsAndMessaging.SCROLL_WINDOW_FLAGS added
Windows.Win32.UI.WindowsAndMessaging.SCROLL_WINDOW_FLAGS.SW_ERASE added
Windows.Win32.UI.WindowsAndMessaging.SCROLL_WINDOW_FLAGS.SW_INVALIDATE added
Windows.Win32.UI.WindowsAndMessaging.SCROLL_WINDOW_FLAGS.SW_SCROLLCHILDREN added
Windows.Win32.UI.WindowsAndMessaging.SCROLL_WINDOW_FLAGS.SW_SMOOTHSCROLL added
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD : [Flags] =>
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_ERASE removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_INVALIDATE removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_OTHERUNZOOM removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_OTHERZOOM removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_PARENTCLOSING removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_PARENTOPENING removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_SCROLLCHILDREN removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_CMD.SW_SMOOTHSCROLL removed
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_STATUS added
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_STATUS.SW_OTHERUNZOOM added
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_STATUS.SW_OTHERZOOM added
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_STATUS.SW_PARENTCLOSING added
Windows.Win32.UI.WindowsAndMessaging.SHOW_WINDOW_STATUS.SW_PARENTOPENING added