Author: akhaldi Date: Mon Apr 2 10:52:36 2012 New Revision: 56319
URL: http://svn.reactos.org/svn/reactos?rev=56319&view=rev Log: [WIN32SS] * Move win32k headers to win32ss/include.
Added: trunk/reactos/win32ss/include/ - copied from r56306, trunk/reactos/include/reactos/win32k/ Removed: trunk/reactos/include/reactos/win32k/ Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/include/user32.h trunk/reactos/win32ss/user/win32csr/CMakeLists.txt trunk/reactos/win32ss/user/win32csr/w32csr.h
Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?re... ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -8,7 +8,8 @@
include_directories( BEFORE include - ${REACTOS_SOURCE_DIR}/include/reactos/subsys) + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/win32ss/include)
list(APPEND SOURCE csr/api.c
Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?rev... ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/
#include <ntdll.h> -#include <win32k/callback.h> +#include <callback.h>
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeList... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -2,7 +2,9 @@
add_definitions(-DLANGPACK)
-include_directories(include) +include_directories( + include + ${REACTOS_SOURCE_DIR}/win32ss/include)
spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)
Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/p... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -33,14 +33,14 @@ #include <d3dhal.h>
/* Public Win32K Headers */ -#include <win32k/ntgdityp.h> +#include <ntgdityp.h> #include <ntgdi.h> -#include <win32k/ntgdihdl.h> +#include <ntgdihdl.h>
/* Private GDI32 Header */ #include "gdi32p.h"
/* Deprecated NTGDI calls which shouldn't exist */ -#include <win32k/ntgdibad.h> +#include <ntgdibad.h>
/* EOF */
Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=56319&... ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -72,12 +72,12 @@ #include <csrss/csrss.h>
/* Public Win32K headers */ -#include <win32k/callback.h> -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/ntgdityp.h> -#include <win32k/ntgdibad.h> -#include <win32k/ntgdihdl.h> +#include <include/callback.h> +#include <include/ntusrtyp.h> +#include <include/ntuser.h> +#include <include/ntgdityp.h> +#include <include/ntgdibad.h> +#include <include/ntgdihdl.h> #include <ntgdi.h>
/* Undocumented user definitions */
Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeLi... ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -4,7 +4,8 @@ include_directories( BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/subsys - include) + include + ${REACTOS_SOURCE_DIR}/win32ss/include)
set_rc_compiler()
Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/include... ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -33,9 +33,9 @@ #include <csrss/csrss.h>
/* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/callback.h> +#include <ntusrtyp.h> +#include <ntuser.h> +#include <callback.h>
/* Undocumented user definitions*/ #include <undocuser.h>
Modified: trunk/reactos/win32ss/user/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/CMake... ============================================================================== --- trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -4,7 +4,8 @@ ${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include ${REACTOS_SOURCE_DIR}/include/reactos/subsys ${REACTOS_SOURCE_DIR}/include/reactos/drivers - ${REACTOS_SOURCE_DIR}/dll/cpl/console) + ${REACTOS_SOURCE_DIR}/dll/cpl/console + ${REACTOS_SOURCE_DIR}/win32ss/include)
spec2def(win32csr.dll win32csr.spec)
Modified: trunk/reactos/win32ss/user/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/w32cs... ============================================================================== --- trunk/reactos/win32ss/user/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/w32csr.h [iso-8859-1] Mon Apr 2 10:52:36 2012 @@ -16,7 +16,7 @@ #include "tuiconsole.h"
/* Public Win32K Headers */ -#include <win32k/ntuser.h> +#include <ntuser.h>
#include "resource.h"