[PATCH 0/1] MR9700: dbgeng/test: Fix test failures on Windows 11.

[PATCH 1/1] dbgeng/test: Fix test failures on Windows 11.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/dbgeng/tests/dbgeng.c | 8 ++++----
 include/dbgeng.h           | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c
index a75fa012b95..150bf717ff9 100644
--- a/dlls/dbgeng/tests/dbgeng.c
+++ b/dlls/dbgeng/tests/dbgeng.c
@@ -50,7 +50,7 @@ static void test_engine_options(void)
     ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr);
     ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options);

-    hr = control->lpVtbl->AddEngineOptions(control, 0x01000000);
+    hr = control->lpVtbl->AddEngineOptions(control, 0x10000000);
     ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);

options = 0;
@@ -58,7 +58,7 @@ static void test_engine_options(void)
     ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr);
     ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options);

-    hr = control->lpVtbl->RemoveEngineOptions(control, 0x01000000);
+    hr = control->lpVtbl->RemoveEngineOptions(control, 0x10000000);
     ok(hr == S_OK, "Failed to remove options, hr %#lx.\n", hr);

hr = control->lpVtbl->AddEngineOptions(control, DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION);
@@ -86,10 +86,10 @@ static void test_engine_options(void)
     ok(hr == S_OK, "Failed to get engine options, hr %#lx.\n", hr);
     ok(options == DEBUG_ENGOPT_INITIAL_BREAK, "Unexpected options %#lx.\n", options);

-    hr = control->lpVtbl->SetEngineOptions(control, 0x01000000);
+    hr = control->lpVtbl->SetEngineOptions(control, 0x10000000);
     ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);

-    hr = control->lpVtbl->SetEngineOptions(control, 0x01000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION);
+    hr = control->lpVtbl->SetEngineOptions(control, 0x10000000 | DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION);
     ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);

options = 0;
diff --git a/include/dbgeng.h b/include/dbgeng.h
index 0193d91eae8..b86d7cc2ee7 100644
--- a/include/dbgeng.h
+++ b/include/dbgeng.h
@@ -76,7 +76,9 @@ DEFINE_GUID(IID_IDebugSystemObjects3,     0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9
 #define DEBUG_ENGOPT_DISABLESQM                     0x00080000
 #define DEBUG_ENGOPT_DISABLE_STEPLINES_OPTIONS      0x00200000
 #define DEBUG_ENGOPT_DEBUGGING_SENSITIVE_DATA       0x00400000
-#define DEBUG_ENGOPT_ALL                            0x004fffff
+#define DEBUG_ENGOPT_PREFER_TRACE_FILES             0x00800000
+#define DEBUG_ENGOPT_RESOLVE_SHADOWED_VARIABLES     0x01000000
+#define DEBUG_ENGOPT_ALL                            0x01efffff
 #define DEBUG_ENGOPT_NETWORK_PATHS (DEBUG_ENGOPT_ALLOW_NETWORK_PATHS | DEBUG_ENGOPT_DISALLOW_NETWORK_PATHS)

/* AttachProcess() flags */