Skip to content

Commit 7d6a5a5

Browse files
committed
[GDITOOLS][GDI32_APITEST] Move resources to gditools lib
This allows to share them in win32knt_apitest.
1 parent cb8278b commit 7d6a5a5

File tree

13 files changed

+158
-173
lines changed

13 files changed

+158
-173
lines changed

modules/rostests/apitests/gdi32/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
include_directories(${REACTOS_SOURCE_DIR}/win32ss)
2+
include_directories(${REACTOS_SOURCE_DIR}/win32ss ../gditools)
33

44
list(APPEND SOURCE
55
AddFontMemResourceEx.c
@@ -76,8 +76,7 @@ list(APPEND SOURCE
7676
SetWindowExtEx.c
7777
SetWorldTransform.c
7878
StretchBlt.c
79-
TextTransform.c
80-
init.c)
79+
TextTransform.c)
8180

8281
list(APPEND PCH_SKIP_SOURCE
8382
testlist.c)
@@ -87,7 +86,7 @@ add_executable(gdi32_apitest
8786
${PCH_SKIP_SOURCE}
8887
resource.rc)
8988

90-
target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys)
89+
target_link_libraries(gdi32_apitest ${PSEH_LIB} gditools win32ksys)
9190
set_module_type(gdi32_apitest win32cui)
9291
add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
9392
add_pch(gdi32_apitest precomp.h "${PCH_SKIP_SOURCE}")

modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
/* New color use parameter. See https://www.betaarchive.com/wiki/index.php?title=Microsoft_KB_Archive/108497 */
1313
#define DIB_PAL_INDICES 2
@@ -180,10 +180,9 @@ void Test_CreateDIBPatternBrushPt_RLE8()
180180

181181
START_TEST(CreateDIBPatternBrush)
182182
{
183-
InitStuff();
183+
GdiToolsInit();
184184

185185
Test_CreateDIBPatternBrush();
186186
Test_CreateDIBPatternBrushPt();
187187
//Test_CreateDIBPatternBrushPt_RLE8(); broken
188188
}
189-

modules/rostests/apitests/gdi32/CreateDIBitmap.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include "gditools.h"
1111

1212
#include <pseh/pseh2.h>
1313

@@ -534,11 +534,10 @@ Test_CreateDIBitmap_CBM_CREATDIB(void)
534534

535535
START_TEST(CreateDIBitmap)
536536
{
537-
InitStuff();
537+
GdiToolsInit();
538538
Test_CreateDIBitmap_Params();
539539
Test_CreateDIBitmap1();
540540
Test_CreateDIBitmap_DIB_PAL_COLORS();
541541
Test_CreateDIBitmap_RLE8();
542542
Test_CreateDIBitmap_CBM_CREATDIB();
543543
}
544-

modules/rostests/apitests/gdi32/FrameRgn.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
#if 0
1313
BOOL
@@ -135,11 +135,8 @@ void Test_FrameRgn()
135135

136136
}
137137

138-
139-
140138
START_TEST(FrameRgn)
141139
{
142-
InitStuff();
140+
GdiToolsInit();
143141
Test_FrameRgn();
144142
}
145-

modules/rostests/apitests/gdi32/GetDIBits.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
void
1313
Test_GetDIBits_xBpp(
@@ -473,7 +473,7 @@ void Test_GetDIBits_BI_BITFIELDS()
473473
START_TEST(GetDIBits)
474474
{
475475
//getchar();
476-
InitStuff();
476+
GdiToolsInit();
477477
Test_GetDIBits_xBpp(1);
478478
Test_GetDIBits_xBpp(4);
479479
Test_GetDIBits_xBpp(8);
@@ -482,4 +482,3 @@ START_TEST(GetDIBits)
482482
Test_GetDIBits_xBpp(32);
483483
Test_GetDIBits();
484484
}
485-

modules/rostests/apitests/gdi32/MaskBlt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
void Test_MaskBlt_1bpp()
1313
{
@@ -293,7 +293,7 @@ void Test_MaskBlt_Brush()
293293

294294
START_TEST(MaskBlt)
295295
{
296-
InitStuff();
296+
GdiToolsInit();
297297
Test_MaskBlt_1bpp();
298298
Test_MaskBlt_16bpp();
299299
Test_MaskBlt_32bpp();

modules/rostests/apitests/gdi32/PaintRgn.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
void Test_PaintRgn()
1313
{
@@ -55,7 +55,6 @@ void Test_PaintRgn()
5555

5656
START_TEST(PaintRgn)
5757
{
58-
InitStuff();
58+
GdiToolsInit();
5959
Test_PaintRgn();
6060
}
61-

modules/rostests/apitests/gdi32/RealizePalette.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
START_TEST(RealizePalette)
1313
{
14-
InitStuff();
14+
GdiToolsInit();
1515
ok_int(RealizePalette(NULL), GDI_ERROR);
1616
ok_int(RealizePalette((HDC)UlongToHandle(0xdeadc0de)), GDI_ERROR);
1717
ok_int(RealizePalette((HDC)UlongToHandle(0x00010001)), 0);

modules/rostests/apitests/gdi32/SetDIBitsToDevice.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "precomp.h"
99

10-
#include "init.h"
10+
#include <gditools.h>
1111

1212
static void
1313
Test_SetDIBitsToDevice_Params()
@@ -687,10 +687,8 @@ Test_SetDIBitsToDevice()
687687

688688
START_TEST(SetDIBitsToDevice)
689689
{
690-
InitStuff();
690+
GdiToolsInit();
691691

692692
Test_SetDIBitsToDevice_Params();
693693
Test_SetDIBitsToDevice();
694-
695-
696694
}

modules/rostests/apitests/gdi32/init.c

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)