25 May
2016
25 May
'16
5:22 p.m.
Author: mjansen
Date: Wed May 25 17:22:47 2016
New Revision: 71400
URL: http://svn.reactos.org/svn/reactos?rev=71400&view=rev
Log:
[APPHELP_APITEST] Remove some code duplication.
Modified:
trunk/rostests/apitests/apphelp/apphelp.c
trunk/rostests/apitests/apphelp/data.c
trunk/rostests/apitests/apphelp/layerapi.c
Modified: trunk/rostests/apitests/apphelp/apphelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.…
==============================================================================
--- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Wed May 25 17:22:47 2016
@@ -40,21 +40,22 @@
void test_create_exe_imp(const char* name, int skip_rsrc_exports);
void test_create_file_imp(const char* name, const char* contents, size_t len);
void test_create_ne_imp(const char* name, int skip_names);
+DWORD get_host_winver();
#define test_create_exe (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 :
test_create_exe_imp
#define test_create_file (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 :
test_create_file_imp
#define test_create_ne (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 :
test_create_ne_imp
-static DWORD g_Version;
-
-#define VERSION_ANY 0
-#define VERSION_WINXP 0x0501
-#define VERSION_2003 0x0502
-#define VERSION_VISTA 0x0600
-#define VERSION_WIN7 0x0601
-#define VERSION_WIN8 0x0602
-#define VERSION_WIN10 0x1000
+static DWORD g_WinVersion;
+
+#define WINVER_ANY 0
+#define WINVER_WINXP 0x0501
+#define WINVER_2003 0x0502
+#define WINVER_VISTA 0x0600
+#define WINVER_WIN7 0x0601
+#define WINVER_WIN8 0x0602
+#define WINVER_WIN10 0x1000
typedef WORD TAG;
@@ -187,20 +188,20 @@
const char* tags[7*8];
} data[] = {
{
- TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_ANY, VERSION_2003,
+ TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_ANY, WINVER_2003,
{
"InvalidTag", "INCLUDE", "GENERAL",
"MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS",
"USE_SERVICE_PACK_FILES", NULL
}
},
{
- TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_VISTA, VERSION_VISTA,
+ TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_VISTA, WINVER_VISTA,
{
"InvalidTag", "INCLUDE", "GENERAL",
"MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS",
"USE_SERVICE_PACK_FILES", "MITIGATION_OS", "BLOCK_UPGRADE",
"INCLUDEEXCLUDEDLL", NULL
}
},
{
- TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_WIN7, VERSION_ANY,
+ TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_WIN7, WINVER_ANY,
{
"InvalidTag", "INCLUDE", "GENERAL",
"MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS",
"USE_SERVICE_PACK_FILES", "MITIGATION_OS", "BLOCK_UPGRADE",
"INCLUDEEXCLUDEDLL", "RAC_EVENT_OFF",
"TELEMETRY_OFF", "SHIM_ENGINE_OFF", "LAYER_PROPAGATION_OFF",
"REINSTALL_UPGRADE", NULL
@@ -208,33 +209,33 @@
},
{
- TAG_TYPE_BYTE, 0x1000, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_BYTE, 0x1000, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", NULL
}
},
{
- TAG_TYPE_WORD, 0x800, __LINE__, VERSION_ANY, VERSION_WIN7,
+ TAG_TYPE_WORD, 0x800, __LINE__, WINVER_ANY, WINVER_WIN7,
{
"InvalidTag", "MATCH_MODE", NULL
}
},
{
- TAG_TYPE_WORD, 0x800, __LINE__, VERSION_WIN8, VERSION_ANY,
+ TAG_TYPE_WORD, 0x800, __LINE__, WINVER_WIN8, WINVER_ANY,
{
"InvalidTag", "MATCH_MODE",
"QUIRK_COMPONENT_CODE_ID", "QUIRK_CODE_ID", NULL
}
},
{
- TAG_TYPE_WORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_WORD | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", "TAG", "INDEX_TAG",
"INDEX_KEY", NULL
}
},
{
- TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_ANY, VERSION_WINXP,
+ TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_ANY, WINVER_WINXP,
{
"InvalidTag", "SIZE", "OFFSET",
"CHECKSUM", "SHIM_TAGID", "PATCH_TAGID",
"MODULE_TYPE", "VERFILEDATEHI",
"VERFILEDATELO", "VERFILEOS", "VERFILETYPE",
"PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION",
"PREVOSPLATFORMID", "PREVOSBUILDNO",
@@ -244,7 +245,7 @@
}
},
{
- TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_2003, VERSION_2003,
+ TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_2003, WINVER_2003,
{
"InvalidTag", "SIZE", "OFFSET",
"CHECKSUM", "SHIM_TAGID", "PATCH_TAGID",
"MODULE_TYPE", "VERFILEDATEHI",
"VERFILEDATELO", "VERFILEOS", "VERFILETYPE",
"PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION",
"PREVOSPLATFORMID", "PREVOSBUILDNO",
@@ -254,7 +255,7 @@
}
},
{
- TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA,
+ TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA,
{
"InvalidTag", "SIZE", "OFFSET",
"CHECKSUM", "SHIM_TAGID", "PATCH_TAGID",
"MODULE_TYPE", "VERDATEHI",
"VERDATELO", "VERFILEOS", "VERFILETYPE",
"PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER",
"PREVOSPLATFORMID", "PREVOSBUILDNO",
@@ -265,7 +266,7 @@
}
},
{
- TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY,
+ TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY,
{
"InvalidTag", "SIZE", "OFFSET",
"CHECKSUM", "SHIM_TAGID", "PATCH_TAGID",
"MODULE_TYPE", "VERDATEHI",
"VERDATELO", "VERFILEOS", "VERFILETYPE",
"PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER",
"PREVOSPLATFORMID", "PREVOSBUILDNO",
@@ -277,21 +278,21 @@
}
},
{
- TAG_TYPE_DWORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_DWORD | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", "TAGID", NULL
}
},
{
- TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_ANY, VERSION_WINXP,
+ TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_ANY, WINVER_WINXP,
{
"InvalidTag", "TIME", "BIN_FILE_VERSION",
"BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL",
"UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD",
"FLAG_MASK_USER", "FLAGS_NTVDM1",
"FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL",
"UPTO_BIN_FILE_VERSION", NULL
}
},
{
- TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_2003, VERSION_2003,
+ TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_2003, WINVER_2003,
{
"InvalidTag", "TIME", "BIN_FILE_VERSION",
"BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL",
"UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD",
"FLAG_MASK_USER", "FLAGS_NTVDM1",
"FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL",
"UPTO_BIN_FILE_VERSION", "FLAG_MASK_FUSION",
"FLAGS_PROCESSPARAM",
@@ -299,7 +300,7 @@
}
},
{
- TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_VISTA, VERSION_ANY,
+ TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_VISTA, WINVER_ANY,
{
"InvalidTag", "TIME", "BIN_FILE_VERSION",
"BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL",
"UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD",
"FLAG_MASK_USER", "FLAGS_NTVDM1",
"FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL",
"UPTO_BIN_FILE_VERSION", "FLAG_MASK_FUSION",
"FLAG_PROCESSPARAM",
@@ -308,7 +309,7 @@
},
{
- TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_ANY, VERSION_2003,
+ TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_ANY, WINVER_2003,
{
"InvalidTag", "NAME", "DESCRIPTION",
"MODULE", "API", "VENDOR", "APP_NAME",
"InvalidTag",
"COMMAND_LINE", "COMPANY_NAME", "DLLFILE",
"WILDCARD_NAME", "InvalidTag", "InvalidTag",
"InvalidTag", "InvalidTag",
@@ -318,7 +319,7 @@
}
},
{
- TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_VISTA, VERSION_VISTA,
+ TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_VISTA, WINVER_VISTA,
{
"InvalidTag", "NAME", "DESCRIPTION",
"MODULE", "API", "VENDOR", "APP_NAME",
"InvalidTag",
"COMMAND_LINE", "COMPANY_NAME", "DLLFILE",
"WILDCARD_NAME", "InvalidTag", "InvalidTag",
"InvalidTag", "InvalidTag",
@@ -328,7 +329,7 @@
}
},
{
- TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_WIN7, VERSION_ANY,
+ TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_WIN7, WINVER_ANY,
{
"InvalidTag", "NAME", "DESCRIPTION",
"MODULE", "API", "VENDOR", "APP_NAME",
"InvalidTag",
"COMMAND_LINE", "COMPANY_NAME", "DLLFILE",
"WILDCARD_NAME", "InvalidTag", "InvalidTag",
"InvalidTag", "InvalidTag",
@@ -339,7 +340,7 @@
},
{
- TAG_TYPE_LIST, 0x800, __LINE__, VERSION_ANY, VERSION_2003,
+ TAG_TYPE_LIST, 0x800, __LINE__, WINVER_ANY, WINVER_2003,
{
"InvalidTag", "DATABASE", "LIBRARY",
"INEXCLUDE", "SHIM", "PATCH", "APP",
"EXE",
"MATCHING_FILE", "SHIM_REF", "PATCH_REF",
"LAYER", "FILE", "APPHELP", "LINK",
"DATA",
@@ -347,7 +348,7 @@
}
},
{
- TAG_TYPE_LIST, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA,
+ TAG_TYPE_LIST, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA,
{
"InvalidTag", "DATABASE", "LIBRARY",
"INEXCLUDE", "SHIM", "PATCH", "APP",
"EXE",
"MATCHING_FILE", "SHIM_REF", "PATCH_REF",
"LAYER", "FILE", "APPHELP", "LINK",
"DATA",
@@ -356,7 +357,7 @@
}
},
{
- TAG_TYPE_LIST, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY,
+ TAG_TYPE_LIST, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY,
{
"InvalidTag", "DATABASE", "LIBRARY",
"INEXCLUDE", "SHIM", "PATCH", "APP",
"EXE",
"MATCHING_FILE", "SHIM_REF", "PATCH_REF",
"LAYER", "FILE", "APPHELP", "LINK",
"DATA",
@@ -366,26 +367,26 @@
}
},
{
- TAG_TYPE_LIST | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_LIST | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", "STRINGTABLE", "INDEXES",
"INDEX", NULL
}
},
{
- TAG_TYPE_STRING, 0x800, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_STRING, 0x800, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", NULL
}
},
{
- TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_2003,
+ TAG_TYPE_STRING | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_2003,
{
"InvalidTag", "STRTAB_ITEM", NULL
}
},
{
- TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_VISTA, VERSION_ANY,
+ TAG_TYPE_STRING | 0x800, 0x800, __LINE__, WINVER_VISTA, WINVER_ANY,
{
"InvalidTag", "STRINGTABLE_ITEM", NULL
}
@@ -393,21 +394,21 @@
{
- TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_ANY, VERSION_2003,
+ TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_ANY, WINVER_2003,
{
"InvalidTag", "InvalidTag", "PATCH_BITS",
"FILE_BITS", "EXE_ID(GUID)", "DATA_BITS",
"MSI_PACKAGE_ID(GUID)", "DATABASE_ID(GUID)",
NULL
}
},
{
- TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA,
+ TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA,
{
"InvalidTag", "InvalidTag", "PATCH_BITS",
"FILE_BITS", "EXE_ID", "DATA_BITS",
"MSI_PACKAGE_ID", "DATABASE_ID",
NULL
}
},
{
- TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY,
+ TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY,
{
"InvalidTag", "InvalidTag", "PATCH_BITS",
"FILE_BITS", "EXE_ID", "DATA_BITS",
"MSI_PACKAGE_ID", "DATABASE_ID",
"CONTEXT_PLATFORM_ID", "CONTEXT_BRANCH_ID",
"InvalidTag", "InvalidTag", "InvalidTag",
"InvalidTag", "InvalidTag", "InvalidTag",
@@ -415,7 +416,7 @@
}
},
{
- TAG_TYPE_BINARY | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY,
+ TAG_TYPE_BINARY | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY,
{
"InvalidTag", "INDEX_BITS", NULL
}
@@ -430,8 +431,8 @@
int n;
for (n = 0; data[n].base; ++n)
{
- if ((data[n].min_ver == VERSION_ANY || g_Version >= data[n].min_ver)
&&
- (data[n].max_ver == VERSION_ANY || g_Version <= data[n].max_ver))
+ if ((data[n].min_ver == WINVER_ANY || g_WinVersion >= data[n].min_ver)
&&
+ (data[n].max_ver == WINVER_ANY || g_WinVersion <= data[n].max_ver))
{
test_tag(data[n].base, data[n].tags, data[n].upper_limit, data[n].line);
}
@@ -846,15 +847,8 @@
START_TEST(apphelp)
{
- RTL_OSVERSIONINFOEXW rtlinfo;
- rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo);
-#ifdef __REACTOS__
- RtlGetVersion((PRTL_OSVERSIONINFOW)&rtlinfo);
-#else
- RtlGetVersion(&rtlinfo);
-#endif
- g_Version = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion;
- trace("Detected version: 0x%x\n", g_Version);
+ g_WinVersion = get_host_winver();
+ trace("Detected version: 0x%x\n", g_WinVersion);
//SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4");
//SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp");
hdll = LoadLibraryA("apphelp.dll");
@@ -869,10 +863,10 @@
test_ApplicationAttributes();
test_SdbTagToString();
#ifdef __REACTOS__
- if (g_Version < VERSION_WIN7)
- {
- g_Version = VERSION_WIN7;
- trace("Using version 0x%x for SdbTagToString tests\n", g_Version);
+ if (g_WinVersion < WINVER_WIN7)
+ {
+ g_WinVersion = WINVER_WIN7;
+ trace("Using version 0x%x for SdbTagToString tests\n", g_WinVersion);
}
#endif
test_SdbTagToStringAllTags();
Modified: trunk/rostests/apitests/apphelp/data.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r…
==============================================================================
--- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Wed May 25 17:22:47 2016
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Mark Jansen
+ * Copyright 2015,2016 Mark Jansen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -783,3 +783,19 @@
}
}
+static DWORD g_WinVersion;
+DWORD get_host_winver()
+{
+ if (!g_WinVersion)
+ {
+ RTL_OSVERSIONINFOEXW rtlinfo = {0};
+ void (__stdcall* pRtlGetVersion)(RTL_OSVERSIONINFOEXW*);
+ pRtlGetVersion = (void
(__stdcall*)(RTL_OSVERSIONINFOEXW*))GetProcAddress(GetModuleHandleA("ntdll"),
"RtlGetVersion");
+
+ rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo);
+ pRtlGetVersion(&rtlinfo);
+ g_WinVersion = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion;
+ }
+ return g_WinVersion;
+}
+
Modified: trunk/rostests/apitests/apphelp/layerapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/layerapi…
==============================================================================
--- trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] Wed May 25 17:22:47 2016
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Mark Jansen
+ * Copyright 2015,2016 Mark Jansen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,6 +31,8 @@
#include "wine/test.h"
+/* data.c */
+DWORD get_host_winver();
#define GPLK_USER 1
#define GPLK_MACHINE 2
@@ -45,10 +47,10 @@
static BOOL(WINAPI *pSetPermLayerState)(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags,
BOOL bMachine, BOOL bEnable);
-static DWORD g_Version;
-#define APPHELP_VISTA 0x0600
-#define APPHELP_WIN8 0x0602
-#define APPHELP_WIN10 0x1000
+static DWORD g_WinVersion;
+#define WINVER_VISTA 0x0600
+#define WINVER_WIN8 0x0602
+#define WINVER_WIN10 0x1000
/* Helper function to disable Wow64 redirection on an os that reports it being enabled.
*/
@@ -137,7 +139,7 @@
else
winetest_ok(dwBufSize == lenResult ||
/* W2k3 is off by 2 when concatenating user / machine */
- broken(g_Version < APPHELP_VISTA && type ==
(GPLK_MACHINE|GPLK_USER) && (lenResult + 2) == dwBufSize),
+ broken(g_WinVersion < WINVER_VISTA && type ==
(GPLK_MACHINE|GPLK_USER) && (lenResult + 2) == dwBufSize),
"Expected dwBufSize to be %u, was %u\n", lenResult,
dwBufSize);
if (result)
{
@@ -173,7 +175,7 @@
char drive_letter;
UINT drivetype = 0;
ok(pAllowPermLayer(NULL) == FALSE, "Expected AllowPermLayer to fail for
NULL\n");
- if (g_Version < APPHELP_WIN8)
+ if (g_WinVersion < WINVER_WIN8)
{
ok(wrapAllowPermLayer("-:"), "Expected AllowPermLayer to
succeed\n");
ok(wrapAllowPermLayer("@:"), "Expected AllowPermLayer to
succeed\n");
@@ -371,7 +373,7 @@
ok(wrapSetPermLayerState(emptyString, "TEST", 0, bMachine, 0) == FALSE,
"Expected SetPermLayerState to fail\n");
expect_LayerValue(bMachine, NULL, NULL);
- if (g_Version <= APPHELP_WIN8)
+ if (g_WinVersion <= WINVER_WIN8)
{
ok(wrapSetPermLayerState(emptyString, "TEST", 0, bMachine, 1) == FALSE,
"Expected SetPermLayerState to fail\n");
expect_LayerValue(bMachine, NULL, NULL);
@@ -399,13 +401,13 @@
expect_LayerValue(bMachine, file, "TEST");
ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "TEST TEST1", g_Version >=
APPHELP_WIN8, "TEST1 TEST");
+ expect_LayerValue2(bMachine, file, "TEST TEST1", g_WinVersion >=
WINVER_WIN8, "TEST1 TEST");
ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "TEST TEST1 TEST2", g_Version >=
APPHELP_WIN8, "TEST2 TEST1 TEST");
+ expect_LayerValue2(bMachine, file, "TEST TEST1 TEST2", g_WinVersion >=
WINVER_WIN8, "TEST2 TEST1 TEST");
ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 0) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "TEST TEST2", g_Version >=
APPHELP_WIN8, "TEST2 TEST");
+ expect_LayerValue2(bMachine, file, "TEST TEST2", g_WinVersion >=
WINVER_WIN8, "TEST2 TEST");
ok(wrapSetPermLayerState(fileW, "TEST", 0, bMachine, 0) == TRUE,
"Expected SetPermLayerState to succeed\n");
expect_LayerValue(bMachine, file, "TEST2");
@@ -415,7 +417,7 @@
/* Valid flags until win8: !# */
/* Key is empty, now play around with the flags. */
- for (dwFlag = ((g_Version >= APPHELP_WIN8) ? 6 : 2); dwFlag < 32; ++dwFlag)
+ for (dwFlag = ((g_WinVersion >= WINVER_WIN8) ? 6 : 2); dwFlag < 32; ++dwFlag)
{
ok(wrapSetPermLayerState(fileW, "TEST", (1<<dwFlag), bMachine, 1)
== FALSE, "Expected SetPermLayerState to fail on 0x%x\n", (1<<dwFlag));
}
@@ -426,23 +428,23 @@
expect_LayerValue(bMachine, file, "# TEST");
ok(wrapSetPermLayerState(fileW, "TEST2", 2, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST TEST2", g_Version >=
APPHELP_WIN8, "!# TEST2 TEST");
+ expect_LayerValue2(bMachine, file, "!# TEST TEST2", g_WinVersion >=
WINVER_WIN8, "!# TEST2 TEST");
ok(wrapSetPermLayerState(fileW, "TEST", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST2 TEST", g_Version >=
APPHELP_WIN8, "!# TEST TEST2");
+ expect_LayerValue2(bMachine, file, "!# TEST2 TEST", g_WinVersion >=
WINVER_WIN8, "!# TEST TEST2");
ok(wrapSetPermLayerState(fileW, "TEST3", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST2 TEST TEST3", g_Version >=
APPHELP_WIN8, "!# TEST3 TEST TEST2");
+ expect_LayerValue2(bMachine, file, "!# TEST2 TEST TEST3", g_WinVersion
>= WINVER_WIN8, "!# TEST3 TEST TEST2");
/* Remove on a flag removes that flag from the start. */
ok(wrapSetPermLayerState(fileW, "TEST2", 2, bMachine, 0) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "# TEST TEST3", g_Version >=
APPHELP_WIN8, "# TEST3 TEST");
+ expect_LayerValue2(bMachine, file, "# TEST TEST3", g_WinVersion >=
WINVER_WIN8, "# TEST3 TEST");
ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES, bMachine,
0) == TRUE, "Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "TEST TEST3", g_Version >=
APPHELP_WIN8, "TEST3 TEST");
+ expect_LayerValue2(bMachine, file, "TEST TEST3", g_WinVersion >=
WINVER_WIN8, "TEST3 TEST");
ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES | 2,
bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST TEST3", g_Version >=
APPHELP_WIN8, "!# TEST3 TEST");
+ expect_LayerValue2(bMachine, file, "!# TEST TEST3", g_WinVersion >=
WINVER_WIN8, "!# TEST3 TEST");
ok(wrapSetPermLayerState(fileW, "TEST3", LAYER_APPLY_TO_SYSTEM_EXES,
bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n");
expect_LayerValue(bMachine, file, "! TEST");
@@ -468,17 +470,17 @@
setLayerValue(bMachine, file, "!#!# TEST2 TEST2 !# TEST ");
ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST2 TEST2 !# TEST TEST1",
g_Version >= APPHELP_WIN8, "!# TEST1 TEST2 TEST2 !# TEST");
+ expect_LayerValue2(bMachine, file, "!# TEST2 TEST2 !# TEST TEST1",
g_WinVersion >= WINVER_WIN8, "!# TEST1 TEST2 TEST2 !# TEST");
/* Removing a duplicate entry will remove all instances of it */
ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 0) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# !# TEST TEST1", g_Version >=
APPHELP_WIN8, "!# TEST1 !# TEST");
+ expect_LayerValue2(bMachine, file, "!# !# TEST TEST1", g_WinVersion >=
WINVER_WIN8, "!# TEST1 !# TEST");
/* Adding a flag cleans other flags (from the start) */
ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES, bMachine,
1) == TRUE, "Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# TEST TEST1", g_Version >=
APPHELP_WIN8, "!# TEST1 !# TEST");
-
- if(g_Version < APPHELP_WIN8)
+ expect_LayerValue2(bMachine, file, "!# TEST TEST1", g_WinVersion >=
WINVER_WIN8, "!# TEST1 !# TEST");
+
+ if(g_WinVersion < WINVER_WIN8)
{
ok(wrapSetPermLayerState(fileW, "$%$%^^", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
expect_LayerValue(bMachine, file, "!# TEST TEST1 $%$%^^");
@@ -491,12 +493,12 @@
/* Tabs are treated as spaces */
setLayerValue(bMachine, file, "!#!# TEST2 \t TEST2 !# \t TEST ");
ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# !# TEST TEST2", g_Version >=
APPHELP_WIN8, "!# TEST2 !# TEST");
+ expect_LayerValue2(bMachine, file, "!# !# TEST TEST2", g_WinVersion >=
WINVER_WIN8, "!# TEST2 !# TEST");
/* Newlines are left as-is */
setLayerValue(bMachine, file, "!#!# TEST2 \n TEST2 !# \r\n TEST ");
ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE,
"Expected SetPermLayerState to succeed\n");
- expect_LayerValue2(bMachine, file, "!# \n !# \r\n TEST TEST2", g_Version
>= APPHELP_WIN8, "!# TEST2 \n !# \r\n TEST");
+ expect_LayerValue2(bMachine, file, "!# \n !# \r\n TEST TEST2", g_WinVersion
>= WINVER_WIN8, "!# TEST2 \n !# \r\n TEST");
/* Whitespace and duplicate flags are eaten from the start */
setLayerValue(bMachine, file, " !#!# TEST2 \t TEST2 !# \t TEST
");
@@ -750,7 +752,7 @@
if(ret)
{
ret = RedirectIat("apphelp.dll", "kernel32.dll",
"GetDriveTypeW", (ULONG_PTR)mGetDriveTypeW, (ULONG_PTR*)&pGetDriveTypeW);
- if (g_Version < APPHELP_WIN8)
+ if (g_WinVersion < WINVER_WIN8)
ok(ret, "Expected redirect_iat to succeed\n");
if(ret)
{
@@ -875,20 +877,13 @@
START_TEST(layerapi)
{
- RTL_OSVERSIONINFOEXW rtlinfo;
/*SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4");*/
hdll = LoadLibraryA("apphelp.dll");
pAllowPermLayer = (void *)GetProcAddress(hdll, "AllowPermLayer");
pSdbSetPermLayerKeys = (void *)GetProcAddress(hdll,
"SdbSetPermLayerKeys");
pSdbGetPermLayerKeys = (void *)GetProcAddress(hdll,
"SdbGetPermLayerKeys");
pSetPermLayerState = (void *)GetProcAddress(hdll, "SetPermLayerState");
- rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo);
-#ifdef __REACTOS__
- RtlGetVersion((PRTL_OSVERSIONINFOW)&rtlinfo);
-#else
- RtlGetVersion(&rtlinfo);
-#endif
- g_Version = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion;
+ g_WinVersion = get_host_winver();
if (!pAllowPermLayer)
{