Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[pschweitzer] 74544: [MUP] Split MUP into two parts; MUP on one side, DFS on the second side. This will allow using headers in other parts
by pschweitzer＠svn.reactos.org 14 May '17

14 May '17

Author: pschweitzer Date: Sun May 14 10:15:43 2017 New Revision: 74544 URL: http://svn.reactos.org/svn/reactos?rev=74544&view=rev Log: [MUP] Split MUP into two parts; MUP on one side, DFS on the second side. This will allow using headers in other parts Added: trunk/reactos/drivers/filesystems/mup/dfs.c (with props) trunk/reactos/drivers/filesystems/mup/dfs.h (with props) Modified: trunk/reactos/drivers/filesystems/mup/CMakeLists.txt trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.h Modified: trunk/reactos/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/CM… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Sun May 14 10:15:43 2017 @@ -1,6 +1,8 @@ list(APPEND SOURCE + dfs.c mup.c + dfs.h mup.h) add_library(mup SHARED ${SOURCE} mup.rc) Added: trunk/reactos/drivers/filesystems/mup/dfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/df… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/dfs.c (added) +++ trunk/reactos/drivers/filesystems/mup/dfs.c [iso-8859-1] Sun May 14 10:15:43 2017 @@ -0,0 +1,96 @@ +/* + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystems/mup/dfs.c + * PURPOSE: Multi UNC Provider + * PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "mup.h" + +#define NDEBUG +#include <debug.h> + +#if defined(ALLOC_PRAGMA) +#pragma alloc_text(INIT, DfsDriverEntry) +#endif + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +DfsVolumePassThrough(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DfsFsdCreate(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DfsFsdCleanup(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DfsFsdClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +VOID +DfsUnload(PDRIVER_OBJECT DriverObject) +{ + UNIMPLEMENTED; +} + +INIT_SECTION +NTSTATUS +DfsDriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + /* We don't support DFS yet, so + * fail to make sure it remains disabled + */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + Propchange: trunk/reactos/drivers/filesystems/mup/dfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/mup/dfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/df… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/dfs.h (added) +++ trunk/reactos/drivers/filesystems/mup/dfs.h [iso-8859-1] Sun May 14 10:15:43 2017 @@ -0,0 +1,58 @@ +#ifndef _DFS_PCH_ +#define _DFS_PCH_ + +#define DFS_OPEN_CONTEXT 0xFF444653 +#define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 +#define DFS_CSCAGENT_NAME_CONTEXT 0xAAAAAAAA +#define DFS_USER_NAME_CONTEXT 0xBBBBBBBB + +typedef struct _DFS_NAME_CONTEXT_ +{ + UNICODE_STRING UNCFileName; + LONG NameContextType; + ULONG Flags; +} DFS_NAME_CONTEXT, *PDFS_NAME_CONTEXT; + +NTSTATUS +NTAPI +DfsVolumePassThrough( + PDEVICE_OBJECT DeviceObject, + PIRP Irp +); + +NTSTATUS +DfsFsdFileSystemControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp +); + +NTSTATUS +DfsFsdCreate( + PDEVICE_OBJECT DeviceObject, + PIRP Irp +); + +NTSTATUS +DfsFsdCleanup( + PDEVICE_OBJECT DeviceObject, + PIRP Irp +); + +NTSTATUS +DfsFsdClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp +); + +VOID +DfsUnload( + PDRIVER_OBJECT DriverObject +); + +NTSTATUS +DfsDriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath +); + +#endif Propchange: trunk/reactos/drivers/filesystems/mup/dfs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sun May 14 10:15:43 2017 @@ -39,12 +39,6 @@ PUNICODE_STRING RegistryPath ); -NTSTATUS -DfsDriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath -); - VOID MupInitializeData( VOID @@ -57,7 +51,6 @@ #if defined(ALLOC_PRAGMA) #pragma alloc_text(INIT, DriverEntry) -#pragma alloc_text(INIT, DfsDriverEntry) #pragma alloc_text(INIT, MupInitializeData) #pragma alloc_text(INIT, MupInitializeVcb) #endif @@ -788,14 +781,6 @@ NTSTATUS NTAPI -DfsVolumePassThrough(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI MupForwardIoRequest(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -1273,13 +1258,6 @@ _SEH2_END; return Status; -} - -NTSTATUS -DfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -1913,14 +1891,6 @@ } NTSTATUS -DfsFsdCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CreateRedirectedFile(PIRP Irp, PFILE_OBJECT FileObject, PIO_SECURITY_CONTEXT SecurityContext) @@ -2323,14 +2293,6 @@ } NTSTATUS -DfsFsdCleanup(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS NTAPI MupCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -2454,14 +2416,6 @@ } NTSTATUS -DfsFsdClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS NTAPI MupClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -2533,12 +2487,6 @@ } VOID -DfsUnload(PDRIVER_OBJECT DriverObject) -{ - UNIMPLEMENTED; -} - -VOID NTAPI MupUnload(PDRIVER_OBJECT DriverObject) { @@ -2550,18 +2498,6 @@ } MupUninitializeData(); -} - -INIT_SECTION -NTSTATUS -DfsDriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - /* We don't support DFS yet, so - * fail to make sure it remains disabled - */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; } /* Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Sun May 14 10:15:43 2017 @@ -18,11 +18,6 @@ #define TAG_MUP ' puM' #define FILE_SIMPLE_RIGHTS_MASK (FILE_ALL_ACCESS & ~STANDARD_RIGHTS_REQUIRED &~ SYNCHRONIZE) - -#define DFS_OPEN_CONTEXT 0xFF444653 -#define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 -#define DFS_CSCAGENT_NAME_CONTEXT 0xAAAAAAAA -#define DFS_USER_NAME_CONTEXT 0xBBBBBBBB #define NODE_TYPE_VCB 0x1 #define NODE_TYPE_UNC 0x2 @@ -146,4 +141,6 @@ PIRP Irp; } QUERY_PATH_CONTEXT, *PQUERY_PATH_CONTEXT; +#include "dfs.h" + #endif /* _MUP_PCH_ */

1 0

[jimtabor] 74543: [NtGDI] - Implement internal functions for setting and retrieving DC origin. Related to CORE-13110. - Code fix ups.
by jimtabor＠svn.reactos.org 14 May '17

14 May '17

Author: jimtabor Date: Sun May 14 01:00:27 2017 New Revision: 74543 URL: http://svn.reactos.org/svn/reactos?rev=74543&view=rev Log: [NtGDI] - Implement internal functions for setting and retrieving DC origin. Related to CORE-13110. - Code fix ups. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Sun May 14 01:00:27 2017 @@ -1337,6 +1337,56 @@ BOOL WINAPI +GreSetDCOrg( + _In_ HDC hdc, + _In_ LONG x, + _In_ LONG y, + _In_opt_ PRECTL Rect) +{ + PDC dc; + + dc = DC_LockDc(hdc); + if (!dc) return FALSE; + + /* Set DC Origin */ + dc->ptlDCOrig.x = x; + dc->ptlDCOrig.y = y; + + /* Recalculate Fill Origin */ + dc->ptlFillOrigin.x = dc->dclevel.ptlBrushOrigin.x + x; + dc->ptlFillOrigin.y = dc->dclevel.ptlBrushOrigin.y + y; + + /* Set DC Window Rectangle */ + if (Rect) + dc->erclWindow = *Rect; + + DC_UnlockDc(dc); + return TRUE; +} + +BOOL +WINAPI +GreGetDCOrgEx( + _In_ HDC hdc, + _Out_ PPOINTL Point, + _Out_ PRECTL Rect) +{ + PDC dc; + + dc = DC_LockDc(hdc); + if (!dc) return FALSE; + + /* Retrieve DC Window Rectangle without a check */ + *Rect = dc->erclWindow; + + DC_UnlockDc(dc); + + /* Use default call for DC Origin and parameter checking */ + return GreGetDCPoint( hdc, GdiGetDCOrg, Point); +} + +BOOL +WINAPI GreGetWindowExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize) Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Sun May 14 01:00:27 2017 @@ -166,3 +166,5 @@ BOOL WINAPI GreGetWindowExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize); BOOL WINAPI GreGetViewportExtEx( _In_ HDC hdc, _Out_ LPSIZE lpSize); BOOL FASTCALL GreSetViewportOrgEx(HDC,int,int,LPPOINT); +BOOL WINAPI GreGetDCOrgEx(_In_ HDC, _Out_ PPOINTL, _Out_ PRECTL); +BOOL WINAPI GreSetDCOrg(_In_ HDC, _In_ LONG, _In_ LONG, _In_opt_ PRECTL); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Sun May 14 01:00:27 2017 @@ -396,8 +396,8 @@ pdc->erclWindow = rclWnd; pdc->erclClip = rclClip; /* Might be an InitDC or DCE... */ - pdc->ptlFillOrigin.x = pdc->dcattr.VisRectRegion.Rect.right; - pdc->ptlFillOrigin.y = pdc->dcattr.VisRectRegion.Rect.bottom; + pdc->ptlFillOrigin.x = pdc->dcattr.ptlBrushOrigin.x; + pdc->ptlFillOrigin.y = pdc->dcattr.ptlBrushOrigin.y; return TRUE; }

1 0

[ion] 74542: [BOOTLIB]: Implement MmMdTruncateDescriptors [BOOTLIB]: Implement MmPaTruncateMemory and call it during paging initialization to remove > 4GB memory.c [BOOTLIB]: Implement BlpMmInitial...
by ion＠svn.reactos.org 14 May '17

14 May '17

Author: ion Date: Sun May 14 00:39:30 2017 New Revision: 74542 URL: http://svn.reactos.org/svn/reactos?rev=74542&view=rev Log: [BOOTLIB]: Implement MmMdTruncateDescriptors [BOOTLIB]: Implement MmPaTruncateMemory and call it during paging initialization to remove > 4GB memory.c [BOOTLIB]: Implement BlpMmInitializeConstraints if those BCD options are used. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sun May 14 00:39:30 2017 @@ -2088,6 +2088,13 @@ _In_ ULONG Flags ); +NTSTATUS +MmMdTruncateDescriptors ( + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ PBL_MEMORY_DESCRIPTOR_LIST NewList, + _In_ ULONGLONG BasePage + ); + VOID MmMdRemoveDescriptorFromList ( _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, @@ -2122,6 +2129,11 @@ ); /* PAGE ALLOCATOR ROUTINES ***************************************************/ + +NTSTATUS +MmPaTruncateMemory ( + _In_ ULONGLONG BasePage + ); NTSTATUS BlMmAllocatePhysicalPages( Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Sun May 14 00:39:30 2017 @@ -406,6 +406,82 @@ /* Increment the count and return the descriptor */ MmGlobalMemoryDescriptorsUsed++; return MemoryDescriptor; +} + +NTSTATUS +MmMdTruncateDescriptors ( + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ PBL_MEMORY_DESCRIPTOR_LIST NewList, + _In_ ULONGLONG BasePage + ) +{ + PLIST_ENTRY ListHead, NextEntry; + PBL_MEMORY_DESCRIPTOR Descriptor, NewDescriptor; + ULONGLONG FoundEndPage; + + /* Search the descriptor list */ + ListHead = MdList->First; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the current descriptor */ + Descriptor = CONTAINING_RECORD(NextEntry, + BL_MEMORY_DESCRIPTOR, + ListEntry); + + /* Go to the next entry in case we have to remove */ + NextEntry = NextEntry->Flink; + + /* Don't touch anything else but free RAM */ + if (((Descriptor->Type >> BL_MEMORY_CLASS_SHIFT) == BlSystemClass) && + (Descriptor->Type != BlConventionalMemory)) + { + continue; + } + + /* Check if this page is within the descriptor's region */ + FoundEndPage = Descriptor->BasePage + Descriptor->PageCount; + if (BasePage > Descriptor->BasePage) + { + /* Check if it doesn't go beyond the descriptor */ + if (BasePage < FoundEndPage) + { + /* Create a new descriptor to describe this region */ + EfiPrintf(L"Truncating descriptor type %lx base: %llx end: %llx\r\n", + Descriptor->Type, Descriptor->BasePage, FoundEndPage); + NewDescriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, + Descriptor->Type, + BasePage, + 0, + FoundEndPage - BasePage); + if (!NewDescriptor) + { + return STATUS_NO_MEMORY; + } + + /* Cut off this descriptor to make it shorter */ + Descriptor->PageCount = BasePage - Descriptor->BasePage; + + /* Add the region to the new list */ + MmMdAddDescriptorToList(NewList, + NewDescriptor, + BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG); + } + } + else + { + /* This whole descriptor covers the truncated area */ + EfiPrintf(L"Truncating descriptor type %lx base: %llx end: %llx\r\n", + Descriptor->Type, Descriptor->BasePage, FoundEndPage); + MmMdRemoveDescriptorFromList(MdList, Descriptor); + MmMdAddDescriptorToList(NewList, + Descriptor, + BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG); + } + } + + /* All good if we got here */ + return STATUS_SUCCESS; } BOOLEAN Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Sun May 14 00:39:30 2017 @@ -939,10 +939,8 @@ Mmx86SelfMapBase.QuadPart = 0; MmArchReferencePage = NULL; - /* Truncate all memory above 4GB so that we don't use it @TODO: FIXME */ - EfiPrintf(L"Warning: not truncating > 4GB memory. Don't boot with more than 4GB of RAM!\r\n"); - //Status = MmPaTruncateMemory(0x100000); - Status = STATUS_SUCCESS; + /* Truncate all memory above 4GB so that we don't use it */ + Status = MmPaTruncateMemory(0x100000); if (!NT_SUCCESS(Status)) { goto Quickie; Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Sun May 14 00:39:30 2017 @@ -48,12 +48,71 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS +MmPaTruncateMemory ( + _In_ ULONGLONG BasePage + ) +{ + NTSTATUS Status; + + /* Increase nesting depth */ + ++MmDescriptorCallTreeCount; + + /* Set the maximum page to the truncated request */ + if (BasePage < PapMaximumPhysicalPage) + { + PapMaximumPhysicalPage = BasePage; + } + + /* Truncate mapped and allocated memory */ + Status = MmMdTruncateDescriptors(&MmMdlMappedAllocated, + &MmMdlTruncatedMemory, + BasePage); + if (NT_SUCCESS(Status)) + { + /* Truncate unmapped and allocated memory */ + Status = MmMdTruncateDescriptors(&MmMdlUnmappedAllocated, + &MmMdlTruncatedMemory, + BasePage); + if (NT_SUCCESS(Status)) + { + /* Truncate mapped and unallocated memory */ + Status = MmMdTruncateDescriptors(&MmMdlMappedUnallocated, + &MmMdlTruncatedMemory, + BasePage); + if (NT_SUCCESS(Status)) + { + /* Truncate unmapped and unallocated memory */ + Status = MmMdTruncateDescriptors(&MmMdlUnmappedUnallocated, + &MmMdlTruncatedMemory, + BasePage); + if (NT_SUCCESS(Status)) + { + /* Truncate reserved memory */ + Status = MmMdTruncateDescriptors(&MmMdlReservedAllocated, + &MmMdlTruncatedMemory, + BasePage); + } + } + } + } + + /* Restore the nesting depth */ + MmMdFreeGlobalDescriptors(); + --MmDescriptorCallTreeCount; + return Status; +} + +NTSTATUS BlpMmInitializeConstraints ( VOID ) { - NTSTATUS Status; + NTSTATUS Status, ReturnStatus; ULONGLONG LowestAddressValid, HighestAddressValid; + ULONGLONG LowestPage, HighestPage; + + /* Assume success */ + ReturnStatus = STATUS_SUCCESS; /* Check for LOWMEM */ Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, @@ -61,8 +120,15 @@ &LowestAddressValid); if (NT_SUCCESS(Status)) { - EfiPrintf(L"/LOWMEM not supported\r\n"); - return STATUS_NOT_IMPLEMENTED; + /* Align the address */ + LowestAddressValid = (ULONG_PTR)PAGE_ALIGN(LowestAddressValid); + LowestPage = LowestAddressValid >> PAGE_SHIFT; + + /* Make sure it's below 4GB */ + if (LowestPage <= 0x100000) + { + PapMinimumPhysicalPage = LowestPage; + } } /* Check for MAXMEM */ @@ -71,12 +137,15 @@ &HighestAddressValid); if (NT_SUCCESS(Status)) { - EfiPrintf(L"/MAXMEM not supported\r\n"); - return STATUS_NOT_IMPLEMENTED; + /* Get the page */ + HighestPage = HighestAddressValid >> PAGE_SHIFT; + + /* Truncate memory above this page */ + ReturnStatus = MmPaTruncateMemory(HighestPage); } /* Return back to the caller */ - return STATUS_SUCCESS; + return ReturnStatus; } NTSTATUS

1 0

[ion] 74541: [BOOTLIB]: Complete implementation of MmMdRemoveRegionFromMdlEx
by ion＠svn.reactos.org 14 May '17

14 May '17

Author: ion Date: Sun May 14 00:11:48 2017 New Revision: 74541 URL: http://svn.reactos.org/svn/reactos?rev=74541&view=rev Log: [BOOTLIB]: Complete implementation of MmMdRemoveRegionFromMdlEx Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Sun May 14 00:11:48 2017 @@ -390,6 +390,7 @@ if (MmGlobalMemoryDescriptorsUsed >= MmGlobalMemoryDescriptorCount) { EfiPrintf(L"Out of descriptors!\r\n"); + EfiStall(1000000); return NULL; } @@ -409,9 +410,9 @@ BOOLEAN MmMdpTruncateDescriptor ( - __in PBL_MEMORY_DESCRIPTOR_LIST MdList, - __in PBL_MEMORY_DESCRIPTOR MemoryDescriptor, - __in ULONG Flags + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ PBL_MEMORY_DESCRIPTOR MemoryDescriptor, + _In_ ULONG Flags ) { PBL_MEMORY_DESCRIPTOR NextDescriptor, PreviousDescriptor; @@ -435,12 +436,14 @@ if ((PreviousEntry != MdList->First) && (MemoryDescriptor->BasePage < PreviousEndPage)) { EfiPrintf(L"Overlap detected -- this is unexpected on x86/x64 platforms\r\n"); + EfiStall(1000000); } /* Check for forward overlap */ if ((NextEntry != MdList->First) && (NextDescriptor->BasePage < EndPage)) { EfiPrintf(L"Overlap detected -- this is unexpected on x86/x64 platforms\r\n"); + EfiStall(1000000); } /* Nothing to do */ @@ -449,9 +452,9 @@ BOOLEAN MmMdpCoalesceDescriptor ( - __in PBL_MEMORY_DESCRIPTOR_LIST MdList, - __in PBL_MEMORY_DESCRIPTOR MemoryDescriptor, - __in ULONG Flags + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ PBL_MEMORY_DESCRIPTOR MemoryDescriptor, + _In_ ULONG Flags ) { PBL_MEMORY_DESCRIPTOR NextDescriptor, PreviousDescriptor; @@ -623,28 +626,25 @@ BOOLEAN HaveNewList, UseVirtualPage; NTSTATUS Status; PLIST_ENTRY ListHead, NextEntry; - PBL_MEMORY_DESCRIPTOR Descriptor; - //BL_MEMORY_DESCRIPTOR NewDescriptor; + PBL_MEMORY_DESCRIPTOR Descriptor, NewDescriptor, ListDescriptor; + BL_MEMORY_DESCRIPTOR OldDescriptor; ULONGLONG RegionSize; - ULONGLONG FoundBasePage, FoundEndPage, FoundPageCount, EndPage; + ULONGLONG FoundBasePage, FoundEndPage, FoundPageCount, EndPage, VirtualPage; /* Set initial status */ Status = STATUS_SUCCESS; + ListDescriptor = NULL; + NewDescriptor = NULL; + HaveNewList = FALSE; /* Check if removed descriptors should go into a new list */ if (NewMdList != NULL) { /* Initialize it */ - MmMdInitializeListHead(NewMdList); - NewMdList->Type = MdList->Type; + MmMdInitializeList(NewMdList, MdList->Type, NULL); /* Remember for later */ HaveNewList = TRUE; - } - else - { - /* For later */ - HaveNewList = FALSE; } /* Is the region being removed physical? */ @@ -684,7 +684,7 @@ EndPage = PageCount + BasePage; /* Make a copy of the original descriptor */ - //NewDescriptor = *Descriptor; // FIXME: Need to use this somewhere... + OldDescriptor = *Descriptor; /* Check if the region to be removed starts after the found region starts */ if ((BasePage > FoundBasePage) || (FoundBasePage >= EndPage)) @@ -695,13 +695,14 @@ /* Check if the found region starts after the region or ends before the region */ if ((FoundBasePage >= BasePage) || (EndPage >= FoundEndPage)) { - /* This descriptor doesn't cover any part of the range -- nothing to do */ - NOTHING; + /* This is a fully-mapped descriptor -- change nothing */ + OldDescriptor.PageCount = 0; } else { /* This descriptor fully covers the entire allocation */ FoundBasePage = Descriptor->BasePage; + VirtualPage = Descriptor->VirtualPage; FoundPageCount = BasePage - FoundBasePage; /* This is how many pages we will eat away from the descriptor */ @@ -710,29 +711,40 @@ /* Update the descriptor to account for the consumed pages */ Descriptor->BasePage += RegionSize; Descriptor->PageCount -= RegionSize; - if (Descriptor->VirtualPage) + if (VirtualPage) { Descriptor->VirtualPage += RegionSize; } /* Initialize a descriptor for the start of the region */ - Descriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, - Descriptor->Type, - FoundBasePage, - Descriptor->VirtualPage, - FoundPageCount); - if (!Descriptor) + NewDescriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, + Descriptor->Type, + FoundBasePage, + VirtualPage, + FoundPageCount); + if (!NewDescriptor) { Status = STATUS_NO_MEMORY; goto Quickie; } /* Add it into the list */ - Status = MmMdAddDescriptorToList(MdList, Descriptor, Flags); + Status = MmMdAddDescriptorToList(MdList, NewDescriptor, Flags); if (!NT_SUCCESS(Status)) { Status = STATUS_NO_MEMORY; goto Quickie; + } + + /* Don't free it on exit path */ + NewDescriptor = NULL; + + /* Adjust the leftover descriptor */ + OldDescriptor.BasePage += FoundPageCount; + OldDescriptor.PageCount = PageCount; + if (OldDescriptor.VirtualPage) + { + OldDescriptor.VirtualPage += FoundPageCount; } } } @@ -741,9 +753,17 @@ /* This descriptor contains the entire allocation */ RegionSize = FoundEndPage - BasePage; Descriptor->PageCount -= RegionSize; + + /* Adjust the leftover descriptor */ + OldDescriptor.BasePage += Descriptor->PageCount; + OldDescriptor.PageCount = RegionSize; + if (OldDescriptor.VirtualPage) + { + OldDescriptor.VirtualPage += FoundPageCount; + } } - /* Keep going */ + /* Go to the next entry */ NextEntry = NextEntry->Flink; } else @@ -764,14 +784,14 @@ } /* This is how many pages we will eat away from the descriptor */ - RegionSize = FoundEndPage - FoundBasePage; + FoundPageCount = FoundEndPage - FoundBasePage; /* Update the descriptor to account for the consumed pages */ - Descriptor->BasePage += RegionSize; - Descriptor->PageCount -= RegionSize; + Descriptor->BasePage += FoundPageCount; + Descriptor->PageCount -= FoundPageCount; if (Descriptor->VirtualPage) { - Descriptor->VirtualPage += RegionSize; + Descriptor->VirtualPage += FoundPageCount; } /* Go to the next entry */ @@ -782,15 +802,53 @@ { /* Remove it */ MmMdRemoveDescriptorFromList(MdList, Descriptor); - MmMdFreeDescriptor(Descriptor); /* Check if we're supposed to insert it into a new list */ if (HaveNewList) { - EfiPrintf(L"Not yet implemented\r\n"); - Status = STATUS_NOT_IMPLEMENTED; + /* This is the one to add */ + ListDescriptor = Descriptor; + } + else + { + /* Nope -- just get rid of it */ + MmMdFreeDescriptor(Descriptor); + } + } + } + + /* Is there a remainder descriptor, and do we have a list for it */ + if ((OldDescriptor.PageCount) && (HaveNewList)) + { + /* Did we already chop off the descriptor? */ + if (ListDescriptor) + { + /* Use what we previously chopped */ + *ListDescriptor = OldDescriptor; + } + else + { + /* First time, so build a descriptor to describe the leftover */ + ListDescriptor = MmMdInitByteGranularDescriptor(OldDescriptor.Flags, + OldDescriptor.Type, + OldDescriptor.BasePage, + OldDescriptor.VirtualPage, + OldDescriptor.PageCount); + if (!ListDescriptor) + { + Status = STATUS_NO_MEMORY; goto Quickie; } + + /* Add it into the list */ + Status = MmMdAddDescriptorToList(NewMdList, ListDescriptor, 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Don't free on exit path */ + ListDescriptor = NULL; } } } @@ -804,11 +862,23 @@ { /* Free and re-initialize it */ MmMdFreeList(NewMdList); - MmMdInitializeListHead(NewMdList); - NewMdList->Type = MdList->Type; - } - } - + MmMdInitializeList(NewMdList, MdList->Type, NULL); + } + + /* Check if we had a list descriptor, and free it */ + if (ListDescriptor) + { + MmMdFreeDescriptor(ListDescriptor); + } + + /* Check if we had a new descriptor, and free it */ + if (NewDescriptor) + { + MmMdFreeDescriptor(NewDescriptor); + } + } + + /* All done */ return Status; }

1 0

[tfaber] 74540: [MKHIVE] - Fail when something goes wrong instead of pretending everything's peachy. CORE-13241 #resolve
by tfaber＠svn.reactos.org 13 May '17

13 May '17

Author: tfaber Date: Sat May 13 22:47:59 2017 New Revision: 74540 URL: http://svn.reactos.org/svn/reactos?rev=74540&view=rev Log: [MKHIVE] - Fail when something goes wrong instead of pretending everything's peachy. CORE-13241 #resolve Modified: trunk/reactos/sdk/tools/mkhive/mkhive.c trunk/reactos/sdk/tools/mkhive/reginf.c Modified: trunk/reactos/sdk/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/mkhive.c?… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/mkhive.c [iso-8859-1] Sat May 13 22:47:59 2017 @@ -101,7 +101,10 @@ for (i = 2; i < argc; i++) { convert_path (FileName, argv[i]); - ImportRegistryFile (FileName); + if (!ImportRegistryFile (FileName)) + { + return 1; + } } convert_path (FileName, argv[1]); Modified: trunk/reactos/sdk/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/reginf.c?… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] Sat May 13 22:47:59 2017 @@ -501,11 +501,15 @@ if (!registry_callback (hInf, (PWCHAR)DelReg, TRUE)) { DPRINT1 ("registry_callback() for DelReg failed\n"); + InfHostCloseFile (hInf); + return FALSE; } if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) { DPRINT1 ("registry_callback() for AddReg failed\n"); + InfHostCloseFile (hInf); + return FALSE; } InfHostCloseFile (hInf);

1 0

[tkreuzer] 74539: [NTOSKRNL] Improve S-List-Fault detection in KiTrap0EHandler to handle usermode faults as well.
by tkreuzer＠svn.reactos.org 13 May '17

13 May '17

Author: tkreuzer Date: Sat May 13 20:07:39 2017 New Revision: 74539 URL: http://svn.reactos.org/svn/reactos?rev=74539&view=rev Log: [NTOSKRNL] Improve S-List-Fault detection in KiTrap0EHandler to handle usermode faults as well. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat May 13 20:07:39 2017 @@ -15,6 +15,8 @@ VOID __cdecl KiFastCallEntry(VOID); VOID __cdecl KiFastCallEntryWithSingleStep(VOID); +extern PVOID KeUserPopEntrySListFault; +extern PVOID KeUserPopEntrySListResume; extern PVOID FrRestore; VOID FASTCALL Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea); @@ -1240,10 +1242,46 @@ TrapFrame); } - /* Check for S-LIST fault in kernel mode */ - if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) - { - PSLIST_HEADER SListHeader; + /* Check for S-List fault + + Explanation: An S-List fault can occur due to a race condition between 2 + threads simultaneously trying to pop an element from the S-List. After + thread 1 has read the pointer to the top element on the S-List it is + preempted and thread 2 calls InterlockedPopEntrySlist on the same S-List, + removing the top element and freeing it's memory. After that thread 1 + resumes and tries to read the address of the Next pointer from the top + element, which it assumes will be the next top element. + But since that memory has been freed, we get a page fault. To handle this + race condition, we let thread 1 repeat the operation. + We do NOT invoke the page fault handler in this case, since we do not + want to trigger any side effects, like paging or a guard page fault. + + Sequence of operations: + + Thread 1 : mov eax, [ebp] <= eax now points to the first element + Thread 1 : mov edx, [ebp + 4] <= edx is loaded with Depth and Sequence + *** preempted *** + Thread 2 : calls InterlockedPopEntrySlist, changing the top element + Thread 2 : frees the memory of the element that was popped + *** preempted *** + Thread 1 : checks if eax is NULL + Thread 1 : InterlockedPopEntrySListFault: mov ebx, [eax] <= faults + + To be sure that we are dealing with exactly the case described above, we + check whether the ListHeader has changed. If Thread 2 only popped one + entry, the Next field in the S-List-header has changed. + If after thread 1 has faulted, thread 2 allocates a new element, by + chance getting the same address as the previously freed element and + pushes it on the list again, we will see the same top element, but the + Sequence member of the S-List header has changed. Therefore we check + both fields to make sure we catch any concurrent modification of the + S-List-header. + */ + if ((TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) || + (TrapFrame->Eip == (ULONG_PTR)KeUserPopEntrySListFault)) + { + ULARGE_INTEGER SListHeader; + PVOID ResumeAddress; /* Sanity check that the assembly is correct: This must be mov ebx, [eax] @@ -1255,30 +1293,50 @@ (((UCHAR*)TrapFrame->Eip)[4] == 0x4D) && (((UCHAR*)TrapFrame->Eip)[5] == 0x00)); - /* Get the pointer to the SLIST_HEADER */ - SListHeader = (PSLIST_HEADER)TrapFrame->Ebp; - - /* Check if the Next member of the SLIST_HEADER was changed */ - if (SListHeader->Next.Next != (PSLIST_ENTRY)TrapFrame->Eax) - { + /* Check if this is a user fault */ + if (TrapFrame->Eip == (ULONG_PTR)KeUserPopEntrySListFault) + { + /* EBP points to the S-List-header. Copy it inside SEH, to protect + against a bogus pointer from user mode */ + _SEH2_TRY + { + ProbeForRead((PVOID)TrapFrame->Ebp, + sizeof(ULARGE_INTEGER), + TYPE_ALIGNMENT(SLIST_HEADER)); + SListHeader = *(PULARGE_INTEGER)TrapFrame->Ebp; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* The S-List pointer is not valid! */ + goto NotSListFault; + } + _SEH2_END; + ResumeAddress = KeUserPopEntrySListResume; + } + else + { + SListHeader = *(PULARGE_INTEGER)TrapFrame->Ebp; + ResumeAddress = ExpInterlockedPopEntrySListResume; + } + + /* Check if either the Next pointer or the Sequence member in the + S-List-header has changed. If any of these has changed, we restart + the operation. Otherwise we only have a bogus pointer and let the + page fault handler deal with it. */ + if ((SListHeader.LowPart != TrapFrame->Eax) || + (SListHeader.HighPart != TrapFrame->Edx)) + { + DPRINT1("*** Got an S-List-Fault ***\n"); + KeGetCurrentThread()->SListFaultCount++; + /* Restart the operation */ - TrapFrame->Eip = (ULONG_PTR)ExpInterlockedPopEntrySListResume; + TrapFrame->Eip = (ULONG_PTR)ResumeAddress; /* Continue execution */ KiEoiHelper(TrapFrame); } - else - { -#if 0 - /* Do what windows does and issue an invalid access violation */ - KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, - TrapFrame->Eip, - StoreInstruction, - Cr2, - TrapFrame); -#endif - } - } + } +NotSListFault: /* Call the access fault handler */ Status = MmAccessFault(Present,

1 0

[hbelusca] 74538: Addendum to r74528 (and close the opened file handle only on success).
by hbelusca＠svn.reactos.org 13 May '17

13 May '17

Author: hbelusca Date: Sat May 13 20:04:11 2017 New Revision: 74538 URL: http://svn.reactos.org/svn/reactos?rev=74538&view=rev Log: Addendum to r74528 (and close the opened file handle only on success). Modified: branches/setup_improvements/base/setup/usetup/filesup.c Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Sat May 13 20:04:11 2017 @@ -105,8 +105,7 @@ HANDLE FileHandle; NTSTATUS Status; - RtlInitUnicodeString(&Name, - PathName); + RtlInitUnicodeString(&Name, PathName); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -120,14 +119,10 @@ &IoStatusBlock, 0, FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - NtClose(FileHandle); - - return TRUE; + if (NT_SUCCESS(Status)) + NtClose(FileHandle); + + return NT_SUCCESS(Status); } @@ -523,8 +518,8 @@ &IoStatusBlock, 0, FILE_SYNCHRONOUS_IO_NONALERT); - - NtClose(FileHandle); + if (NT_SUCCESS(Status)) + NtClose(FileHandle); return NT_SUCCESS(Status); }

1 0

[tfaber] 74537: [CMAKE] - Only call mkhive once, as it always generates all 6 binary hives (and if you don't give it all inf files, some of the hives will end up empty). - Remove no longer needed d...
by tfaber＠svn.reactos.org 13 May '17

13 May '17

Author: tfaber Date: Sat May 13 19:54:51 2017 New Revision: 74537 URL: http://svn.reactos.org/svn/reactos?rev=74537&view=rev Log: [CMAKE] - Only call mkhive once, as it always generates all 6 binary hives (and if you don't give it all inf files, some of the hives will end up empty). - Remove no longer needed dependency of efisys on bcd_hive CORE-13241 Modified: trunk/reactos/boot/CMakeLists.txt trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=74… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Sat May 13 19:54:51 2017 @@ -17,7 +17,7 @@ add_custom_target(efisys COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi - DEPENDS native-fatten fat bootmgfw bcd_hive + DEPENDS native-fatten fat bootmgfw VERBATIM) Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sat May 13 19:54:51 2017 @@ -774,6 +774,7 @@ ${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/BCD COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} DEPENDS native-mkhive ${_livecd_inf_files}) @@ -782,7 +783,8 @@ ${CMAKE_BINARY_DIR}/boot/bootdata/default ${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system) + ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/BCD) add_cd_file( FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam @@ -794,18 +796,9 @@ DESTINATION reactos/system32/config FOR livecd) - # BCD Hive - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf - DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) - - add_custom_target(bcd_hive - DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD) - add_cd_file( FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - TARGET bcd_hive + TARGET livecd_hives DESTINATION efi/boot NO_CAB FOR bootcd regtest livecd)

1 0

[ion] 74536: [BOOTLIB]: Separate free and zero memory, and code vs data runtime data, as newer bootlibs do. [BOOTLIB]: Fix bugs in MmMdpHasPrecedence and cleanup. [BOOTLIB]: Fix bug in MmMdFreeDesc...
by ion＠svn.reactos.org 13 May '17

13 May '17

Author: ion Date: Sat May 13 19:32:26 2017 New Revision: 74536 URL: http://svn.reactos.org/svn/reactos?rev=74536&view=rev Log: [BOOTLIB]: Separate free and zero memory, and code vs data runtime data, as newer bootlibs do. [BOOTLIB]: Fix bugs in MmMdpHasPrecedence and cleanup. [BOOTLIB]: Fix bug in MmMdFreeDescriptor. [BOOTLIB]: Cleanup MmMdpSaveCurrentListPointer. [BOOTLIB]: Fix bug in MmMdpCoalesceDescriptor. [BOOTLIB]: Fix multiple bugs in MmMdAddDescriptorToList, and cleanup. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sat May 13 19:32:26 2017 @@ -329,12 +329,14 @@ BlUnusableMemory = 0xF0000002, BlReservedMemory = 0xF0000003, BlEfiBootMemory = 0xF0000004, - BlEfiRuntimeMemory = 0xF0000006, + BlConventionalZeroedMemory = 0xF000005, + BlEfiRuntimeCodeMemory = 0xF0000006, BlAcpiReclaimMemory = 0xF0000008, BlAcpiNvsMemory = 0xF0000009, BlDeviceIoMemory = 0xF000000A, BlDevicePortMemory = 0xF000000B, BlPalMemory = 0xF000000C, + BlEfiRuntimeDataMemory = 0xF000000E, } BL_MEMORY_TYPE; typedef enum _BL_MEMORY_ATTR Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Sat May 13 19:32:26 2017 @@ -1343,8 +1343,11 @@ break; case EfiRuntimeServicesCode: + OsType = BlEfiRuntimeCodeMemory; + break; + case EfiRuntimeServicesData: - OsType = BlEfiRuntimeMemory; + OsType = BlEfiRuntimeDataMemory; break; case EfiConventionalMemory: Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Sat May 13 19:32:26 2017 @@ -26,13 +26,38 @@ BlDeviceIoMemory, BlDevicePortMemory, BlPalMemory, - BlEfiRuntimeMemory, + BlEfiRuntimeCodeMemory, + BlEfiRuntimeDataMemory, BlAcpiNvsMemory, BlAcpiReclaimMemory, - BlEfiBootMemory + BlEfiBootMemory, + BlConventionalMemory, + BlConventionalZeroedMemory }; /* FUNCTIONS *****************************************************************/ + +LONG +MmMdpLookupTypePrecedenceIndex ( + _In_ BL_MEMORY_TYPE Type + ) +{ + ULONG i; + + /* Check the precedence array */ + for (i = 0; i < RTL_NUMBER_OF(MmPlatformMemoryTypePrecedence); i++) + { + /* Check for a match */ + if (MmPlatformMemoryTypePrecedence[i] == Type) + { + /* Return the index */ + return i; + } + } + + /* Invalid index type */ + return -1; +} /* The order is Conventional > Other > System > Loader > Application */ BOOLEAN @@ -44,14 +69,14 @@ BL_MEMORY_CLASS Class1, Class2; ULONG i, j; + /* It isn't free RAM, but the comparator is -- it succeeds it */ + if (Type2 == BlConventionalMemory) + { + return TRUE; + } + /* Descriptor is free RAM -- it precedes */ if (Type1 == BlConventionalMemory) - { - return TRUE; - } - - /* It isn't free RAM, but the comparator is -- it succeeds it */ - if (Type2 == BlConventionalMemory) { return FALSE; } @@ -77,55 +102,30 @@ /* Descriptor is system class */ if (Class1 == BlSystemClass) { - /* And so is the other guy... */ - if (Class2 == BlSystemClass) - { - i = 0; - j = 0; - - /* Scan for the descriptor's system precedence index */ - do - { - if (MmPlatformMemoryTypePrecedence[j] == Type1) - { - break; - } - } while (++j < RTL_NUMBER_OF(MmPlatformMemoryTypePrecedence)); - - /* Use an invalid index if one wasn't found */ - if (j == RTL_NUMBER_OF(MmPlatformMemoryTypePrecedence)) - { - j = 0xFFFFFFFF; - } - - /* Now scan for the comparator's system precedence index */ - while (MmPlatformMemoryTypePrecedence[i] != Type2) - { - /* Use an invalid index if one wasn't found */ - if (++i >= RTL_NUMBER_OF(MmPlatformMemoryTypePrecedence)) - { - i = 0xFFFFFFFF; - break; - } - } - - /* Does the current have a valid index? */ - if (j != 0xFFFFFFFF) - { - /* Yes, what about the comparator? */ - if (i != 0xFFFFFFFF) - { - /* Let the indexes fight! */ - return i >= j; - } - - /* Succeed the comparator, its index is unknown */ - return FALSE; - } - } - - /* The comparator isn't system, so it precedes it */ - return TRUE; + /* If the other guy isn't, system wins */ + if (Class2 != BlSystemClass) + { + return TRUE; + } + + /* Scan for the descriptor's system precedence index */ + i = MmMdpLookupTypePrecedenceIndex(Type1); + j = MmMdpLookupTypePrecedenceIndex(Type2); + + /* Does the current have a valid index? */ + if (i == 0xFFFFFFFF) + { + return TRUE; + } + + /* Yes, what about the comparator? */ + if (j == 0xFFFFFFFF) + { + return FALSE; + } + + /* Let the indexes fight! */ + return i <= j; } /* Descriptor is not system class, but comparator is -- it succeeds it */ @@ -134,7 +134,7 @@ return FALSE; } - /* Descriptor is loader class -- it precedes */ + /* Descriptor is loader class -- it preceedes */ if (Class1 == BlLoaderClass) { return TRUE; @@ -163,8 +163,9 @@ /* Check if this is a valid static descriptor */ if (((MmDynamicMemoryDescriptors) && (MemoryDescriptor >= MmDynamicMemoryDescriptors) && - (MemoryDescriptor < (MmDynamicMemoryDescriptors + MmDynamicMemoryDescriptorCount))) || - ((MemoryDescriptor >= MmStaticMemoryDescriptors) && (MemoryDescriptor < &MmStaticMemoryDescriptors[511]))) + (MemoryDescriptor < &MmDynamicMemoryDescriptors[MmDynamicMemoryDescriptorCount])) || + ((MemoryDescriptor >= MmStaticMemoryDescriptors) && + (MemoryDescriptor < &MmStaticMemoryDescriptors[RTL_NUMBER_OF(MmStaticMemoryDescriptors)]))) { /* It's a global/static descriptor, so just zero it */ RtlZeroMemory(MemoryDescriptor, sizeof(BL_MEMORY_DESCRIPTOR)); @@ -188,9 +189,13 @@ _In_ PLIST_ENTRY Current ) { + PBL_MEMORY_DESCRIPTOR FirstEntry, LastEntry; + /* Make sure that this is not a global descriptor and not the first one */ - if (((Current < &MmGlobalMemoryDescriptors->ListEntry) || - (Current >= &MmGlobalMemoryDescriptors[MmGlobalMemoryDescriptorCount].ListEntry)) && + FirstEntry = &MmGlobalMemoryDescriptors[0]; + LastEntry = &MmGlobalMemoryDescriptors[MmGlobalMemoryDescriptorCount]; + if ((((ULONG_PTR)Current < (ULONG_PTR)FirstEntry) || + ((ULONG_PTR)Current >= (ULONG_PTR)LastEntry)) && (Current != MdList->First)) { /* Save this as the current pointer */ @@ -390,7 +395,7 @@ /* Take one of the available descriptors and fill it out */ MemoryDescriptor = &MmGlobalMemoryDescriptors[MmGlobalMemoryDescriptorsUsed]; - MemoryDescriptor->BaseAddress = BasePage; + MemoryDescriptor->BasePage = BasePage; MemoryDescriptor->VirtualPage = VirtualPage; MemoryDescriptor->PageCount = PageCount; MemoryDescriptor->Flags = Flags; @@ -485,9 +490,9 @@ (NextDescriptor->Type == MemoryDescriptor->Type) && ((NextDescriptor->Flags ^ MemoryDescriptor->Flags) & 0x1B19FFFF) && (EndPage == NextDescriptor->BasePage) && - ((!(MemoryDescriptor->VirtualPage) && !(PreviousDescriptor->VirtualPage)) || - ((MemoryDescriptor->VirtualPage) && (PreviousDescriptor->VirtualPage) && - (MappedEndPage == NextDescriptor->VirtualPage)))) + ((!(MemoryDescriptor->VirtualPage) && !(NextDescriptor->VirtualPage)) || + ((MemoryDescriptor->VirtualPage) && (NextDescriptor->VirtualPage) && + (MappedEndPage == NextDescriptor->VirtualPage)))) { EfiPrintf(L"Next descriptor coalescable!\r\n"); } @@ -516,15 +521,12 @@ if (Flags & BL_MM_ADD_DESCRIPTOR_NEVER_COALESCE_FLAG) { /* Then we won't be coalescing */ - Flags &= BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; - } - else + Flags &= ~BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; + } + else if (MemoryDescriptor->Flags & BlMemoryCoalesced) { /* Coalesce if the descriptor requires it */ - if (MemoryDescriptor->Flags & BlMemoryCoalesced) - { - Flags |= BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; - } + Flags |= BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; } /* Check if truncation is forcefully disabled */ @@ -548,82 +550,81 @@ /* Check if there's no current pointer, or if it's higher than the new one */ if (!(ThisEntry) || - (MemoryDescriptor->BaseAddress <= ThisDescriptor->BaseAddress)) + (MemoryDescriptor->BasePage <= ThisDescriptor->BasePage)) { /* Start at the first descriptor instead, since current is past us */ ThisEntry = FirstEntry->Flink; + } + + /* Loop until we find the right location to insert */ + while (ThisEntry != FirstEntry) + { + /* Get the descriptor part of this entry */ ThisDescriptor = CONTAINING_RECORD(ThisEntry, BL_MEMORY_DESCRIPTOR, ListEntry); - } - - /* Loop until we find the right location to insert */ - while (1) - { - /* Have we gotten back to the first entry? */ - if (ThisEntry == FirstEntry) - { - /* Then we didn't find a good match, so insert it right here */ - InsertTailList(FirstEntry, &MemoryDescriptor->ListEntry); - - /* Do we have to truncate? */ - if (Flags & BL_MM_ADD_DESCRIPTOR_TRUNCATE_FLAG) - { - /* Do it and then exit */ - if (MmMdpTruncateDescriptor(MdList, MemoryDescriptor, Flags)) - { - return STATUS_SUCCESS; - } - } - - /* Do we have to coalesce? */ - if (Flags & BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG) - { - /* Do it and then exit */ - if (MmMdpCoalesceDescriptor(MdList, MemoryDescriptor, Flags)) - { - return STATUS_SUCCESS; - } - } - - /* Do we have to update the current pointer? */ - if (Flags & BL_MM_ADD_DESCRIPTOR_UPDATE_LIST_POINTER_FLAG) - { - /* Do it */ - MmMdpSaveCurrentListPointer(MdList, &MemoryDescriptor->ListEntry); - } - - /* We're done */ - return STATUS_SUCCESS; - } - - /* Is the new descriptor below this address, and has precedence over it? */ - if ((MemoryDescriptor->BaseAddress < ThisDescriptor->BaseAddress) && - (MmMdpHasPrecedence(MemoryDescriptor->Type, ThisDescriptor->Type))) + + /* Is the address smaller, or equal but more important? */ + if ((MemoryDescriptor->BasePage < ThisDescriptor->BasePage) || + ((MemoryDescriptor->BasePage == ThisDescriptor->BasePage) && + (MmMdpHasPrecedence(MemoryDescriptor->Type, ThisDescriptor->Type)))) { /* Then insert right here */ InsertTailList(ThisEntry, &MemoryDescriptor->ListEntry); + goto Quickie; + } + + /* Try the next entry */ + ThisEntry = ThisEntry->Flink; + } + + /* Then we didn't find a good match, so insert it right here */ + InsertTailList(FirstEntry, &MemoryDescriptor->ListEntry); + +Quickie: + /* Do we have to truncate? */ + if (Flags & BL_MM_ADD_DESCRIPTOR_TRUNCATE_FLAG) + { + /* Do it and then exit */ + if (MmMdpTruncateDescriptor(MdList, MemoryDescriptor, Flags)) + { return STATUS_SUCCESS; } - - /* Try the next descriptor */ - ThisEntry = ThisEntry->Flink; - ThisDescriptor = CONTAINING_RECORD(ThisEntry, BL_MEMORY_DESCRIPTOR, ListEntry); - } + } + + /* Do we have to coalesce? */ + if (Flags & BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG) + { + /* Do it and then exit */ + if (MmMdpCoalesceDescriptor(MdList, MemoryDescriptor, Flags)) + { + return STATUS_SUCCESS; + } + } + + /* Do we have to update the current pointer? */ + if (Flags & BL_MM_ADD_DESCRIPTOR_UPDATE_LIST_POINTER_FLAG) + { + /* Do it */ + MmMdpSaveCurrentListPointer(MdList, &MemoryDescriptor->ListEntry); + } + + /* We're done */ + return STATUS_SUCCESS; } NTSTATUS MmMdRemoveRegionFromMdlEx ( - __in PBL_MEMORY_DESCRIPTOR_LIST MdList, - __in ULONG Flags, - __in ULONGLONG BasePage, - __in ULONGLONG PageCount, - __in PBL_MEMORY_DESCRIPTOR_LIST NewMdList + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ ULONG Flags, + _In_ ULONGLONG BasePage, + _In_ ULONGLONG PageCount, + _Out_opt_ PBL_MEMORY_DESCRIPTOR_LIST NewMdList ) { BOOLEAN HaveNewList, UseVirtualPage; NTSTATUS Status; PLIST_ENTRY ListHead, NextEntry; PBL_MEMORY_DESCRIPTOR Descriptor; - BL_MEMORY_DESCRIPTOR NewDescriptor; + //BL_MEMORY_DESCRIPTOR NewDescriptor; ULONGLONG RegionSize; ULONGLONG FoundBasePage, FoundEndPage, FoundPageCount, EndPage; @@ -683,7 +684,7 @@ EndPage = PageCount + BasePage; /* Make a copy of the original descriptor */ - RtlCopyMemory(&NewDescriptor, NextEntry, sizeof(NewDescriptor)); + //NewDescriptor = *Descriptor; // FIXME: Need to use this somewhere... /* Check if the region to be removed starts after the found region starts */ if ((BasePage > FoundBasePage) || (FoundBasePage >= EndPage)) Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Sat May 13 19:32:26 2017 @@ -790,7 +790,8 @@ /* Check if this is a UEFI-related descriptor, unless it's the self-map page */ Descriptor = CONTAINING_RECORD(NextEntry, BL_MEMORY_DESCRIPTOR, ListEntry); if (((Descriptor->Type == BlEfiBootMemory) || - (Descriptor->Type == BlEfiRuntimeMemory) || + (Descriptor->Type == BlEfiRuntimeCodeMemory) || + (Descriptor->Type == BlEfiRuntimeDataMemory) || // WINBUG? (Descriptor->Type == BlLoaderMemory)) && ((Descriptor->BasePage << PAGE_SHIFT) != Mmx86SelfMapBase.QuadPart)) {

1 0

[mjansen] 74535: [APPHELP][SHIMLIB] Forward some events to loaded shims. CORE-11329
by mjansen＠svn.reactos.org 13 May '17

13 May '17

Author: mjansen Date: Sat May 13 18:49:27 2017 New Revision: 74535 URL: http://svn.reactos.org/svn/reactos?rev=74535&view=rev Log: [APPHELP][SHIMLIB] Forward some events to loaded shims. CORE-11329 Added: trunk/reactos/dll/appcompat/apphelp/shimeng.c (with props) Removed: trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sat May 13 18:49:27 2017 @@ -15,6 +15,7 @@ sdbread.c sdbstringtable.c sdbwrite.c + shimeng.c apphelp.spec apphelp.h ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sat May 13 18:49:27 2017 @@ -157,17 +157,19 @@ @ stdcall SdbWriteStringTag(ptr long wstr) @ stub SdbWriteStringTagDirect @ stdcall SdbWriteWORDTag(ptr long long) -@ stub SE_DllLoaded -@ stub SE_DllUnloaded +@ stdcall SE_DllLoaded(ptr) +@ stdcall SE_DllUnloaded(ptr) +@ stub SE_DynamicShim +@ stub SE_DynamicUnshim +@ stdcall SE_InstallAfterInit(ptr ptr) +@ stdcall SE_InstallBeforeInit(ptr ptr) +@ stdcall SE_IsShimDll(ptr) +@ stdcall SE_ProcessDying() @ stub SE_GetHookAPIs @ stub SE_GetMaxShimCount @ stub SE_GetProcAddressLoad @ stub SE_GetShimCount -@ stub SE_InstallAfterInit -@ stub SE_InstallBeforeInit -@ stub SE_IsShimDll @ stub SE_LdrEntryRemoved -@ stub SE_ProcessDying @ stub SetPermLayers @ cdecl ShimDbgPrint(long str str) @ stub ShimDumpCache Added: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c (added) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Sat May 13 18:49:27 2017 @@ -0,0 +1,163 @@ +/* + * Copyright 2015-2017 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_NO_STATUS +#include "windows.h" +#include "ntndk.h" +#include "shimlib.h" +#include <strsafe.h> + +HANDLE g_pShimEngModHandle = 0; + + +ULONG g_ShimEngDebugLevel = 0xffffffff; + + + + +VOID SeiInitDebugSupport(VOID) +{ + static const UNICODE_STRING DebugKey = RTL_CONSTANT_STRING(L"SHIMENG_DEBUG_LEVEL"); + UNICODE_STRING DebugValue; + NTSTATUS Status; + ULONG NewLevel = 0; + WCHAR Buffer[40]; + + RtlInitEmptyUnicodeString(&DebugValue, Buffer, sizeof(Buffer)); + + Status = RtlQueryEnvironmentVariable_U(NULL, &DebugKey, &DebugValue); + + if (NT_SUCCESS(Status)) + { + if (!NT_SUCCESS(RtlUnicodeStringToInteger(&DebugValue, 10, &NewLevel))) + NewLevel = 0; + } + g_ShimEngDebugLevel = NewLevel; +} + + +/** + * Outputs diagnostic info. + * + * @param [in] Level The level to log this message with, choose any of [SHIM_ERR, + * SHIM_WARN, SHIM_INFO]. + * @param [in] FunctionName The function this log should be attributed to. + * @param [in] Format The format string. + * @param ... Variable arguments providing additional information. + * + * @return Success: TRUE Failure: FALSE. + */ +BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR Function, PCSTR Format, ...) +{ + char Buffer[512]; + char* Current = Buffer; + const char* LevelStr; + size_t Length = sizeof(Buffer); + va_list ArgList; + HRESULT hr; + + if (g_ShimEngDebugLevel == 0xffffffff) + SeiInitDebugSupport(); + + if (Level > g_ShimEngDebugLevel) + return FALSE; + + switch (Level) + { + case SEI_MSG: + LevelStr = "MSG "; + break; + case SEI_FAIL: + LevelStr = "FAIL"; + break; + case SEI_WARN: + LevelStr = "WARN"; + break; + case SEI_INFO: + LevelStr = "INFO"; + break; + default: + LevelStr = "USER"; + break; + } + + if (Function) + hr = StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s] [%s] ", LevelStr, Function); + else + hr = StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s] ", LevelStr); + + if (!SUCCEEDED(hr)) + return FALSE; + + va_start(ArgList, Format); + hr = StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); + va_end(ArgList); + if (!SUCCEEDED(hr)) + return FALSE; + + DbgPrint("%s", Buffer); + return TRUE; +} + + + + + + +VOID NotifyShims(DWORD dwReason, PVOID Info) +{ + /* Enumerate all loaded shims */ +} + + +VOID NTAPI SE_InstallBeforeInit(PUNICODE_STRING ProcessImage, PVOID pShimData) +{ + SHIMENG_FAIL("(%wZ, %p)", ProcessImage, pShimData); + /* Find & Load all shims.. */ +} + +VOID NTAPI SE_InstallAfterInit(PUNICODE_STRING ProcessImage, PVOID pShimData) +{ + SHIMENG_FAIL("(%wZ, %p)", ProcessImage, pShimData); + NotifyShims(SHIM_NOTIFY_ATTACH, NULL); +} + +VOID NTAPI SE_ProcessDying(VOID) +{ + SHIMENG_FAIL("()"); + NotifyShims(SHIM_NOTIFY_DETACH, NULL); +} + +VOID WINAPI SE_DllLoaded(PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + SHIMENG_FAIL("(%p)", LdrEntry); + NotifyShims(SHIM_REASON_DLL_LOAD, LdrEntry); +} + +VOID WINAPI SE_DllUnloaded(PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + SHIMENG_FAIL("(%p)", LdrEntry); + NotifyShims(SHIM_REASON_DLL_UNLOAD, LdrEntry); +} + +BOOL WINAPI SE_IsShimDll(PVOID BaseAddress) +{ + SHIMENG_FAIL("(%p)", BaseAddress); + return FALSE; +} + Propchange: trunk/reactos/dll/appcompat/apphelp/shimeng.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt [iso-8859-1] Sat May 13 18:49:27 2017 @@ -1,6 +1,5 @@ list(APPEND SOURCE - shimdbgsupp.c shimlib.c shimlib.h # These .inl functions are included so they show up in vs Removed: trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c (removed) @@ -1,79 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Shim library - * FILE: dll/appcompat/shims/shimlib/shimdbgsupp.c - * PURPOSE: Shim debug helper functions - * PROGRAMMER: Mark Jansen - */ - -#include <windef.h> -#include <winbase.h> -#include <shimlib.h> -#include <strsafe.h> - -#include "wine/winternl.h" - -#define DPFLTR_APPCOMPAT_ID 123 - -void ApphelppInitDebugSupport(PCWSTR KeyName, PULONG Level); -static void SeiInitDebugSupport() -{ - ApphelppInitDebugSupport(L"SHIMENG_DEBUG_LEVEL", &g_ShimEngDebugLevel); -} - - -/** - * Outputs diagnostic info. - * - * @param [in] Level The level to log this message with, choose any of [SHIM_ERR, - * SHIM_WARN, SHIM_INFO]. - * @param [in] FunctionName The function this log should be attributed to. - * @param [in] Format The format string. - * @param ... Variable arguments providing additional information. - * - * @return Success: TRUE Failure: FALSE. - */ -BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...) -{ - char Buffer[512]; - va_list ArgList; - char* Current = Buffer; - const char* LevelStr; - size_t Length = sizeof(Buffer); - - if (g_ShimEngDebugLevel == 0xffffffff) - SeiInitDebugSupport(); - - if (Level > g_ShimEngDebugLevel) - return FALSE; - - switch (Level) - { - case SEI_ERR: - LevelStr = "Err "; - Level = DPFLTR_MASK | (1 << DPFLTR_ERROR_LEVEL); - break; - case SEI_WARN: - LevelStr = "Warn"; - Level = DPFLTR_MASK | (1 << DPFLTR_WARNING_LEVEL); - break; - case SEI_INFO: - LevelStr = "Info"; - Level = DPFLTR_MASK | (1 << DPFLTR_INFO_LEVEL); - break; - default: - LevelStr = "User"; - Level = DPFLTR_MASK | (1 << DPFLTR_INFO_LEVEL); - break; - } - StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s][%-20s] ", LevelStr, FunctionName); - va_start(ArgList, Format); - StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); - va_end(ArgList); -#if defined(APPCOMPAT_USE_DBGPRINTEX) && APPCOMPAT_USE_DBGPRINTEX - return NT_SUCCESS(DbgPrintEx(DPFLTR_APPCOMPAT_ID, Level, "%s", Buffer)); -#else - OutputDebugStringA(Buffer); - return TRUE; -#endif -} Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] Sat May 13 18:49:27 2017 @@ -49,15 +49,17 @@ typedef enum _SEI_LOG_LEVEL { - SEI_ERR = 1, - SEI_WARN = 2, - SEI_INFO = 3, + SEI_MSG = 1, + SEI_FAIL = 2, + SEI_WARN = 3, + SEI_INFO = 4, } SEI_LOG_LEVEL; -BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); +BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR Function, PCSTR Format, ...); extern ULONG g_ShimEngDebugLevel; -#define SHIMENG_ERR(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIMENG_MSG(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_MSG, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIMENG_FAIL(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_FAIL, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #define SHIMENG_WARN(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #define SHIMENG_INFO(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
29
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 May 2017