[USER32_WINETEST] Add a PCH.

modules/rostests/winetests/user32/CMakeLists.txt

@@ -1,4 +1,7 @@
 
+remove_definitions(-DWINVER=0x502 -D_WIN32_WINNT=0x502)
+add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x600)
+
 list(APPEND SOURCE
     broadcast.c
     class.c
@@ -24,9 +27,14 @@ list(APPEND SOURCE
     win.c
     winstation.c
     wsprintf.c
-    testlist.c)
+    precomp.h)
 
-add_executable(user32_winetest ${SOURCE} resource.rc)
+add_executable(user32_winetest
+    ${SOURCE}
+    testlist.c
+    resource.rc)
+
+add_pch(user32_winetest precomp.h SOURCE)
 # some tests need to be run from an app compiled as GUI
 set_module_type(user32_winetest win32gui)
 add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32)

modules/rostests/winetests/user32/broadcast.c

@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#define _WIN32_WINNT 0x0501
+#include "precomp.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-
-#include "wine/test.h"
 
 typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM );
 typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO );

modules/rostests/winetests/user32/class.c

@@ -18,21 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* To get CS_DROPSHADOW with the MSVC headers */
+#include "precomp.h"
-//#define _WIN32_WINNT 0x0501
 
-#include <stdlib.h>
+#include <commctrl.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commctrl.h"
 
 #define NUMCLASSWORDS 4
 

modules/rostests/winetests/user32/clipboard.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
+#include "precomp.h"
-#include "wine/test.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
 
 #define WM_CLIPBOARDUPDATE 0x031D
 

modules/rostests/winetests/user32/combo.c

@@ -17,14 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#define STRICT
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "wine/test.h"
 
 #define COMBO_ID 1995
 

modules/rostests/winetests/user32/cursoricon.c

@@ -20,16 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdlib.h>
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 #include "pshpack1.h"
 

modules/rostests/winetests/user32/dce.c

@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdlib.h>
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "wine/test.h"
 
 #ifndef DCX_USESTYLE
 #define DCX_USESTYLE         0x00010000

modules/rostests/winetests/user32/dde.c

@@ -19,18 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
 
-#include "windef.h"
+#include <dde.h>
-#include "winbase.h"
+#include <ddeml.h>
-#include "winuser.h"
-#include "winnls.h"
-#include "dde.h"
-#include "ddeml.h"
-#include "winerror.h"
-
-#include "wine/test.h"
 
 static const WCHAR TEST_DDE_SERVICE[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0};
 

modules/rostests/winetests/user32/dialog.c

@@ -28,18 +28,8 @@
  * strangeness, especially since most are in situations that would not
  * normally be met.
  */
-#undef WINVER
-#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 #define MAXHWNDS 1024
 static HWND hwnd [MAXHWNDS];

modules/rostests/winetests/user32/edit.c

@@ -18,11 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <windows.h>
-#include <commctrl.h>
-
-#include "wine/test.h"
 
 #ifndef ES_COMBO
 #define ES_COMBO 0x200

modules/rostests/winetests/user32/generated.c

@@ -5,16 +5,7 @@
  * Unit tests for data structure packing
  */
 
-#undef WINVER
+#include "precomp.h"
-#define WINVER 0x0600
-//#define _WIN32_IE 0x0501
-//#define _WIN32_WINNT 0x0501
-
-#define WINE_NOWINSOCK
-
-#include "windows.h"
-
-#include "wine/test.h"
 
 /***********************************************************************
  * Compatibility macros

modules/rostests/winetests/user32/input.c

@@ -44,19 +44,7 @@
  *
  */
 
-//#define _WIN32_WINNT 0x401
+#include "precomp.h"
-//#define _WIN32_IE 0x0500
-
-#include <stdarg.h>
-#include <assert.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#include "winnls.h"
-
-#include "wine/test.h"
 
 /* globals */
 static HWND hWndTest;

modules/rostests/winetests/user32/listbox.c

@@ -17,17 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-
-#include "wine/test.h"
 
 #ifdef VISIBLE
 #define WAIT Sleep (1000)

modules/rostests/winetests/user32/menu.c

@@ -19,21 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#define _WIN32_WINNT 0x0501
+#include "precomp.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#define OEMRESOURCE         /* For OBM_MNARROW */
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "wine/test.h"
 
 static ATOM atomMenuCheckClass;
 

modules/rostests/winetests/user32/monitor.c

@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 static HMODULE hdll;
 static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID);

modules/rostests/winetests/user32/msg.c

@@ -20,21 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#define _WIN32_WINNT 0x0600 /* For WM_CHANGEUISTATE,QS_RAWINPUT,WM_DWMxxxx */
+#include "precomp.h"
-//#define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */
 
-#include <assert.h>
+#include <dbt.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "dbt.h"
-
-#include "wine/test.h"
 
 #define MDI_FIRST_CHILD_ID 2004
 

modules/rostests/winetests/user32/precomp.h

@@ -0,0 +1,16 @@
+#ifndef _USER32_APITEST_PRECOMP_H_
+#define _USER32_APITEST_PRECOMP_H_
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#define WINE_NOWINSOCK
+#include <windows.h>
+
+#define WINE_NO_INLINE_RECT
+#include <wine/test.h>
+
+#endif /* _USER32_APITEST_PRECOMP_H_ */

modules/rostests/winetests/user32/resource.c

@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <windows.h>
-
-#include "wine/test.h"
 
 static UINT (WINAPI *pPrivateExtractIconsA)(LPCSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL;
 

modules/rostests/winetests/user32/scroll.c

@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <windows.h>
-
-#include "wine/test.h"
 
 static HWND hScroll;
 static BOOL bThemeActive = FALSE;

modules/rostests/winetests/user32/static.c

@@ -17,14 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-#include <stdio.h>
-
-#define STRICT
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "wine/test.h"
 
 #define TODO_COUNT 1
 

modules/rostests/winetests/user32/sysparams.c

@@ -16,24 +16,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */
-//#define _WIN32_IE 0x0700
-#undef WINVER
-#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */
 
-#include <assert.h>
+#include "precomp.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winreg.h"
-#include "winuser.h"
-#include "winnls.h"
 
 #ifndef SPI_GETDESKWALLPAPER
 # define SPI_GETDESKWALLPAPER 0x0073

modules/rostests/winetests/user32/text.c

@@ -19,14 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winerror.h"
-#include "winnls.h"
 
 #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100)
 #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top)

modules/rostests/winetests/user32/uitools.c

@@ -17,11 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_NO_INLINE_RECT
+#include "precomp.h"
-#include "wine/test.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 static void test_FillRect(void)
 {

modules/rostests/winetests/user32/win.c

@@ -20,20 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* To get ICON_SMALL2 with the MSVC headers */
+#include "precomp.h"
-//#define _WIN32_WINNT 0x0501
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "wine/test.h"
 
 #ifndef SPI_GETDESKWALLPAPER
 #define SPI_GETDESKWALLPAPER 0x0073

modules/rostests/winetests/user32/winstation.c

@@ -18,12 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
+#include "precomp.h"
-#include "winbase.h"
+
-#include "wingdi.h"
+#include <wine/winternl.h>
-#include "winuser.h"
-#include "winnls.h"
-#include "wine/winternl.h"
 
 static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG);
 

modules/rostests/winetests/user32/wsprintf.c

@@ -17,13 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
 
 static const struct
 {