Changes R2_MODE and TEXT_ALIGN_OPTIONS (#1047)

Co-authored-by: Steve Otteson <sotteson@microsoft.com>

generation/WinSDK/enums.json

@@ -3930,6 +3930,7 @@
     "type": "uint",
     "namespace": "Windows.Win32.Graphics.Gdi",
     "name": "TEXT_ALIGN_OPTIONS",
+    "flags": true,
     "members": [
       {
         "name": "TA_NOUPDATECP",
@@ -4006,6 +4007,10 @@
         "struct": "RICHEDIT_IMAGE_PARAMETERS",
         "field": "Type"
       },
+      {
+        "method": "GetTextAlign",
+        "parameter": "return"
+      },
       {
         "method": "SetTextAlign",
         "parameter": "align"
@@ -14936,8 +14941,16 @@
   },
   {
     "addUsesTo": "R2_MODE",
+    "autoPopulate": {
+      "filter": "R2_",
+      "header": "wingdi.h"
+    },
     "members": [],
     "uses": [
+      {
+        "method": "GetROP2",
+        "parameter": "return"
+      },
       {
         "method": "SetROP2",
         "parameter": "rop2"

scripts/ChangesSinceLastRelease.txt

@@ -236,3 +236,8 @@ Windows.Win32.UI.Controls.Apis.GetThemeSysBool : iBoolId...Int32 => THEME_PROPER
 Windows.Win32.UI.Controls.Apis.GetThemeSysInt : iIntId...Int32 => THEME_PROPERTY_SYMBOL_ID
 Windows.Win32.UI.Controls.Apis.SetThemeAppProperties : dwFlags...UInt32 => SET_THEME_APP_PROPERTIES_FLAGS
 Windows.Win32.UI.Controls.SET_THEME_APP_PROPERTIES_FLAGS added
+# Fixes to R2_MODE and TEXT_ALIGN_OPTIONS
+Windows.Win32.Graphics.Gdi.Apis.GetROP2 : return...Int32 => R2_MODE
+Windows.Win32.Graphics.Gdi.Apis.GetTextAlign : return...UInt32 => TEXT_ALIGN_OPTIONS
+Windows.Win32.Graphics.Gdi.TEXT_ALIGN_OPTIONS :  => [Flags]
+