[cwittich] 66697: [WINETESTS] fix kernel32 and ntdll winetest build

Author: cwittich
Date: Sat Mar 14 14:02:06 2015
New Revision: 66697

URL: http://svn.reactos.org/svn/reactos?rev=66697&view=rev
Log:
[WINETESTS]
fix kernel32 and ntdll winetest build

Modified:
    trunk/rostests/winetests/kernel32/debugger.c
    trunk/rostests/winetests/kernel32/heap.c
    trunk/rostests/winetests/kernel32/loader.c
    trunk/rostests/winetests/kernel32/process.c
    trunk/rostests/winetests/kernel32/virtual.c
    trunk/rostests/winetests/ntdll/atom.c
    trunk/rostests/winetests/ntdll/directory.c
    trunk/rostests/winetests/ntdll/exception.c
    trunk/rostests/winetests/ntdll/file.c
    trunk/rostests/winetests/ntdll/ntdll_test.h
    trunk/rostests/winetests/ntdll/om.c
    trunk/rostests/winetests/ntdll/pipe.c
    trunk/rostests/winetests/ntdll/port.c
    trunk/rostests/winetests/ntdll/reg.c

Modified: trunk/rostests/winetests/kernel32/debugger.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugge...
==============================================================================
--- trunk/rostests/winetests/kernel32/debugger.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/debugger.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -22,7 +22,7 @@
 #include <assert.h>

#include <windows.h>
-#include <winternl.h>
+#include <wine/winternl.h>
 #include <winreg.h>
 #include "wine/test.h"

Modified: trunk/rostests/winetests/kernel32/heap.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c?...
==============================================================================
--- trunk/rostests/winetests/kernel32/heap.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/heap.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -27,7 +27,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "wine/test.h"

#define MAGIC_DEAD 0xdeadbeef

Modified: trunk/rostests/winetests/kernel32/loader.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader....
==============================================================================
--- trunk/rostests/winetests/kernel32/loader.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/loader.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -27,7 +27,7 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "wine/test.h"
 #include "delayloadhandler.h"

Modified: trunk/rostests/winetests/kernel32/process.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/process...
==============================================================================
--- trunk/rostests/winetests/kernel32/process.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/process.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -31,8 +31,8 @@
 #include "winuser.h"
 #include "wincon.h"
 #include "winnls.h"
-#include "winternl.h"
-
+
+#include "wine/winternl.h"
 #include "wine/test.h"

/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */

Modified: trunk/rostests/winetests/kernel32/virtual.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtual...
==============================================================================
--- trunk/rostests/winetests/kernel32/virtual.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/virtual.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -26,7 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "winerror.h"
 #include "winuser.h"
 #include "wine/exception.h"

Modified: trunk/rostests/winetests/ntdll/atom.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/atom.c?rev...
==============================================================================
--- trunk/rostests/winetests/ntdll/atom.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/atom.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -36,7 +36,7 @@
 #include "winnls.h"
 #include "winuser.h"
 #include "wine/test.h"
-#include "winternl.h"
+#include "wine/winternl.h"

#ifndef __WINE_WINTERNL_H
 typedef unsigned short RTL_ATOM, *PRTL_ATOM;

Modified: trunk/rostests/winetests/ntdll/directory.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory....
==============================================================================
--- trunk/rostests/winetests/ntdll/directory.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/directory.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -34,7 +34,7 @@
 #define WIN32_NO_STATUS

#include "wine/test.h"
-#include "winternl.h"
+#include "wine/winternl.h"

static NTSTATUS (WINAPI *pNtClose)( PHANDLE );
 static NTSTATUS (WINAPI *pNtOpenFile)    ( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG );

Modified: trunk/rostests/winetests/ntdll/exception.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception....
==============================================================================
--- trunk/rostests/winetests/ntdll/exception.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/exception.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -33,7 +33,7 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "winreg.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "wine/exception.h"
 #include "wine/test.h"

Modified: trunk/rostests/winetests/ntdll/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?rev...
==============================================================================
--- trunk/rostests/winetests/ntdll/file.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/file.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -34,7 +34,7 @@
 #define WIN32_NO_STATUS

#include "wine/test.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "winuser.h"
 #include "wine/winioctl.h"

Modified: trunk/rostests/winetests/ntdll/ntdll_test.h
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ntdll_test...
==============================================================================
--- trunk/rostests/winetests/ntdll/ntdll_test.h	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/ntdll_test.h	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -30,6 +30,6 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "winreg.h"
-#include "winternl.h"

+#include "wine/winternl.h"
 #include "wine/test.h"

Modified: trunk/rostests/winetests/ntdll/om.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=6...
==============================================================================
--- trunk/rostests/winetests/ntdll/om.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/om.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -20,7 +20,7 @@
  */

#include "ntdll_test.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "stdio.h"
 #include "winnt.h"
 #include "stdlib.h"

Modified: trunk/rostests/winetests/ntdll/pipe.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/pipe.c?rev...
==============================================================================
--- trunk/rostests/winetests/ntdll/pipe.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/pipe.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -28,7 +28,7 @@
 #include "winreg.h"
 #include "winnls.h"
 #include "wine/test.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "winioctl.h"

#ifndef __WINE_WINTERNL_H

Modified: trunk/rostests/winetests/ntdll/port.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?rev...
==============================================================================
--- trunk/rostests/winetests/ntdll/port.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/port.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -28,7 +28,7 @@
 #include "winreg.h"
 #include "winnls.h"
 #include "wine/test.h"
-#include "winternl.h"
+#include "wine/winternl.h"

#ifndef __WINE_WINTERNL_H

Modified: trunk/rostests/winetests/ntdll/reg.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev=...
==============================================================================
--- trunk/rostests/winetests/ntdll/reg.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/reg.c	[iso-8859-1] Sat Mar 14 14:02:06 2015
@@ -23,7 +23,7 @@
  */

#include "ntdll_test.h"
-#include "winternl.h"
+#include "wine/winternl.h"
 #include "stdio.h"
 #include "winnt.h"
 #include "winnls.h"