From 00aac1ad3b6b6cfa50f12e1f5b04a4d17055a4d7 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 14 Mar 2015 13:40:36 +0000
Subject: [PATCH] [PSDK] Move winternl.h to include/reactos/wine.

svn path=/trunk/; revision=66695
---
 reactos/base/applications/taskmgr/endproc.c       |  2 +-
 reactos/base/system/format/format.c               |  6 +++---
 reactos/dll/directx/wine/dsound/CMakeLists.txt    |  2 +-
 reactos/dll/win32/avicap32/CMakeLists.txt         |  2 ++
 reactos/dll/win32/shell32/wine/shellord.c         | 12 ++++++------
 reactos/dll/win32/wininet/CMakeLists.txt          |  2 +-
 reactos/dll/win32/winsta/CMakeLists.txt           |  2 ++
 reactos/include/{psdk => reactos/wine}/winternl.h |  0
 reactos/lib/sdk/crt/string/scanf.c                |  2 +-
 9 files changed, 17 insertions(+), 13 deletions(-)
 rename reactos/include/{psdk => reactos/wine}/winternl.h (100%)

diff --git a/reactos/base/applications/taskmgr/endproc.c b/reactos/base/applications/taskmgr/endproc.c
index b831d3a94d9..94afe5b6175 100644
--- a/reactos/base/applications/taskmgr/endproc.c
+++ b/reactos/base/applications/taskmgr/endproc.c
@@ -24,7 +24,7 @@
 
 #include "precomp.h"
 #include <psdk/stierr.h>
-#include <psdk/winternl.h>
+#include <wine/winternl.h>
 
 void ProcessPage_OnEndProcess(void)
 {
diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c
index 73d3b0711ec..9092aad7e58 100644
--- a/reactos/base/system/format/format.c
+++ b/reactos/base/system/format/format.c
@@ -8,7 +8,7 @@
 #include <winbase.h>
 #include <winnls.h>
 #include <winuser.h>
-#include <winternl.h>
+#include <wine/winternl.h>
 #include <fmifs/fmifs.h>
 #include <tchar.h>
 
@@ -56,10 +56,10 @@ int LoadStringAndOem(HINSTANCE hInst,
 		UINT uID,
 		LPTSTR szStr,
 		int Siz
-)	
+)
 {
   TCHAR szTmp[RC_STRING_MAX_SIZE];
-  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); 
+  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp));
   CharToOem(szTmp, szStr);
   return(res);
 }
diff --git a/reactos/dll/directx/wine/dsound/CMakeLists.txt b/reactos/dll/directx/wine/dsound/CMakeLists.txt
index 57d718850e6..f04d29af2d6 100644
--- a/reactos/dll/directx/wine/dsound/CMakeLists.txt
+++ b/reactos/dll/directx/wine/dsound/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(
     -D_USE_MATH_DEFINES
     -D__WINESRC__)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)
 
 add_library(dsound SHARED
diff --git a/reactos/dll/win32/avicap32/CMakeLists.txt b/reactos/dll/win32/avicap32/CMakeLists.txt
index 7c574f5a94b..d09589e389b 100644
--- a/reactos/dll/win32/avicap32/CMakeLists.txt
+++ b/reactos/dll/win32/avicap32/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)
 
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
 add_library(avicap32 SHARED
     avicap32.c
     avicap32.rc
diff --git a/reactos/dll/win32/shell32/wine/shellord.c b/reactos/dll/win32/shell32/wine/shellord.c
index 43f4893574d..0a4fffa3f4f 100644
--- a/reactos/dll/win32/shell32/wine/shellord.c
+++ b/reactos/dll/win32/shell32/wine/shellord.c
@@ -28,7 +28,7 @@
 
 #include <windef.h>
 #include <winbase.h>
-#include <winternl.h>
+#include <wine/winternl.h>
 #include <shlobj.h>
 #include <undocshell.h>
 #include <shlwapi.h>
@@ -1217,10 +1217,10 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length)
 	if( r == ERROR_SUCCESS )
 	{
 		type = REG_BINARY;
-		r = RegQueryValueExW( hkey, szwSettings, 
+		r = RegQueryValueExW( hkey, szwSettings,
 			NULL, &type, (LPBYTE)cs, (LPDWORD)&length );
 		RegCloseKey( hkey );
-			
+
 	}
 
 	/* if we can't read from the registry, create default values */
@@ -1242,7 +1242,7 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length)
 		cs->fAdminsCreateCommonGroups = TRUE;
 		cs->fMenuEnumFilter  = 96;
 	}
-	
+
 	return TRUE;
 }
 
@@ -1264,7 +1264,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
 		 NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL);
 	if( r == ERROR_SUCCESS )
 	{
-		r = RegSetValueExW( hkey, szwSettings, 0, 
+		r = RegSetValueExW( hkey, szwSettings, 0,
 			REG_BINARY, (LPBYTE) cs, cs->cLength);
 
 		RegCloseKey( hkey );
@@ -1546,7 +1546,7 @@ DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString)
 /************************************************************************
  *	DoEnvironmentSubst			[SHELL32.53]
  *
- * See DoEnvironmentSubstA.  
+ * See DoEnvironmentSubstA.
  */
 DWORD WINAPI DoEnvironmentSubstAW(LPVOID x, UINT y)
 {
diff --git a/reactos/dll/win32/wininet/CMakeLists.txt b/reactos/dll/win32/wininet/CMakeLists.txt
index 18d831b9203..7f968a8eddb 100644
--- a/reactos/dll/win32/wininet/CMakeLists.txt
+++ b/reactos/dll/win32/wininet/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(
     -D_WINE
     -Dclose=_close)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine
                     ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
 
 spec2def(wininet.dll wininet.spec ADD_IMPORTLIB)
diff --git a/reactos/dll/win32/winsta/CMakeLists.txt b/reactos/dll/win32/winsta/CMakeLists.txt
index 18d65dc3b7b..21408ac5787 100644
--- a/reactos/dll/win32/winsta/CMakeLists.txt
+++ b/reactos/dll/win32/winsta/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 spec2def(winsta.dll winsta.spec)
 
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
 list(APPEND SOURCE
     logon.c
     main.c
diff --git a/reactos/include/psdk/winternl.h b/reactos/include/reactos/wine/winternl.h
similarity index 100%
rename from reactos/include/psdk/winternl.h
rename to reactos/include/reactos/wine/winternl.h
diff --git a/reactos/lib/sdk/crt/string/scanf.c b/reactos/lib/sdk/crt/string/scanf.c
index 8951f86357c..338d55237e9 100644
--- a/reactos/lib/sdk/crt/string/scanf.c
+++ b/reactos/lib/sdk/crt/string/scanf.c
@@ -26,7 +26,7 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#include <winternl.h>
+#include <wine/winternl.h>
 #include <wine/debug.h>
 
 #include "winesup.h"