6 Mar
2015
6 Mar
'15
2:33 p.m.
Author: hbelusca
Date: Fri Mar 6 14:33:02 2015
New Revision: 66588
URL: http://svn.reactos.org/svn/reactos?rev=66588&view=rev
Log:
Revert tree-restructure attempt: r66583, r66582, r66581, r66578, sauf ntdll changes,
r66576 and r66575 sauf mvdm changes (ok with Aleksander).
Added:
trunk/reactos/base/services/svchost/
- copied from r66574, trunk/reactos/base/services/svchost/
trunk/reactos/base/system/services/
- copied from r66574, trunk/reactos/base/system/services/
trunk/reactos/dll/shellext/
- copied from r66574, trunk/reactos/dll/shellext/
trunk/reactos/dll/win32/advapi32/
- copied from r66574, trunk/reactos/dll/win32/advapi32/
trunk/reactos/dll/win32/browseui/
- copied from r66574, trunk/reactos/dll/win32/browseui/
trunk/reactos/dll/win32/ieframe/
- copied from r66574, trunk/reactos/dll/win32/ieframe/
trunk/reactos/dll/win32/kernel32/
- copied from r66574, trunk/reactos/dll/win32/kernel32/
trunk/reactos/dll/win32/kernel32_vista/
- copied from r66574, trunk/reactos/dll/win32/kernel32_vista/
trunk/reactos/dll/win32/mshtml/
- copied from r66574, trunk/reactos/dll/win32/mshtml/
trunk/reactos/dll/win32/mshtml.tlb/
- copied from r66574, trunk/reactos/dll/win32/mshtml.tlb/
trunk/reactos/dll/win32/shdoclc/
- copied from r66574, trunk/reactos/dll/win32/shdoclc/
trunk/reactos/dll/win32/shdocvw/
- copied from r66574, trunk/reactos/dll/win32/shdocvw/
trunk/reactos/dll/win32/shell32/
- copied from r66580, trunk/reactos/dll/win32/shell32/
trunk/reactos/dll/win32/shfolder/
- copied from r66580, trunk/reactos/dll/win32/shfolder/
trunk/reactos/dll/win32/shimgvw/
- copied from r66580, trunk/reactos/dll/win32/shimgvw/
trunk/reactos/dll/win32/shlwapi/
- copied from r66580, trunk/reactos/dll/win32/shlwapi/
trunk/reactos/dll/win32/url/
- copied from r66574, trunk/reactos/dll/win32/url/
trunk/reactos/dll/win32/urlmon/
- copied from r66574, trunk/reactos/dll/win32/urlmon/
trunk/reactos/subsystems/win/
- copied from r66574, trunk/reactos/subsystems/win/
trunk/reactos/subsystems/win32/
- copied from r66574, trunk/reactos/subsystems/win32/
trunk/reactos/win32ss/drivers/
- copied from r66574, trunk/reactos/win32ss/drivers/
trunk/reactos/win32ss/gdi/
- copied from r66574, trunk/reactos/win32ss/gdi/
trunk/reactos/win32ss/include/
- copied from r66574, trunk/reactos/win32ss/include/
trunk/reactos/win32ss/napi.h
- copied unchanged from r66574, trunk/reactos/win32ss/napi.h
trunk/reactos/win32ss/pch.h
- copied unchanged from r66574, trunk/reactos/win32ss/pch.h
trunk/reactos/win32ss/reactx/
- copied from r66574, trunk/reactos/win32ss/reactx/
trunk/reactos/win32ss/sys-stubs.S
- copied unchanged from r66574, trunk/reactos/win32ss/sys-stubs.S
trunk/reactos/win32ss/user/
- copied from r66574, trunk/reactos/win32ss/user/
trunk/reactos/win32ss/w32ksvc.db
- copied unchanged from r66574, trunk/reactos/win32ss/w32ksvc.db
trunk/reactos/win32ss/w32ksvc.h
- copied unchanged from r66574, trunk/reactos/win32ss/w32ksvc.h
trunk/reactos/win32ss/win32k.h
- copied unchanged from r66574, trunk/reactos/win32ss/win32k.h
trunk/reactos/win32ss/win32k.rc
- copied unchanged from r66574, trunk/reactos/win32ss/win32k.rc
trunk/reactos/win32ss/win32k.spec
- copied unchanged from r66574, trunk/reactos/win32ss/win32k.spec
trunk/reactos/win32ss/win32kp.h
- copied unchanged from r66574, trunk/reactos/win32ss/win32kp.h
Removed:
trunk/reactos/base/shell/browseui/
trunk/reactos/base/shell/ie/
trunk/reactos/base/shell/shell32/
trunk/reactos/base/shell/shellext/
trunk/reactos/base/shell/shfolder/
trunk/reactos/base/shell/shlwapi/
trunk/reactos/win32ss/base/
trunk/reactos/win32ss/core/
Modified:
trunk/reactos/base/services/CMakeLists.txt
trunk/reactos/base/shell/CMakeLists.txt
trunk/reactos/base/system/CMakeLists.txt
trunk/reactos/dll/CMakeLists.txt
trunk/reactos/dll/cpl/console/CMakeLists.txt
trunk/reactos/dll/win32/CMakeLists.txt
trunk/reactos/subsystems/CMakeLists.txt
trunk/reactos/win32ss/CMakeLists.txt
Modified: trunk/reactos/base/services/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t…
==============================================================================
--- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -3,6 +3,7 @@
add_subdirectory(eventlog)
add_subdirectory(rpcss)
add_subdirectory(spoolsv)
+add_subdirectory(svchost)
add_subdirectory(tcpsvcs)
add_subdirectory(telnetd)
#add_subdirectory(tftpd)
Modified: trunk/reactos/base/shell/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -1,11 +1,5 @@
-add_subdirectory(browseui)
add_subdirectory(cmd)
add_subdirectory(explorer)
add_subdirectory(filebrowser)
-add_subdirectory(ie)
add_subdirectory(rshell)
-add_subdirectory(shell32)
-add_subdirectory(shfolder)
-add_subdirectory(shlwapi)
-add_subdirectory(shellext)
Modified: trunk/reactos/base/system/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt…
==============================================================================
--- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -9,6 +9,7 @@
add_subdirectory(regsvr32)
add_subdirectory(rundll32)
add_subdirectory(runonce)
+add_subdirectory(services)
add_subdirectory(smss)
add_subdirectory(subst)
add_subdirectory(userinit)
Modified: trunk/reactos/dll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=665…
==============================================================================
--- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -5,4 +5,5 @@
add_subdirectory(keyboard)
add_subdirectory(ntdll)
add_subdirectory(opengl)
+add_subdirectory(shellext)
add_subdirectory(win32)
Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists…
==============================================================================
--- trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -1,7 +1,7 @@
include_directories(
- ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv
- ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv/frontends/gui)
+ ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv
+ ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv/frontends/gui)
spec2def(console.dll console.spec)
Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r…
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -3,6 +3,7 @@
add_subdirectory(aclui)
add_subdirectory(activeds)
add_subdirectory(actxprxy)
+add_subdirectory(advapi32)
add_subdirectory(advpack)
add_subdirectory(atl)
add_subdirectory(atl100)
@@ -13,6 +14,7 @@
add_subdirectory(batt)
add_subdirectory(bcrypt)
add_subdirectory(beepmidi)
+add_subdirectory(browseui)
add_subdirectory(cabinet)
add_subdirectory(cards)
add_subdirectory(cfgmgr32)
@@ -50,6 +52,7 @@
add_subdirectory(httpapi)
add_subdirectory(iccvid)
add_subdirectory(icmp)
+add_subdirectory(ieframe)
add_subdirectory(iernonce)
add_subdirectory(imaadp32.acm)
add_subdirectory(imagehlp)
@@ -65,6 +68,8 @@
add_subdirectory(itss)
add_subdirectory(jscript)
add_subdirectory(jsproxy)
+add_subdirectory(kernel32)
+add_subdirectory(kernel32_vista)
add_subdirectory(loadperf)
add_subdirectory(localspl)
add_subdirectory(localui)
@@ -95,7 +100,9 @@
add_subdirectory(msg711.acm)
add_subdirectory(msgina)
add_subdirectory(msgsm32.acm)
+add_subdirectory(mshtml)
add_subdirectory(msi)
+add_subdirectory(mshtml.tlb)
add_subdirectory(msimg32)
add_subdirectory(msimtf)
add_subdirectory(msisip)
@@ -173,6 +180,12 @@
add_subdirectory(setupapi)
add_subdirectory(sfc)
add_subdirectory(sfc_os)
+add_subdirectory(shdoclc)
+add_subdirectory(shdocvw)
+add_subdirectory(shell32)
+add_subdirectory(shfolder)
+add_subdirectory(shimgvw)
+add_subdirectory(shlwapi)
add_subdirectory(slbcsp)
add_subdirectory(smdll)
add_subdirectory(sndblst)
@@ -197,6 +210,8 @@
add_subdirectory(unicows)
add_subdirectory(untfs)
add_subdirectory(updspapi)
+add_subdirectory(url)
+add_subdirectory(urlmon)
add_subdirectory(userenv)
add_subdirectory(usp10)
add_subdirectory(uxtheme)
Modified: trunk/reactos/subsystems/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015
@@ -1,2 +1,4 @@
add_subdirectory(mvdm)
+add_subdirectory(win)
+add_subdirectory(win32)
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] Fri Mar 6 14:33:02 2015
@@ -1,3 +1,235 @@
-add_subdirectory(base)
-add_subdirectory(core)
+set(USE_DIBLIB FALSE)
+
+# Give WIN32 subsystem its own project.
+PROJECT(WIN32SS)
+
+add_subdirectory(drivers)
+
+if(USE_DIBLIB)
+ add_subdirectory(gdi/diblib)
+endif()
+
+add_subdirectory(gdi/gdi32)
+add_subdirectory(reactx)
+add_subdirectory(user/user32)
+add_subdirectory(user/winsrv)
+
+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/math.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/xlateobj.c
+ user/ntuser/main.c
+ user/ntuser/misc/file.c
+ user/ntuser/misc/rtlstr.c
+ user/ntuser/misc/copy.c
+ user/ntuser/misc/registry.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/dde.c
+ user/ntuser/defwnd.c
+ user/ntuser/desktop.c
+ user/ntuser/display.c
+ user/ntuser/draw.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/ime.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/shutdown.c
+ user/ntuser/simplecall.c
+ user/ntuser/sysparams.c
+ user/ntuser/timer.c
+ user/ntuser/useratom.c
+ user/ntuser/usrheap.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/init.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
+ pch.h)
+
+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 STREQUAL "i386")
+list(APPEND ASM_SOURCE
+ gdi/dib/i386/dib24bpp_hline.s
+ gdi/dib/i386/dib32bpp_hline.s
+ gdi/dib/i386/dib32bpp_colorfill.s
+ gdi/eng/i386/floatobj.S)
+else()
+list(APPEND SOURCE
+ gdi/dib/dib24bppc.c
+ gdi/dib/dib32bppc.c)
+endif()
+
+if(KDBG)
+ list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c)
+endif()
+
+add_asm_files(win32k_asm ${ASM_SOURCE})
+
+add_library(win32k SHARED
+ ${SOURCE}
+ ${win32k_asm}
+ win32k.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
+
+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 SOURCE)
+add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
+
+set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
+add_asm_files(win32ksys_asm sys-stubs.S)
+add_library(win32ksys ${win32ksys_asm})
+set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")