[GDI32_APITEST] Add a PCH.

2026-08-27 03:43:36 +00:00 · 2017-12-02 22:14:47 +01:00
parent c2bdad2981
commit aee83c359c
74 changed files with 106 additions and 307 deletions
@@ -9,10 +9,7 @@
 *                    Captured from firefox, embedded on reactos.org
 */

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

 typedef struct _fnt_res
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 #define COUNT 26

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_AddFontResourceExW()
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_BeginPath()
 {
@@ -73,10 +73,11 @@ list(APPEND SOURCE
    SetWindowExtEx.c
    SetWorldTransform.c
    init.c
-    testlist.c)
+    precomp.h)

-add_executable(gdi32_apitest ${SOURCE} resource.rc)
+add_executable(gdi32_apitest ${SOURCE} testlist.c resource.rc)
 target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys)
 set_module_type(gdi32_apitest win32cui)
 add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
+add_pch(gdi32_apitest precomp.h SOURCE)
 add_rostests_file(TARGET gdi32_apitest)
@@ -5,8 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 typedef struct _RECT_TEST
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 typedef union
 {
@@ -5,11 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-
-#define DEFAULT_BITMAP 21
+#include "precomp.h"

 void Test_CreateBitmap_Params()
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Magnus Olsen
 */

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

 void Test_CreateBitmapIndirect()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_CreateCompatibleDC()
 {
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <wingdi.h>
 #include "init.h"

 /* New color use parameter. See support.microsoft.com/kb/kbview/108497 */
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 #include "init.h"

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 #define INVALIDFONT "ThisFontDoesNotExist"

@@ -6,8 +6,7 @@
 *                  Katayama Hirofumi MZ
 */

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

 #define trace_if(val, msg) do { if (!(val)) trace(msg); } while (0)

@@ -1,9 +1,5 @@

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

 // FIXME user32

@@ -204,5 +200,3 @@ START_TEST(CreateIconIndirect)
    ok(iconinfo2.hbmColor == NULL, "\n");

 }
-
-
@@ -5,12 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"

 void Test_CreatePen()
 {
@@ -5,7 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_CreateRectRgn()
 {
@@ -16,4 +16,3 @@ START_TEST(CreateRectRgn)
 {
    Test_CreateRectRgn();
 }
-
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_DPtoLP_Params()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Magnus Olsen
 */

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

 void Test_EngAcquireSemaphore()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Magnus Olsen
 */

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

 void Test_EngCreateSemaphore()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Magnus Olsen
 */

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

 void Test_EngDeleteSemaphore()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Magnus Olsen
 */

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

 void Test_EngReleaseSemaphore()
 {
@@ -5,12 +5,7 @@
 * PROGRAMMERS:     Thomas Faber <[email protected]>
 */

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

 static BYTE ContextContinue;
 static BYTE ContextStop;
@@ -5,18 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define CLIPRGN 1
-
-#define ok_rect(_prc, _left, _top, _right, _bottom) \
-    ok_int((_prc)->left, _left); \
-    ok_int((_prc)->top, _top); \
-    ok_int((_prc)->right, _right); \
-    ok_int((_prc)->bottom, _bottom); \
+#include "precomp.h"

 void Test_ExcludeClipRect()
 {
@@ -5,13 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-#include <stdio.h>
+#include "precomp.h"

 #define ok_lasterror(err) \
    ok(GetLastError() == err, "expected last error " #err " but got 0x%lx\n", GetLastError());
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <windows.h>
 #include <math.h>

 VOID
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
+#include "precomp.h"
+
 #include "init.h"

 #if 0
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HDC WINAPI GdiConvertDC(HDC hdc);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HFONT WINAPI GdiConvertFont(HFONT);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HPALETTE WINAPI GdiConvertPalette(HPALETTE);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HRGN WINAPI GdiConvertRegion(HRGN);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 BOOL WINAPI GdiDeleteLocalDC(HDC);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_GdiGetCharDimensions()
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HDC WINAPI GdiGetLocalDC(HDC);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 BOOL WINAPI GdiReleaseLocalDC(HDC);

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 BOOL WINAPI GdiSetAttrs(HDC);

@@ -5,16 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define ok_rect(_prc, _left, _top, _right, _bottom) \
-    ok_int((_prc)->left, _left); \
-    ok_int((_prc)->top, _top); \
-    ok_int((_prc)->right, _right); \
-    ok_int((_prc)->bottom, _bottom); \
+#include "precomp.h"

 void Test_GetClipBox()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_GetClipRgn()
 {
@@ -5,13 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"

 void Test_GetCurrentObject()
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_GetDIBColorTable()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 #include "init.h"

@@ -4,11 +4,8 @@
 * PURPOSE:         Test for GetFontResourceInfoW
 * PROGRAMMERS:     Katayama Hirofumi MZ <[email protected]>
 */
-#include <apitest.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <stdio.h>
+
+#include "precomp.h"

 /* GetFontResourceInfoW is undocumented */
 BOOL WINAPI GetFontResourceInfoW(LPCWSTR lpFileName, DWORD *pdwBufSize, void* lpBuffer, DWORD dwType);
@@ -5,11 +5,7 @@
 * PROGRAMMERS:     Ged Murphy
 */

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

 #define ok_lasterrornotchanged() \
    ok_err(0x12345)
@@ -5,13 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"

 void
 Test_General(void)
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

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

 void Test_GetPixel_1bpp()
 {
@@ -5,13 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <stdio.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-#define CLIPRGN 1
 #define METARGN 2
 #define APIRGN  3
 #define SYSRGN  4
@@ -5,15 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 void Test_GetStockObject()
 {
@@ -5,14 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <stdio.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 void Test_GetTextExtentExPoint()
 {
@@ -5,12 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 void Test_GetTextFace()
 {
@@ -5,10 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <wingdi.h>
-#include <winuser.h>
 #include "init.h"

 void Test_MaskBlt_1bpp()
@@ -5,11 +5,9 @@
 * PROGRAMMERS:     Víctor Martínez Calvo ( [email protected] )
 */

-#include <apitest.h>
-#include <wingdi.h>
-#include <ndk/rtlfuncs.h>
-#include <strsafe.h>
+#include "precomp.h"

+#include <ndk/rtlfuncs.h>

 INT
 APIENTRY
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-#include <wingdi.h>
-
-#define CLIPRGN 1
+#include "precomp.h"

 void Test_OffsetClipRgn()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
-#include "init.h"
+#include "precomp.h"

 void Test_OffsetRgn()
 {
@@ -5,11 +5,9 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
-#include "init.h"
+#include "precomp.h"

+#include "init.h"

 void Test_PaintRgn()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 HBITMAP ghbmpTarget;
 PULONG gpulTargetBits;
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <stdio.h>
-#include <wine/test.h>
-#include <windows.h>
+#include "precomp.h"
+
 #include "init.h"

 START_TEST(RealizePalette)
@@ -19,4 +18,3 @@ START_TEST(RealizePalette)
    ok_int(RealizePalette(ghdcDIB32), 0);

 }
-
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

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

 void Test_Rectangle(void)
 {
@@ -5,17 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <stdio.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 HDC hdc1, hdc2;

@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Thomas Faber <[email protected]
 */

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

 START_TEST(SetBoundsRect)
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp)
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_SetDCPenColor()
 {
@@ -5,9 +5,7 @@
 * PROGRAMMERS:     Jérôme Gardou
 */

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

 void Test_SetDIBits()
 {
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <wingdi.h>
 #include "init.h"

 static void
@@ -5,13 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 void Test_SetMapMode()
 {
@@ -5,9 +5,8 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

-#include <wingdi.h>
 #include <mmsystem.h>

 static struct
@@ -5,12 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
+#include "precomp.h"

 #define NUM_SYSCOLORS 31

@@ -5,13 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"

 void Test_SetWindowExtEx()
 {
@@ -5,10 +5,7 @@
 * PROGRAMMERS:     Timo Kreuzer
 */

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

 void Test_SetWorldTransform()
 {
@@ -1,7 +1,6 @@

-#include <stdio.h>
-#include <windef.h>
-#include <wingdi.h>
+#include "precomp.h"
+
 #include "init.h"

 HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32;
@@ -1,3 +1,4 @@
+#pragma once

 extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32;
 extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32;
@@ -0,0 +1,25 @@
+#ifndef _GDI32_APITEST_PRECOMP_H_
+#define _GDI32_APITEST_PRECOMP_H_
+
+#include <apitest.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winddi.h>
+#include <winnls.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
+#include <stdio.h>
+#include <strsafe.h>
+
+#define CLIPRGN 1
+
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
+
+#define ok_rect(_prc, _left, _top, _right, _bottom) \
+    ok_int((_prc)->left, _left); \
+    ok_int((_prc)->top, _top); \
+    ok_int((_prc)->right, _right); \
+    ok_int((_prc)->bottom, _bottom); \
+
+#endif /* _GDI32_APITEST_PRECOMP_H_ */