ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ROSAUTOTEST] Fix ReactOS detection

Browse Source 
bootcdregtest installs ReactOS into "c:\Windows", therefore the old detection method of checking the "Windows" directory no longer works.

A previous change tried to fix this by adding "|| IsReactOS()", but that resolves to CConfiguration::IsReactOS(), which simply returns m_IsReactOS.

Use ::IsReactOS() instead to get our versionhelper function.
This commit is contained in:
Timo Kreuzer
2026-04-26 11:22:14 +00:00
parent 2cbce1c043
commit 7ab226a130
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/rostests/rosautotest/CConfiguration.cpp
+4 -7
View File
@@ -26,15 +26,12 @@ CConfiguration::CConfiguration()
m_Submit(false),
m_ListModules(false)
{
WCHAR WindowsDirectory[MAX_PATH];
WCHAR Interactive[32];
/* Check if we are running under ReactOS from the SystemRoot directory */
if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH))
FATAL("GetWindowsDirectoryW failed\n");
m_IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7);
m_IsReactOS = m_IsReactOS || IsReactOS();
/* Check if we are running under ReactOS by calling our versionhelper function.
We cannot use the name of the SystemRoot folder, because bootcdregtest is using "c:\Windows".
Note: "IsReactOS()" without "::" would resolve to CConfiguration::IsReactOS(). */
m_IsReactOS = ::IsReactOS();
if(GetEnvironmentVariableW(L"WINETEST_INTERACTIVE", Interactive, _countof(Interactive)))
m_IsInteractive = _wtoi(Interactive);