[SHLWAPI_WINETEST] Add a PCH.

diff --git a/modules/rostests/winetests/shlwapi/CMakeLists.txt b/modules/rostests/winetests/shlwapi/CMakeLists.txt
index dfd73e6..f46f22d 100644 (file)
--- a/modules/rostests/winetests/shlwapi/CMakeLists.txt
+++ b/modules/rostests/winetests/shlwapi/CMakeLists.txt
@@ -15,9 +15,9 @@ list(APPEND SOURCE
     string.c
     thread.c
     url.c
-    testlist.c)
+    precomp.h)
 
-add_executable(shlwapi_winetest ${SOURCE})
+add_executable(shlwapi_winetest ${SOURCE} testlist.c)
 target_link_libraries(shlwapi_winetest uuid)
 set_module_type(shlwapi_winetest win32cui)
 add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32)
@@ -26,4 +26,5 @@ if(MSVC)
     add_importlibs(shlwapi_winetest ntdll)
 endif()
 
+add_pch(shlwapi_winetest precomp.h SOURCE)
 add_rostests_file(TARGET shlwapi_winetest)

diff --git a/modules/rostests/winetests/shlwapi/assoc.c b/modules/rostests/winetests/shlwapi/assoc.c
index 5e37dd6..8915b3a 100644 (file)
--- a/modules/rostests/winetests/shlwapi/assoc.c
+++ b/modules/rostests/winetests/shlwapi/assoc.c
@@ -17,16 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#include <wine/test.h>
-#include <winreg.h>
-#include <shlwapi.h>
-#include <shlguid.h>
+#include "precomp.h"
 
 #define expect(expected, got) ok( (expected) == (got), "Expected %d, got %d\n", (expected), (got))
 #define expect_hr(expected, got) ok( (expected) == (got), "Expected %08x, got %08x\n", (expected), (got))

diff --git a/modules/rostests/winetests/shlwapi/clist.c b/modules/rostests/winetests/shlwapi/clist.c
index e7fc4f9..c621ffc 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/clist.c
+++ b/modules/rostests/winetests/shlwapi/clist.c
@@ -17,18 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-
-#include <wine/test.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <objbase.h>
+#include "precomp.h"
 
 typedef struct tagSHLWAPI_CLIST
 {

diff --git a/modules/rostests/winetests/shlwapi/clsid.c b/modules/rostests/winetests/shlwapi/clsid.c
index afad9ae..c86407c 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/clsid.c
+++ b/modules/rostests/winetests/shlwapi/clsid.c
@@ -17,22 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winnls.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <initguid.h>
-#include <shlguid.h>
-#include <shobjidl.h>
+#include "precomp.h"
+
 #include <olectl.h>
+#include <initguid.h>
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 

diff --git a/modules/rostests/winetests/shlwapi/generated.c b/modules/rostests/winetests/shlwapi/generated.c
index 44a449d..59fdd9f 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/generated.c
+++ b/modules/rostests/winetests/shlwapi/generated.c
@@ -5,26 +5,7 @@
  * Unit tests for data structure packing
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#ifndef __REACTOS__
-#define WINVER 0x0501
-#define _WIN32_IE 0x0501
-#define _WIN32_WINNT 0x0501
-#endif
-
-#define WINE_NOWINSOCK
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "wtypes.h"
-#include <winreg.h>
-#include <shlwapi.h>
-
-#include <wine/test.h>
+#include "precomp.h"
 
 /***********************************************************************
  * Compatibility macros

diff --git a/modules/rostests/winetests/shlwapi/istream.c b/modules/rostests/winetests/shlwapi/istream.c
index 9aefb1f..134a74c 100644 (file)
--- a/modules/rostests/winetests/shlwapi/istream.c
+++ b/modules/rostests/winetests/shlwapi/istream.c
@@ -17,22 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <winnls.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <shlwapi.h>
+#include "precomp.h"
 
 static void test_IStream_invalid_operations(IStream * stream, DWORD mode)
 {

diff --git a/modules/rostests/winetests/shlwapi/ordinal.c b/modules/rostests/winetests/shlwapi/ordinal.c
index c26a716..3cc8856 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/ordinal.c
+++ b/modules/rostests/winetests/shlwapi/ordinal.c
@@ -17,28 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdio.h>
-
-#define COBJMACROS
-#define CONST_VTABLE
-#include <wine/test.h>
-//#include "winbase.h"
-#include <winreg.h>
-#include <winnls.h>
-//#include "winerror.h"
-//#include "winuser.h"
-#include <ole2.h>
-//#include "oaidl.h"
-//#include "ocidl.h"
-//#include "mlang.h"
-#include <shlwapi.h>
-//#include "docobj.h"
-#include <shobjidl.h>
-//#include "shlobj.h"
+#include "precomp.h"
 
 /* Function ptrs for ordinal calls */
 static HMODULE hShlwapi;

diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c
index 6456e81..d025dbf 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/path.c
+++ b/modules/rostests/winetests/shlwapi/path.c
@@ -17,20 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <wine/test.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <winreg.h>
-#include <winnls.h>
-#include <shlwapi.h>
-#include <wininet.h>
+#include "precomp.h"
 
 static BOOL (WINAPI *pPathIsValidCharA)(char,DWORD);
 static BOOL (WINAPI *pPathIsValidCharW)(WCHAR,DWORD);

diff --git a/modules/rostests/winetests/shlwapi/precomp.h b/modules/rostests/winetests/shlwapi/precomp.h
new file mode 100644 (file)
index 0000000..0d6f5ba
--- /dev/null
+++ b/modules/rostests/winetests/shlwapi/precomp.h
@@ -0,0 +1,22 @@
+#ifndef _SHLWAPI_WINETEST_PRECOMP_H_
+#define _SHLWAPI_WINETEST_PRECOMP_H_
+
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
+#define CONST_VTABLE
+
+#include <wine/test.h>
+
+#include <winnls.h>
+#include <winreg.h>
+#include <shlwapi.h>
+#include <shlguid.h>
+#include <shobjidl.h>
+#include <ole2.h>
+#include <wininet.h>
+
+#endif /* !_SHLWAPI_WINETEST_PRECOMP_H_ */

diff --git a/modules/rostests/winetests/shlwapi/shreg.c b/modules/rostests/winetests/shlwapi/shreg.c
index a175e31..50c62b6 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/shreg.c
+++ b/modules/rostests/winetests/shlwapi/shreg.c
@@ -17,20 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-//#include "winuser.h"
-#include <shlwapi.h>
+#include "precomp.h"
 
 /* Keys used for testing */
 #define REG_TEST_KEY        "Software\\Wine\\Test"

diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c
index 1d8a6af..d12d820 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/string.c
+++ b/modules/rostests/winetests/shlwapi/string.c
@@ -17,23 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winnls.h>
-#include <ole2.h>
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_PATH
-#define NO_SHLWAPI_GDI
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-//#include "shtypes.h"
+#include "precomp.h"
 
 #define expect_eq(expr, val, type, fmt) do { \
     type ret = expr; \

diff --git a/modules/rostests/winetests/shlwapi/thread.c b/modules/rostests/winetests/shlwapi/thread.c
index 28b4ccd..17ff7a7 100644 (file)
--- a/modules/rostests/winetests/shlwapi/thread.c
+++ b/modules/rostests/winetests/shlwapi/thread.c
@@ -17,24 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdio.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-#define CONST_VTABLE
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winerror.h"
-#include <ole2.h>
-//#include "shlwapi.h"
-
-#include <wine/test.h>
+#include "precomp.h"
 
 static HRESULT (WINAPI *pSHCreateThreadRef)(LONG*, IUnknown**);
 static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**);

diff --git a/modules/rostests/winetests/shlwapi/url.c b/modules/rostests/winetests/shlwapi/url.c
index f3756e4..1e7679f 100644 (file)
--- a/modules/rostests/winetests/shlwapi/url.c
+++ b/modules/rostests/winetests/shlwapi/url.c
@@ -18,20 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <winreg.h>
-#include <winnls.h>
-#include <shlwapi.h>
-#include <wininet.h>
+#include "precomp.h"
+
 #include <intshcut.h>
 
 /* ################ */