diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index f36197c2e1d5a..1780482beafe2 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -8,7 +8,7 @@ MinimalUI=Yes [Operating Systems] LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" +LiveCD_Debug="LiveCD (Debug) Network" LiveCD_Macpi="LiveCD ACPI SMP (Debug)" LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" LiveCD_VBoxDebug="LiveCD (VBox Debug)" @@ -23,7 +23,7 @@ Options=/FASTDETECT /MININT [LiveCD_Debug] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT +Options=/DEBUG /DEBUGPORT=NET /HOST_IP=10.0.0.175 /HOST_PORT=50000 /ENCRYPTION_KEY=make.reactos.great.again /W2003 /CPUFREQ=3000 /SOS /FASTDETECT /MININT [LiveCD_Macpi] BootType=Windows2003 diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 1a8d77e362c1c..2a646e46c5f1c 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1592,7 +1592,7 @@ USBPORT_DmaEndpointWorker(IN PUSBPORT_ENDPOINT Endpoint) { PDEVICE_OBJECT FdoDevice; ULONG PrevState; - ULONG EndpointState; + ULONG EndpointState = 0; BOOLEAN IsPaused = FALSE; DPRINT_CORE("USBPORT_DmaEndpointWorker ... \n"); diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 618de5c940bdd..c5adb499c28f8 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -55,3 +55,20 @@ endif() 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 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 NAME_ON_CD ${item} FOR all) + endforeach(item) +endif() +## +## Slipstreaming drivers +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) + endforeach(item) +endif() +# \ No newline at end of file diff --git a/modules/system32/kd_02_14e4.dll b/modules/system32/kd_02_14e4.dll new file mode 100644 index 0000000000000..f72adbab52223 Binary files /dev/null and b/modules/system32/kd_02_14e4.dll differ diff --git a/modules/system32/kd_02_1969.dll b/modules/system32/kd_02_1969.dll new file mode 100644 index 0000000000000..4224b300f84ba Binary files /dev/null and b/modules/system32/kd_02_1969.dll differ diff --git a/modules/system32/kd_02_8086.dll b/modules/system32/kd_02_8086.dll new file mode 100644 index 0000000000000..7c02e191a8e03 Binary files /dev/null and b/modules/system32/kd_02_8086.dll differ diff --git a/modules/system32/kdnet.dll b/modules/system32/kdnet.dll new file mode 100644 index 0000000000000..fa69419e6fd21 Binary files /dev/null and b/modules/system32/kdnet.dll differ diff --git a/modules/system32/kdstub.dll b/modules/system32/kdstub.dll new file mode 100644 index 0000000000000..becfd43ed5e80 Binary files /dev/null and b/modules/system32/kdstub.dll differ diff --git a/modules/system32/wglgears.exe b/modules/system32/wglgears.exe new file mode 100644 index 0000000000000..f628f0cf0d57d Binary files /dev/null and b/modules/system32/wglgears.exe differ