[PATCH v2 0/2] MR1803: ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.

[Zebediah Figura (＠zfigura)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53976

--
  v2: ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.
      include: Add CONFIGFLAG_* definitions.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1803

[PATCH v2 1/2] include: Add CONFIGFLAG_* definitions.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 include/regstr.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/include/regstr.h b/include/regstr.h
index 0be6c9ac5f1..aa03bc1865b 100644
--- a/include/regstr.h
+++ b/include/regstr.h
@@ -30,5 +30,27 @@
 /* UninstallString <= 63 chars in Windows (otherwise problems) */
 #define REGSTR_VAL_UNINSTALLER_COMMANDLINE	TEXT("UninstallString")
 
+#define CONFIGFLAG_DISABLED             0x00000001
+#define CONFIGFLAG_REMOVED              0x00000002
+#define CONFIGFLAG_MANUAL_INSTALL       0x00000004
+#define CONFIGFLAG_IGNORE_BOOT_LC       0x00000008
+#define CONFIGFLAG_NET_BOOT             0x00000010
+#define CONFIGFLAG_REINSTALL            0x00000020
+#define CONFIGFLAG_FAILEDINSTALL        0x00000040
+#define CONFIGFLAG_CANTSTOPACHILD       0x00000080
+#define CONFIGFLAG_OKREMOVEROM          0x00000100
+#define CONFIGFLAG_NOREMOVEEXIT         0x00000200
+#define CONFIGFLAG_FINISH_INSTALL       0x00000400
+#define CONFIGFLAG_NEEDS_FORCED_CONFIG  0x00000800
+#ifdef REMOTE_BOOT
+#define CONFIGFLAG_NETBOOT_CARD         0x00001000
+#endif
+#define CONFIGFLAG_PARTIAL_LOG_CONF     0x00002000
+#define CONFIGFLAG_SUPPRESS_SURPRISE    0x00004000
+#define CONFIGFLAG_VERIFY_HARDWARE      0x00008000
+#define CONFIGFLAG_FINISHINSTALL_UI     0x00010000
+#define CONFIGFLAG_FINISHINSTALL_ACTION 0x00020000
+#define CONFIGFLAG_BOOT_DEVICE          0x00040000
+#define CONFIGFLAG_NEEDS_CLASS_CONFIG   0x00080000
 
 #endif  /* _INC_REGSTR_H */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1803

[PATCH v2 2/2] ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53976
---
 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 02af7ca230b..ff93cfc98ec 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -36,6 +36,7 @@
 #include "setupapi.h"
 #include "cfgmgr32.h"
 #include "newdev.h"
+#include "regstr.h"
 #include "dbt.h"
 #include "initguid.h"
 #include "devguid.h"
@@ -1634,7 +1635,8 @@ static void test_pnp_devices(void)
     ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS,
             &type, (BYTE *)&dword, sizeof(dword), NULL);
     ok(ret, "got error %#lx\n", GetLastError());
-    ok(!dword, "got flags %#lx\n", dword);
+    /* windows 7 sets CONFIGFLAG_FINISH_INSTALL; it's not clear what this means */
+    ok(!(dword & ~CONFIGFLAG_FINISH_INSTALL), "got flags %#lx\n", dword);
     ok(type == REG_DWORD, "got type %lu\n", type);
 
     ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1803