Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 01/01: [CDROM_NEW] Add the registry file to CMakeLists.txt

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97cf947919dbffd1e2f0a… commit 97cf947919dbffd1e2f0a4fc66005932f7722be1 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 19 21:41:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 19 21:41:52 2020 +0300 [CDROM_NEW] Add the registry file to CMakeLists.txt Addendum to 2f6abcc4c339dfe260c125e05b227aac80415c9d --- drivers/storage/class/cdrom_new/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom_new/CMakeLists.txt index 7def3bc655d..f67e5ff3aeb 100644 --- a/drivers/storage/class/cdrom_new/CMakeLists.txt +++ b/drivers/storage/class/cdrom_new/CMakeLists.txt @@ -38,4 +38,5 @@ 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_registry_inf(cdrom_reg.inf) add_driver_inf(cdrom cdrom.inf)

3 years, 9 months

[reactos] 04/04: [CDROM_NEW] Add a registry file for use on livecd and setup

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f6abcc4c339dfe260c12… commit 2f6abcc4c339dfe260c125e05b227aac80415c9d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 19 21:24:24 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 19 21:24:24 2020 +0300 [CDROM_NEW] Add a registry file for use on livecd and setup --- drivers/storage/class/cdrom_new/cdrom_reg.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/storage/class/cdrom_new/cdrom_reg.inf b/drivers/storage/class/cdrom_new/cdrom_reg.inf new file mode 100644 index 00000000000..b23b20ed378 --- /dev/null +++ b/drivers/storage/class/cdrom_new/cdrom_reg.inf @@ -0,0 +1,7 @@ +; Cdrom class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\cdrom","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\cdrom","Group",0x00000000,"SCSI CDROM Class" +HKLM,"SYSTEM\CurrentControlSet\Services\cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\cdrom","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\cdrom","Type",0x00010001,0x00000001

3 years, 9 months

[reactos] 03/04: [VBE] Enable the driver start in the registry

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=971cf12c9a7bd083130f0… commit 971cf12c9a7bd083130f09f957b3a99965997356 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 19 21:00:06 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 19 21:00:06 2020 +0300 [VBE] Enable the driver start in the registry --- media/inf/display.inf | 2 +- win32ss/drivers/miniport/vbe/vbemp_reg.inf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/inf/display.inf b/media/inf/display.inf index 87ebba7b3db..b43ae6c4062 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -49,7 +49,7 @@ framebuf.dll [VGA_Inst.NT.Services] AddService = , 0x00000002 ;AddService = VGA, , VGA_Service_Inst -;AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE +AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE ;AddService = XboxVmp, 0x00000003, XBOX_Service_Inst [VGA_Service_Inst] diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/win32ss/drivers/miniport/vbe/vbemp_reg.inf index 37e80178270..00a92c14c3b 100644 --- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf +++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf @@ -3,7 +3,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001

3 years, 9 months

[reactos] 02/04: [BOOTDATA] Enable loading of the pci.sys driver

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bf65730bae72abdcfc3d… commit 9bf65730bae72abdcfc3d7bdfafab28062bf4cb4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 19 20:52:54 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 19 20:52:54 2020 +0300 [BOOTDATA] Enable loading of the pci.sys driver --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index ac1bf829629..6e2c3f69452 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -120,7 +120,7 @@ usbstor.sys = 1,,,,,,x,4,,,,1,4 kbdhid.sys = 1,,,,,,,4,,,,1,4 kbdclass.sys = 1,,,,,,x,4,,,,1,4 l_intl.nls = 1,,,,,,,2,,,,1,2 -pci.sys = 1,,,,,,,4,,,,1,4 +pci.sys = 1,,,,,,x,4,,,,1,4 scsiport.sys = 1,,,,,,,4,,,,1,4 storport.sys = 1,,,,,,,4,,,,1,4 fastfat.sys = 1,,,,,,x,4,,,,1,4

3 years, 9 months

[reactos] 01/04: [BOOTDATA] Do not explicitly load driver libraries in txtsetup.sif

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85cb8a897da94883b0e9c… commit 85cb8a897da94883b0e9ce11b544e0665a06cf22 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 19 20:44:38 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 19 20:44:38 2020 +0300 [BOOTDATA] Do not explicitly load driver libraries in txtsetup.sif If any driver depends on them, they will be loaded automatically --- boot/bootdata/txtsetup.sif | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 4cc751b7834..ac1bf829629 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -99,7 +99,7 @@ c_437.nls = 1,,,,,,,2,,,,1,2 c_1252.nls = 1,,,,,,,2,,,,1,2 cdfs.sys = 1,,,,,,x,4,,,,1,4 cdrom.sys = 1,,,,,,x,4,,,,1,4 -classpnp.sys = 1,,,,,,x,4,,,,1,4 +classpnp.sys = 1,,,,,,,4,,,,1,4 isapnp.sys = 1,,,,,,,4,,,,1,4 kdcom.dll = 1,,,,,,,2,,,,1,2 kdvbox.dll = 1,,,,,,,2,,,,1,2 @@ -110,9 +110,9 @@ hidclass.sys = 1,,,,,,,4,,,,1,4 hidparse.sys = 1,,,,,,,4,,,,1,4 hidusb.sys = 1,,,,,,,4,,,,1,4 usbccgp.sys = 1,,,,,,x,4,,,,1,4 -usbd.sys = 1,,,,,,x,4,,,,1,4 +usbd.sys = 1,,,,,,,4,,,,1,4 usbhub.sys = 1,,,,,,x,4,,,,1,4 -usbport.sys = 1,,,,,,x,4,,,,1,4 +usbport.sys = 1,,,,,,,4,,,,1,4 usbuhci.sys = 1,,,,,,x,4,,,,1,4 usbohci.sys = 1,,,,,,x,4,,,,1,4 usbehci.sys = 1,,,,,,x,4,,,,1,4 @@ -121,8 +121,8 @@ kbdhid.sys = 1,,,,,,,4,,,,1,4 kbdclass.sys = 1,,,,,,x,4,,,,1,4 l_intl.nls = 1,,,,,,,2,,,,1,2 pci.sys = 1,,,,,,,4,,,,1,4 -scsiport.sys = 1,,,,,,x,4,,,,1,4 -storport.sys = 1,,,,,,x,4,,,,1,4 +scsiport.sys = 1,,,,,,,4,,,,1,4 +storport.sys = 1,,,,,,,4,,,,1,4 fastfat.sys = 1,,,,,,x,4,,,,1,4 btrfs.sys = 1,,,,,,x,4,,,,1,4 ramdisk.sys = 1,,,,,,x,4,,,,1,4

3 years, 9 months

[reactos] 01/01: [WIN32SS] Trim EOL white-space

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=449a3417862fe3b2b2847… commit 449a3417862fe3b2b2847c5789f6e4d3bd0feb96 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Dec 19 17:51:37 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Dec 19 17:51:37 2020 +0100 [WIN32SS] Trim EOL white-space Addendum to 0.4.15-dev-1457-g 870aa1254f07f6ec7d8c1ad93d53fa6c6b18264b --- win32ss/user/ntuser/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/clipboard.c b/win32ss/user/ntuser/clipboard.c index 2ec385b1ce8..fc8df56944a 100644 --- a/win32ss/user/ntuser/clipboard.c +++ b/win32ss/user/ntuser/clipboard.c @@ -375,7 +375,7 @@ UserClipboardRelease(PWND pWindow) { PWINSTATION_OBJECT pWinStaObj; - if (!pWindow) + if (!pWindow) return; pWinStaObj = IntGetWinStaForCbAccess();

3 years, 9 months

[reactos] 01/01: [WIN32SS] Fix BSOD 0x1E nullptr deref via Git-bash CORE-16586

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=870aa1254f07f6ec7d8c1… commit 870aa1254f07f6ec7d8c1ad93d53fa6c6b18264b Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Dec 19 17:47:33 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Dec 19 17:47:33 2020 +0100 [WIN32SS] Fix BSOD 0x1E nullptr deref via Git-bash CORE-16586 Thanks to the patches author Doug Lyons! --- win32ss/user/ntuser/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/user/ntuser/clipboard.c b/win32ss/user/ntuser/clipboard.c index d144220a18f..2ec385b1ce8 100644 --- a/win32ss/user/ntuser/clipboard.c +++ b/win32ss/user/ntuser/clipboard.c @@ -375,6 +375,9 @@ UserClipboardRelease(PWND pWindow) { PWINSTATION_OBJECT pWinStaObj; + if (!pWindow) + return; + pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) return;

3 years, 9 months

[reactos] 01/01: [CDFS] Fix a macro-copy-paste and shrink the binary size CORE-17405

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889eab78ca7c0f17a2ada… commit 889eab78ca7c0f17a2ada9ff20de5807a293cdfe Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Dec 18 04:48:31 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Dec 18 04:48:31 2020 +0100 [CDFS] Fix a macro-copy-paste and shrink the binary size CORE-17405 --- drivers/filesystems/cdfs/cddata.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/filesystems/cdfs/cddata.h b/drivers/filesystems/cdfs/cddata.h index 395b1862ca6..759854fd77d 100644 --- a/drivers/filesystems/cdfs/cddata.h +++ b/drivers/filesystems/cdfs/cddata.h @@ -173,7 +173,7 @@ extern CDFS_TELEMETRY_DATA_CONTEXT CdTelemetryData; #if DBG #undef CD_SANITY -#define CD_SANITY +//#define CD_SANITY #endif #ifdef CD_SANITY @@ -241,7 +241,6 @@ extern CDFS_TELEMETRY_DATA_CONTEXT CdTelemetryData; #define ASSERT_VCB(V) { NOTHING; } #define ASSERT_OPTIONAL_VCB(V) { NOTHING; } #define ASSERT_FCB(F) { NOTHING; } -#define ASSERT_OPTIONAL_FCB(F) { NOTHING; } #define ASSERT_FCB_NONPAGED(FN) { NOTHING; } #define ASSERT_OPTIONAL_FCB(FN) { NOTHING; } #define ASSERT_CCB(C) { NOTHING; }

3 years, 9 months

[reactos] 01/01: [RTL] Fix build on MSVC bots part 2

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0d136ffcf6af4934870d… commit b0d136ffcf6af4934870d8725d00f0a361d853f9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Dec 17 15:01:50 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Dec 17 15:01:50 2020 +0100 [RTL] Fix build on MSVC bots part 2 Then stick with your stupid PCH on master already. Addendum to 0.4.15-dev-1453-g 4ad7b6d --- sdk/lib/rtl/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 391c021047f..65bf915b45d 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -112,8 +112,7 @@ endif() add_asm_files(rtl_asm ${ASM_SOURCE}) add_library(rtl ${SOURCE} ${rtl_asm}) -#disable pch to prevent macro redefinition rtl.h WIN32_NO_STATUS -#add_pch(rtl rtl.h SOURCE) +add_pch(rtl rtl.h SOURCE) add_dependencies(rtl psdk asm) list(APPEND SOURCE_VISTA

3 years, 9 months

[reactos] 01/01: [RDBSSLIB][RTL] Fix build on MSVC bots

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd3c54092812aeb203857… commit dd3c54092812aeb203857fa25f5502f0f565a3cd Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Dec 17 14:33:26 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Dec 17 14:33:26 2020 +0100 [RDBSSLIB][RTL] Fix build on MSVC bots Addendum to 0.4.15-dev-1453-g 4ad7b6d Looks like CMake on master does not longer understand the syntax of replace_compile_flags(). Will investigate that later again, when other issues have been solved that do currently prevent me from testing that locally at all. Most likely remove_target_compile_option() has to be used instead now. --- sdk/lib/drivers/rdbsslib/CMakeLists.txt | 5 ----- sdk/lib/rtl/CMakeLists.txt | 5 ----- 2 files changed, 10 deletions(-) diff --git a/sdk/lib/drivers/rdbsslib/CMakeLists.txt b/sdk/lib/drivers/rdbsslib/CMakeLists.txt index 56ab772675d..7b6ec545500 100644 --- a/sdk/lib/drivers/rdbsslib/CMakeLists.txt +++ b/sdk/lib/drivers/rdbsslib/CMakeLists.txt @@ -3,11 +3,6 @@ add_definitions(-DUNICODE -D_UNICODE -DRDBSS_TRACKER) include_directories(${REACTOS_SOURCE_DIR}/drivers/filesystems/mup ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/copysup) -if(MSVC) - # error C4101: 'BreakpointsSave' : unreferenced local variable in Release-Configuration - replace_compile_flags("/we4101" " ") -endif() - list(APPEND SOURCE rdbss.c) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index eb76fc9b7a9..391c021047f 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -5,11 +5,6 @@ add_definitions( -D_NTSYSTEM_ -D_NTDLLBUILD_) -if(MSVC) - # error C4101: unreferenced local variable in Release-Configuration due to debug logging - replace_compile_flags("/we4101" " ") -endif() - list(APPEND SOURCE access.c acl.c

3 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2020