[0.4.15][SDK][CRYPT32][SETUPAPI][BOOTDATA] Fix VirtualBox guest additions, RelWithDebInfo target, USB

Fixes the release with debug information build target (RelWithDebInfo), complete a backport for CORE-19496, and import VirtualBox guest additions fixes from Ratin Gao (RatinCN). In addition, comment out bogus asserts in the USB stack that can prevent ReactOS from booting over USB on real hardware. Also adjust boot options in both LiveCD and BootCD to boot by default into the non-debug version. Finally, remove some bugchecks in our memory manager for common issues that do not bugcheck on release versions anyways. The text for the readme document on the desktop was also updated. This includes a squashed backport of the following commits: 6c7d2a2e25 [SDK] Fix RelWithDebInfo (#7811) 275c40d26d [CRYPT32] Initial implementation of CertEnumSystemStoreLocation() (#7746) 7a9c744b70 [SETUPAPI] Stub implement SetupQueryInfVersionInformation (#7769) 49a55a099e [SETUPAPI] Refactor SetupInstallServicesFromInfSectionExW (#7770) cfcc8d85b2 [NEWDEV] Fix HardwareId match logic in UpdateDriverForPlugAndPlayDevicesW (#7808) 2ffc6d281b [BOOTDATA] Follow-up of #7795; Modify NLS registry (#7799)
2025-04-04 04:26:32 +00:00 · 2025-03-23 09:31:12 +01:00 · 2025-03-23 09:31:12 +01:00 · dbb43bbaeb
commit dbb43bbaeb
parent 22fb3bb2c1
18 changed files with 370 additions and 128 deletions
--- a/base/setup/lib/bootsup.c
+++ b/base/setup/lib/bootsup.c
@ -135,7 +135,7 @@ CreateFreeLoaderReactOSEntries(
    else
 #endif
    {
-#if DBG
+#if 0 // DBG
        BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
 #else
        BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS");
@ -153,7 +153,7 @@ CreateFreeLoaderReactOSEntries(
    else
    {
        /* Timeout=10 */
-        BootOptions.Timeout = 10;
+        BootOptions.Timeout = 3; // 10 by default (0.4.15 hack)
    }
 #endif

--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@ -1100,7 +1100,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","040a",0x00000000,"l_intl.n
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","080a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0c0a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","100a",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","140a",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","140a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","180a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1c0a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","200a",0x00000000,"l_intl.nls"
@ -1150,7 +1150,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","041d",0x00000000,"l_intl.n
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","081d",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","041e",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","041f",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0420",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0420",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0421",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0422",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0423",0x00000000,"l_intl.nls"
@ -1158,15 +1158,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0424",0x00000000,"l_intl.n
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0425",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0426",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0427",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0429",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042a",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0429",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042a",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042b",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042c",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","082c",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042d",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042f",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0436",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0437",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0437",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0438",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0439",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls"
@ -1178,7 +1178,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.n
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0843",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0444",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0445",0x00000000,"l_intl.nls"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0455",0x00000000,"l_intl.nls"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0455",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0456",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","048f",0x00000000,"l_intl.nls"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0490",0x00000000,"l_intl.nls"
@ -1189,6 +1189,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","InstallLanguage",0x0000000
 ; Supported and installed locales
 ; If you add/uncomment an entry here, please also add the appropriate Language
 ; in the previous section.
+; See also: https://www.venea.net/web/culture-code
+;           https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale",,0x00000012
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000401",0x00000000,"d"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000801",0x00000000,"d"
@ -1233,7 +1235,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000040a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000080a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c0a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000100a",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000140a",0x00000000,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000140a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000180a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001c0a",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000200a",0x00000000,"1"
@ -1270,7 +1272,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000814",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000415",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000416",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000816",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000417",0x00000000,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000417",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000418",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000419",0x00000000,"5"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000041a",0x00000000,"2"
@ -1282,7 +1284,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000041d",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000081d",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000041e",0x00000000,"b"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000041f",0x00000000,"6"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000420",0x00000000,""
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000420",0x00000000,"d"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000421",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000422",0x00000000,"5"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000423",0x00000000,"5"
@ -1290,15 +1292,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000424",0x00000000,"2"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000425",0x00000000,"3"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000426",0x00000000,"3"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000427",0x00000000,"3"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000429",0x00000000,""
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042a",0x00000000,""
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000429",0x00000000,"d"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042a",0x00000000,"e"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042b",0x00000000,"11"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042c",0x00000000,"6"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000082c",0x00000000,"5"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042d",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042f",0x00000000,"5"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000436",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000437",0x00000000,"10"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000437",0x00000000,"10"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000438",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000439",0x00000000,"f"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1"
@ -1309,11 +1311,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000843",0x00000000,"5"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000444",0x00000000,"5"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000445",0x00000000,"f"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000455",0x00000000,""
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000445",0x00000000,"f"
+HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000455",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000456",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000048f",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000490",0x00000000,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000048f",0x00000000,"1" ; tdd-Tale-CN, reserved
+;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000490",0x00000000,"1" ; khb-Talu-CN, reserved

 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language Groups","1",0x00000000,"1"
 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language Groups","2",0x00000000,"1"
--- a/boot/bootdata/livecd.ini
+++ b/boot/bootdata/livecd.ini
@ -1,6 +1,6 @@
 [FREELOADER]
-DefaultOS=LiveCD_Debug
-TimeOut=5
+DefaultOS=LiveCD
+TimeOut=3 ; 5 was default (0.4.15 hack)

 [Display]
 TitleText=ReactOS LiveCD
@ -9,8 +9,8 @@ MinimalUI=Yes
 [Operating Systems]
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
-LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
-LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
+; LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
+; LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
 LiveCD_VBoxDebug="LiveCD (VBox Debug)"
 LiveCD_Screen="LiveCD (Screen)"
 LiveCD_LogFile="LiveCD (Log file)"
@ -25,15 +25,15 @@ BootType=Windows2003
 SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT

-[LiveCD_Macpi]
-BootType=Windows2003
-SystemPath=\reactos
-Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
+; [LiveCD_Macpi]
+; BootType=Windows2003
+; SystemPath=\reactos
+; Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT

-[LiveCD_Aacpi]
-BootType=Windows2003
-SystemPath=\reactos
-Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
+; [LiveCD_Aacpi]
+; BootType=Windows2003
+; SystemPath=\reactos
+; Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT

 [LiveCD_VBoxDebug]
 BootType=Windows2003
--- a/boot/bootdata/readme.txt
+++ b/boot/bootdata/readme.txt
@ -1,6 +1,6 @@
 ========================
-ReactOS™ Version 0.4.x
-Updated October 9, 2021
+ReactOS™ Version 0.4.15
+Updated 23 March 2025
 ========================

 1. What is ReactOS?
--- a/dll/win32/crypt32/crypt32.spec
+++ b/dll/win32/crypt32/crypt32.spec
@ -39,6 +39,7 @@
@ stdcall CertEnumCertificatesInStore(ptr ptr)
@ stdcall CertEnumPhysicalStore(ptr long ptr ptr)
@ stdcall CertEnumSystemStore(long ptr ptr ptr)
+@ stdcall CertEnumSystemStoreLocation(long ptr ptr)
@ stdcall CertFindAttribute(str long ptr)
@ stdcall CertFindCRLInStore(ptr long long long ptr ptr)
@ stdcall CertFindCTLInStore(ptr long long long ptr ptr)
--- a/dll/win32/crypt32/store.c
+++ b/dll/win32/crypt32/store.c
@ -1358,6 +1358,61 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara,
    return ret;
 }

+#ifdef __REACTOS__
+
+typedef struct _CERT_SYSTEM_STORE_LOCATION
+{
+    DWORD dwFlags;
+    PCWSTR pwszStoreLocation;
+} CERT_SYSTEM_STORE_LOCATION, *PCERT_SYSTEM_STORE_LOCATION;
+
+static const CERT_SYSTEM_STORE_LOCATION gSystemStoreLocations[] = {
+    { CERT_SYSTEM_STORE_CURRENT_USER, L"CurrentUser" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE, L"LocalMachine" },
+    { CERT_SYSTEM_STORE_CURRENT_SERVICE, L"CurrentService" },
+    { CERT_SYSTEM_STORE_SERVICES, L"Services" },
+    { CERT_SYSTEM_STORE_USERS, L"Users" },
+    { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, L"CurrentUserGroupPolicy" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, L"LocalMachineGroupPolicy" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, L"LocalMachineEnterprise" },
+};
+
+BOOL
+WINAPI
+CertEnumSystemStoreLocation(
+    _In_ DWORD dwFlags,
+    _Inout_opt_ void *pvArg,
+    __callback PFN_CERT_ENUM_SYSTEM_STORE_LOCATION pfnEnum)
+{
+    DWORD i;
+
+    /* Check input flags */
+    if (dwFlags != 0)
+    {
+        SetLastError(E_INVALIDARG);
+        return FALSE;
+    }
+
+    /* Return fixed system stores */
+    for (i = 0; i < ARRAYSIZE(gSystemStoreLocations); i++)
+    {
+        if (!pfnEnum(gSystemStoreLocations[i].pwszStoreLocation,
+                     gSystemStoreLocations[i].dwFlags,
+                     NULL,
+                     pvArg))
+        {
+            return FALSE;
+        }
+    }
+
+    /* FIXME: Return registered OID system stores by calling CryptEnumOIDFunction */
+    FIXME("Registered OID system stores is not enumerated\n");
+
+    return TRUE;
+}
+
+#endif /* __REACTOS__ */
+
 BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags,
 void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum)
 {
--- a/dll/win32/newdev/newdev.c
+++ b/dll/win32/newdev/newdev.c
@ -1,7 +1,7 @@
 /*
 * New device installer (newdev.dll)
 *
- * Copyright 2005-2006 Hervé Poussineau (hpoussin@reactos.org)
+ * Copyright 2005-2006 Hervé Poussineau (hpoussin@reactos.org)
 *           2005 Christoph von Wittich (Christoph@ActiveVB.de)
 *           2009 Colin Finck (colin@reactos.org)
 *
@ -50,6 +50,7 @@ UpdateDriverForPlugAndPlayDevicesW(
    LPWSTR Buffer = NULL;
    DWORD BufferSize;
    LPCWSTR CurrentHardwareId; /* Pointer into Buffer */
+    DWORD Property;
    BOOL FoundHardwareId, FoundAtLeastOneDevice = FALSE;
    BOOL ret = FALSE;

@ -86,51 +87,58 @@ UpdateDriverForPlugAndPlayDevicesW(
            break;
        }

-        /* Get Hardware ID */
-        HeapFree(GetProcessHeap(), 0, Buffer);
-        Buffer = NULL;
-        BufferSize = 0;
-        while (!SetupDiGetDeviceRegistryPropertyW(
-            DevInstData.hDevInfo,
-            &DevInstData.devInfoData,
-            SPDRP_HARDWAREID,
-            NULL,
-            (PBYTE)Buffer,
-            BufferSize,
-            &BufferSize))
-        {
-            if (GetLastError() == ERROR_FILE_NOT_FOUND)
-            {
-                Buffer = NULL;
-                break;
-            }
-            else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-            {
-                TRACE("SetupDiGetDeviceRegistryPropertyW() failed with error 0x%x\n", GetLastError());
-                goto cleanup;
-            }
-            /* This error was expected */
-            HeapFree(GetProcessHeap(), 0, Buffer);
-            Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize);
-            if (!Buffer)
-            {
-                TRACE("HeapAlloc() failed\n", GetLastError());
-                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-                goto cleanup;
-            }
-        }
-        if (Buffer == NULL)
-            continue;
-
-        /* Check if we match the given hardware ID */
+        /* Match Hardware ID */
        FoundHardwareId = FALSE;
-        for (CurrentHardwareId = Buffer; *CurrentHardwareId != UNICODE_NULL; CurrentHardwareId += wcslen(CurrentHardwareId) + 1)
+        Property = SPDRP_HARDWAREID;
+        while (TRUE)
        {
-            if (wcscmp(CurrentHardwareId, HardwareId) == 0)
+            /* Get IDs data */
+            Buffer = NULL;
+            BufferSize = 0;
+            while (!SetupDiGetDeviceRegistryPropertyW(DevInstData.hDevInfo,
+                                                      &DevInstData.devInfoData,
+                                                      Property,
+                                                      NULL,
+                                                      (PBYTE)Buffer,
+                                                      BufferSize,
+                                                      &BufferSize))
+            {
+                if (GetLastError() == ERROR_FILE_NOT_FOUND)
+                {
+                    break;
+                }
+                else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+                {
+                    TRACE("SetupDiGetDeviceRegistryPropertyW() failed with error 0x%x\n", GetLastError());
+                    goto cleanup;
+                }
+                /* This error was expected */
+                HeapFree(GetProcessHeap(), 0, Buffer);
+                Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize);
+                if (!Buffer)
+                {
+                    TRACE("HeapAlloc() failed\n", GetLastError());
+                    SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                    goto cleanup;
+                }
+            }
+            if (Buffer)
+            {
+                /* Check if we match the given hardware ID */
+                for (CurrentHardwareId = Buffer; *CurrentHardwareId != UNICODE_NULL; CurrentHardwareId += wcslen(CurrentHardwareId) + 1)
+                {
+                    if (_wcsicmp(CurrentHardwareId, HardwareId) == 0)
+                    {
+                        FoundHardwareId = TRUE;
+                        break;
+                    }
+                }
+            }
+            if (FoundHardwareId || Property == SPDRP_COMPATIBLEIDS)
            {
-                FoundHardwareId = TRUE;
                break;
            }
+            Property = SPDRP_COMPATIBLEIDS;
        }
        if (!FoundHardwareId)
            continue;
--- a/dll/win32/setupapi/install.c
+++ b/dll/win32/setupapi/install.c
@ -1612,37 +1612,72 @@ void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, IN
 /***********************************************************************
 *              SetupInstallServicesFromInfSectionW  (SETUPAPI.@)
 */
-BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF Inf, PCWSTR SectionName, DWORD Flags)
+BOOL
+WINAPI
+SetupInstallServicesFromInfSectionW(
+    _In_ HINF InfHandle,
+    _In_ PCWSTR SectionName,
+    _In_ DWORD Flags)
 {
-    return SetupInstallServicesFromInfSectionExW( Inf, SectionName, Flags,
-                                                  NULL, NULL, NULL, NULL );
+    return SetupInstallServicesFromInfSectionExW(InfHandle,
+                                                 SectionName,
+                                                 Flags,
+                                                 INVALID_HANDLE_VALUE,
+                                                 NULL,
+                                                 NULL,
+                                                 NULL);
 }

 /***********************************************************************
 *              SetupInstallServicesFromInfSectionA  (SETUPAPI.@)
 */
-BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DWORD Flags)
+BOOL
+WINAPI
+SetupInstallServicesFromInfSectionA(
+    _In_ HINF InfHandle,
+    _In_ PCSTR SectionName,
+    _In_ DWORD Flags)
 {
-    return SetupInstallServicesFromInfSectionExA( Inf, SectionName, Flags,
-                                                  NULL, NULL, NULL, NULL );
+    return SetupInstallServicesFromInfSectionExA(InfHandle,
+                                                 SectionName,
+                                                 Flags,
+                                                 INVALID_HANDLE_VALUE,
+                                                 NULL,
+                                                 NULL,
+                                                 NULL);
 }

 /***********************************************************************
 *		SetupInstallServicesFromInfSectionExA  (SETUPAPI.@)
 */
-BOOL WINAPI SetupInstallServicesFromInfSectionExA( HINF hinf, PCSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 )
+BOOL
+WINAPI
+SetupInstallServicesFromInfSectionExA(
+    _In_ HINF InfHandle,
+    _In_ PCSTR SectionName,
+    _In_ DWORD Flags,
+    _In_opt_ HDEVINFO DeviceInfoSet,
+    _In_opt_ PSP_DEVINFO_DATA DeviceInfoData,
+    _Reserved_ PVOID Reserved1,
+    _Reserved_ PVOID Reserved2)
 {
-    UNICODE_STRING sectionnameW;
-    BOOL ret = FALSE;
+    UNICODE_STRING SectionNameW;
+    BOOL ret;

-    if (RtlCreateUnicodeStringFromAsciiz( &sectionnameW, sectionname ))
+    if (!RtlCreateUnicodeStringFromAsciiz(&SectionNameW, SectionName))
    {
-        ret = SetupInstallServicesFromInfSectionExW( hinf, sectionnameW.Buffer, flags, devinfo, devinfo_data, reserved1, reserved2 );
-        RtlFreeUnicodeString( &sectionnameW );
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
    }
-    else
-        SetLastError( ERROR_NOT_ENOUGH_MEMORY );

+    ret = SetupInstallServicesFromInfSectionExW(InfHandle,
+                                                SectionNameW.Buffer,
+                                                Flags,
+                                                DeviceInfoSet,
+                                                DeviceInfoData,
+                                                Reserved1,
+                                                Reserved2);
+    RtlFreeUnicodeString(&SectionNameW);
    return ret;
 }

@ -2078,29 +2113,61 @@ cleanup:
 /***********************************************************************
 *		SetupInstallServicesFromInfSectionExW  (SETUPAPI.@)
 */
-BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PVOID reserved1, PVOID reserved2 )
+BOOL
+WINAPI
+SetupInstallServicesFromInfSectionExW(
+    _In_ HINF InfHandle,
+    _In_ PCWSTR SectionName,
+    _In_ DWORD Flags,
+    _In_opt_ HDEVINFO DeviceInfoSet,
+    _In_opt_ PSP_DEVINFO_DATA DeviceInfoData,
+    _Reserved_ PVOID Reserved1,
+    _Reserved_ PVOID Reserved2)
 {
-    struct DeviceInfoSet *list = NULL;
+    struct DeviceInfoSet *list;
    BOOL ret = FALSE;

-    TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname),
-        flags, DeviceInfoSet, DeviceInfoData, reserved1, reserved2);
+    /* FIXME: SPSVCINST_ASSOCSERVICE is not fully supported */
+    static const DWORD SupportedFlags =
+        SPSVCINST_TAGTOFRONT | SPSVCINST_DELETEEVENTLOGENTRY | SPSVCINST_NOCLOBBER_DISPLAYNAME |
+        SPSVCINST_NOCLOBBER_STARTTYPE | SPSVCINST_NOCLOBBER_ERRORCONTROL |
+        SPSVCINST_NOCLOBBER_LOADORDERGROUP | SPSVCINST_NOCLOBBER_DEPENDENCIES |
+        SPSVCINST_STOPSERVICE;

-    if (!sectionname)
-        SetLastError(ERROR_INVALID_PARAMETER);
-    else if (flags & ~(SPSVCINST_TAGTOFRONT | SPSVCINST_DELETEEVENTLOGENTRY | SPSVCINST_NOCLOBBER_DISPLAYNAME | SPSVCINST_NOCLOBBER_STARTTYPE | SPSVCINST_NOCLOBBER_ERRORCONTROL | SPSVCINST_NOCLOBBER_LOADORDERGROUP | SPSVCINST_NOCLOBBER_DEPENDENCIES | SPSVCINST_STOPSERVICE))
+    TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n",
+          InfHandle,
+          debugstr_w(SectionName),
+          Flags,
+          DeviceInfoSet,
+          DeviceInfoData,
+          Reserved1,
+          Reserved2);
+
+    if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE)
    {
-        TRACE("Unknown flags: 0x%08lx\n", flags & ~(SPSVCINST_TAGTOFRONT | SPSVCINST_DELETEEVENTLOGENTRY | SPSVCINST_NOCLOBBER_DISPLAYNAME | SPSVCINST_NOCLOBBER_STARTTYPE | SPSVCINST_NOCLOBBER_ERRORCONTROL | SPSVCINST_NOCLOBBER_LOADORDERGROUP | SPSVCINST_NOCLOBBER_DEPENDENCIES | SPSVCINST_STOPSERVICE));
+        list = NULL;
+    } else
+    {
+        list = (struct DeviceInfoSet*)DeviceInfoSet;
+    }
+
+    if (Flags & ~(SupportedFlags))
+    {
+        TRACE("Unknown flags: 0x%08lx\n", Flags & ~(SupportedFlags));
        SetLastError(ERROR_INVALID_FLAGS);
    }
-    else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE)
-        SetLastError(ERROR_INVALID_HANDLE);
-    else if (DeviceInfoSet && (list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC)
-        SetLastError(ERROR_INVALID_HANDLE);
-    else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA))
-        SetLastError(ERROR_INVALID_USER_BUFFER);
-    else if (reserved1 != NULL || reserved2 != NULL)
+    else if (!SectionName || Reserved1 || Reserved2)
+    {
        SetLastError(ERROR_INVALID_PARAMETER);
+    }
+    else if (list && list->magic != SETUP_DEVICE_INFO_SET_MAGIC)
+    {
+        SetLastError(ERROR_INVALID_HANDLE);
+    }
+    else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA))
+    {
+        SetLastError(ERROR_INVALID_USER_BUFFER);
+    }
    else
    {
        struct needs_callback_info needs_info;
@ -2111,16 +2178,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname
        BOOL bNeedReboot = FALSE;

        /* Parse 'Include' and 'Needs' directives */
-        iterate_section_fields( hinf, sectionname, Include, include_callback, NULL);
+        iterate_section_fields(InfHandle, SectionName, Include, include_callback, NULL);
        needs_info.type = 1;
-        needs_info.flags = flags;
+        needs_info.flags = Flags;
        needs_info.devinfo = DeviceInfoSet;
        needs_info.devinfo_data = DeviceInfoData;
-        needs_info.reserved1 = reserved1;
-        needs_info.reserved2 = reserved2;
-        iterate_section_fields( hinf, sectionname, Needs, needs_callback, &needs_info);
+        needs_info.reserved1 = Reserved1;
+        needs_info.reserved2 = Reserved2;
+        iterate_section_fields(InfHandle, SectionName, Needs, needs_callback, &needs_info);

-        if (flags & SPSVCINST_STOPSERVICE)
+        if (Flags & SPSVCINST_STOPSERVICE)
        {
            FIXME("Stopping the device not implemented\n");
            /* This may lead to require a reboot */
@ -2136,16 +2203,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname
                goto done;
            }
 #endif
-            flags &= ~SPSVCINST_STOPSERVICE;
+            Flags &= ~SPSVCINST_STOPSERVICE;
        }

-        if (!(ret = SetupFindFirstLineW( hinf, sectionname, NULL, &ContextService )))
+        if (!(ret = SetupFindFirstLineW(InfHandle, SectionName, NULL, &ContextService)))
        {
-            SetLastError( ERROR_SECTION_NOT_FOUND );
+            SetLastError(ERROR_SECTION_NOT_FOUND);
            goto done;
        }

-        ret = SetupFindFirstLineW(hinf, sectionname, AddService, &ContextService);
+        ret = SetupFindFirstLineW(InfHandle, SectionName, AddService, &ContextService);
        while (ret)
        {
            if (!GetStringField(&ContextService, 1, &ServiceName))
@ -2164,11 +2231,11 @@ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname
            if (!GetStringField(&ContextService, 3, &ServiceSection))
                goto done;

-            ret = InstallOneService(list, hinf, ServiceSection, ServiceName, (ServiceFlags & ~SPSVCINST_ASSOCSERVICE) | flags);
+            ret = InstallOneService(list, InfHandle, ServiceSection, ServiceName, (ServiceFlags & ~SPSVCINST_ASSOCSERVICE) | Flags);
            if (!ret)
                goto done;

-            if (ServiceFlags & SPSVCINST_ASSOCSERVICE)
+            if (list && (ServiceFlags & SPSVCINST_ASSOCSERVICE))
            {
                ret = SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, (LPBYTE)ServiceName, (strlenW(ServiceName) + 1) * sizeof(WCHAR));
                if (!ret)
--- a/dll/win32/setupapi/query.c
+++ b/dll/win32/setupapi/query.c
@ -693,3 +693,21 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(

    return TRUE;
 }
+
+BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff,
+    DWORD size, DWORD *req_size)
+{
+    FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff,
+        size, req_size);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff,
+    DWORD size, DWORD *req_size)
+{
+    FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff,
+        size, req_size);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
--- a/dll/win32/setupapi/setupapi.spec
+++ b/dll/win32/setupapi/setupapi.spec
@ -475,8 +475,8 @@
@ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr)
@ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr)
@ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr)
-@ stub SetupQueryInfVersionInformationA
-@ stub SetupQueryInfVersionInformationW
+@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr)
+@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr)
@ stub SetupQuerySourceListA
@ stub SetupQuerySourceListW
@ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long)
--- a/drivers/usb/usbstor/scsi.c
+++ b/drivers/usb/usbstor/scsi.c
@ -181,7 +181,7 @@ USBSTOR_CSWCompletionRoutine(
        // should happen only when a sense request was sent
        if (Request != FDODeviceExtension->ActiveSrb)
        {
-            ASSERT(IoStack->Parameters.Scsi.Srb == &Context->SenseSrb);
+            // ASSERT(IoStack->Parameters.Scsi.Srb == &Context->SenseSrb);
            FDODeviceExtension->ActiveSrb->SenseInfoBufferLength = Request->DataTransferLength;
            Request = FDODeviceExtension->ActiveSrb;
            IoStack->Parameters.Scsi.Srb = Request;
@ -195,7 +195,7 @@ USBSTOR_CSWCompletionRoutine(
        // the command is correct but with failed status - issue request sense
        DPRINT("USBSTOR_CSWCompletionRoutine: CSW_STATUS_COMMAND_FAILED\n");

-        ASSERT(FDODeviceExtension->ActiveSrb == Request);
+        // ASSERT(FDODeviceExtension->ActiveSrb == Request);

        // setting a generic error status, additional information
        // should be read by higher-level driver from SenseInfoBuffer
@ -545,7 +545,7 @@ USBSTOR_HandleExecuteSCSI(
    PSCSI_REQUEST_BLOCK Request;
    PPDO_DEVICE_EXTENSION PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;

-    ASSERT(PDODeviceExtension->Common.IsFDO == FALSE);
+    // ASSERT(PDODeviceExtension->Common.IsFDO == FALSE);

    IoStack = IoGetCurrentIrpStackLocation(Irp);
    Request = IoStack->Parameters.Scsi.Srb;
--- a/modules/rostests/apitests/CMakeLists.txt
+++ b/modules/rostests/apitests/CMakeLists.txt
@ -18,6 +18,7 @@ if (NOT USE_DUMMY_PSEH)
    add_subdirectory(compiler)
 endif()
 add_subdirectory(crt)
+add_subdirectory(crypt32)
 add_subdirectory(dbghelp)
 add_subdirectory(dciman32)
 add_subdirectory(dnsapi)
--- a/modules/rostests/apitests/crypt32/CMakeLists.txt
+++ b/modules/rostests/apitests/crypt32/CMakeLists.txt
@ -0,0 +1,10 @@
+
+list(APPEND SOURCE
+    CertEnumSystemStoreLocation.c
+    testlist.c)
+
+add_executable(crypt32_apitest ${SOURCE})
+target_link_libraries(crypt32_apitest wine ${PSEH_LIB})
+set_module_type(crypt32_apitest win32cui)
+add_importlibs(crypt32_apitest crypt32 msvcrt kernel32 ntdll)
+add_rostests_file(TARGET crypt32_apitest)
--- a/modules/rostests/apitests/crypt32/CertEnumSystemStoreLocation.c
+++ b/modules/rostests/apitests/crypt32/CertEnumSystemStoreLocation.c
@ -0,0 +1,74 @@
+/*
+ * PROJECT:     ReactOS API Tests
+ * LICENSE:     MIT (https://spdx.org/licenses/MIT)
+ * PURPOSE:     Test for CertEnumSystemStoreLocation
+ * COPYRIGHT:   Copyright 2025 Ratin Gao <ratin@knsoft.org>
+ */
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <apitest.h>
+#include <windef.h>
+#include <wincrypt.h>
+
+#define ARG_CONTEXT ((PVOID)(ULONG_PTR)0x12345678)
+
+typedef struct _CERT_SYSTEM_STORE_LOCATION
+{
+    DWORD dwFlags;
+    PCWSTR pwszStoreLocation;
+} CERT_SYSTEM_STORE_LOCATION, * PCERT_SYSTEM_STORE_LOCATION;
+
+static const CERT_SYSTEM_STORE_LOCATION g_SystemStoreLocations[] = {
+    { CERT_SYSTEM_STORE_CURRENT_USER, L"CurrentUser" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE, L"LocalMachine" },
+    { CERT_SYSTEM_STORE_CURRENT_SERVICE, L"CurrentService" },
+    { CERT_SYSTEM_STORE_SERVICES, L"Services" },
+    { CERT_SYSTEM_STORE_USERS, L"Users" },
+    { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, L"CurrentUserGroupPolicy" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, L"LocalMachineGroupPolicy" },
+    { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, L"LocalMachineEnterprise" },
+};
+
+static ULONG g_Index = 0;
+
+static
+BOOL
+WINAPI
+CertEnumSystemStoreLocationCallback(
+    _In_ LPCWSTR pwszStoreLocation,
+    _In_ DWORD dwFlags,
+    _Reserved_ void* pvReserved,
+    _Inout_opt_ void* pvArg)
+{
+    ok(pvReserved == NULL, "pvReserved is not NULL\n");
+    ok(pvArg == ARG_CONTEXT, "pvArg incorrect\n");
+
+    if (g_Index < ARRAYSIZE(g_SystemStoreLocations))
+    {
+        ok(dwFlags == g_SystemStoreLocations[g_Index].dwFlags, "#%lu dwFlags incorrect\n", g_Index);
+        ok(wcscmp(pwszStoreLocation, g_SystemStoreLocations[g_Index].pwszStoreLocation) == 0,
+           "#%lu pwszStoreLocation incorrect\n",
+           g_Index);
+    }
+
+    g_Index++;
+    return TRUE;
+}
+
+START_TEST(CertEnumSystemStoreLocation)
+{
+    BOOL bRet;
+
+    /* dwFlags should be 0, otherwise fail with E_INVALIDARG */
+    bRet = CertEnumSystemStoreLocation(1, ARG_CONTEXT, CertEnumSystemStoreLocationCallback);
+    ok(bRet == FALSE && GetLastError() == E_INVALIDARG,
+       "CertEnumSystemStoreLocation should failed with E_INVALIDARG when dwFlags is not 0\n");
+
+    /* Start enumeration */
+    bRet = CertEnumSystemStoreLocation(0, ARG_CONTEXT, CertEnumSystemStoreLocationCallback);
+    ok(bRet != FALSE, "CertEnumSystemStoreLocation failed with 0x%08lX\n", GetLastError());
+    ok(g_Index >= ARRAYSIZE(g_SystemStoreLocations), "Count of enumerated item incorrect\n");
+}
--- a/modules/rostests/apitests/crypt32/testlist.c
+++ b/modules/rostests/apitests/crypt32/testlist.c
@ -0,0 +1,13 @@
+#define __ROS_LONG64__
+
+#define STANDALONE
+#include <apitest.h>
+
+extern void func_CertEnumSystemStoreLocation(void);
+
+const struct test winetest_testlist[] =
+{
+    { "CertEnumSystemStoreLocation", func_CertEnumSystemStoreLocation },
+
+    { 0, 0 }
+};
--- a/ntoskrnl/io/pnpmgr/pnpinit.c
+++ b/ntoskrnl/io/pnpmgr/pnpinit.c
@ -107,6 +107,7 @@ PiInitCacheGroupInformation(VOID)
                                  NULL,
                                  &GroupString,
                                  KEY_READ);
+
    if (NT_SUCCESS(Status))
    {
        /* Get the list */
--- a/ntoskrnl/mm/ARM3/expool.c
+++ b/ntoskrnl/mm/ARM3/expool.c
@ -2604,11 +2604,6 @@ ExFreePoolWithTag(IN PVOID P,
        if (TagToFree && TagToFree != Tag)
        {
            DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Tag);
-#if DBG
-            /* Do not bugcheck in case this is a big allocation for which we didn't manage to insert the tag */
-            if (Tag != ' GIB')
-                KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree);
-#endif
        }

        //
@ -2690,9 +2685,6 @@ ExFreePoolWithTag(IN PVOID P,
    if (TagToFree && TagToFree != Tag)
    {
        DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Tag);
-#if DBG
-        KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree);
-#endif
    }

    //
--- a/sdk/cmake/gcc.cmake
+++ b/sdk/cmake/gcc.cmake
@ -112,7 +112,7 @@ endif()
 add_compile_options(-march=${OARCH} -mtune=${TUNE})

 # Warnings, errors
-if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_C_COMPILER_ID STREQUAL Clang))
+if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND (NOT CMAKE_C_COMPILER_ID STREQUAL Clang))
    add_compile_options(-Werror)
 else()
    if(CMAKE_C_COMPILER_ID STREQUAL "Clang")