[ADVAPI32_APITEST] Add a PCH.

2024-12-19 17:13:29 +08:00 · 2017-12-12 12:44:32 +01:00 · 2017-12-12 12:44:32 +01:00 · 24f8946956
commit 24f8946956
parent 24f35397c6
20 changed files with 34 additions and 75 deletions
--- a/modules/rostests/apitests/advapi32/CMakeLists.txt
+++ b/modules/rostests/apitests/advapi32/CMakeLists.txt
@ -17,10 +17,11 @@ list(APPEND SOURCE
    ServiceArgs.c
    ServiceEnv.c
    svchlp.c
-    testlist.c)
+    precomp.h)

-add_executable(advapi32_apitest ${SOURCE})
+add_executable(advapi32_apitest ${SOURCE} testlist.c)
 target_link_libraries(advapi32_apitest wine ${PSEH_LIB})
 set_module_type(advapi32_apitest win32cui)
 add_importlibs(advapi32_apitest advapi32 msvcrt kernel32 ntdll)
+add_pch(advapi32_apitest precomp.h SOURCE)
 add_rostests_file(TARGET advapi32_apitest)
--- a/modules/rostests/apitests/advapi32/CreateService.c
+++ b/modules/rostests/apitests/advapi32/CreateService.c
@ -5,11 +5,7 @@
 * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
 */

-#include <apitest.h>
-
-#include <winreg.h>
-#include <winsvc.h>
-#include <strsafe.h>
+#include "precomp.h"

 static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService, DWORD *tag)
 {
--- a/modules/rostests/apitests/advapi32/DuplicateTokenEx.c
+++ b/modules/rostests/apitests/advapi32/DuplicateTokenEx.c
@ -5,9 +5,7 @@
 * PROGRAMMER:      Jérôme Gardou <jerome.gardou@reactos.org>
 */

-#include <apitest.h>
-#include <winbase.h>
-#include <rtlfuncs.h>
+#include "precomp.h"

 #define ok_luid_equal(Luid, Expected)                                                                             \
    ok(RtlEqualLuid((Luid), (Expected)), "Got wrong LUID %08lx%08lx, expected (%08lx%08lx).\n", \
--- a/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c
+++ b/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c
@ -5,13 +5,9 @@
 * PROGRAMMER:      Jérôme Gardou <jerome.gardou@reactos.org>
 */

-#include <apitest.h>
+#include "precomp.h"

-#define WIN32_NO_STATUS
-#include <winreg.h>
-#include <ndk/rtlfuncs.h>
 #include <ndk/cmfuncs.h>
-#include <ndk/cmtypes.h>

 #define IS_HKCR(hk) (((UINT_PTR)hk & 3) == 2)

--- a/modules/rostests/apitests/advapi32/IsTextUnicode.c
+++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c
@ -6,13 +6,8 @@
 *                  Dmitry Chapyshev
 */

-#include <apitest.h>
+#include "precomp.h"

-#define WIN32_NO_STATUS
-#include <ndk/rtlfuncs.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <wincon.h>
 #include <stdio.h>

 PVOID LoadCodePageData(ULONG Code)
--- a/modules/rostests/apitests/advapi32/LockServiceDatabase.c
+++ b/modules/rostests/apitests/advapi32/LockServiceDatabase.c
@ -5,10 +5,7 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
 */

-#include <apitest.h>
-
-#include <winsvc.h>
-#include <strsafe.h>
+#include "precomp.h"

 #define TESTING_SERVICE     L"Spooler"

--- a/modules/rostests/apitests/advapi32/QueryServiceConfig2.c
+++ b/modules/rostests/apitests/advapi32/QueryServiceConfig2.c
@ -5,11 +5,7 @@
 * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
 */

-#include <apitest.h>
-
-#include <winreg.h>
-#include <winsvc.h>
-#include <strsafe.h>
+#include "precomp.h"

 #define TESTING_SERVICEW     L"Spooler"
 #define TESTING_SERVICEA      "Spooler"
--- a/modules/rostests/apitests/advapi32/RegEnumKey.c
+++ b/modules/rostests/apitests/advapi32/RegEnumKey.c
@ -5,10 +5,7 @@
 * PROGRAMMER:      Thomas Faber & Doug Lyons
 */

-#include <apitest.h>
-
-#define WIN32_NO_STATUS
-#include <winreg.h>
+#include "precomp.h"

 START_TEST(RegEnumKey)
 {
--- a/modules/rostests/apitests/advapi32/RegEnumValueW.c
+++ b/modules/rostests/apitests/advapi32/RegEnumValueW.c
@ -5,10 +5,7 @@
 * PROGRAMMER:      Jérôme Gardou <jerome.gardou@reactos.org>
 */

-#include <apitest.h>
-
-#define WIN32_NO_STATUS
-#include <winreg.h>
+#include "precomp.h"

 START_TEST(RegEnumValueW)
 {
--- a/modules/rostests/apitests/advapi32/RegOpenKeyExW.c
+++ b/modules/rostests/apitests/advapi32/RegOpenKeyExW.c
@ -4,15 +4,11 @@
 * PURPOSE:         Test for the RegOpenKeyExW alignment
 * PROGRAMMER:      Mark Jansen (mark.jansen@reactos.org)
 */
-#include <apitest.h>
-
-#define WIN32_NO_STATUS
-#include <winreg.h>

+#include "precomp.h"

 #define TEST_STR    L".exe"

-
 START_TEST(RegOpenKeyExW)
 {
    char GccShouldNotAlignThis[20 * 2];
--- a/modules/rostests/apitests/advapi32/RegQueryInfoKey.c
+++ b/modules/rostests/apitests/advapi32/RegQueryInfoKey.c
@ -5,10 +5,7 @@
 * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
 */

-#include <apitest.h>
-
-#define WIN32_NO_STATUS
-#include <winreg.h>
+#include "precomp.h"

 #define TestKeyAccess(da, er, es) TestKeyAccess_(__FILE__, __LINE__, da, er, es)
 static
--- a/modules/rostests/apitests/advapi32/RegQueryValueExW.c
+++ b/modules/rostests/apitests/advapi32/RegQueryValueExW.c
@ -4,10 +4,8 @@
 * PURPOSE:         Test for the RegQueryValueW API
 * PROGRAMMER:      Victor Martinez Calvo <victor.martinez@reactos.org>
 */
-#include <apitest.h>

-#define WIN32_NO_STATUS
-#include <winreg.h>
+#include "precomp.h"

 static DWORD delete_key(HKEY hkey)
 {
--- a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c
+++ b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c
@ -5,12 +5,8 @@
 * PROGRAMMER:      Timo Kreuzer <timo.kreuzer@reactos.org>
 */

-#include <apitest.h>
+#include "precomp.h"

-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ndk/ntndk.h>
-#include <winsafer.h>
 #include <ntsecapi.h>

 START_TEST(RtlEncryptMemory)
--- a/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c
+++ b/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c
@ -5,11 +5,8 @@
 * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
 */

-#include <apitest.h>
+#include "precomp.h"

-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ndk/ntndk.h>
 #include <winsafer.h>

 #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r)
--- a/modules/rostests/apitests/advapi32/ServiceArgs.c
+++ b/modules/rostests/apitests/advapi32/ServiceArgs.c
@ -6,10 +6,7 @@
 *                  Thomas Faber <thomas.faber@reactos.org>
 */

-#include <apitest.h>
-#include <winnls.h>
-#include <winsvc.h>
-#include <strsafe.h>
+#include "precomp.h"

 static char **argv;
 static int argc;
--- a/modules/rostests/apitests/advapi32/ServiceEnv.c
+++ b/modules/rostests/apitests/advapi32/ServiceEnv.c
@ -5,8 +5,8 @@
 * PROGRAMMER:      Hermes Belusca-Maito
 */

-#include <apitest.h>
-#include <winsvc.h>
+#include "precomp.h"
+
 #include "svchlp.h"


--- a/modules/rostests/apitests/advapi32/eventlog.c
+++ b/modules/rostests/apitests/advapi32/eventlog.c
@ -5,10 +5,7 @@
 * PROGRAMMER:      Hermes Belusca-Maito
 */

-#include <apitest.h>
-
-#define WIN32_NO_STATUS
-#include <winbase.h>
+#include "precomp.h"

 START_TEST(eventlog)
 {
--- a/modules/rostests/apitests/advapi32/precomp.h
+++ b/modules/rostests/apitests/advapi32/precomp.h
@ -0,0 +1,12 @@
+#ifndef _ADVAPI32_APITEST_PRECOMP_H_
+#define _ADVAPI32_APITEST_PRECOMP_H_
+
+#include <apitest.h>
+#include <winreg.h>
+#include <winsvc.h>
+#include <winnls.h>
+#include <strsafe.h>
+#include <ntstatus.h>
+#include <ndk/rtlfuncs.h>
+
+#endif /* _ADVAPI32_APITEST_PRECOMP_H_ */
--- a/modules/rostests/apitests/advapi32/svchlp.c
+++ b/modules/rostests/apitests/advapi32/svchlp.c
@ -13,10 +13,7 @@
 *   the service process, without really passing it 
 */

-#include <apitest.h>
-#include <winnls.h>
-#include <winsvc.h>
-#include <strsafe.h>
+#include "precomp.h"

 static HANDLE hClientPipe = INVALID_HANDLE_VALUE;
 static WCHAR named_pipe_name[100]; // Shared: FIXME!
--- a/modules/rostests/apitests/advapi32/svchlp.h
+++ b/modules/rostests/apitests/advapi32/svchlp.h
@ -7,8 +7,7 @@
 *                  Hermes Belusca-Maito
 */

-// #include <apitest.h>
-
+#pragma once

 /**********  S E R V I C E   ( C L I E N T )   M O D U L E   S I D E  *********/