[CRT_APITEST] Fix version check for (_w)system on ReactOS

ReactOS behaves like Vista+ now.

Author: tkreuzer

modules/rostests/apitests/crt/_wsystem.c

@@ -13,60 +13,63 @@ START_TEST(_wsystem)
     int ret;
     WCHAR szCmdExe[MAX_PATH];
 
+    /* ReactOS behaves like Vista here */
+    DWORD dwOsVer = is_reactos() ? _WIN32_WINNT_VISTA : GetNTVersion();
+
     GetSystemDirectoryW(szCmdExe, _countof(szCmdExe));
     lstrcatW(szCmdExe, L"\\cmd.exe");
 
     SetEnvironmentVariableW(L"COMSPEC", NULL);
     errno = 0xDEADBEEF;
     ret = _wsystem(NULL);
     ok_int(errno, 0xDEADBEEF);
-    ok_int(ret, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0 : 1);
+    ok_int(ret, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0 : 1);
 
     SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec");
     errno = 0xDEADBEEF;
     ret = _wsystem(NULL);
     ok_int(errno, 0xDEADBEEF);
-    ok_int(ret, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0 : 1);
+    ok_int(ret, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0 : 1);
 
     SetEnvironmentVariableW(L"COMSPEC", szCmdExe);
     errno = 0xDEADBEEF;
     ret = _wsystem(NULL);
     ok_int(errno, 0xDEADBEEF);
-    ok_int(ret, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0 : 1);
+    ok_int(ret, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0 : 1);
 
     SetEnvironmentVariableW(L"COMSPEC", NULL);
     errno = 0xDEADBEEF;
     ret = _wsystem(L"echo This is a test");
-    ok_int(errno, (_winver >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec");
     errno = 0xDEADBEEF;
     ret = _wsystem(L"echo This is a test");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableW(L"COMSPEC", szCmdExe);
     errno = 0xDEADBEEF;
     ret = _wsystem(L"echo This is a test");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableW(L"COMSPEC", NULL);
     errno = 0xDEADBEEF;
     ret = _wsystem(L"InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 
     SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec");
     errno = 0xDEADBEEF;
     ret = _wsystem(L"InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 
     SetEnvironmentVariableW(L"COMSPEC", szCmdExe);
     errno = 0xDEADBEEF;
     ret = _wsystem(L"InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 }

modules/rostests/apitests/crt/system.c

@@ -13,6 +13,13 @@ START_TEST(system)
     int ret;
     CHAR szCmdExe[MAX_PATH];
 
+#ifdef TEST_CRTDLL
+    DWORD dwOsVer = _WIN32_WINNT_WIN2K;
+#else
+    /* ReactOS behaves like Vista here */
+    DWORD dwOsVer = is_reactos() ? _WIN32_WINNT_VISTA : GetNTVersion();
+#endif
+
     GetSystemDirectoryA(szCmdExe, _countof(szCmdExe));
     lstrcatA(szCmdExe, "\\cmd.exe");
 
@@ -37,36 +44,36 @@ START_TEST(system)
     SetEnvironmentVariableA("COMSPEC", NULL);
     errno = 0xDEADBEEF;
     ret = system("echo This is a test");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableA("COMSPEC", "InvalidComSpec");
     errno = 0xDEADBEEF;
     ret = system("echo This is a test");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableA("COMSPEC", szCmdExe);
     errno = 0xDEADBEEF;
     ret = system("echo This is a test");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 0);
 
     SetEnvironmentVariableA("COMSPEC", NULL);
     errno = 0xDEADBEEF;
     ret = system("InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 
     SetEnvironmentVariableA("COMSPEC", "InvalidComSpec");
     errno = 0xDEADBEEF;
     ret = system("InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 
     SetEnvironmentVariableA("COMSPEC", szCmdExe);
     errno = 0xDEADBEEF;
     ret = system("InvalidCommandLine");
-    ok_int(errno, (GetNTVersion() >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
+    ok_int(errno, (dwOsVer >= _WIN32_WINNT_VISTA) ? 0xdeadbeef : 0);
     ok_int(ret, 1);
 }