[ros-diffs] [akhaldi] 56311: * Reorganize the whole ReactOS codebase into a new layout. Discussing it will only waste time, so we better have it then talk about it after. * Put ntoskrnl and ntdll in the same f...

Author: akhaldi
Date: Sun Apr  1 20:42:43 2012
New Revision: 56311

URL: http://svn.reactos.org/svn/reactos?rev=56311&view=rev
Log:
* Reorganize the whole ReactOS codebase into a new layout. Discussing it will only waste
time, so we better have it then talk about it after.
* Put ntoskrnl and ntdll in the same folder, because they both start with nt.
* Place hal next to acpi, they both deal with hardware stuff.
* Move mountmgr next to usb drivers.
* Put the rtl next to the crt, and share as much as possible between the two.
* I'm just kidding, you know, April's fool and all ;)

Here's the real deal:

[WIN32SS]
* And finally, integrate win32k itself into the new file layout. Now the subsystem modules
are located close to each other (like gdi32 and ntgdi, or user32 and ntuser).
* Thanks go to the subsystem team for coming up with this nice layout, hopefully this will
scale to the whole codebase layout soon.
* Special thanks to Smiley for coming up with this cool idea :)

Added:
    trunk/reactos/win32ss/gdi/dib/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/dib/
    trunk/reactos/win32ss/gdi/diblib/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/diblib/
    trunk/reactos/win32ss/gdi/eng/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/eng/
    trunk/reactos/win32ss/gdi/eng/device.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/device.h
    trunk/reactos/win32ss/gdi/eng/driverobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/driverobj.h
    trunk/reactos/win32ss/gdi/eng/eng.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/eng.h
    trunk/reactos/win32ss/gdi/eng/engevent.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/engevent.h
    trunk/reactos/win32ss/gdi/eng/engobjects.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/engobjects.h
    trunk/reactos/win32ss/gdi/eng/floatobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/floatobj.h
    trunk/reactos/win32ss/gdi/eng/inteng.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/inteng.h
    trunk/reactos/win32ss/gdi/eng/ldevobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/ldevobj.h
    trunk/reactos/win32ss/gdi/eng/mouse.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/mouse.h
    trunk/reactos/win32ss/gdi/eng/pdevobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/pdevobj.h
    trunk/reactos/win32ss/gdi/eng/stubs.c
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
    trunk/reactos/win32ss/gdi/eng/surface.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/surface.h
    trunk/reactos/win32ss/gdi/eng/umpdstubs.c
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c
    trunk/reactos/win32ss/gdi/eng/xlateobj.h
      - copied, changed from r56306,
trunk/reactos/subsystems/win32/win32k/include/xlateobj.h
    trunk/reactos/win32ss/gdi/ntgdi/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/objects/
    trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/bitmaps.h
    trunk/reactos/win32ss/gdi/ntgdi/brush.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/brush.h
    trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/cliprgn.h
    trunk/reactos/win32ss/gdi/ntgdi/color.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/color.h
    trunk/reactos/win32ss/gdi/ntgdi/coord.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/coord.h
    trunk/reactos/win32ss/gdi/ntgdi/dc.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dc.h
    trunk/reactos/win32ss/gdi/ntgdi/dib.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dib.h
    trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/gdidebug.h
    trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/gdifloat.h
    trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/gdiobj.h
    trunk/reactos/win32ss/gdi/ntgdi/intgdi.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/intgdi.h
    trunk/reactos/win32ss/gdi/ntgdi/misc.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/misc.h
    trunk/reactos/win32ss/gdi/ntgdi/paint.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/paint.h
    trunk/reactos/win32ss/gdi/ntgdi/palette.h
      - copied, changed from r56306,
trunk/reactos/subsystems/win32/win32k/include/palette.h
    trunk/reactos/win32ss/gdi/ntgdi/path.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/path.h
    trunk/reactos/win32ss/gdi/ntgdi/pen.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/pen.h
    trunk/reactos/win32ss/gdi/ntgdi/rect.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/rect.h
    trunk/reactos/win32ss/gdi/ntgdi/region.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/region.h
    trunk/reactos/win32ss/gdi/ntgdi/text.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/text.h
    trunk/reactos/win32ss/gdi/ntgdi/xformobj.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/xformobj.h
    trunk/reactos/win32ss/napi.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/napi.h
    trunk/reactos/win32ss/pch.h
      - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/pch.h
    trunk/reactos/win32ss/reactx/ntddraw/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/ntddraw/
    trunk/reactos/win32ss/reactx/ntddraw/intddraw.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/intddraw.h
    trunk/reactos/win32ss/sys-stubs.S
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/sys-stubs.S
    trunk/reactos/win32ss/user/ntuser/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/ntuser/
    trunk/reactos/win32ss/user/ntuser/accelerator.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/accelerator.h
    trunk/reactos/win32ss/user/ntuser/callback.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/callback.h
    trunk/reactos/win32ss/user/ntuser/caret.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/caret.h
    trunk/reactos/win32ss/user/ntuser/class.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/class.h
    trunk/reactos/win32ss/user/ntuser/clipboard.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/clipboard.h
    trunk/reactos/win32ss/user/ntuser/csr.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/csr.h
    trunk/reactos/win32ss/user/ntuser/cursoricon.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/cursoricon.h
    trunk/reactos/win32ss/user/ntuser/dce.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dce.h
    trunk/reactos/win32ss/user/ntuser/desktop.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/desktop.h
    trunk/reactos/win32ss/user/ntuser/focus.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/focus.h
    trunk/reactos/win32ss/user/ntuser/guicheck.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/guicheck.h
    trunk/reactos/win32ss/user/ntuser/hook.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/hook.h
    trunk/reactos/win32ss/user/ntuser/hotkey.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/hotkey.h
    trunk/reactos/win32ss/user/ntuser/input.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/input.h
    trunk/reactos/win32ss/user/ntuser/main.c
      - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/win32ss/user/ntuser/menu.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/menu.h
    trunk/reactos/win32ss/user/ntuser/misc/
      - copied from r56306, trunk/reactos/subsystems/win32/win32k/misc/
    trunk/reactos/win32ss/user/ntuser/mmcopy.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/mmcopy.h
    trunk/reactos/win32ss/user/ntuser/monitor.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/monitor.h
    trunk/reactos/win32ss/user/ntuser/msgqueue.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/msgqueue.h
    trunk/reactos/win32ss/user/ntuser/ntuser.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/ntuser.h
    trunk/reactos/win32ss/user/ntuser/object.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/object.h
    trunk/reactos/win32ss/user/ntuser/painting.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/painting.h
    trunk/reactos/win32ss/user/ntuser/prop.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/prop.h
    trunk/reactos/win32ss/user/ntuser/scroll.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/scroll.h
    trunk/reactos/win32ss/user/ntuser/sysparams.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/sysparams.h
    trunk/reactos/win32ss/user/ntuser/tags.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/tags.h
    trunk/reactos/win32ss/user/ntuser/timer.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/timer.h
    trunk/reactos/win32ss/user/ntuser/useratom.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/useratom.h
    trunk/reactos/win32ss/user/ntuser/userfuncs.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/userfuncs.h
    trunk/reactos/win32ss/user/ntuser/vis.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/vis.h
    trunk/reactos/win32ss/user/ntuser/win32.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/win32.h
    trunk/reactos/win32ss/user/ntuser/win32kdebug.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
    trunk/reactos/win32ss/user/ntuser/window.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/window.h
    trunk/reactos/win32ss/user/ntuser/winpos.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/winpos.h
    trunk/reactos/win32ss/user/ntuser/winsta.h
      - copied unchanged from r56306,
trunk/reactos/subsystems/win32/win32k/include/winsta.h
    trunk/reactos/win32ss/w32ksvc.db
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/w32ksvc.db
    trunk/reactos/win32ss/w32ksvc.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/w32ksvc.h
    trunk/reactos/win32ss/win32k.h
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.h
    trunk/reactos/win32ss/win32k.rc
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.rc
    trunk/reactos/win32ss/win32k.spec
      - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.spec
    trunk/reactos/win32ss/win32kp.h
      - copied, changed from r56306,
trunk/reactos/subsystems/win32/win32k/include/win32kp.h
Removed:
    trunk/reactos/subsystems/win32/win32k/
Modified:
    trunk/reactos/subsystems/win32/CMakeLists.txt
    trunk/reactos/win32ss/CMakeLists.txt
    trunk/reactos/win32ss/drivers/videoprt/event.c

Modified: trunk/reactos/subsystems/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/CMakeList…
==============================================================================
--- trunk/reactos/subsystems/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/CMakeLists.txt [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -1,3 +1,2 @@
 
 add_subdirectory(csrss)
-add_subdirectory(win32k)

Modified: trunk/reactos/win32ss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev…
==============================================================================
--- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -1,6 +1,222 @@
+
+set(USE_DIBLIB FALSE)
 
 add_subdirectory(drivers)
+add_subdirectory(gdi/diblib)
 add_subdirectory(gdi/gdi32)
 add_subdirectory(reactx)
 add_subdirectory(user/user32)
 add_subdirectory(user/win32csr)
+
+spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
+
+include_directories(
+    .
+    include
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_definitions(
+    -DLANGPACK
+    -D_WIN32K_)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib)
+
+list(APPEND GENDIB_FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c)
+
+add_custom_command(
+    OUTPUT ${GENDIB_FILES}
+    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib
+    DEPENDS native-gendib)
+
+list(APPEND SOURCE
+    gdi/dib/alphablend.c
+    gdi/dib/dib1bpp.c
+    gdi/dib/dib4bpp.c
+    gdi/dib/dib8bpp.c
+    gdi/dib/dib16bpp.c
+    gdi/dib/dib24bpp.c
+    gdi/dib/dib32bpp.c
+    gdi/dib/floodfill.c
+    gdi/dib/stretchblt.c
+    gdi/eng/alphablend.c
+    gdi/eng/bitblt.c
+    gdi/eng/engbrush.c
+    gdi/eng/engevent.c
+    gdi/eng/clip.c
+    gdi/eng/debug.c
+    gdi/eng/device.c
+    gdi/eng/driverobj.c
+    gdi/eng/error.c
+    gdi/eng/float.c
+    gdi/eng/gradient.c
+    gdi/eng/lineto.c
+    gdi/eng/ldevobj.c
+    gdi/eng/mapping.c
+    gdi/eng/mem.c
+    gdi/eng/engmisc.c
+    gdi/eng/mouse.c
+    gdi/eng/paint.c
+    gdi/eng/pdevobj.c
+    gdi/eng/perfcnt.c
+    gdi/eng/rlecomp.c
+    gdi/eng/semaphor.c
+    gdi/eng/sort.c
+    gdi/eng/string.c
+    gdi/eng/stretchblt.c
+    gdi/eng/surface.c
+    gdi/eng/transblt.c
+    gdi/eng/engwindow.c
+    gdi/eng/xlate.c
+    user/ntuser/main.c
+    user/ntuser/misc/file.c
+    user/ntuser/misc/math.c
+    user/ntuser/misc/rtlstr.c
+    user/ntuser/misc/copy.c
+    user/ntuser/misc/registry.c
+    user/ntuser/misc/usrheap.c
+    reactx/ntddraw/ddraw.c
+    reactx/ntddraw/dd.c
+    reactx/ntddraw/ddsurf.c
+    reactx/ntddraw/d3d.c
+    reactx/ntddraw/dvp.c
+    reactx/ntddraw/mocomp.c
+    reactx/ntddraw/eng.c
+    reactx/ntddraw/dxeng.c
+    user/ntuser/accelerator.c
+    user/ntuser/callback.c
+    user/ntuser/callproc.c
+    user/ntuser/caret.c
+    user/ntuser/class.c
+    user/ntuser/clipboard.c
+    user/ntuser/csr.c
+    user/ntuser/cursoricon.c
+    user/ntuser/defwnd.c
+    user/ntuser/desktop.c
+    user/ntuser/display.c
+    user/ntuser/event.c
+    user/ntuser/focus.c
+    user/ntuser/guicheck.c
+    user/ntuser/hook.c
+    user/ntuser/hotkey.c
+    user/ntuser/input.c
+    user/ntuser/keyboard.c
+    user/ntuser/kbdlayout.c
+    user/ntuser/menu.c
+    user/ntuser/message.c
+    user/ntuser/metric.c
+    user/ntuser/misc.c
+    user/ntuser/monitor.c
+    user/ntuser/mouse.c
+    user/ntuser/msgqueue.c
+    user/ntuser/ntstubs.c
+    user/ntuser/ntuser.c
+    user/ntuser/painting.c
+    user/ntuser/prop.c
+    user/ntuser/scrollbar.c
+    user/ntuser/session.c
+    user/ntuser/simplecall.c
+    user/ntuser/sysparams.c
+    user/ntuser/timer.c
+    user/ntuser/useratom.c
+    user/ntuser/vis.c
+    user/ntuser/windc.c
+    user/ntuser/window.c
+    user/ntuser/winpos.c
+    user/ntuser/winsta.c
+    user/ntuser/object.c
+    gdi/ntgdi/arc.c
+    gdi/ntgdi/bezier.c
+    gdi/ntgdi/bitblt.c
+    gdi/ntgdi/bitmaps.c
+    gdi/ntgdi/brush.c
+    gdi/ntgdi/cliprgn.c
+    gdi/ntgdi/coord.c
+    gdi/ntgdi/dcattr.c
+    gdi/ntgdi/dclife.c
+    gdi/ntgdi/dcobjs.c
+    gdi/ntgdi/dcstate.c
+    gdi/ntgdi/dcutil.c
+    gdi/ntgdi/device.c
+    gdi/ntgdi/dibobj.c
+    gdi/ntgdi/drawing.c
+    gdi/ntgdi/fillshap.c
+    gdi/ntgdi/font.c
+    gdi/ntgdi/freetype.c
+    gdi/ntgdi/gdibatch.c
+    gdi/ntgdi/gdidbg.c
+    gdi/ntgdi/gdiobj.c
+    gdi/ntgdi/gdipool.c
+    gdi/ntgdi/icm.c
+    gdi/ntgdi/line.c
+    gdi/ntgdi/metafile.c
+    gdi/ntgdi/palette.c
+    gdi/ntgdi/path.c
+    gdi/ntgdi/pen.c
+    gdi/ntgdi/polyfill.c
+    gdi/ntgdi/print.c
+    gdi/ntgdi/rect.c
+    gdi/ntgdi/region.c
+    gdi/ntgdi/stockobj.c
+    gdi/ntgdi/text.c
+    gdi/ntgdi/wingl.c
+    gdi/ntgdi/xformobj.c
+    gdi/eng/stubs.c
+    gdi/eng/umpdstubs.c
+    win32k.rc)
+
+if(USE_DIBLIB)
+    add_definitions(-D_USE_DIBLIB_)
+    list(APPEND SOURCE
+        gdi/dib/dib_new.c
+        gdi/eng/bitblt_new.c)
+else()
+    list(APPEND SOURCE
+        gdi/dib/dib.c
+        gdi/eng/copybits.c
+        ${GENDIB_FILES})
+endif()
+
+if(ARCH MATCHES i386)
+list(APPEND SOURCE
+    gdi/dib/i386/dib24bpp_hline.s
+    gdi/dib/i386/dib32bpp_hline.s
+    gdi/dib/i386/dib32bpp_colorfill.s
+    gdi/eng/i386/floatobj.S
+    user/ntuser/misc/i386/cos_asm.s
+    user/ntuser/misc/i386/sin_asm.s
+    user/ntuser/misc/i386/atan2_asm.s
+    user/ntuser/misc/i386/floor_asm.s
+    user/ntuser/misc/i386/ceil_asm.s)
+else()
+list(APPEND SOURCE
+    gdi/dib/dib24bppc.c
+    gdi/dib/dib32bppc.c)
+endif()
+
+add_library(win32k SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
+    ${SOURCE})
+
+set_module_type(win32k kernelmodedriver)
+
+target_link_libraries(win32k
+    ${PSEH_LIB}
+    dxguid
+    libcntpr)
+
+if(USE_DIBLIB)
+    target_link_libraries(win32k diblib)
+endif()
+
+add_importlibs(win32k ntoskrnl hal ftfd)
+add_pch(win32k pch.h)
+add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
+
+add_library(win32ksys sys-stubs.S)
+set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)

Modified: trunk/reactos/win32ss/drivers/videoprt/event.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/e…
==============================================================================
--- trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -9,7 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "videoprt.h"
-#include "../../subsystems/win32/win32k/include/engevent.h"
+#include "../../gdi/eng/engevent.h"
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 

Copied: trunk/reactos/win32ss/gdi/eng/xlateobj.h (from r56306,
trunk/reactos/subsystems/win32/win32k/include/xlateobj.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.h…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -54,7 +54,7 @@
 void
 DbgCmpXlate(XLATEOBJ *pxlo1, XLATEOBJ *pxlo2);
 
-VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PALETTE *ppalSrc, PALETTE *ppalDst,
ULONG, ULONG, ULONG);
+VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PPALETTE ppalSrc, PPALETTE ppalDst,
ULONG, ULONG, ULONG);
 VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst);
 VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0,
ULONG Color1);
 VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo);

Copied: trunk/reactos/win32ss/gdi/ntgdi/palette.h (from r56306,
trunk/reactos/subsystems/win32/win32k/include/palette.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -48,7 +48,7 @@
   ULONG ulGreenShift;
   ULONG ulBlueShift;
   HDEV  hPDev;
-} PALETTE, *PPALETTE;
+} PALETTE;
 
 extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault;
 extern PPALETTE appalSurfaceDefault[];
@@ -104,3 +104,4 @@
                ppal->IndexedColors[ulIndex].peGreen,
                ppal->IndexedColors[ulIndex].peBlue);
 }
+

Copied: trunk/reactos/win32ss/pch.h (from r56306,
trunk/reactos/subsystems/win32/win32k/pch.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?p2=trunk/rea…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -97,6 +97,6 @@
 #include <freetype/freetype.h>
 
 /* Internal Win32K header */
-#include "include/win32kp.h"
+#include "win32kp.h"
 
 #endif /* __W32K_H */

Copied: trunk/reactos/win32ss/user/ntuser/main.c (from r56306,
trunk/reactos/subsystems/win32/win32k/main/dllmain.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -7,7 +7,7 @@
  */
 
 #include <win32k.h>
-#include <include/napi.h>
+#include <napi.h>
 
 #define NDEBUG
 #include <debug.h>

Copied: trunk/reactos/win32ss/win32kp.h (from r56306,
trunk/reactos/subsystems/win32/win32k/include/win32kp.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?p2=trunk…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Sun Apr  1 20:42:43 2012
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Graphics Subsystem
- * FILE:            subsys/win32k/include/win32k.h
+ * FILE:            win32ss/win32kp.h
  * PURPOSE:         Internal Win32K Header
  * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
  */
@@ -27,79 +27,80 @@
 #define DBG_ENABLE_SERVICE_HOOKS 0
 
 /* Misc headers  */
-#include <include/win32kdebug.h>
-#include <include/mmcopy.h>
-#include <include/tags.h>
-#include <include/rect.h>
-#include <include/misc.h>
+#include "user/ntuser/win32kdebug.h"
+#include "user/ntuser/mmcopy.h"
+#include "user/ntuser/tags.h"
+#include "gdi/ntgdi/rect.h"
+#include "gdi/ntgdi/misc.h"
 
 /* Internal NtGdi Headers */
 typedef struct _DC *PDC;
-#include <include/gdiobj.h>
-#include <include/surface.h>
-#include <include/pdevobj.h>
-#include <include/ldevobj.h>
-#include <include/xformobj.h>
-#include <include/bitmaps.h>
-#include <include/engobjects.h>
-#include <include/eng.h>
-#include <include/brush.h>
-#include <include/color.h>
-#include <include/driverobj.h>
-#include <include/palette.h>
-#include <include/region.h>
-#include <include/dc.h>
-#include <include/dib.h>
-#include <include/xlateobj.h>
-#include <include/cliprgn.h>
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/intddraw.h>
-#include <include/paint.h>
-#include <include/text.h>
-#include <include/engevent.h>
-#include <include/device.h>
-#include <include/pen.h>
-#include <include/cliprgn.h>
-#include <include/coord.h>
-#include <include/gdifloat.h>
-#include <include/path.h>
-#include <include/floatobj.h>
-#include <dib/dib.h>
-#include <include/mouse.h>
+typedef struct _PALETTE *PPALETTE;
+#include "gdi/ntgdi/gdiobj.h"
+#include "gdi/eng/surface.h"
+#include "gdi/eng/pdevobj.h"
+#include "gdi/eng/ldevobj.h"
+#include "gdi/eng/device.h"
+#include "gdi/eng/driverobj.h"
+#include "gdi/eng/engobjects.h"
+#include "gdi/eng/eng.h"
+#include "gdi/eng/engevent.h"
+#include "gdi/eng/inteng.h"
+#include "gdi/eng/xlateobj.h"
+#include "gdi/eng/floatobj.h"
+#include "gdi/eng/mouse.h"
+#include "gdi/ntgdi/xformobj.h"
+#include "gdi/ntgdi/brush.h"
+#include "gdi/ntgdi/color.h"
+#include "gdi/ntgdi/bitmaps.h"
+#include "gdi/ntgdi/palette.h"
+#include "gdi/ntgdi/region.h"
+#include "gdi/ntgdi/dc.h"
+#include "gdi/ntgdi/dib.h"
+#include "gdi/ntgdi/cliprgn.h"
+#include "gdi/ntgdi/intgdi.h"
+#include "gdi/ntgdi/paint.h"
+#include "gdi/ntgdi/text.h"
+#include "gdi/ntgdi/pen.h"
+#include "gdi/ntgdi/cliprgn.h"
+#include "gdi/ntgdi/coord.h"
+#include "gdi/ntgdi/gdifloat.h"
+#include "gdi/ntgdi/path.h"
+#include "gdi/dib/dib.h"
+#include "reactx/ntddraw/intddraw.h"
 
 /* Internal NtUser Headers */
 typedef struct _DESKTOP *PDESKTOP;
-#include <include/win32.h>
-#include <include/object.h>
-#include <include/ntuser.h>
-#include <include/cursoricon.h>
-#include <include/accelerator.h>
-#include <include/hook.h>
-#include <include/clipboard.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/desktop.h>
-#include <include/dce.h>
-#include <include/focus.h>
-#include <include/hotkey.h>
-#include <include/input.h>
-#include <include/menu.h>
-#include <include/monitor.h>
-#include <include/timer.h>
-#include <include/caret.h>
-#include <include/painting.h>
-#include <include/class.h>
-#include <include/window.h>
-#include <include/sysparams.h>
-#include <include/prop.h>
-#include <include/guicheck.h>
-#include <include/useratom.h>
-#include <include/vis.h>
-#include <include/userfuncs.h>
-#include <include/scroll.h>
-#include <include/csr.h>
-#include <include/winpos.h>
-#include <include/callback.h>
+#include "user/ntuser/win32.h"
+#include "user/ntuser/object.h"
+#include "user/ntuser/ntuser.h"
+#include "user/ntuser/cursoricon.h"
+#include "user/ntuser/accelerator.h"
+#include "user/ntuser/hook.h"
+#include "user/ntuser/clipboard.h"
+#include "user/ntuser/winsta.h"
+#include "user/ntuser/msgqueue.h"
+#include "user/ntuser/desktop.h"
+#include "user/ntuser/dce.h"
+#include "user/ntuser/focus.h"
+#include "user/ntuser/hotkey.h"
+#include "user/ntuser/input.h"
+#include "user/ntuser/menu.h"
+#include "user/ntuser/monitor.h"
+#include "user/ntuser/timer.h"
+#include "user/ntuser/caret.h"
+#include "user/ntuser/painting.h"
+#include "user/ntuser/class.h"
+#include "user/ntuser/window.h"
+#include "user/ntuser/sysparams.h"
+#include "user/ntuser/prop.h"
+#include "user/ntuser/guicheck.h"
+#include "user/ntuser/useratom.h"
+#include "user/ntuser/vis.h"
+#include "user/ntuser/userfuncs.h"
+#include "user/ntuser/scroll.h"
+#include "user/ntuser/csr.h"
+#include "user/ntuser/winpos.h"
+#include "user/ntuser/callback.h"
 
-#include <include/gdidebug.h>
+#include "gdi/ntgdi/gdidebug.h"