From 58f0550e7bac8207c2953e0487c3357caf875d09 Mon Sep 17 00:00:00 2001
From: Jason Filby <jason.filby@gmail.com>
Date: Thu, 13 May 2004 19:31:09 +0000
Subject: [PATCH] Regression-test enable win32k; patch by Casper Hornstrup

svn path=/trunk/; revision=9362
---
 reactos/subsys/win32k/main/dllmain.c         |  5 ++++-
 reactos/subsys/win32k/makefile               |  4 +++-
 reactos/subsys/win32k/tests/.cvsignore       |  7 +++++++
 reactos/subsys/win32k/tests/makefile         | 20 ++++++++++++++++++++
 reactos/subsys/win32k/tests/tests/.cvsignore |  3 +++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 reactos/subsys/win32k/tests/.cvsignore
 create mode 100644 reactos/subsys/win32k/tests/makefile
 create mode 100644 reactos/subsys/win32k/tests/tests/.cvsignore

diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c
index eecbeb9a26e..f00b24e5774 100644
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@@ -16,11 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dllmain.c,v 1.72 2004/05/10 17:07:17 weiden Exp $
+/* $Id: dllmain.c,v 1.73 2004/05/13 19:29:47 jfilby Exp $
  *
  *  Entry Point for win32k.sys
  */
 #include <w32k.h>
+#include <roscfg.h>
 
 #ifdef __USE_W32API
 typedef NTSTATUS (STDCALL *PW32_PROCESS_CALLBACK)(
@@ -305,6 +306,8 @@ DllMain (
   /* Create stock objects, ie. precreated objects commonly
      used by win32 applications */
   CreateStockObjects();
+  
+  PREPARE_TESTS
 
   return STATUS_SUCCESS;
 }
diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index 6a236aa70ad..de8e52d271b 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.98 2004/05/10 17:07:18 weiden Exp $
+# $Id: makefile,v 1.99 2004/05/13 19:29:47 jfilby Exp $
 
 PATH_TO_TOP = ../..
 
@@ -14,6 +14,8 @@ TARGET_PCH = w32k.h
 
 TARGET_DDKLIBS = freetype.a
 
+TARGET_REGTESTS = yes
+
 FREETYPE_DIR = $(PATH_TO_TOP)/lib/freetype
 
 include $(PATH_TO_TOP)/config
diff --git a/reactos/subsys/win32k/tests/.cvsignore b/reactos/subsys/win32k/tests/.cvsignore
new file mode 100644
index 00000000000..9c5dee23dd0
--- /dev/null
+++ b/reactos/subsys/win32k/tests/.cvsignore
@@ -0,0 +1,7 @@
+_regtests.c
+_rtstub.c
+Makefile.tests
+*.d
+*.o
+*.a
+
diff --git a/reactos/subsys/win32k/tests/makefile b/reactos/subsys/win32k/tests/makefile
new file mode 100644
index 00000000000..24b4b17984a
--- /dev/null
+++ b/reactos/subsys/win32k/tests/makefile
@@ -0,0 +1,20 @@
+PATH_TO_TOP = ../../..
+
+TARGET_TYPE = library
+
+TARGET_NAME = regtests
+
+TARGET_LIBPATH = .
+
+TARGET_CFLAGS = -I$(REGTESTS_PATH_INC)
+
+-include Makefile.tests
+
+TARGET_OBJECTS = \
+  _regtests.o \
+  $(addprefix tests/, $(TESTS))
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
diff --git a/reactos/subsys/win32k/tests/tests/.cvsignore b/reactos/subsys/win32k/tests/tests/.cvsignore
new file mode 100644
index 00000000000..b822e1cc2e6
--- /dev/null
+++ b/reactos/subsys/win32k/tests/tests/.cvsignore
@@ -0,0 +1,3 @@
+*.d
+*.o
+