Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [SDK] Make gen_baseaddress.py compatible with Python 3.
by Thomas Faber 08 Sep '18

08 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e6810d5d2263d62b5cfc… commit 5e6810d5d2263d62b5cfcb5d18baeccc5de4a17a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 8 11:10:51 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 8 11:11:08 2018 +0200 [SDK] Make gen_baseaddress.py compatible with Python 3. --- sdk/tools/gen_baseaddress.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index 3d8605b7a8..5219a4ee32 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -4,7 +4,7 @@ LICENSE: MIT (https://spdx.org/licenses/MIT) PURPOSE: Update baseaddresses of all modules COPYRIGHT: Copyright 2017,2018 Mark Jansen (mark.jansen(a)reactos.org) ''' - +from __future__ import print_function, absolute_import, division import os import struct import sys @@ -12,9 +12,9 @@ import sys try: import pefile except ImportError: - print '# Please install pefile from pip or https://github.com/erocarrera/pefile' - print '# Using fallback' - print + print('# Please install pefile from pip or https://github.com/erocarrera/pefile') + print('# Using fallback') + print() ALL_EXTENSIONS = ( '.dll', '.acm', '.ax', '.cpl', '.drv', '.ocx' @@ -194,18 +194,18 @@ EXCLUDE = ( def size_of_image_fallback(filename): with open(filename, 'rb') as fin: if fin.read(2) != 'MZ': - print filename, 'No dos header found!' + print(filename, 'No dos header found!') return 0 fin.seek(0x3C) e_lfanew = struct.unpack('i', fin.read(4))[0] fin.seek(e_lfanew) if fin.read(4) != 'PE\0\0': - print filename, 'No PE header found!' + print(filename, 'No PE header found!') return 0 fin.seek(e_lfanew + 0x18) pe_magic = struct.unpack('h', fin.read(2))[0] if pe_magic != 0x10b: - print filename, 'is not a 32 bit exe!' + print(filename, 'is not a 32 bit exe!') return 0 fin.seek(e_lfanew + 0x50) pe_size_of_image = struct.unpack('i', fin.read(4))[0] @@ -233,7 +233,7 @@ class Module(object): postfix = ' # should be above 0x%08x' % self.address elif self._reserved: postfix = ' # reserved' - print 'set(baseaddress_%-30s 0x%08x)%s' % (name, self.address, postfix) + print('set(baseaddress_%-30s 0x%08x)%s' % (name, self.address, postfix)) def end(self): return self.address + self.size @@ -276,7 +276,7 @@ class MemoryLayout(object): current_start = self._next_address(size) current_end = current_start + size + self.module_padding # Is there overlap with reserved modules? - for key, reserved in self.reserved.iteritems(): + for key, reserved in self.reserved.items(): res_start = reserved[0] res_end = res_start + reserved[1] + self.module_padding if (res_start <= current_start <= res_end) or \ @@ -293,11 +293,11 @@ class MemoryLayout(object): def update(self, priorities): # sort addresses, should only contain reserved modules at this point! - for key, reserved in self.reserved.iteritems(): + for key, reserved in self.reserved.items(): assert reserved[1] != 0, key for curr in priorities: if not curr in self.found: - print '# Did not find', curr, '!' + print('# Did not find', curr, '!') else: obj = self.found[curr] del self.found[curr] @@ -315,8 +315,8 @@ class MemoryLayout(object): obj.gen_baseaddress() def run_dir(target): - print '# Generated from', target - print '# Generated by sdk/tools/gen_baseaddress.py' + print('# Generated from', target) + print('# Generated by sdk/tools/gen_baseaddress.py') layout = MemoryLayout(0x7c920000) layout.add_reserved('user32.dll', 0x77a20000) for root, _, files in os.walk(target): @@ -329,7 +329,7 @@ def run_dir(target): def main(dirs): if len(dirs) < 1: trydir = os.getcwd() - print '# No path specified, trying', trydir + print('# No path specified, trying', trydir) dirs = [trydir] for onedir in dirs: run_dir(onedir)

1 0

02/02: [USBUHCI_NEW] Add license headers.
by Thomas Faber 08 Sep '18

08 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e400519cb5d23c40be2d4… commit e400519cb5d23c40be2d4b3fc5f43d48c794db6b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 8 10:13:43 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 8 10:16:02 2018 +0200 [USBUHCI_NEW] Add license headers. --- drivers/usb/usbuhci_new/dbg_uhci.h | 7 +++++++ drivers/usb/usbuhci_new/hardware.h | 7 +++++++ drivers/usb/usbuhci_new/roothub.c | 7 +++++++ drivers/usb/usbuhci_new/usbuhci.c | 7 +++++++ drivers/usb/usbuhci_new/usbuhci.h | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/drivers/usb/usbuhci_new/dbg_uhci.h b/drivers/usb/usbuhci_new/dbg_uhci.h index 50c03ca4bd..2a74f10655 100644 --- a/drivers/usb/usbuhci_new/dbg_uhci.h +++ b/drivers/usb/usbuhci_new/dbg_uhci.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB UHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBUHCI debugging declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef DBG_UHCI_H__ #define DBG_UHCI_H__ diff --git a/drivers/usb/usbuhci_new/hardware.h b/drivers/usb/usbuhci_new/hardware.h index c9b6d4a42a..db253eac0c 100644 --- a/drivers/usb/usbuhci_new/hardware.h +++ b/drivers/usb/usbuhci_new/hardware.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB UHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBUHCI hardware declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #define UHCI_FRAME_LIST_MAX_ENTRIES 1024 // Number of frames in Frame List #define UHCI_NUM_ROOT_HUB_PORTS 2 diff --git a/drivers/usb/usbuhci_new/roothub.c b/drivers/usb/usbuhci_new/roothub.c index 6fa0e34eec..2916ef5cc3 100644 --- a/drivers/usb/usbuhci_new/roothub.c +++ b/drivers/usb/usbuhci_new/roothub.c @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB UHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBUHCI root hub functions + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbuhci.h" #define NDEBUG diff --git a/drivers/usb/usbuhci_new/usbuhci.c b/drivers/usb/usbuhci_new/usbuhci.c index eed9b0b48d..b08306d920 100644 --- a/drivers/usb/usbuhci_new/usbuhci.c +++ b/drivers/usb/usbuhci_new/usbuhci.c @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB UHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBUHCI main driver functions + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbuhci.h" #define NDEBUG diff --git a/drivers/usb/usbuhci_new/usbuhci.h b/drivers/usb/usbuhci_new/usbuhci.h index 55408f9bc9..e5d6ab584a 100644 --- a/drivers/usb/usbuhci_new/usbuhci.h +++ b/drivers/usb/usbuhci_new/usbuhci.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB UHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBUHCI declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBUHCI_H__ #define USBUHCI_H__

1 0

01/02: [USBOHCI_NEW] Add license headers.
by Thomas Faber 08 Sep '18

08 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855df84fb2967d7ac0c85… commit 855df84fb2967d7ac0c855a27b207dad64ba46a0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 8 10:12:39 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 8 10:15:52 2018 +0200 [USBOHCI_NEW] Add license headers. --- drivers/usb/usbohci_new/dbg_ohci.h | 7 +++++++ drivers/usb/usbohci_new/hardware.h | 7 +++++++ drivers/usb/usbohci_new/roothub.c | 7 +++++++ drivers/usb/usbohci_new/usbohci.c | 7 +++++++ drivers/usb/usbohci_new/usbohci.h | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/drivers/usb/usbohci_new/dbg_ohci.h b/drivers/usb/usbohci_new/dbg_ohci.h index 273fe56e3f..8da6476825 100644 --- a/drivers/usb/usbohci_new/dbg_ohci.h +++ b/drivers/usb/usbohci_new/dbg_ohci.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB OHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBOHCI debugging declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef DBG_OHCI_H__ #define DBG_OHCI_H__ diff --git a/drivers/usb/usbohci_new/hardware.h b/drivers/usb/usbohci_new/hardware.h index f4e5d3367c..7834fb86fc 100644 --- a/drivers/usb/usbohci_new/hardware.h +++ b/drivers/usb/usbohci_new/hardware.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB OHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBOHCI hardware declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #define OHCI_NUMBER_OF_INTERRUPTS 32 #define OHCI_MAX_PORT_COUNT 15 #define ED_EOF -1 diff --git a/drivers/usb/usbohci_new/roothub.c b/drivers/usb/usbohci_new/roothub.c index 832203627a..3c25dfffe1 100644 --- a/drivers/usb/usbohci_new/roothub.c +++ b/drivers/usb/usbohci_new/roothub.c @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB OHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBOHCI root hub functions + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbohci.h" #define NDEBUG diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index e4bed31d6d..ef18ceb2a8 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB OHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBOHCI main driver functions + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbohci.h" #define NDEBUG diff --git a/drivers/usb/usbohci_new/usbohci.h b/drivers/usb/usbohci_new/usbohci.h index fffcb18b61..7e52959376 100644 --- a/drivers/usb/usbohci_new/usbohci.h +++ b/drivers/usb/usbohci_new/usbohci.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB OHCI Miniport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBOHCI declarations + * COPYRIGHT: Copyright 2017-2018 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBOHCI_H__ #define USBOHCI_H__

1 0

01/01: [DDK] Add NT6+ implementation for Rx*PrefixTableLock macros
by Pierre Schweitzer 08 Sep '18

08 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7554829576754dd2e4de8… commit 7554829576754dd2e4de85f40d32f54d23e45925 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 8 10:05:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 8 10:06:40 2018 +0200 [DDK] Add NT6+ implementation for Rx*PrefixTableLock macros --- sdk/include/ddk/prefix.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/ddk/prefix.h b/sdk/include/ddk/prefix.h index f3fbb10e17..44291cf041 100644 --- a/sdk/include/ddk/prefix.h +++ b/sdk/include/ddk/prefix.h @@ -99,6 +99,10 @@ VOID RxpReleasePrefixTableLock( _In_ PRX_PREFIX_TABLE pTable, _In_ BOOLEAN ProcessBufferingStateChangeRequests); +#else +#define RxAcquirePrefixTableLockShared(T, W) ExAcquireResourceSharedLite(&(T)->TableLock, (W)) +#define RxAcquirePrefixTableLockExclusive(T, W) ExAcquireResourceExclusiveLite(&(T)->TableLock, (W)) +#define RxReleasePrefixTableLock(T) ExReleaseResourceLite(&(T)->TableLock) #endif VOID

1 0

01/01: [USBOHCI_NEW][USBUHCI_NEW] Avoid unnecessary/incorrect status defines.
by Thomas Faber 08 Sep '18

08 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6d6b329bee3ef27ba338… commit d6d6b329bee3ef27ba3380547e85a1da2a7763ea Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 2 19:39:46 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 8 08:45:18 2018 +0200 [USBOHCI_NEW][USBUHCI_NEW] Avoid unnecessary/incorrect status defines. --- drivers/usb/usbohci_new/hardware.h | 2 -- drivers/usb/usbohci_new/roothub.c | 2 +- drivers/usb/usbuhci_new/roothub.c | 2 +- drivers/usb/usbuhci_new/usbuhci.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/usb/usbohci_new/hardware.h b/drivers/usb/usbohci_new/hardware.h index 43fe27a199..f4e5d3367c 100644 --- a/drivers/usb/usbohci_new/hardware.h +++ b/drivers/usb/usbohci_new/hardware.h @@ -49,8 +49,6 @@ #define OHCI_TD_CONDITION_BUFFER_UNDERRUN 0x0D #define OHCI_TD_CONDITION_NOT_ACCESSED 0x0E -#define OHCI_RH_STATUS_GOOD 1 - typedef union _OHCI_TRANSFER_CONTROL { struct { ULONG Reserved : 18; diff --git a/drivers/usb/usbohci_new/roothub.c b/drivers/usb/usbohci_new/roothub.c index bbd4e7e5f3..832203627a 100644 --- a/drivers/usb/usbohci_new/roothub.c +++ b/drivers/usb/usbohci_new/roothub.c @@ -97,7 +97,7 @@ OHCI_RH_GetStatus(IN PVOID ohciExtension, IN PUSHORT Status) { DPRINT("OHCI_RH_GetStatus: \n"); - *Status = OHCI_RH_STATUS_GOOD; + *Status = USB_GETSTATUS_SELF_POWERED; return MP_STATUS_SUCCESS; } diff --git a/drivers/usb/usbuhci_new/roothub.c b/drivers/usb/usbuhci_new/roothub.c index 9ec3612a0d..6fa0e34eec 100644 --- a/drivers/usb/usbuhci_new/roothub.c +++ b/drivers/usb/usbuhci_new/roothub.c @@ -34,7 +34,7 @@ UhciRHGetStatus(IN PVOID uhciExtension, IN PUSHORT Status) { DPRINT("UhciRHGetStatus: ...\n"); - *Status = UHCI_RH_STATUS_SUCCESS; + *Status = USB_GETSTATUS_SELF_POWERED; return MP_STATUS_SUCCESS; } diff --git a/drivers/usb/usbuhci_new/usbuhci.h b/drivers/usb/usbuhci_new/usbuhci.h index f9db2d7d6a..55408f9bc9 100644 --- a/drivers/usb/usbuhci_new/usbuhci.h +++ b/drivers/usb/usbuhci_new/usbuhci.h @@ -13,7 +13,6 @@ extern USBPORT_REGISTRATION_PACKET RegPacket; #define UHCI_MAX_HC_SCHEDULE_ERRORS 16 -#define UHCI_RH_STATUS_SUCCESS 1 #define UHCI_MAX_ISO_TRANSFER_SIZE 0x10000 #define UHCI_MAX_BULK_TRANSFER_SIZE 0x1000

1 0

01/01: [KMTESTS:FLTMGR] Hide FltMgrLoad and FltMgrReg
by Serge Gautherie 07 Sep '18

07 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e95aebfda83e3847297e… commit 7e95aebfda83e3847297ee649022be094cf693b2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 1 17:50:23 2018 +0200 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Sep 7 08:45:50 2018 +0100 [KMTESTS:FLTMGR] Hide FltMgrLoad and FltMgrReg And add "// TODO: WIP/untested/crashes." ROSTESTS-299 --- modules/rostests/kmtests/kmtest/testlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 7b4930f659..a0ede71368 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -42,8 +42,8 @@ const KMT_TEST TestList[] = { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, - { "FltMgrLoad", Test_FltMgrLoad }, - { "FltMgrReg", Test_FltMgrReg }, + { "-FltMgrLoad", Test_FltMgrLoad }, // TODO: WIP/untested/crashes. + { "-FltMgrReg", Test_FltMgrReg }, // TODO: WIP/untested/crashes. { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject },

1 0

01/01: [CPL][DESK] Update monitor resource (#816)
by Abdulganiev Rafael 07 Sep '18

07 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25f4ed75a01844f0e991b… commit 25f4ed75a01844f0e991bc22c821e5153aa952b3 Author: Abdulganiev Rafael <40519766+A-Rafael(a)users.noreply.github.com> AuthorDate: Fri Sep 7 11:43:36 2018 +0400 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Sep 7 08:43:36 2018 +0100 [CPL][DESK] Update monitor resource (#816) [DESK.CPL] Update monitor resource --- dll/cpl/desk/resources/monitor.bmp | Bin 31722 -> 31722 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/cpl/desk/resources/monitor.bmp b/dll/cpl/desk/resources/monitor.bmp index 7e632ef14c..e81c7b5b19 100644 Binary files a/dll/cpl/desk/resources/monitor.bmp and b/dll/cpl/desk/resources/monitor.bmp differ

1 0

03/03: [LIBTIRPC] Fix CVE-2018-14622 by backporting its fix
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=000bbe074ed29d1efe39d… commit 000bbe074ed29d1efe39d4d65c81d1c1ead07c93 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Sep 5 21:44:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:30 2018 +0200 [LIBTIRPC] Fix CVE-2018-14622 by backporting its fix CORE-15005 --- dll/3rdparty/libtirpc/src/svc_vc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/3rdparty/libtirpc/src/svc_vc.c b/dll/3rdparty/libtirpc/src/svc_vc.c index 4d7e1f1fd2..2ccbe0e340 100644 --- a/dll/3rdparty/libtirpc/src/svc_vc.c +++ b/dll/3rdparty/libtirpc/src/svc_vc.c @@ -340,6 +340,10 @@ again: */ newxprt = makefd_xprt(sock, r->sendsize, r->recvsize); +#ifdef __REACTOS__ // CVE-2018-14622 + if (!newxprt) + return (FALSE); +#endif if (!__rpc_set_netbuf(&newxprt->xp_rtaddr, &addr, len)) return (FALSE);

1 0

02/03: [NTOSKRNL] Don't raise a status when parameters are invalid on file mapping
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dabca398f547304724f9… commit 3dabca398f547304724f9388fec19a0184444482 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Sep 3 08:12:58 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:29 2018 +0200 [NTOSKRNL] Don't raise a status when parameters are invalid on file mapping --- ntoskrnl/cc/pin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 07044e23e7..d96c64bc2f 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -83,7 +83,6 @@ CcMapData ( { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); - ExRaiseStatus(STATUS_INVALID_PARAMETER); return FALSE; }

1 0

01/03: [NTOSKRNL] When allocating a new BCB, save it in a list
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e17f61138c60a09969f37… commit e17f61138c60a09969f37a4022eb315ea19a1828 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 2 14:37:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:25 2018 +0200 [NTOSKRNL] When allocating a new BCB, save it in a list This list is stored in the shared map. Later, this will allow reusing BCB when appropriate --- ntoskrnl/cc/pin.c | 22 +++++++++++++++++++++- ntoskrnl/cc/view.c | 1 + ntoskrnl/include/internal/cc.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index aba97049f1..07044e23e7 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -51,6 +51,7 @@ CcMapData ( NTSTATUS Status; PINTERNAL_BCB iBcb; LONGLONG ROffset; + KIRQL OldIrql; DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, @@ -156,6 +157,10 @@ CcMapData ( ExInitializeResourceLite(&iBcb->Lock); *pBcb = (PVOID)iBcb; + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p\n", FileObject, FileOffset, Length, Flags, iBcb); return TRUE; @@ -340,12 +345,20 @@ CcUnpinDataForThread ( if (--iBcb->RefCount == 0) { - CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; + + SharedCacheMap = iBcb->Vacb->SharedCacheMap; + CcRosReleaseVacb(SharedCacheMap, iBcb->Vacb, TRUE, iBcb->Dirty, FALSE); + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + RemoveEntryList(&iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } @@ -377,6 +390,8 @@ CcUnpinRepinnedBcb ( IN PIO_STATUS_BLOCK IoStatus) { PINTERNAL_BCB iBcb = Bcb; + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; CCTRACE(CC_API_DEBUG, "Bcb=%p WriteThrough=%d\n", Bcb, WriteThrough); @@ -408,12 +423,17 @@ CcUnpinRepinnedBcb ( ASSERT(iBcb->Vacb->PinCount == 0); } + SharedCacheMap = iBcb->Vacb->SharedCacheMap; CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, iBcb->Vacb, TRUE, iBcb->Dirty, FALSE); + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + RemoveEntryList(&iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 6a087e6531..e3c8285254 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1417,6 +1417,7 @@ CcRosInitializeFileCache ( InitializeListHead(&SharedCacheMap->PrivateList); KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); + InitializeListHead(&SharedCacheMap->BcbList); } KeAcquireGuardedMutex(&ViewLock); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 0dcea16f43..0c12004326 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -172,6 +172,7 @@ typedef struct _ROS_SHARED_CACHE_MAP CSHORT NodeByteSize; ULONG OpenCount; LARGE_INTEGER FileSize; + LIST_ENTRY BcbList; LARGE_INTEGER SectionSize; PFILE_OBJECT FileObject; ULONG DirtyPages; @@ -181,6 +182,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PVOID LazyWriteContext; LIST_ENTRY PrivateList; ULONG DirtyPageThreshold; + KSPIN_LOCK BcbSpinLock; PRIVATE_CACHE_MAP PrivateCacheMap; /* ROS specific */ @@ -235,6 +237,7 @@ typedef struct _INTERNAL_BCB BOOLEAN Dirty; BOOLEAN Pinned; CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ + LIST_ENTRY BcbEntry; } INTERNAL_BCB, *PINTERNAL_BCB; typedef struct _LAZY_WRITER

1 0

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018