VS: Fix MANIFESTUAC link flag map to .vcxproj elements

Original header commit v3.10.0-rc1~97^2

Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order
to map them correctly to `.vcxproj` elements.

Keep the old incorrect flag table entries for `uiAccess` and `level`
flags for compatibility even though they do not really exist.

Fixes: #16563

5 files changed, 20 insertions, 105 deletions

diff --git a/Templates/MSBuild/FlagTables/v10_Link.json b/Templates/MSBuild/FlagTables/v10_Link.json
index 27003f8c23..ac5b8b16cc 100644
--- a/Templates/MSBuild/FlagTables/v10_Link.json
+++ b/Templates/MSBuild/FlagTables/v10_Link.json
@@ -533,20 +533,13 @@
   },
   {
     "name": "EnableUAC",
-    "switch": "MANIFESTUAC:NO",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "EnableUAC",
     "switch": "MANIFESTUAC:",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "true",
+    "comment": "",
+    "value": "",
     "flags": [
       "UserValue",
-      "UserIgnored",
-      "Continue"
+      "UserRequired",
+      "SpaceAppendable"
     ]
   },
   {
@@ -561,16 +554,6 @@
   },
   {
     "name": "UACUIAccess",
-    "switch": "MANIFESTUAC:",
-    "comment": "UAC Bypass UI Protection",
-    "value": "true",
-    "flags": [
-      "UserValue",
-      "UserRequired"
-    ]
-  },
-  {
-    "name": "UACUIAccess",
     "switch": "uiAccess='false'",
     "comment": "UAC Bypass UI Protection",
     "value": "false",
diff --git a/Templates/MSBuild/FlagTables/v11_Link.json b/Templates/MSBuild/FlagTables/v11_Link.json
index 75b9b196f6..5d5c13f219 100644
--- a/Templates/MSBuild/FlagTables/v11_Link.json
+++ b/Templates/MSBuild/FlagTables/v11_Link.json
@@ -596,20 +596,13 @@
   },
   {
     "name": "EnableUAC",
-    "switch": "MANIFESTUAC:NO",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "EnableUAC",
     "switch": "MANIFESTUAC:",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "true",
+    "comment": "",
+    "value": "",
     "flags": [
       "UserValue",
-      "UserIgnored",
-      "Continue"
+      "UserRequired",
+      "SpaceAppendable"
     ]
   },
   {
@@ -624,16 +617,6 @@
   },
   {
     "name": "UACUIAccess",
-    "switch": "MANIFESTUAC:",
-    "comment": "UAC Bypass UI Protection",
-    "value": "true",
-    "flags": [
-      "UserValue",
-      "UserRequired"
-    ]
-  },
-  {
-    "name": "UACUIAccess",
     "switch": "uiAccess='false'",
     "comment": "UAC Bypass UI Protection",
     "value": "false",
diff --git a/Templates/MSBuild/FlagTables/v12_Link.json b/Templates/MSBuild/FlagTables/v12_Link.json
index 75b9b196f6..5d5c13f219 100644
--- a/Templates/MSBuild/FlagTables/v12_Link.json
+++ b/Templates/MSBuild/FlagTables/v12_Link.json
@@ -596,20 +596,13 @@
   },
   {
     "name": "EnableUAC",
-    "switch": "MANIFESTUAC:NO",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "EnableUAC",
     "switch": "MANIFESTUAC:",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "true",
+    "comment": "",
+    "value": "",
     "flags": [
       "UserValue",
-      "UserIgnored",
-      "Continue"
+      "UserRequired",
+      "SpaceAppendable"
     ]
   },
   {
@@ -624,16 +617,6 @@
   },
   {
     "name": "UACUIAccess",
-    "switch": "MANIFESTUAC:",
-    "comment": "UAC Bypass UI Protection",
-    "value": "true",
-    "flags": [
-      "UserValue",
-      "UserRequired"
-    ]
-  },
-  {
-    "name": "UACUIAccess",
     "switch": "uiAccess='false'",
     "comment": "UAC Bypass UI Protection",
     "value": "false",
diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json
index c2a18ef55a..3fb072c506 100644
--- a/Templates/MSBuild/FlagTables/v140_Link.json
+++ b/Templates/MSBuild/FlagTables/v140_Link.json
@@ -639,20 +639,13 @@
   },
   {
     "name": "EnableUAC",
-    "switch": "MANIFESTUAC:NO",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "EnableUAC",
     "switch": "MANIFESTUAC:",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "true",
+    "comment": "",
+    "value": "",
     "flags": [
       "UserValue",
-      "UserIgnored",
-      "Continue"
+      "UserRequired",
+      "SpaceAppendable"
     ]
   },
   {
@@ -667,16 +660,6 @@
   },
   {
     "name": "UACUIAccess",
-    "switch": "MANIFESTUAC:",
-    "comment": "UAC Bypass UI Protection",
-    "value": "true",
-    "flags": [
-      "UserValue",
-      "UserRequired"
-    ]
-  },
-  {
-    "name": "UACUIAccess",
     "switch": "uiAccess='false'",
     "comment": "UAC Bypass UI Protection",
     "value": "false",
diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json
index d5144c8024..66ee76fcb4 100644
--- a/Templates/MSBuild/FlagTables/v141_Link.json
+++ b/Templates/MSBuild/FlagTables/v141_Link.json
@@ -646,20 +646,13 @@
   },
   {
     "name": "EnableUAC",
-    "switch": "MANIFESTUAC:NO",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "false",
-    "flags": []
-  },
-  {
-    "name": "EnableUAC",
     "switch": "MANIFESTUAC:",
-    "comment": "Enable User Account Control (UAC)",
-    "value": "true",
+    "comment": "",
+    "value": "",
     "flags": [
       "UserValue",
-      "UserIgnored",
-      "Continue"
+      "UserRequired",
+      "SpaceAppendable"
     ]
   },
   {
@@ -674,16 +667,6 @@
   },
   {
     "name": "UACUIAccess",
-    "switch": "MANIFESTUAC:",
-    "comment": "UAC Bypass UI Protection",
-    "value": "true",
-    "flags": [
-      "UserValue",
-      "UserRequired"
-    ]
-  },
-  {
-    "name": "UACUIAccess",
     "switch": "uiAccess='false'",
     "comment": "UAC Bypass UI Protection",
     "value": "false",