[ros-diffs] [akhaldi] 56320: [GDI32_APITEST] * Addendum to r56319.

Author: akhaldi
Date: Mon Apr  2 10:52:54 2012
New Revision: 56320

URL: http://svn.reactos.org/svn/reactos?rev=56320&view=rev
Log:
[GDI32_APITEST]
* Addendum to r56319.

Modified:
    trunk/rostests/apitests/gdi32/CMakeLists.txt
    trunk/rostests/apitests/gdi32/CombineTransform.c
    trunk/rostests/apitests/gdi32/CreatePen.c
    trunk/rostests/apitests/gdi32/ExtCreatePen.c
    trunk/rostests/apitests/gdi32/GetCurrentObject.c
    trunk/rostests/apitests/gdi32/GetObject.c
    trunk/rostests/apitests/gdi32/GetStockObject.c
    trunk/rostests/apitests/gdi32/SelectObject.c

Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists…
==============================================================================
--- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -1,5 +1,6 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
+include_directories(${REACTOS_SOURCE_DIR}/win32ss)
 
 list(APPEND SOURCE
     AddFontResource.c

Modified: trunk/rostests/apitests/gdi32/CombineTransform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra…
==============================================================================
--- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Mon Apr  2 10:52:54
2012
@@ -9,8 +9,6 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
 
 #define ok_int(x, y) ok(x == y, "Wrong value for " #x ", expected "
#y ", got %ld\n", (long)x);
 #define ok_flt(x, y) ok(x == y, "Wrong value for " #x ", expected "
#y ", got %f\n", (double)x);

Modified: trunk/rostests/apitests/gdi32/CreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.…
==============================================================================
--- trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 void Test_CreatePen()
 {

Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP…
==============================================================================
--- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 void Test_ExtCreatePen()
 {

Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] Mon Apr  2 10:52:54
2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 void Test_GetCurrentObject()
 {

Modified: trunk/rostests/apitests/gdi32/GetObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 void
 Test_General(void)

Modified: trunk/rostests/apitests/gdi32/GetStockObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb…
==============================================================================
--- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")

Modified: trunk/rostests/apitests/gdi32/SelectObject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje…
==============================================================================
--- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Mon Apr  2 10:52:54 2012
@@ -9,8 +9,8 @@
 #include <wine/test.h>
 #include <windows.h>
 #include <winddi.h>
-#include <reactos/win32k/ntgdityp.h>
-#include <reactos/win32k/ntgdihdl.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")