More and more WinForms enums #1245

chenss3 · 2022-09-12T20:32:28Z

Fixes: #1092
Fixes: #1076
Fixes: #1121
Fixes: #1086
Fixes: #1089

Metadata Diff:

# DISPATCH_FLAGS
Windows.Win32.System.Com.IDispatch.Invoke : wFlags...UInt16 => DISPATCH_FLAGS
Windows.Win32.System.Com.ITypeInfo.Invoke : wFlags...UInt16 => DISPATCH_FLAGS
Windows.Win32.System.Ole.Apis.DISPATCH_METHOD removed
Windows.Win32.System.Ole.Apis.DISPATCH_PROPERTYGET removed
Windows.Win32.System.Ole.Apis.DISPATCH_PROPERTYPUT removed
Windows.Win32.System.Ole.Apis.DISPATCH_PROPERTYPUTREF removed
Windows.Win32.System.SystemServices.DISPATCH_FLAGS added
Windows.Win32.System.SystemServices.DISPATCH_FLAGS.DISPATCH_METHOD added
Windows.Win32.System.SystemServices.DISPATCH_FLAGS.DISPATCH_PROPERTYGET added
Windows.Win32.System.SystemServices.DISPATCH_FLAGS.DISPATCH_PROPERTYPUT added
Windows.Win32.System.SystemServices.DISPATCH_FLAGS.DISPATCH_PROPERTYPUTREF added
# VARFORMAT_FIRST_DAY
Windows.Win32.System.Ole.Apis.VarFormat : iFirstDay...Int32 => VARFORMAT_FIRST_DAY
Windows.Win32.System.Ole.Apis.VarTokenizeFormatString : iFirstDay...Int32 => VARFORMAT_FIRST_DAY
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_FRIDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_MONDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_SATURDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_SUNDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_SYSTEMDEFAULT added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_THURSDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_TUESDAY added
Windows.Win32.System.Ole.VARFORMAT_FIRST_DAY.VARFORMAT_FIRST_DAY_WEDNESDAY added
# VARFORMAT_FIRST_WEEK
Windows.Win32.System.Ole.Apis.VarFormat : iFirstWeek...Int32 => VARFORMAT_FIRST_WEEK
Windows.Win32.System.Ole.Apis.VarTokenizeFormatString : iFirstWeek...Int32 => VARFORMAT_FIRST_WEEK
Windows.Win32.System.Ole.VARFORMAT_FIRST_WEEK added
Windows.Win32.System.Ole.VARFORMAT_FIRST_WEEK.VARFORMAT_FIRST_WEEK_CONTAINS_JANUARY_FIRST added
Windows.Win32.System.Ole.VARFORMAT_FIRST_WEEK.VARFORMAT_FIRST_WEEK_HAS_SEVEN_DAYS added
Windows.Win32.System.Ole.VARFORMAT_FIRST_WEEK.VARFORMAT_FIRST_WEEK_LARGER_HALF_IN_CURRENT_YEAR added
Windows.Win32.System.Ole.VARFORMAT_FIRST_WEEK.VARFORMAT_FIRST_WEEK_SYSTEMDEFAULT added
# VARFORMAT_NAMED_FORMAT
Windows.Win32.System.Ole.Apis.VarFormatDateTime : iNamedFormat...Int32 => VARFORMAT_NAMED_FORMAT
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT added
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT.VARFORMAT_NAMED_FORMAT_GENERALDATE added
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT.VARFORMAT_NAMED_FORMAT_LONGDATE added
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT.VARFORMAT_NAMED_FORMAT_LONGTIME added
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT.VARFORMAT_NAMED_FORMAT_SHORTDATE added
Windows.Win32.System.Ole.VARFORMAT_NAMED_FORMAT.VARFORMAT_NAMED_FORMAT_SHORTTIME added
# VARFORMAT_GROUP
Windows.Win32.System.Ole.Apis.VarFormatNumber : iGroup...Int32 => VARFORMAT_GROUP
Windows.Win32.System.Ole.Apis.VarFormatPercent : iGroup...Int32 => VARFORMAT_GROUP
Windows.Win32.System.Ole.VARFORMAT_GROUP added
Windows.Win32.System.Ole.VARFORMAT_GROUP.VARFORMAT_GROUP_NOTTHOUSANDS added
Windows.Win32.System.Ole.VARFORMAT_GROUP.VARFORMAT_GROUP_SYSTEMDEFAULT added
Windows.Win32.System.Ole.VARFORMAT_GROUP.VARFORMAT_GROUP_THOUSANDS added
# VARFORMAT_LEADING_DIGIT
Windows.Win32.System.Ole.Apis.VarFormatNumber : iIncLead...Int32 => VARFORMAT_LEADING_DIGIT
Windows.Win32.System.Ole.Apis.VarFormatPercent : iIncLead...Int32 => VARFORMAT_LEADING_DIGIT
Windows.Win32.System.Ole.VARFORMAT_LEADING_DIGIT added
Windows.Win32.System.Ole.VARFORMAT_LEADING_DIGIT.VARFORMAT_LEADING_DIGIT_INCLUDED added
Windows.Win32.System.Ole.VARFORMAT_LEADING_DIGIT.VARFORMAT_LEADING_DIGIT_NOTINCLUDED added
Windows.Win32.System.Ole.VARFORMAT_LEADING_DIGIT.VARFORMAT_LEADING_DIGIT_SYSTEMDEFAULT added
# VARFORMAT_PARENTHESES
Windows.Win32.System.Ole.Apis.VarFormatNumber : iUseParens...Int32 => VARFORMAT_PARENTHESES
Windows.Win32.System.Ole.Apis.VarFormatPercent : iUseParens...Int32 => VARFORMAT_PARENTHESES
Windows.Win32.System.Ole.VARFORMAT_PARENTHESES added
Windows.Win32.System.Ole.VARFORMAT_PARENTHESES.VARFORMAT_PARENTHESES_NOTUSED added
Windows.Win32.System.Ole.VARFORMAT_PARENTHESES.VARFORMAT_PARENTHESES_SYSTEMDEFAULT added
Windows.Win32.System.Ole.VARFORMAT_PARENTHESES.VARFORMAT_PARENTHESES_USED added
# GPFIDL_FLAGS
Windows.Win32.UI.Shell.Apis.GPFIDL_ALTNAME removed
Windows.Win32.UI.Shell.Apis.GPFIDL_DEFAULT removed
Windows.Win32.UI.Shell.Apis.GPFIDL_UNCPRINTER removed
Windows.Win32.UI.Shell.Apis.SHGetPathFromIDListEx : uOpts...Int32 => GPFIDL_FLAGS
Windows.Win32.UI.Shell.GPFIDL_FLAGS added
Windows.Win32.UI.Shell.GPFIDL_FLAGS.GPFIDL_ALTNAME added
Windows.Win32.UI.Shell.GPFIDL_FLAGS.GPFIDL_DEFAULT added
Windows.Win32.UI.Shell.GPFIDL_FLAGS.GPFIDL_UNCPRINTER added
# SCROLLBAR_COMMAND
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_BOTTOM removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_ENDSCROLL removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_LEFT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_LINEDOWN removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_LINELEFT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_LINERIGHT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_LINEUP removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_PAGEDOWN removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_PAGELEFT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_PAGERIGHT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_PAGEUP removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_RIGHT removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_THUMBPOSITION removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_THUMBTRACK removed
Windows.Win32.UI.WindowsAndMessaging.Apis.SB_TOP removed
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_BOTTOM added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_ENDSCROLL added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_LEFT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_LINEDOWN added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_LINELEFT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_LINERIGHT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_LINEUP added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_PAGEDOWN added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_PAGELEFT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_PAGERIGHT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_PAGEUP added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_RIGHT added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_THUMBPOSITION added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_THUMBTRACK added
Windows.Win32.UI.WindowsAndMessaging.SCROLLBAR_COMMAND.SB_TOP added
# OleCtl.h functions 
Windows.Win32.System.Ole.Apis.OleCreateFontIndirect : lpFontDesc : [In,Out] => [In]
Windows.Win32.System.Ole.Apis.OleCreateFontIndirect : lplpvObj : [In,Out] => [Out]
Windows.Win32.System.Ole.Apis.OleCreatePictureIndirect : lplpvObj : [In,Out] => [Out]
Windows.Win32.System.Ole.Apis.OleCreatePictureIndirect : lpPictDesc : [In,Out] => [In]
Windows.Win32.System.Ole.Apis.OleCreatePropertyFrame : pPageClsID : [In,Out] => [In]
Windows.Win32.System.Ole.Apis.OleCreatePropertyFrame : ppUnk : [Out] => [In]
Windows.Win32.System.Ole.Apis.OleCreatePropertyFrame : pvReserved : [In,Out] => [In]
Windows.Win32.System.Ole.Apis.OleCreatePropertyFrameIndirect : lpParams : [In,Out] => [In]
Windows.Win32.System.Ole.Apis.OleLoadPicture : lplpvObj : [In,Out] => [Out]
Windows.Win32.System.Ole.Apis.OleLoadPictureEx : lplpvObj : [In,Out] => [Out]
Windows.Win32.System.Ole.Apis.OleLoadPicturePath : ppvRet : [In,Out] => [Out]
Windows.Win32.System.Ole.Apis.OleTranslateColor : lpcolorref : [In,Out] => [Out]

generation/WinSDK/enums.json

elachlan · 2022-09-16T01:04:26Z

@chenss3 What is the merge conflict on? Apparently I cannot see what is causing it.

mikebattista · 2022-09-16T01:25:51Z

@chenss3 What is the merge conflict on? Apparently I cannot see what is causing it.

This branch doesn't contain the .gitattributes change. Sync with main and see if that helps. The conflict is in the changes file.

chenss3 · 2022-09-16T23:56:42Z

@chenss3 What is the merge conflict on? Apparently I cannot see what is causing it.

This branch doesn't contain the .gitattributes change. Sync with main and see if that helps. The conflict is in the changes file.

Should be fixed now!

elachlan · 2022-09-17T00:10:58Z

When you synced with main, did the changes file merge fine?

chenss3 · 2022-09-17T00:27:33Z

When you synced with main, did the changes file merge fine?

When I synced with main that time, I still had to manually resolve the merge conflicts in the changes file.

mikebattista · 2022-09-20T17:28:23Z

scripts/ChangesSinceLastRelease.txt

+Windows.Win32.System.Ole.Apis.OleLoadPicture : lplpvObj : [In,Out] => [Out]
+Windows.Win32.System.Ole.Apis.OleLoadPictureEx : lplpvObj : [In,Out] => [Out]
+Windows.Win32.System.Ole.Apis.OleLoadPicturePath : ppvRet : [In,Out] => [Out]
+Windows.Win32.System.Ole.Apis.OleTranslateColor : lpcolorref : [In,Out] => [Out]
 # UIA_ enums
 Windows.Win32.System.SystemServices.UIA_ANNOTATIONTYPE added


APIs in the SystemServices namespace indicates a bug. Even though the UIA changes went in with another PR, please update enums.json to move anything in SystemServices over to a more relevant namespace like Accessibility.

Either add a usage so the enum follows the namespace of the APIs, or add an explicit namespace definition.

Sophia Chen added 3 commits September 9, 2022 15:25

adding the varformat enum first try

07a320d

add in more enums

dc7bdc8

fix ole function input output

a0fab63

chenss3 requested review from mikebattista and sotteson1 as code owners September 12, 2022 20:32

mikebattista requested changes Sep 12, 2022

View reviewed changes

generation/WinSDK/enums.json Outdated Show resolved Hide resolved

generation/WinSDK/enums.json Outdated Show resolved Hide resolved

Sophia Chen added 2 commits September 12, 2022 16:31

move to proper interface format

3092584

merge conflict

b17e842

elachlan mentioned this pull request Sep 16, 2022

Investigate merge driver/merge strategy to reduce merge conflicts on ChangesSinceLastRelease.txt #1246

Closed

sync with main

1134099

mikebattista previously approved these changes Sep 19, 2022

View reviewed changes

merge conflict

7463f7f

chenss3 dismissed mikebattista’s stale review via 7463f7f September 20, 2022 16:54

mikebattista requested changes Sep 20, 2022

View reviewed changes

Sophia Chen added 2 commits September 20, 2022 13:19

move namespaces

b8f7499

merge conflict

7592809

chenss3 merged commit 374ae00 into main Sep 20, 2022

chenss3 deleted the user/chenss3/winform5 branch September 20, 2022 20:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More and more WinForms enums #1245

More and more WinForms enums #1245

chenss3 commented Sep 12, 2022

elachlan commented Sep 16, 2022

mikebattista commented Sep 16, 2022

chenss3 commented Sep 16, 2022

elachlan commented Sep 17, 2022

chenss3 commented Sep 17, 2022

mikebattista Sep 20, 2022

More and more WinForms enums #1245

More and more WinForms enums #1245

Conversation

chenss3 commented Sep 12, 2022

elachlan commented Sep 16, 2022

mikebattista commented Sep 16, 2022

chenss3 commented Sep 16, 2022

elachlan commented Sep 17, 2022

chenss3 commented Sep 17, 2022

mikebattista Sep 20, 2022

Choose a reason for hiding this comment