diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index 2c45ca5a51886..ba3502a5f94e6 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -7,10 +7,17 @@ TitleText=ReactOS LiveCD MinimalUI=Yes [Operating Systems] +Old="Old" LiveCD="LiveCD ACPI SMP" LiveCD_Debug="LiveCD ACPI SMP (Debug kdnet)" LiveCD_Macpi="LiveCD ACPI SMP (Debug COM)" + +[Old] +BootType=Windows2003 +SystemPath=\reactos +Options=/FASTDETECT /MININT + [LiveCD] BootType=Windows2003 SystemPath=\reactos diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt index e0e1f3e2ee11b..b368ba830655a 100644 --- a/drivers/bus/isapnp/CMakeLists.txt +++ b/drivers/bus/isapnp/CMakeLists.txt @@ -18,5 +18,5 @@ add_library(isapnp MODULE ${SOURCE} isapnp.rc) set_module_type(isapnp kernelmodedriver) add_importlibs(isapnp ntoskrnl hal) add_pch(isapnp isapnp.h SOURCE) -add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET isapnp DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(isapnp_reg.inf) diff --git a/drivers/hid/mouhid/CMakeLists.txt b/drivers/hid/mouhid/CMakeLists.txt index 1350ca1c863b7..5854cc41d3776 100644 --- a/drivers/hid/mouhid/CMakeLists.txt +++ b/drivers/hid/mouhid/CMakeLists.txt @@ -4,4 +4,4 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) add_library(mouhid MODULE mouhid.c mouhid.rc) set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) -add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) +#add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index fc22dc6513cef..b8a947bdacfa6 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -24,5 +24,5 @@ set_module_type(i8042prt kernelmodedriver) target_link_libraries(i8042prt dmilib) add_importlibs(i8042prt ntoskrnl hal) add_pch(i8042prt i8042prt.h SOURCE) -add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(i8042prt_reg.inf) diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index 42b9f791c6cb3..bc86190b3669e 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(mouclass kernelmodedriver) target_link_libraries(mouclass ${PSEH_LIB}) add_importlibs(mouclass ntoskrnl hal) add_pch(mouclass mouclass.h "${PCH_SKIP_SOURCE}") -add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) +#add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) add_registry_inf(mouclass_reg.inf) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index fc04713730b2d..0ff701abf333b 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -34,6 +34,6 @@ target_compile_definitions(cdrom PRIVATE DEBUG_USE_KDPRINT) target_link_libraries(cdrom wdf01000 ntoskrnl_vista libcntpr ${PSEH_LIB}) add_importlibs(cdrom ntoskrnl hal) # add_pch(cdrom cdrom.h SOURCE) -add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdrom_reg.inf) add_driver_inf(cdrom cdrom.inf) diff --git a/drivers/storage/class/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt index fadc6ff48c7ea..d699856add4ce 100644 --- a/drivers/storage/class/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -52,4 +52,4 @@ endif() set_module_type(classpnp kernelmodedriver) target_link_libraries(classpnp ntoskrnl_vista libcntpr ${PSEH_LIB}) add_importlibs(classpnp ntoskrnl hal) -add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index 5250b8cdec316..0fa693f545ef2 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -28,6 +28,6 @@ endif() set_module_type(disk kernelmodedriver) target_link_libraries(disk ntoskrnl_vista libcntpr wdmguid) add_importlibs(disk classpnp ntoskrnl hal) -add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(disk_reg.inf) add_driver_inf(disk disk.inf) diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt index 58cc433de83d3..2a6bf80ba456e 100644 --- a/drivers/storage/ide/atapi/CMakeLists.txt +++ b/drivers/storage/ide/atapi/CMakeLists.txt @@ -3,5 +3,5 @@ add_library(atapi MODULE atapi.c atapi.rc) target_link_libraries(atapi libcntpr) set_module_type(atapi kernelmodedriver) add_importlibs(atapi scsiport) -add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(atapi_reg.inf) diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt index 492ea66bd1154..9058afc7725ba 100644 --- a/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/drivers/storage/ide/pciidex/CMakeLists.txt @@ -17,4 +17,4 @@ add_library(pciidex MODULE add_pch(pciidex pciidex.h SOURCE) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl hal) -add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/port/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt index f4bbc0b48e8ba..2c9a5ec8564a8 100644 --- a/drivers/storage/port/scsiport/CMakeLists.txt +++ b/drivers/storage/port/scsiport/CMakeLists.txt @@ -28,4 +28,4 @@ add_library(scsiport MODULE add_pch(scsiport scsiport.h "${PCH_SKIP_SOURCE}") set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) -add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 46b4089b725ba..6142dd538e052 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -56,10 +56,27 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/optional/DroidSansFallback.ttf) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/optional/DroidSansFallback.ttf" DESTINATION reactos/Fonts FOR livecd) endif() -## Slipstreaming KDNET +## Slipstreaming drivers +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/drivers/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/${item} DESTINATION reactos/system32/drivers NO_CAB NAME_ON_CD ${item} FOR all) + endforeach(item) +endif() + +## Slipstreaming system32 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/system32/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/system32/ ${CMAKE_CURRENT_SOURCE_DIR}/system32/*) foreach(item ${EXTRA_FILES}) - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system32/${item} DESTINATION reactos/system32 NAME_ON_CD ${item} FOR all) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system32/${item} DESTINATION reactos/system32 NO_CAB NAME_ON_CD ${item} FOR all) + endforeach(item) +endif() + +## Slipstreaming config +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/config/ ${CMAKE_CURRENT_SOURCE_DIR}/config/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/config/${item} DESTINATION reactos/system32/config NO_CAB NAME_ON_CD ${item} FOR all) endforeach(item) endif() +# \ No newline at end of file diff --git a/modules/config/SECURITY b/modules/config/SECURITY new file mode 100644 index 0000000000000..07c4246f7ff0e Binary files /dev/null and b/modules/config/SECURITY differ diff --git a/modules/drivers/atapi.sys b/modules/drivers/atapi.sys new file mode 100644 index 0000000000000..4b219f982a1e0 Binary files /dev/null and b/modules/drivers/atapi.sys differ diff --git a/modules/drivers/cdrom.sys b/modules/drivers/cdrom.sys new file mode 100644 index 0000000000000..6c6b5210d623f Binary files /dev/null and b/modules/drivers/cdrom.sys differ diff --git a/modules/drivers/classpnp.sys b/modules/drivers/classpnp.sys new file mode 100644 index 0000000000000..87c08886341ad Binary files /dev/null and b/modules/drivers/classpnp.sys differ diff --git a/modules/drivers/disk.sys b/modules/drivers/disk.sys new file mode 100644 index 0000000000000..18abd9380951b Binary files /dev/null and b/modules/drivers/disk.sys differ diff --git a/modules/drivers/i8042prt.sys b/modules/drivers/i8042prt.sys new file mode 100644 index 0000000000000..aa3e2bcfb01ff Binary files /dev/null and b/modules/drivers/i8042prt.sys differ diff --git a/modules/drivers/isapnp.sys b/modules/drivers/isapnp.sys new file mode 100644 index 0000000000000..5bfe068f37dbf Binary files /dev/null and b/modules/drivers/isapnp.sys differ diff --git a/modules/drivers/kbdclass.sys b/modules/drivers/kbdclass.sys new file mode 100644 index 0000000000000..ccbd48a195fb6 Binary files /dev/null and b/modules/drivers/kbdclass.sys differ diff --git a/modules/drivers/mouclass.sys b/modules/drivers/mouclass.sys new file mode 100644 index 0000000000000..e84a29d183283 Binary files /dev/null and b/modules/drivers/mouclass.sys differ diff --git a/modules/drivers/mouhid.sys b/modules/drivers/mouhid.sys new file mode 100644 index 0000000000000..f49ba4ba25dc6 Binary files /dev/null and b/modules/drivers/mouhid.sys differ diff --git a/modules/drivers/pciidex.sys b/modules/drivers/pciidex.sys new file mode 100644 index 0000000000000..f5518aae53f8f Binary files /dev/null and b/modules/drivers/pciidex.sys differ diff --git a/modules/drivers/scsiport.sys b/modules/drivers/scsiport.sys new file mode 100644 index 0000000000000..9e292c5e27a94 Binary files /dev/null and b/modules/drivers/scsiport.sys differ diff --git a/modules/drivers/vga.sys b/modules/drivers/vga.sys new file mode 100644 index 0000000000000..9868301d043d6 Binary files /dev/null and b/modules/drivers/vga.sys differ diff --git a/modules/drivers/vgapnp.sys b/modules/drivers/vgapnp.sys new file mode 100644 index 0000000000000..9868301d043d6 Binary files /dev/null and b/modules/drivers/vgapnp.sys differ diff --git a/modules/drivers/videoprt.sys b/modules/drivers/videoprt.sys new file mode 100644 index 0000000000000..c3f18f6ec1e9b Binary files /dev/null and b/modules/drivers/videoprt.sys differ diff --git a/modules/system32/gdi32.dll b/modules/system32/gdi32.dll new file mode 100644 index 0000000000000..3afdff8421702 Binary files /dev/null and b/modules/system32/gdi32.dll differ diff --git a/modules/system32/user32.dll b/modules/system32/user32.dll new file mode 100644 index 0000000000000..978e0a0a9ecc9 Binary files /dev/null and b/modules/system32/user32.dll differ diff --git a/modules/system32/win32k.sys b/modules/system32/win32k.sys new file mode 100644 index 0000000000000..afcfacba29fe4 Binary files /dev/null and b/modules/system32/win32k.sys differ diff --git a/modules/system32/winsrv.dll b/modules/system32/winsrv.dll new file mode 100644 index 0000000000000..e43443e7b5945 Binary files /dev/null and b/modules/system32/winsrv.dll differ diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 7bc66aebce14e..7da516f05887d 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -828,7 +828,7 @@ function(create_registry_hives) ${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/default ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/security + # ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index 6555fb19eca80..f9643078bb380 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -255,7 +255,7 @@ endif() add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k pch.h SOURCE) -add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) +#add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) if(ARCH STREQUAL "amd64") set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc64.h) diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt index 3b79632d85055..be75bd70d7db7 100644 --- a/win32ss/drivers/miniport/vbe/CMakeLists.txt +++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(vgapnp libcntpr) # pc98vid takes place of vga service on PC-98 platform if(NOT SARCH STREQUAL "pc98") - add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) + # add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) add_registry_inf(vbemp_reg.inf) endif() diff --git a/win32ss/drivers/miniport/vga/CMakeLists.txt b/win32ss/drivers/miniport/vga/CMakeLists.txt index 70dd2e368410f..e5a92a2257c5b 100644 --- a/win32ss/drivers/miniport/vga/CMakeLists.txt +++ b/win32ss/drivers/miniport/vga/CMakeLists.txt @@ -8,5 +8,5 @@ add_library(vga MODULE ${SOURCE} vgamp.rc) set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) add_pch(vga vgamp.h SOURCE) -add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) +#add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) add_registry_inf(vga_reg.inf) diff --git a/win32ss/drivers/videoprt/CMakeLists.txt b/win32ss/drivers/videoprt/CMakeLists.txt index cc5a174f57f6b..8696b36831bcc 100644 --- a/win32ss/drivers/videoprt/CMakeLists.txt +++ b/win32ss/drivers/videoprt/CMakeLists.txt @@ -39,4 +39,4 @@ set_module_type(videoprt kernelmodedriver) target_link_libraries(videoprt ${PSEH_LIB}) add_importlibs(videoprt ntoskrnl hal) add_pch(videoprt videoprt.h "${PCH_SKIP_SOURCE}") -add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) +#add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) diff --git a/win32ss/gdi/gdi32/CMakeLists.txt b/win32ss/gdi/gdi32/CMakeLists.txt index 37f66f8a7ea94..18bf097cf0365 100644 --- a/win32ss/gdi/gdi32/CMakeLists.txt +++ b/win32ss/gdi/gdi32/CMakeLists.txt @@ -67,4 +67,4 @@ endif() add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 include/precomp.h SOURCE) add_dependencies(gdi32 psdk) -add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) +#add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index ca2f2a143e2ae..be3ce4849577f 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -91,4 +91,4 @@ endif() add_delay_importlibs(user32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h SOURCE) -add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) +#add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt index c0cc6d68164c4..316a501c4b537 100644 --- a/win32ss/user/winsrv/CMakeLists.txt +++ b/win32ss/user/winsrv/CMakeLists.txt @@ -32,4 +32,4 @@ target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSE add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} ${USERSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) add_dependencies(winsrv bugcodes xdk) -add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) +#add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)