[COM_APITEST] Improve the existing PCH and make use of it.

diff --git a/modules/rostests/apitests/com/CMakeLists.txt b/modules/rostests/apitests/com/CMakeLists.txt
index 1bd1adc..76e6efe 100644 (file)
--- a/modules/rostests/apitests/com/CMakeLists.txt
+++ b/modules/rostests/apitests/com/CMakeLists.txt
@@ -10,10 +10,11 @@ list(APPEND SOURCE
     shdocvw.c
     shell32.c
     com_apitest.c
     shdocvw.c
     shell32.c
     com_apitest.c

-    testlist.c)
+    com_apitest.h)

 
 

-add_executable(com_apitest ${SOURCE})
+add_executable(com_apitest ${SOURCE} testlist.c)

 target_link_libraries(com_apitest wine uuid)
 set_module_type(com_apitest win32cui)
 add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll)
 target_link_libraries(com_apitest wine uuid)
 set_module_type(com_apitest win32cui)
 add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll)

+add_pch(com_apitest com_apitest.h SOURCE)

 add_rostests_file(TARGET com_apitest)
 add_rostests_file(TARGET com_apitest)

diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c
index 0f9e592..7f72b0b 100644 (file)
--- a/modules/rostests/apitests/com/com_apitest.c
+++ b/modules/rostests/apitests/com/com_apitest.c
@@ -7,6 +7,12 @@
 
 #include "com_apitest.h"
 
 
 #include "com_apitest.h"
 

+#include <mshtmhst.h>
+#include <shlwapi.h>
+#include <commoncontrols.h>
+#include <activscp.h>
+#include <ndk/rtlfuncs.h>
+

 #define NDEBUG
 #include <debug.h>
 
 #define NDEBUG
 #include <debug.h>
 

diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h
index dd26a93..f841e58 100644 (file)
--- a/modules/rostests/apitests/com/com_apitest.h
+++ b/modules/rostests/apitests/com/com_apitest.h
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
  */
 
  * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
  */
 

-#pragma once
+#ifndef _COM_APITEST_H_
+#define _COM_APITEST_H_

 
 /* Define this if you're adding new classes - the test will auto-generate the
  * interface table entries for you ;) */
 
 /* Define this if you're adding new classes - the test will auto-generate the
  * interface table entries for you ;) */


@@ -17,33 +18,23 @@
 
 #define COBJMACROS
 #define WIN32_NO_STATUS
 
 #define COBJMACROS
 #define WIN32_NO_STATUS

+

 #include <wine/test.h>
 #include <wine/test.h>

+

 #include <objbase.h>
 #include <objsafe.h>
 #include <oleacc.h>
 #include <oledb.h>
 #include <objbase.h>
 #include <objsafe.h>
 #include <oleacc.h>
 #include <oledb.h>

-#include <oaidl.h>
-#include <dispex.h>

 #include <netcon.h>
 #include <netcfgx.h>
 #include <netcfgn.h>
 #include <netcon.h>
 #include <netcfgx.h>
 #include <netcfgn.h>

-#include <mshtmhst.h>

 #include <perhist.h>
 #include <shlguid.h>
 #include <perhist.h>
 #include <shlguid.h>

-#include <shlobj.h>
-#include <shobjidl.h>
-#include <shldisp.h>

 #include <shdeprecated.h>
 #include <shdeprecated.h>

-#include <shlobj_undoc.h>

 #include <shlguid_undoc.h>
 #include <shlguid_undoc.h>

-#include <shlwapi.h>
-#include <commoncontrols.h>
-#include <activscp.h>

 #include <urlhist.h>
 #include <htiface.h>
 #include <urlhist.h>
 #include <htiface.h>

-#include <htiframe.h>

 #include <mshtml.h>
 #include <mshtml.h>

-#include <ndk/rtlfuncs.h>

 #include <initguid.h>
 
 typedef IUnknown *PUNKNOWN;
 #include <initguid.h>
 
 typedef IUnknown *PUNKNOWN;


@@ -202,3 +193,5 @@ DEFINE_GUID(IID_DFConstraint,              0x403df050, 0x23bd, 0x11d2, 0x93, 0x9
 DEFINE_GUID(IID_CDefView,                  0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62);
 DEFINE_GUID(IID_FolderItems2,              0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f);
 DEFINE_GUID(IID_FolderItems3,              0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f);
 DEFINE_GUID(IID_CDefView,                  0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62);
 DEFINE_GUID(IID_FolderItems2,              0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f);
 DEFINE_GUID(IID_FolderItems3,              0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f);

+
+#endif /* _COM_APITEST_H_ */