Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 01/01: [SAMLIB] Check the server name in the binding routine

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be65a8568bba1ff336c5d… commit be65a8568bba1ff336c5d4ec330b10b0d8b462ae Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 19 21:51:06 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 19 21:51:06 2021 +0200 [SAMLIB] Check the server name in the binding routine --- dll/win32/samlib/samlib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dll/win32/samlib/samlib.c b/dll/win32/samlib/samlib.c index d5414d664b5..7237a874d12 100644 --- a/dll/win32/samlib/samlib.c +++ b/dll/win32/samlib/samlib.c @@ -77,6 +77,27 @@ PSAMPR_SERVER_NAME_bind(PSAMPR_SERVER_NAME pszSystemName) TRACE("PSAMPR_SERVER_NAME_bind(%S)\n", pszSystemName); + /* Check the server name prefix and server name length */ + if (pszSystemName != NULL) + { + int nLength = wcslen(pszSystemName); + int nNameLength = nLength; + + if (nLength >= 1 && pszSystemName[0] == L'\\') + nNameLength--; + + if (nLength >= 2 && pszSystemName[1] == L'\\') + nNameLength--; + + if (((nLength - nNameLength != 0) && + (nLength - nNameLength != 2)) || + (nNameLength == 0)) + { + WARN("Invalid server name %S", pszSystemName); + RpcRaiseException(STATUS_OBJECT_NAME_INVALID); + } + } + status = RpcStringBindingComposeW(NULL, L"ncacn_np", pszSystemName,

3 years, 4 months

[reactos] 01/01: [SAMLIB] SamConnect: Pass a zero-terminated server name to SamrConnect

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b6e8af1bd7ff203411d3… commit 5b6e8af1bd7ff203411d37cb8c5eccbf92c750d3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 19 20:28:54 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 19 20:29:24 2021 +0200 [SAMLIB] SamConnect: Pass a zero-terminated server name to SamrConnect --- dll/win32/samlib/samlib.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dll/win32/samlib/samlib.c b/dll/win32/samlib/samlib.c index 5c9b1da2284..d5414d664b5 100644 --- a/dll/win32/samlib/samlib.c +++ b/dll/win32/samlib/samlib.c @@ -75,7 +75,7 @@ PSAMPR_SERVER_NAME_bind(PSAMPR_SERVER_NAME pszSystemName) LPWSTR pszStringBinding; RPC_STATUS status; - TRACE("PSAMPR_SERVER_NAME_bind() called\n"); + TRACE("PSAMPR_SERVER_NAME_bind(%S)\n", pszSystemName); status = RpcStringBindingComposeW(NULL, L"ncacn_np", @@ -113,7 +113,7 @@ PSAMPR_SERVER_NAME_unbind(PSAMPR_SERVER_NAME pszSystemName, { RPC_STATUS status; - TRACE("PSAMPR_SERVER_NAME_unbind() called\n"); + TRACE("PSAMPR_SERVER_NAME_unbind(%S)\n", pszSystemName); status = RpcBindingFree(&hBinding); if (status) @@ -500,14 +500,26 @@ SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { + PSAMPR_SERVER_NAME pServerName = NULL; NTSTATUS Status; TRACE("SamConnect(%p %p 0x%08x %p)\n", ServerName, ServerHandle, DesiredAccess, ObjectAttributes); + if (ServerName != NULL && ServerName->Length > 0 && ServerName->Buffer != NULL) + { + /* Create a zero-terminated server name */ + pServerName = midl_user_allocate(ServerName->Length + sizeof(WCHAR)); + if (pServerName == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + CopyMemory(pServerName, ServerName->Buffer, ServerName->Length); + pServerName[ServerName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + RpcTryExcept { - Status = SamrConnect((PSAMPR_SERVER_NAME)ServerName, + Status = SamrConnect(pServerName, (SAMPR_HANDLE *)ServerHandle, DesiredAccess); } @@ -517,6 +529,9 @@ SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL, } RpcEndExcept; + if (pServerName) + midl_user_free(pServerName); + return Status; }

3 years, 4 months

[reactos] 01/01: [PCI] Filter out devices with null vendor and device ID

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4405f9610f7703a647f4… commit a4405f9610f7703a647f43229a8e063fb85c98d7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jun 17 17:04:09 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jun 19 20:58:27 2021 +0300 [PCI] Filter out devices with null vendor and device ID Some virtual machines errorneously expose null PCI device function on PIIX4 chipset where an USB controller should normally reside. Windows pci.sys driver does not enumerate these devices. Affected virtual machines: - Connectix Virtual PC 5.1.370 - Connectix Virtual PC 5.2.418 - Microsoft Virtual PC 2004 SP1 (5.3.582.27) - Microsoft Virtual PC 2007 SP1 (6.0.156.0) Non-affected virtual machines: - Connectix Virtual PC 4.0 - Microsoft Hyper-V Fixes CORE-17636. --- drivers/bus/pci/fdo.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bus/pci/fdo.c b/drivers/bus/pci/fdo.c index 2cd73f650b2..17a4c07c622 100644 --- a/drivers/bus/pci/fdo.c +++ b/drivers/bus/pci/fdo.c @@ -151,6 +151,12 @@ FdoEnumerateDevices( PciConfig.VendorID, PciConfig.DeviceID); + if (PciConfig.VendorID == 0 && PciConfig.DeviceID == 0) + { + DPRINT("Filter out devices with null vendor and device ID\n"); + continue; + } + Status = FdoLocateChildDevice(&Device, DeviceExtension, SlotNumber, &PciConfig); if (!NT_SUCCESS(Status)) {

3 years, 4 months

[reactos] 01/01: [WIN32K] Revert incorrect part of R50928 for RealizePalette. (#3678)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7954134d0d60100911b8… commit c7954134d0d60100911b8872d3605fbb576d968d Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jun 19 11:25:03 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 19 18:25:03 2021 +0200 [WIN32K] Revert incorrect part of R50928 for RealizePalette. (#3678) Revert incorrect code for Realize Palette Revert part of SVN R50928 that causes Durak card suites to have wrong colors. SVN r50928 == git 5de8339cd196e2bc01ac631e677010a939b2d083 JIRA issue: CORE-13748 <= Durak Example JIRA issue: CORE-16510 <= GDIProg Example The patch also fixes 2 crashes on each bot, although it was not targeted for that explicitly: KVM: https://reactos.org/testman/compare.php?ids=77304,77308 LGTM VBox: https://reactos.org/testman/compare.php?ids=77305,77309 LGTM --- win32ss/gdi/ntgdi/palette.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index ec92c287219..31cd4f5f3fd 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -730,7 +730,7 @@ UINT FASTCALL IntGdiRealizePalette(HDC hDC) { - UINT i, realize = 0; + UINT realize = 0; PDC pdc; PALETTE *ppalSurf, *ppalDC; @@ -769,13 +769,8 @@ IntGdiRealizePalette(HDC hDC) ASSERT(ppalDC->flFlags & PAL_INDEXED); - // FIXME: Should we resize ppalSurf if it's too small? - realize = (ppalDC->NumColors < ppalSurf->NumColors) ? ppalDC->NumColors : ppalSurf->NumColors; - - for (i=0; i<realize; i++) - { - InterlockedExchange((LONG*)&ppalSurf->IndexedColors[i], *(LONG*)&ppalDC->IndexedColors[i]); - } + DPRINT1("RealizePalette unimplemented for %s\n", + (pdc->dctype == DC_TYPE_MEMORY ? "memory managed DCs" : "device DCs")); cleanup: DC_UnlockDc(pdc);

3 years, 4 months

[reactos] 01/01: [NTGDI] Fix potential BSOD 0x1E CORE-17626

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=514147776a7e706369110… commit 514147776a7e70636911033ab6c89779b2c8ee1e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jun 19 17:41:49 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jun 19 17:41:49 2021 +0200 [NTGDI] Fix potential BSOD 0x1E CORE-17626 in CreateDIBPalette() when passing invalid arguments to CreateDIBSection. This could be triggered by using the broken test-application "GDIProg". After this patch not only the BSOD is fixed but also the app does properly start up, like it is the case on 2k3sp2. Thanks to the patches author Doug Lyons. --- win32ss/gdi/ntgdi/dibobj.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 3d88101c8ab..1ae6e8affa9 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -45,6 +45,8 @@ CreateDIBPalette( { PPALETTE ppal; ULONG i, cBitsPixel, cColors; + RGBQUAD rgb; + NTSTATUS Status; if (pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) { @@ -133,12 +135,28 @@ CreateDIBPalette( /* Loop all color indices in the DIB */ for (i = 0; i < cColors; i++) { - /* Get the color value and translate it to a COLORREF */ - RGBQUAD rgb = prgb[i]; - COLORREF crColor = RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue); + /* User SEH to verify READ success */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + rgb = prgb[i]; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + /* On Read Failure, put zero in Palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, 0); + } + _SEH2_END - /* Set the RGB value in the palette */ - PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + if(NT_SUCCESS(Status)) + { + /* Get the color value and translate it to a COLORREF */ + COLORREF crColor = RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); + } } } else

3 years, 4 months

[reactos] 01/01: [SDK] Add script to check includes with modified struct packing

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=560fdd150aec7e891cb9d… commit 560fdd150aec7e891cb9d4a53778ace9e8dccf5f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jun 10 22:05:25 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 19 16:30:21 2021 +0200 [SDK] Add script to check includes with modified struct packing --- sdk/tools/check_packing.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sdk/tools/check_packing.py b/sdk/tools/check_packing.py new file mode 100644 index 00000000000..f56e49a2fb6 --- /dev/null +++ b/sdk/tools/check_packing.py @@ -0,0 +1,72 @@ +''' +PROJECT: ReactOS code linter +LICENSE: MIT (https://spdx.org/licenses/MIT) +PURPOSE: Verifies that there are no headers included when packing is modified +COPYRIGHT: Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> +''' +from pathlib import Path +import re + +DEFAULT_SUFFIXES = [ + '.cpp', '.cxx', '.cc', '.c', '.idl' + '.hpp', '.h', '.inc' +] + +START_HEADERS = [ + 'pshpack1.h', + 'pshpack2.h', + 'pshpack4.h', + 'pshpack8.h', +] + +END_HEADERS = [ + 'poppack.h', +] + + +def print_error(file, line, text): + print(f'{file}({line}): ERROR: {text}') + +def print_warning(file, line, text): + print(f'{file}({line}): WARNING: {text}') + + +def check_file(filename): + cur_packing = [] + with open (filename, 'rb') as input_file: + for line_nr, line in enumerate(input_file): + res = re.search(rb'#[\s]*include[\s]+[<"]([^[">]+)[">]', line) + if res: + header = res.group(1).decode('utf-8') + line_nr += 1 # Line numbers start at 1 + if header in START_HEADERS: + if cur_packing: + print_warning(filename, line_nr, f'Overrides packing from {cur_packing[-1][0]} to {header}') + cur_packing.append([header, line_nr]) + elif header in END_HEADERS: + if cur_packing: + cur_packing.pop() + else: + print_error(filename, line_nr, f'Unexpected "{header}"') + elif cur_packing: + err = f'Include "{header}" while struct packing is modified ({cur_packing[-1][0]})' + print_error(filename, line_nr, err) + if cur_packing: + print_error(filename, cur_packing[-1][1], 'Struct packing not restored!') + + +def check_packing(path, include_suffixes): + global EXCLUDE_SUFFIXES + for item in path.iterdir(): + if item.is_dir() and item.name[0] != '.': + check_packing(item, include_suffixes) + continue + suffix = item.suffix + if suffix in include_suffixes: + check_file(item) + + +if __name__ == '__main__': + # Skip filename and 'sdk/tools' + use_path = Path(__file__).parents[2] + check_packing(use_path, DEFAULT_SUFFIXES)

3 years, 4 months

[reactos] 09/09: [NTOS][SETUP] Add x64 SMP kernel and make SMP the default boot mode on x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b627352815eda056d6333… commit b627352815eda056d6333f6fbbf92028ea516e9a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 12 14:25:48 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS][SETUP] Add x64 SMP kernel and make SMP the default boot mode on x64 --- base/setup/lib/settings.c | 5 +++++ boot/bootdata/txtsetup.sif | 8 +++++++- ntoskrnl/CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index cafe247c05c..f958d846960 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -273,6 +273,10 @@ GetComputerIdentifier( return FALSE; } +#ifdef _M_AMD64 + /* On x64 we are l33t and use the MP config by default */ + ComputerIdentifier = L"X64 MP"; +#else if (IsAcpiComputer()) { if (pFullInfo->SubKeys == 1) @@ -299,6 +303,7 @@ GetComputerIdentifier( ComputerIdentifier = L"PC MP"; } } +#endif RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 63e0df890cc..1fdf60c17f9 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -236,6 +236,7 @@ pc98_up = "NEC PC-98 Uniprocessor" [Computer.NTamd64] x64_up = "Standard x64 Uniprocessor" +x64_mp = "Standard x64 Multiprocessor" [Map.Computer.NTx86] ;<id> = <pnp id string> @@ -249,7 +250,8 @@ xbox = "Xbox" pc98_up = "NEC PC-98 UP" [Map.Computer.NTamd64] -x64_up = "ACPI UP" +x64_up = "X64 UP" +x64_mp = "X64 MP" [Files.pci_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 @@ -287,6 +289,10 @@ halpc98.dll = 1,,,,,,,2,,,hal.dll,1,2 ntoskrnl.exe = 1,,,,,,,2,,,,1,2 hal.dll = 1,,,,,,,2,,,,1,2 +[Files.x64_mp] +ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 +halmp.dll = 1,,,,,,,2,,,hal.dll,1,2 + [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<width>,<height>,<bpp> vga = "VGA Display (640x480x4)",,Vga,640,480,4 diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 2efd6f12833..b3362814e56 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -54,7 +54,7 @@ add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${PCH_SKIP_S add_dependencies(ntoskrnl psdk asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) -if(BUILD_MP) +if(BUILD_MP OR (ARCH STREQUAL "amd64")) add_subdirectory(ntkrnlmp) endif()

3 years, 4 months

[reactos] 08/09: [HAL] Add smp component and build x64 smp hal

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=400af0cfc57139f876c19… commit 400af0cfc57139f876c199cab22dee7d3e85c9f1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 6 14:19:00 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [HAL] Add smp component and build x64 smp hal Like the up component it contains the spinlock code and now also the HalpBuildType variable. --- hal/halx86/CMakeLists.txt | 5 ++++- hal/halx86/apic/halinit.c | 7 +++---- hal/halx86/generic/buildtype.c | 14 ++++++++++++++ hal/halx86/mp/halinit_mp.c | 1 - hal/halx86/pic/halinit.c | 4 ---- hal/halx86/smp.cmake | 8 ++++++++ hal/halx86/up.cmake | 1 + hal/halx86/xbox/halinit.c | 4 ---- 8 files changed, 30 insertions(+), 14 deletions(-) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 5375b354c7f..77716ffa4c9 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -45,6 +45,7 @@ include(generic.cmake) include(acpi.cmake) include(apic.cmake) include(up.cmake) +include(smp.cmake) if(ARCH STREQUAL "i386") include(pcidata.cmake) @@ -73,7 +74,9 @@ elseif(ARCH STREQUAL "amd64") amd64/x86bios.c) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) - #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) target_link_libraries(hal fast486) + add_hal(halmp SOURCES ${HAL_SOURCE} COMPONENTS generic acpi smp apic) + target_link_libraries(halmp fast486) + endif() diff --git a/hal/halx86/apic/halinit.c b/hal/halx86/apic/halinit.c index 5223e29b758..314317576b3 100644 --- a/hal/halx86/apic/halinit.c +++ b/hal/halx86/apic/halinit.c @@ -16,10 +16,6 @@ VOID NTAPI ApicInitializeLocalApic(ULONG Cpu); -/* GLOBALS ******************************************************************/ - -const USHORT HalpBuildType = HAL_BUILD_TYPE; - /* FUNCTIONS ****************************************************************/ VOID @@ -41,6 +37,9 @@ HalpInitProcessor( VOID HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + DPRINT1("Using HAL: APIC %s %s\n", + (HalpBuildType & PRCB_BUILD_UNIPROCESSOR) ? "UP" : "SMP", + (HalpBuildType & PRCB_BUILD_DEBUG) ? "DBG" : "REL"); /* Enable clock interrupt handler */ HalpEnableInterruptHandler(IDT_INTERNAL, diff --git a/hal/halx86/generic/buildtype.c b/hal/halx86/generic/buildtype.c new file mode 100644 index 00000000000..2aad63360f9 --- /dev/null +++ b/hal/halx86/generic/buildtype.c @@ -0,0 +1,14 @@ +/* +* PROJECT: ReactOS Hardware Abstraction Layer +* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +* PURPOSE: Defines HalpBuildType for either UP or SMP +* COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> +*/ + +/* INCLUDES *****************************************************************/ + +#include <hal.h> + +/* GLOBALS ******************************************************************/ + +const USHORT HalpBuildType = HAL_BUILD_TYPE; diff --git a/hal/halx86/mp/halinit_mp.c b/hal/halx86/mp/halinit_mp.c index 4bac3fcbf1e..f0ddb8c7d5a 100644 --- a/hal/halx86/mp/halinit_mp.c +++ b/hal/halx86/mp/halinit_mp.c @@ -16,7 +16,6 @@ /* GLOBALS ******************************************************************/ -const USHORT HalpBuildType = HAL_BUILD_TYPE; extern BOOLEAN HaliFindSmpConfig(VOID); ULONG_PTR KernelBase; diff --git a/hal/halx86/pic/halinit.c b/hal/halx86/pic/halinit.c index 69c6cce2605..3f4527725a4 100644 --- a/hal/halx86/pic/halinit.c +++ b/hal/halx86/pic/halinit.c @@ -12,10 +12,6 @@ #define NDEBUG #include <debug.h> -/* GLOBALS ******************************************************************/ - -const USHORT HalpBuildType = HAL_BUILD_TYPE; - /* FUNCTIONS ****************************************************************/ VOID diff --git a/hal/halx86/smp.cmake b/hal/halx86/smp.cmake new file mode 100644 index 00000000000..f05db28f3de --- /dev/null +++ b/hal/halx86/smp.cmake @@ -0,0 +1,8 @@ + +list(APPEND HAL_SMP_SOURCE + generic/buildtype.c + generic/spinlock.c) + +add_library(lib_hal_smp OBJECT ${HAL_SMP_SOURCE}) +add_dependencies(lib_hal_smp bugcodes xdk) +target_compile_definitions(lib_hal_smp PRIVATE CONFIG_SMP) diff --git a/hal/halx86/up.cmake b/hal/halx86/up.cmake index d413710240e..24b8103cefe 100644 --- a/hal/halx86/up.cmake +++ b/hal/halx86/up.cmake @@ -1,5 +1,6 @@ list(APPEND HAL_UP_SOURCE + generic/buildtype.c generic/spinlock.c) add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) diff --git a/hal/halx86/xbox/halinit.c b/hal/halx86/xbox/halinit.c index 51e0cb00821..409f8ac55cb 100644 --- a/hal/halx86/xbox/halinit.c +++ b/hal/halx86/xbox/halinit.c @@ -12,10 +12,6 @@ #define NDEBUG #include <debug.h> -/* GLOBALS ******************************************************************/ - -const USHORT HalpBuildType = HAL_BUILD_TYPE; - /* FUNCTIONS ****************************************************************/ VOID

3 years, 4 months

[reactos] 07/09: [NTOS:MM] Improve an ASSERT

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=396167bc7e52fae3901f2… commit 396167bc7e52fae3901f27e7f00fd019ea6b5dc4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 10 08:38:13 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS:MM] Improve an ASSERT --- ntoskrnl/mm/ARM3/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 0910d080542..9cb0cacf23b 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -2412,7 +2412,7 @@ MiProtectVirtualMemory(IN PEPROCESS Process, MI_WRITE_INVALID_PTE(PointerPte, PteContents); #ifdef CONFIG_SMP // FIXME: Should invalidate entry in every CPU TLB - ASSERT(FALSE); + ASSERT(KeNumberProcessors == 1); #endif KeInvalidateTlbEntry(MiPteToAddress(PointerPte));

3 years, 4 months

[reactos] 06/09: [NTOS:MM] Fix PFN lock usage

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33949028fbceb25eedf9d… commit 33949028fbceb25eedf9d71475ccfc4be063a6cd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 7 10:40:20 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 19 12:17:18 2021 +0200 [NTOS:MM] Fix PFN lock usage --- ntoskrnl/mm/balance.c | 6 ++++++ ntoskrnl/mm/freelist.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index e6f1313b03f..f8fce014f56 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -77,6 +77,8 @@ NTSTATUS NTAPI MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page) { + KIRQL OldIrql; + if (Page == 0) { DPRINT1("Tried to release page zero.\n"); @@ -85,8 +87,12 @@ MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page) (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + OldIrql = MiAcquirePfnLock(); + MmDereferencePage(Page); + MiReleasePfnLock(OldIrql); + return(STATUS_SUCCESS); } diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 69b8b6d1e96..fdd5d4b64da 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -566,10 +566,9 @@ NTAPI MmDereferencePage(PFN_NUMBER Pfn) { PMMPFN Pfn1; - KIRQL OldIrql; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - OldIrql = MiAcquirePfnLock(); + MI_ASSERT_PFN_LOCK_HELD(); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); @@ -596,8 +595,6 @@ MmDereferencePage(PFN_NUMBER Pfn) DPRINT("Legacy free: %lx\n", Pfn); MiInsertPageInFreeList(Pfn); } - - MiReleasePfnLock(OldIrql); } PFN_NUMBER

3 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
23
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 June 2021