Alexandre Julliard : ntdll: Add support for 2019 and 2020 WindowsSettings namespaces.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1326687feb2b66d8013034387cfb47ea1bb99e7e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1326687feb2b66d8013034387...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Apr 11 16:54:20 2022 +0200

ntdll: Add support for 2019 and 2020 WindowsSettings namespaces.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/actctx.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 92f2f0148b2..be003b7c267 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -615,6 +615,8 @@ static const WCHAR windowsSettings2005NSW[] = L"http://schemas.microsoft.com/SMI
 static const WCHAR windowsSettings2011NSW[] = L"http://schemas.microsoft.com/SMI/2011/WindowsSettings";
 static const WCHAR windowsSettings2016NSW[] = L"http://schemas.microsoft.com/SMI/2016/WindowsSettings";
 static const WCHAR windowsSettings2017NSW[] = L"http://schemas.microsoft.com/SMI/2017/WindowsSettings";
+static const WCHAR windowsSettings2019NSW[] = L"http://schemas.microsoft.com/SMI/2019/WindowsSettings";
+static const WCHAR windowsSettings2020NSW[] = L"http://schemas.microsoft.com/SMI/2020/WindowsSettings";
 
 struct olemisc_entry
 {
@@ -2535,12 +2537,14 @@ static void parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *asse
 
     while (next_xml_elem( xmlbuf, &elem, parent ))
     {
-        if (xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) ||
+        if (xml_elem_cmp( &elem, L"activeCodePage", windowsSettings2019NSW ) ||
+            xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) ||
             xml_elem_cmp( &elem, L"disableTheming", windowsSettings2005NSW ) ||
             xml_elem_cmp( &elem, L"disableWindowFiltering", windowsSettings2011NSW ) ||
             xml_elem_cmp( &elem, L"dpiAware", windowsSettings2005NSW ) ||
             xml_elem_cmp( &elem, L"dpiAwareness", windowsSettings2016NSW ) ||
             xml_elem_cmp( &elem, L"gdiScaling", windowsSettings2017NSW ) ||
+            xml_elem_cmp( &elem, L"heapType", windowsSettings2020NSW ) ||
             xml_elem_cmp( &elem, L"highResolutionScrollingAware", windowsSettings2017NSW ) ||
             xml_elem_cmp( &elem, L"longPathAware", windowsSettings2016NSW ) ||
             xml_elem_cmp( &elem, L"magicFutureSetting", windowsSettings2017NSW ) ||
@@ -2564,7 +2568,7 @@ static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly,
 
     while (next_xml_elem( xmlbuf, &elem, parent ))
     {
-        if (xml_elem_cmp( &elem, L"windowsSettings", asmv3W ))
+        if (xml_elem_cmp( &elem, L"windowsSettings", asmv1W ))
         {
             parse_windows_settings_elem( xmlbuf, assembly, acl, &elem );
         }
@@ -2783,7 +2787,7 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly,
         {
             parse_compatibility_elem(xmlbuf, assembly, acl, &elem);
         }
-        else if (xml_elem_cmp(&elem, L"application", asmv3W))
+        else if (xml_elem_cmp(&elem, L"application", asmv1W))
         {
             parse_application_elem(xmlbuf, assembly, acl, &elem);
         }
@@ -5845,7 +5849,9 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL
         if (wcscmp( ns, windowsSettings2005NSW ) &&
             wcscmp( ns, windowsSettings2011NSW ) &&
             wcscmp( ns, windowsSettings2016NSW ) &&
-            wcscmp( ns, windowsSettings2017NSW ))
+            wcscmp( ns, windowsSettings2017NSW ) &&
+            wcscmp( ns, windowsSettings2019NSW ) &&
+            wcscmp( ns, windowsSettings2020NSW ))
             return STATUS_INVALID_PARAMETER;
     }
     else ns = windowsSettings2005NSW;