[ros-diffs] [reactos] 01/01: [COMCTL32_WINETEST] Add a PCH.

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=284a839dbd6f647894211…

commit 284a839dbd6f6478942117c2bd8ecc83b1dde6b3
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Dec 17 13:40:43 2017 +0100

    [COMCTL32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/comctl32/CMakeLists.txt | 12 +++++++----
 modules/rostests/winetests/comctl32/animate.c      | 10 +--------
 modules/rostests/winetests/comctl32/button.c       |  8 +++----
 modules/rostests/winetests/comctl32/comboex.c      | 11 +---------
 modules/rostests/winetests/comctl32/datetime.c     | 11 +---------
 modules/rostests/winetests/comctl32/dpa.c          | 17 +--------------
 modules/rostests/winetests/comctl32/header.c       | 19 +---------------
 modules/rostests/winetests/comctl32/imagelist.c    | 21 +++---------------
 modules/rostests/winetests/comctl32/ipaddress.c    |  6 +-----
 modules/rostests/winetests/comctl32/listview.c     | 11 +---------
 modules/rostests/winetests/comctl32/misc.c         |  9 +-------
 modules/rostests/winetests/comctl32/monthcal.c     | 16 +-------------
 modules/rostests/winetests/comctl32/mru.c          | 14 ++----------
 modules/rostests/winetests/comctl32/msg.h          |  8 +++----
 modules/rostests/winetests/comctl32/pager.c        |  9 +-------
 modules/rostests/winetests/comctl32/precomp.h      | 25 ++++++++++++++++++++++
 modules/rostests/winetests/comctl32/progress.c     | 11 +---------
 modules/rostests/winetests/comctl32/propsheet.c    |  9 +-------
 modules/rostests/winetests/comctl32/rebar.c        | 15 +------------
 modules/rostests/winetests/comctl32/status.c       |  7 +-----
 modules/rostests/winetests/comctl32/subclass.c     |  8 ++-----
 modules/rostests/winetests/comctl32/syslink.c      | 10 +--------
 modules/rostests/winetests/comctl32/tab.c          | 11 +---------
 modules/rostests/winetests/comctl32/taskdialog.c   | 10 +--------
 modules/rostests/winetests/comctl32/toolbar.c      | 16 +-------------
 modules/rostests/winetests/comctl32/tooltips.c     | 11 +---------
 modules/rostests/winetests/comctl32/trackbar.c     | 10 +--------
 modules/rostests/winetests/comctl32/treeview.c     | 15 +------------
 modules/rostests/winetests/comctl32/updown.c       | 10 +--------
 modules/rostests/winetests/comctl32/v6util.h       |  6 ++++--
 30 files changed, 72 insertions(+), 284 deletions(-)

diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt
b/modules/rostests/winetests/comctl32/CMakeLists.txt
index b1798c3018..f72f87a169 100644
--- a/modules/rostests/winetests/comctl32/CMakeLists.txt
+++ b/modules/rostests/winetests/comctl32/CMakeLists.txt
@@ -5,7 +5,6 @@ add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
     animate.c
-    button.c
     comboex.c
     datetime.c
     dpa.c
@@ -21,7 +20,6 @@ list(APPEND SOURCE
     propsheet.c
     rebar.c
     status.c
-    subclass.c
     syslink.c
     tab.c
     taskdialog.c
@@ -30,9 +28,14 @@ list(APPEND SOURCE
     trackbar.c
     treeview.c
     updown.c
-    testlist.c)
+    precomp.h)
 
-add_executable(comctl32_winetest ${SOURCE} rsrc.rc)
+add_executable(comctl32_winetest
+    ${SOURCE}
+    button.c
+    subclass.c
+    testlist.c
+    rsrc.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
     add_target_compile_flags(comctl32_winetest "-Wno-format")
@@ -40,4 +43,5 @@ endif()
 
 set_module_type(comctl32_winetest win32cui)
 add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32)
+add_pch(comctl32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET comctl32_winetest)
diff --git a/modules/rostests/winetests/comctl32/animate.c
b/modules/rostests/winetests/comctl32/animate.c
index 28cf55b958..9324acd0e6 100644
--- a/modules/rostests/winetests/comctl32/animate.c
+++ b/modules/rostests/winetests/comctl32/animate.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commctrl.h"
-
-#include "wine/test.h"
+#include "precomp.h"
 
 #define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */
 #define INVALID_AVI_INDEX 0xffff
diff --git a/modules/rostests/winetests/comctl32/button.c
b/modules/rostests/winetests/comctl32/button.c
index 8cb5b5fc9b..ccc052b327 100644
--- a/modules/rostests/winetests/comctl32/button.c
+++ b/modules/rostests/winetests/comctl32/button.c
@@ -22,15 +22,13 @@
 
 #undef USE_WINE_TODOS
 
-//#include <windows.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
+#include "wine/test.h"
+
+#include <assert.h>
 #include <wingdi.h>
 #include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
 #include "v6util.h"
 #include "msg.h"
 
diff --git a/modules/rostests/winetests/comctl32/comboex.c
b/modules/rostests/winetests/comctl32/comboex.c
index ec13e22801..947a871a6b 100644
--- a/modules/rostests/winetests/comctl32/comboex.c
+++ b/modules/rostests/winetests/comctl32/comboex.c
@@ -17,16 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-//#include <windows.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <commctrl.h>
-
-//#include "wine/test.h"
-#include "msg.h"
+#include "precomp.h"
 
 #define EDITBOX_SEQ_INDEX  0
 #define NUM_MSG_SEQUENCES  1
diff --git a/modules/rostests/winetests/comctl32/datetime.c
b/modules/rostests/winetests/comctl32/datetime.c
index fcd7bee143..19ee52ba40 100644
--- a/modules/rostests/winetests/comctl32/datetime.c
+++ b/modules/rostests/winetests/comctl32/datetime.c
@@ -17,16 +17,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
-//#include <windows.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <commctrl.h>
-//#include "wine/test.h"
-#include "msg.h"
+#include "precomp.h"
 
 #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n",
(EXPECTED), (GOT))
 
diff --git a/modules/rostests/winetests/comctl32/dpa.c
b/modules/rostests/winetests/comctl32/dpa.c
index 291fb98b78..b72214533b 100644
--- a/modules/rostests/winetests/comctl32/dpa.c
+++ b/modules/rostests/winetests/comctl32/dpa.c
@@ -19,22 +19,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 <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <objbase.h>
-//#include "objidl.h"
-
-#include <wine/test.h>
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n",
expected, got)
 
diff --git a/modules/rostests/winetests/comctl32/header.c
b/modules/rostests/winetests/comctl32/header.c
index 8be4db27dd..f428349186 100644
--- a/modules/rostests/winetests/comctl32/header.c
+++ b/modules/rostests/winetests/comctl32/header.c
@@ -18,24 +18,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 <windows.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <objbase.h>
-#include <commctrl.h>
-#include <assert.h>
-
-#include <wine/test.h>
-#include "v6util.h"
-#include "msg.h"
+#include "precomp.h"
 
 typedef struct tagEXPECTEDNOTIFY
 {
diff --git a/modules/rostests/winetests/comctl32/imagelist.c
b/modules/rostests/winetests/comctl32/imagelist.c
index 5d2cf3cb05..57e7f5c069 100644
--- a/modules/rostests/winetests/comctl32/imagelist.c
+++ b/modules/rostests/winetests/comctl32/imagelist.c
@@ -21,28 +21,13 @@
  * 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 "precomp.h"
 
-#define COBJMACROS
-#define CONST_VTABLE
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <objbase.h>
-#include <commctrl.h> /* must be included after objbase.h to get ImageList_Write
*/
 #include <ole2.h>
-#include <initguid.h>
-#include <commoncontrols.h>
 #include <shellapi.h>
 
-#include <wine/test.h>
-#include "v6util.h"
+#include <initguid.h>
+#include <commoncontrols.h>
 
 #define IMAGELIST_MAGIC (('L' << 8) | 'I')
 
diff --git a/modules/rostests/winetests/comctl32/ipaddress.c
b/modules/rostests/winetests/comctl32/ipaddress.c
index 22bd1d0555..f5075662dd 100644
--- a/modules/rostests/winetests/comctl32/ipaddress.c
+++ b/modules/rostests/winetests/comctl32/ipaddress.c
@@ -17,11 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <winuser.h>
-#include <commctrl.h>
+#include "precomp.h"
 
 #define expect(expected, got) ok(expected == got, "expected %d, got %d\n",
expected,got)
 
diff --git a/modules/rostests/winetests/comctl32/listview.c
b/modules/rostests/winetests/comctl32/listview.c
index ba3700fead..2210fb3a8a 100644
--- a/modules/rostests/winetests/comctl32/listview.c
+++ b/modules/rostests/winetests/comctl32/listview.c
@@ -20,16 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <stdio.h>
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-
-#include "v6util.h"
-#include "msg.h"
+#include "precomp.h"
 
 enum seq_index {
     PARENT_SEQ_INDEX,
diff --git a/modules/rostests/winetests/comctl32/misc.c
b/modules/rostests/winetests/comctl32/misc.c
index 89fc5f73b5..9fe3ae378e 100644
--- a/modules/rostests/winetests/comctl32/misc.c
+++ b/modules/rostests/winetests/comctl32/misc.c
@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-//#include <windows.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include "v6util.h"
+#include "precomp.h"
 
 static PVOID (WINAPI * pAlloc)(LONG);
 static PVOID (WINAPI * pReAlloc)(PVOID, LONG);
diff --git a/modules/rostests/winetests/comctl32/monthcal.c
b/modules/rostests/winetests/comctl32/monthcal.c
index 1ca593e6bb..84ba54acfa 100644
--- a/modules/rostests/winetests/comctl32/monthcal.c
+++ b/modules/rostests/winetests/comctl32/monthcal.c
@@ -19,21 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <commctrl.h>
-
-#include "v6util.h"
-//#include <assert.h>
-//#include <windows.h>
-#include "msg.h"
+#include "precomp.h"
 
 #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n",
expected, got);
 #define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n",
expected, got);
diff --git a/modules/rostests/winetests/comctl32/mru.c
b/modules/rostests/winetests/comctl32/mru.c
index 5c0ec48d44..1cb9a99c60 100644
--- a/modules/rostests/winetests/comctl32/mru.c
+++ b/modules/rostests/winetests/comctl32/mru.c
@@ -17,18 +17,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
  */
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-#include <winuser.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <commctrl.h>
-//#include "shlwapi.h"
-
-#include <wine/test.h>
+
+#include "precomp.h"
 
 /* Keys for testing MRU functions */
 #define REG_TEST_BASEKEYA    "Software\\Wine"
diff --git a/modules/rostests/winetests/comctl32/msg.h
b/modules/rostests/winetests/comctl32/msg.h
index 36327d1d72..fe9969daa0 100644
--- a/modules/rostests/winetests/comctl32/msg.h
+++ b/modules/rostests/winetests/comctl32/msg.h
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-//#include <windows.h>
-#include <wine/test.h>
+#pragma once
 
 /* undocumented SWP flags - from SDK 3.1 */
 #define SWP_NOCLIENTSIZE	0x0800
@@ -164,7 +162,7 @@ static void dump_sequence( struct msg_sequence **seq, int
sequence_index,
     }
 }
 
-static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
+static inline void ok_sequence_(struct msg_sequence **seq, int sequence_index,
     const struct message *expected, const char *context, BOOL todo,
     const char *file, int line)
 {
@@ -387,7 +385,7 @@ done:
         ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__)
 
 
-static void init_msg_sequences(struct msg_sequence **seq, int n)
+static inline void init_msg_sequences(struct msg_sequence **seq, int n)
 {
     int i;
 
diff --git a/modules/rostests/winetests/comctl32/pager.c
b/modules/rostests/winetests/comctl32/pager.c
index 4eb48be116..4766656150 100644
--- a/modules/rostests/winetests/comctl32/pager.c
+++ b/modules/rostests/winetests/comctl32/pager.c
@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-
-#include "msg.h"
+#include "precomp.h"
 
 #define NUM_MSG_SEQUENCES   1
 #define PAGER_SEQ_INDEX     0
diff --git a/modules/rostests/winetests/comctl32/precomp.h
b/modules/rostests/winetests/comctl32/precomp.h
new file mode 100644
index 0000000000..92352b7794
--- /dev/null
+++ b/modules/rostests/winetests/comctl32/precomp.h
@@ -0,0 +1,25 @@
+#ifndef _COMCTL32_WINETEST_PRECOMP_H_
+#define _COMCTL32_WINETEST_PRECOMP_H_
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
+#define CONST_VTABLE
+
+#include <stdio.h>
+
+#include <wine/test.h>
+#include <assert.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <wine/commctrl.h>
+
+#include "msg.h"
+#include "resources.h"
+#include "v6util.h"
+
+#endif /* !_COMCTL32_WINETEST_PRECOMP_H_ */
diff --git a/modules/rostests/winetests/comctl32/progress.c
b/modules/rostests/winetests/comctl32/progress.c
index 7f69c35232..506fee007f 100644
--- a/modules/rostests/winetests/comctl32/progress.c
+++ b/modules/rostests/winetests/comctl32/progress.c
@@ -17,16 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commctrl.h" 
-
-#include "wine/test.h"
-
+#include "precomp.h"
 
 static HWND hProgressParentWnd, hProgressWnd;
 static const char progressTestClass[] = "ProgressBarTestClass";
diff --git a/modules/rostests/winetests/comctl32/propsheet.c
b/modules/rostests/winetests/comctl32/propsheet.c
index 76e706a7b1..fd9f997dcb 100644
--- a/modules/rostests/winetests/comctl32/propsheet.c
+++ b/modules/rostests/winetests/comctl32/propsheet.c
@@ -18,16 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
+#include "precomp.h"
 
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
 #include <reactos/undocuser.h>
-#include "msg.h"
-
-#include "resources.h"
 
 static HWND parenthwnd;
 static HWND sheethwnd;
diff --git a/modules/rostests/winetests/comctl32/rebar.c
b/modules/rostests/winetests/comctl32/rebar.c
index 16030e3def..5aa3a1ef5f 100644
--- a/modules/rostests/winetests/comctl32/rebar.c
+++ b/modules/rostests/winetests/comctl32/rebar.c
@@ -17,20 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* make sure the structures work with a comctl32 v5.x */
-#define _WIN32_WINNT 0x500
-#define _WIN32_IE 0x500
-
-#include <wine/test.h>
-
-#include <assert.h>
-//#include <stdarg.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-//#include <uxtheme.h>
+#include "precomp.h"
 
 static RECT height_change_notify_rect;
 static HWND hMainWnd;
diff --git a/modules/rostests/winetests/comctl32/status.c
b/modules/rostests/winetests/comctl32/status.c
index 6db6bf52fa..94345e1a3a 100644
--- a/modules/rostests/winetests/comctl32/status.c
+++ b/modules/rostests/winetests/comctl32/status.c
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
+#include "precomp.h"
 
 #define SUBCLASS_NAME "MyStatusBar"
 
diff --git a/modules/rostests/winetests/comctl32/subclass.c
b/modules/rostests/winetests/comctl32/subclass.c
index 720c68e28d..7333c65916 100644
--- a/modules/rostests/winetests/comctl32/subclass.c
+++ b/modules/rostests/winetests/comctl32/subclass.c
@@ -19,17 +19,13 @@
 
 #define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */
 
+#include "wine/test.h"
+
 #include <assert.h>
-#include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
 #include "winuser.h"
 #include "commctrl.h"
 
-#include "wine/test.h"
-
 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
 static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
 static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
diff --git a/modules/rostests/winetests/comctl32/syslink.c
b/modules/rostests/winetests/comctl32/syslink.c
index 9f7233fae7..028e7a6b96 100644
--- a/modules/rostests/winetests/comctl32/syslink.c
+++ b/modules/rostests/winetests/comctl32/syslink.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-
-#include "v6util.h"
-#include "msg.h"
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n",
expected, got)
 #define NUM_MSG_SEQUENCE 2
diff --git a/modules/rostests/winetests/comctl32/tab.c
b/modules/rostests/winetests/comctl32/tab.c
index 431a49de17..99f4bc3e89 100644
--- a/modules/rostests/winetests/comctl32/tab.c
+++ b/modules/rostests/winetests/comctl32/tab.c
@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-#include <assert.h>
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <stdio.h>
-
-#include "msg.h"
+#include "precomp.h"
 
 #define DEFAULT_MIN_TAB_WIDTH 54
 #define TAB_PADDING_X 6
diff --git a/modules/rostests/winetests/comctl32/taskdialog.c
b/modules/rostests/winetests/comctl32/taskdialog.c
index c937127897..40ca1637c2 100644
--- a/modules/rostests/winetests/comctl32/taskdialog.c
+++ b/modules/rostests/winetests/comctl32/taskdialog.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "commctrl.h"
-
-#include "wine/test.h"
-#include "v6util.h"
+#include "precomp.h"
 
 static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL
*);
 static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const
WCHAR *,
diff --git a/modules/rostests/winetests/comctl32/toolbar.c
b/modules/rostests/winetests/comctl32/toolbar.c
index e2c29f45c6..f49cd2ae81 100644
--- a/modules/rostests/winetests/comctl32/toolbar.c
+++ b/modules/rostests/winetests/comctl32/toolbar.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "commctrl.h" 
-
-#include "resources.h"
-
-#include "wine/test.h"
-
-#include "msg.h"
+#include "precomp.h"
 
 #define PARENT_SEQ_INDEX       0
 #define NUM_MSG_SEQUENCES      1
diff --git a/modules/rostests/winetests/comctl32/tooltips.c
b/modules/rostests/winetests/comctl32/tooltips.c
index 06b49e397c..2cc0210312 100644
--- a/modules/rostests/winetests/comctl32/tooltips.c
+++ b/modules/rostests/winetests/comctl32/tooltips.c
@@ -17,16 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-#include <assert.h>
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <commctrl.h>
-
-#include "resources.h"
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n",
expected, got)
 
diff --git a/modules/rostests/winetests/comctl32/trackbar.c
b/modules/rostests/winetests/comctl32/trackbar.c
index 0bbe97c54a..9a028003d7 100644
--- a/modules/rostests/winetests/comctl32/trackbar.c
+++ b/modules/rostests/winetests/comctl32/trackbar.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <stdio.h>
-
-#include "msg.h"
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n",
expected, got)
 #define NUM_MSG_SEQUENCE 2
diff --git a/modules/rostests/winetests/comctl32/treeview.c
b/modules/rostests/winetests/comctl32/treeview.c
index 83ba492b7b..e14c33690a 100644
--- a/modules/rostests/winetests/comctl32/treeview.c
+++ b/modules/rostests/winetests/comctl32/treeview.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "wine/commctrl.h"
-
-#include "wine/test.h"
-#include "v6util.h"
-#include "msg.h"
+#include "precomp.h"
 
 static const char *TEST_CALLBACK_TEXT = "callback_text";
 
diff --git a/modules/rostests/winetests/comctl32/updown.c
b/modules/rostests/winetests/comctl32/updown.c
index fb5ade4a72..e3dde91ebc 100644
--- a/modules/rostests/winetests/comctl32/updown.c
+++ b/modules/rostests/winetests/comctl32/updown.c
@@ -44,15 +44,7 @@
  *   - more stuff to test
  */
 
-#include <wine/test.h>
-
-//#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <stdio.h>
-
-#include "msg.h"
+#include "precomp.h"
 
 #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n",
(EXPECTED), (GOT))
 
diff --git a/modules/rostests/winetests/comctl32/v6util.h
b/modules/rostests/winetests/comctl32/v6util.h
index 9f5a9c48da..0247df6365 100644
--- a/modules/rostests/winetests/comctl32/v6util.h
+++ b/modules/rostests/winetests/comctl32/v6util.h
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n",
expected, got)
 
 #ifdef __i386__
@@ -60,7 +62,7 @@ static const CHAR manifest[] =
     "</dependency>\n"
     "</assembly>\n";
 
-static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx)
+static inline void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx)
 {
     HANDLE hKernel32;
     BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR);
@@ -81,7 +83,7 @@ static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx)
     DeleteFileA(manifest_name);
 }
 
-static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx)
+static inline BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx)
 {
     HANDLE hKernel32;
     HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*);