From 6665ab10d77eed2accd3028bd9ed083b845a1a98 Mon Sep 17 00:00:00 2001
From: Mike Battista <13860912+mikebattista@users.noreply.github.com>
Date: Tue, 9 Nov 2021 19:49:15 -0800
Subject: [PATCH] Printer enum fixes for #720.

---
 generation/WinSDK/emitter.settings.rsp    |  2 +
 generation/WinSDK/enums.json              | 88 +++++++++++++++++++++++
 scripts/BaselineWinmd/Windows.Win32.winmd |  4 +-
 3 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
index 626f5fd5e..1089fb89d 100644
--- a/generation/WinSDK/emitter.settings.rsp
+++ b/generation/WinSDK/emitter.settings.rsp
@@ -554,3 +554,5 @@ IReferenceClock::AdviseTime::hEvent=HANDLE
 IReferenceClock::AdvisePeriodic::hSemaphore=HANDLE
 JsDebugReadMemoryFlags=[ScopedEnum]
 SHCreateItemFromParsingName::ppv=[ComOutPtr]
+PRINTER_OPTIONSA::dwFlags=PRINTER_OPTION_FLAGS
+PRINTER_OPTIONSW::dwFlags=PRINTER_OPTION_FLAGS
\ No newline at end of file
diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
index 5c47d10b1..3c745e40b 100644
--- a/generation/WinSDK/enums.json
+++ b/generation/WinSDK/enums.json
@@ -29281,5 +29281,93 @@
         "parameter": "pulDeviceForm"
       }
     ]
+  },
+  {
+    "name": "PRINTER_ACCESS_RIGHTS",
+    "flags": true,    
+    "autoPopulate": {
+      "filter": "PRINTER_ACCESS_|SERVER_ACCESS_",
+      "header": "winspool.h"
+    },
+    "members": [
+      {
+        "name": "PRINTER_ALL_ACCESS",
+        "value": "(PRINTER_STANDARD_RIGHTS_REQUIRED | PRINTER_ACCESS_ADMINISTER | PRINTER_ACCESS_USE)"
+      },
+      {
+        "name": "PRINTER_READ",
+        "value": "(PRINTER_STANDARD_RIGHTS_READ | PRINTER_ACCESS_USE)"
+      },
+      {
+        "name": "PRINTER_WRITE",
+        "value": "(PRINTER_STANDARD_RIGHTS_WRITE | PRINTER_ACCESS_USE)"
+      },
+      {
+        "name": "PRINTER_EXECUTE",
+        "value": "(PRINTER_STANDARD_RIGHTS_EXECUTE | PRINTER_ACCESS_USE)"
+      },
+      {
+        "name": "SERVER_ALL_ACCESS",
+        "value": "(PRINTER_STANDARD_RIGHTS_REQUIRED | SERVER_ACCESS_ADMINISTER | SERVER_ACCESS_ENUMERATE)"
+      },
+      {
+        "name": "SERVER_READ",
+        "value": "(PRINTER_STANDARD_RIGHTS_READ | SERVER_ACCESS_ENUMERATE)"
+      },
+      {
+        "name": "SERVER_WRITE",
+        "value": "(PRINTER_STANDARD_RIGHTS_WRITE | SERVER_ACCESS_ADMINISTER | SERVER_ACCESS_ENUMERATE)"
+      },
+      {
+        "name": "SERVER_EXECUTE",
+        "value": "(PRINTER_STANDARD_RIGHTS_EXECUTE | SERVER_ACCESS_ENUMERATE)"
+      },
+      {
+        "name": "PRINTER_DELETE",
+        "value": "(0x00010000)"
+      },
+      {
+        "name": "PRINTER_READ_CONTROL",
+        "value": "(0x00020000)"
+      },
+      {
+        "name": "PRINTER_WRITE_DAC",
+        "value": "(0x00040000)"
+      },
+      {
+        "name": "PRINTER_WRITE_OWNER",
+        "value": "(0x00080000)"
+      },
+      {
+        "name": "PRINTER_SYNCHRONIZE",
+        "value": "(0x00100000)"
+      },
+      {
+        "name": "PRINTER_STANDARD_RIGHTS_REQUIRED",
+        "value": "(0x000F0000)"
+      },
+      {
+        "name": "PRINTER_STANDARD_RIGHTS_READ",
+        "value": "(0x00020000)"
+      },
+      {
+        "name": "PRINTER_STANDARD_RIGHTS_WRITE",
+        "value": "(0x00020000)"
+      },
+      {
+        "name": "PRINTER_STANDARD_RIGHTS_EXECUTE",
+        "value": "(0x00020000)"
+      }
+    ],
+    "uses": [
+      {
+        "struct": "PRINTER_DEFAULTSA",
+        "field": "DesiredAccess"
+      },
+      {
+        "struct": "PRINTER_DEFAULTSW",
+        "field": "DesiredAccess"
+      }
+    ]
   }
 ]
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
index bf24745b7..522539b30 100644
--- a/scripts/BaselineWinmd/Windows.Win32.winmd
+++ b/scripts/BaselineWinmd/Windows.Win32.winmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:334ccd1a6d462c2802333f18ec2515d47cea911a8bd92f78d4f00142cc21434f
-size 15601152
+oid sha256:0e089aa1c68fa02e24f0b7a9cc7042d71730a028e9a8f99a06f99586e4ca4bbe
+size 15601664