Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[tfaber] 63827: [NPFS] - Avoid magic values, remove a few casts and don't name an IO_STATUS_BLOCK Status. No code changes.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Aug 7 10:24:07 2014 New Revision: 63827 URL: http://svn.reactos.org/svn/reactos?rev=63827&view=rev Log: [NPFS] - Avoid magic values, remove a few casts and don't name an IO_STATUS_BLOCK Status. No code changes. Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c trunk/reactos/drivers/filesystems/npfs/readsup.c trunk/reactos/drivers/filesystems/npfs/waitsup.c Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] Thu Aug 7 10:24:07 2014 @@ -68,7 +68,7 @@ Irp = DataQueueEntry->Irp; - if ((DataQueueEntry->DataEntryType == 0) && (Irp)) + if ((DataQueueEntry->DataEntryType == Buffered) && (Irp)) { DataLeft = DataQueueEntry->DataSize - ByteOffset; @@ -127,12 +127,12 @@ DataQueue->BytesInQueue -= QueueEntry->DataSize; --DataQueue->EntriesInQueue; - HasWrites = 1; + HasWrites = TRUE; if (DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !QueueEntry->QuotaInEntry) { - HasWrites = 0; + HasWrites = FALSE; } DataQueue->QuotaUsed -= QueueEntry->QuotaInEntry; @@ -140,7 +140,7 @@ if (IsListEmpty(&DataQueue->Queue)) { DataQueue->QueueState = Empty; - HasWrites = 0; + HasWrites = FALSE; } Irp = QueueEntry->Irp; @@ -183,7 +183,9 @@ NextEntry != &DataQueue->Queue; NextEntry = DataQueue->Queue.Flink) { - DataEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, QueueEntry); + DataEntry = CONTAINING_RECORD(NextEntry, + NP_DATA_QUEUE_ENTRY, + QueueEntry); Type = DataEntry->DataEntryType; if (Type == Buffered || Type == Unbuffered) break; @@ -223,29 +225,29 @@ NpAcquireExclusiveVcb(); } - DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3]; + DataEntry = Irp->Tail.Overlay.DriverContext[3]; if (DataEntry) { if (DataEntry->QueueEntry.Blink == &DataQueue->Queue) { DataQueue->ByteOffset = 0; - FirstEntry = 1; + FirstEntry = TRUE; } else { - FirstEntry = 0; + FirstEntry = FALSE; } RemoveEntryList(&DataEntry->QueueEntry); ClientSecurityContext = DataEntry->ClientSecurityContext; - CompleteWrites = 1; + CompleteWrites = TRUE; if (DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !DataEntry->QuotaInEntry) { - CompleteWrites = 0; + CompleteWrites = FALSE; } DataQueue->BytesInQueue -= DataEntry->DataSize; Modified: trunk/reactos/drivers/filesystems/npfs/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/readsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/readsup.c [iso-8859-1] Thu Aug 7 10:24:07 2014 @@ -17,12 +17,12 @@ IO_STATUS_BLOCK NTAPI -NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, IN BOOLEAN Peek, IN BOOLEAN ReadOverflowOperation, IN PVOID Buffer, - IN ULONG BufferSize, - IN ULONG Mode, + IN ULONG BufferSize, + IN ULONG Mode, IN PNP_CCB Ccb, IN PLIST_ENTRY List) { @@ -30,14 +30,14 @@ PVOID DataBuffer; ULONG DataSize, DataLength, TotalBytesCopied, RemainingSize, Offset; PIRP Irp; - IO_STATUS_BLOCK Status; + IO_STATUS_BLOCK IoStatus; BOOLEAN CompleteWrites = FALSE; PAGED_CODE(); if (ReadOverflowOperation) Peek = TRUE; RemainingSize = BufferSize; - Status.Status = STATUS_SUCCESS; + IoStatus.Status = STATUS_SUCCESS; TotalBytesCopied = 0; if (Peek) @@ -110,7 +110,7 @@ { if (Mode == FILE_PIPE_MESSAGE_MODE) { - Status.Status = STATUS_BUFFER_OVERFLOW; + IoStatus.Status = STATUS_BUFFER_OVERFLOW; break; } } @@ -137,7 +137,7 @@ if (Mode == FILE_PIPE_MESSAGE_MODE) { - Status.Status = STATUS_SUCCESS; + IoStatus.Status = STATUS_SUCCESS; break; } @@ -159,9 +159,9 @@ } } - Status.Information = TotalBytesCopied; + IoStatus.Information = TotalBytesCopied; if (CompleteWrites) NpCompleteStalledWrites(DataQueue, List); - return Status; + return IoStatus; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/waitsup.c [iso-8859-1] Thu Aug 7 10:24:07 2014 @@ -17,7 +17,7 @@ VOID NTAPI -NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject, +NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL OldIrql; @@ -53,7 +53,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); } - + VOID NTAPI NpTimerDispatch(IN PKDPC Dpc, @@ -243,7 +243,7 @@ WaitEntry->WaitQueue = WaitQueue; WaitEntry->Irp = Irp; - WaitBuffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; + WaitBuffer = Irp->AssociatedIrp.SystemBuffer; if (WaitBuffer->TimeoutSpecified) { DueTime = WaitBuffer->Timeout; @@ -281,7 +281,6 @@ KeSetTimer(&WaitEntry->Timer, DueTime, &WaitEntry->Dpc); WaitEntry = NULL; - } KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);

10 years, 4 months

[tfaber] 63826: [NPFS] - Base data queue entry on the right struct member in NpCompleteStalledWrites. Fixes list entry corruption found in CORE-8419.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Aug 7 10:10:02 2014 New Revision: 63826 URL: http://svn.reactos.org/svn/reactos?rev=63826&view=rev Log: [NPFS] - Base data queue entry on the right struct member in NpCompleteStalledWrites. Fixes list entry corruption found in CORE-8419. Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] Thu Aug 7 10:10:02 2014 @@ -62,7 +62,9 @@ { if (!QuotaLeft) break; - DataQueueEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, Irp); + DataQueueEntry = CONTAINING_RECORD(NextEntry, + NP_DATA_QUEUE_ENTRY, + QueueEntry); Irp = DataQueueEntry->Irp;

10 years, 4 months

[tfaber] 63825: [NTOS:OB] - Use ObpTypeObjectType's lock when modifying object type global properties, not the new object type's - Correctly free string returned by RtlUnicodeStringToAnsiString

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Aug 7 00:16:21 2014 New Revision: 63825 URL: http://svn.reactos.org/svn/reactos?rev=63825&view=rev Log: [NTOS:OB] - Use ObpTypeObjectType's lock when modifying object type global properties, not the new object type's - Correctly free string returned by RtlUnicodeStringToAnsiString Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Thu Aug 7 00:16:21 2014 @@ -1145,7 +1145,7 @@ /* Set the key and free the converted name */ LocalObjectType->Key = *(PULONG)AnsiName.Buffer; - ExFreePool(AnsiName.Buffer); + RtlFreeAnsiString(&AnsiName); } else { @@ -1227,7 +1227,7 @@ InitializeListHead(&LocalObjectType->TypeList); /* Lock the object type */ - ObpEnterObjectTypeMutex(LocalObjectType); + ObpEnterObjectTypeMutex(ObpTypeObjectType); /* Get creator info and insert it into the type list */ CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); @@ -1246,7 +1246,7 @@ } /* Release the object type */ - ObpLeaveObjectTypeMutex(LocalObjectType); + ObpLeaveObjectTypeMutex(ObpTypeObjectType); /* Check if we're actually creating the directory object itself */ if (!(ObpTypeDirectoryObject) ||

10 years, 4 months

[dgorbachev] 63824: [EXPLORER] Use -Wno-error option when building with link-time optimization. [BROWSEUI] "Fix" multiple definition of (non-virtual thunk to) QueryInterface errors. Binutils linker...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Aug 6 23:10:17 2014 New Revision: 63824 URL: http://svn.reactos.org/svn/reactos?rev=63824&view=rev Log: [EXPLORER] Use -Wno-error option when building with link-time optimization. [BROWSEUI] "Fix" multiple definition of (non-virtual thunk to) QueryInterface errors. Binutils linker bug. Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Wed Aug 6 23:10:17 2014 @@ -63,4 +63,9 @@ if(NOT MSVC) add_compile_flags("-Wno-error=narrowing") + + # GCC bug #59472 + if(LTCG) + add_target_link_flags(explorer "-Wno-error") + endif() endif() Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Wed Aug 6 23:10:17 2014 @@ -61,4 +61,9 @@ if(NOT MSVC) add_target_compile_flags(browseui "-Wno-unused-but-set-variable") + + # Binutils linker bug + if(LTCG) + add_target_link_flags(browseui "-Wl,--allow-multiple-definition") + endif() endif()

10 years, 4 months

[dgorbachev] 63823: [NTOSKRNL][PSEH3] - Add inline asm dependencies to fix undefined reference errors when building with link-time optimization. - Improve formatting. - No functional changes.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Aug 6 23:10:08 2014 New Revision: 63823 URL: http://svn.reactos.org/svn/reactos?rev=63823&view=rev Log: [NTOSKRNL][PSEH3] - Add inline asm dependencies to fix undefined reference errors when building with link-time optimization. - Improve formatting. - No functional changes. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Wed Aug 6 23:10:08 2014 @@ -113,15 +113,6 @@ /* This attribute allows automatic cleanup of the registered frames */ #define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup))) -/* CLANG specific definitions! */ -#ifdef __clang__ - -/* CLANG thinks it is smart and optimizes the alloca away if it is 0 and with it the use of a frame register */ -#define _SEH3$_EnforceFramePointer() asm volatile ("#\n" : : "m"(*(char*)__builtin_alloca(4)) : "%esp", "memory") - -/* CLANG doesn't have asm goto! */ -#define _SEH3$_ASM_GOTO(...) - int __attribute__((regparm(3))) __attribute__((returns_twice)) @@ -129,6 +120,23 @@ volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, const SEH3$_SCOPE_TABLE* ScopeTable, void* AllocaFrame); + +int +__attribute__((regparm(3))) +__attribute__((returns_twice)) +_SEH3$_RegisterTryLevelWithNonVolatiles( + volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, + const SEH3$_SCOPE_TABLE* ScopeTable, + void* AllocaFrame); + +/* CLANG specific definitions! */ +#ifdef __clang__ + +/* CLANG thinks it is smart and optimizes the alloca away if it is 0 and with it the use of a frame register */ +#define _SEH3$_EnforceFramePointer() asm volatile ("#\n" : : "m"(*(char*)__builtin_alloca(4)) : "%esp", "memory") + +/* CLANG doesn't have asm goto! */ +#define _SEH3$_ASM_GOTO(...) #define _SEH3$_RegisterFrame_(_TrylevelFrame, _DataTable) \ do { \ @@ -141,14 +149,6 @@ } \ } while(0) -int -__attribute__((regparm(3))) -__attribute__((returns_twice)) -_SEH3$_RegisterTryLevelWithNonVolatiles( - volatile SEH3$_REGISTRATION_FRAME* RegistrationFrame, - const SEH3$_SCOPE_TABLE* ScopeTable, - void* AllocaFrame); - #define _SEH3$_RegisterTryLevel_(_TrylevelFrame, _DataTable) \ do { \ int result = _SEH3$_RegisterTryLevelWithNonVolatiles(_TrylevelFrame, _DataTable, __builtin_alloca(0)); \ @@ -171,21 +171,21 @@ #ifdef __cplusplus #define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \ - asm goto ("leal %0, %%eax\n" \ - "leal %1, %%edx\n" \ - "call " #_Function "WithStackLayout\n" \ + asm goto ("leal %0, %%eax\n\t" \ + "leal %1, %%edx\n\t" \ + "call " #_Function "WithStackLayout" \ : \ - : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)), "c"(__builtin_alloca(0)) \ + : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)), "c" (__builtin_alloca(0)), "p" (_SEH3$_RegisterFrameWithNonVolatiles) \ : "eax", "edx", "memory" \ : _SEH3$_l_BeforeTry, _SEH3$_l_HandlerTarget, _SEH3$_l_OnException, _SEH3$_l_BeforeFilterOrFinally, _SEH3$_l_FilterOrFinally) #else #define _SEH3$_CALL_WRAPPER(_Function, _TrylevelFrame, _DataTable) \ - asm goto ("leal %0, %%eax\n" \ - "leal %1, %%edx\n" \ - "call " #_Function "\n" \ + asm goto ("leal %0, %%eax\n\t" \ + "leal %1, %%edx\n\t" \ + "call " #_Function \ : \ - : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)) \ + : "m" (*(_TrylevelFrame)), "m" (*(_DataTable)), "p" (_SEH3$_RegisterFrameWithNonVolatiles) \ : "eax", "edx", "ecx", "memory" \ : _SEH3$_l_BeforeTry, _SEH3$_l_HandlerTarget, _SEH3$_l_OnException, _SEH3$_l_BeforeFilterOrFinally, _SEH3$_l_FilterOrFinally) #endif @@ -227,8 +227,8 @@ /* On invocation, the AllocaFrame field is loaded with the return esp value */ #define _SEH3$_NESTED_FUNC_RETURN(_Result) \ /* Restore esp and return to the caller */ \ - asm volatile ("movl %[FixedEsp], %%esp\nret\n" \ - : : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "ebx", "ecx", "edx", "esi", "edi", "flags", "memory") + asm volatile ("movl %[FixedEsp], %%esp\n\tret" \ + : : "a" (_Result), [FixedEsp] "m" (_SEH3$_TrylevelFrame.AllocaFrame) : "ebx", "ecx", "edx", "esi", "edi", "flags", "memory") /* The filter "function" */ #define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Wed Aug 6 23:10:08 2014 @@ -82,8 +82,8 @@ /* Second call to get the filter result */ "mov $1, %%ecx\n\t" - "call *%[Filter]\n\t" - : "=a"(FilterResult) + "call *%[Filter]" + : "=a" (FilterResult) : [RegistrationFrame] "m" (RegistrationFrame), [Filter] "m" (Filter) : "ecx", "edx"); @@ -197,14 +197,14 @@ { asm volatile ( /* Load the registers */ - "movl 20(%%ecx), %%esp\n" - "movl 24(%%ecx), %%ebp\n" + "movl 20(%%ecx), %%esp\n\t" + "movl 24(%%ecx), %%ebp\n\t" /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ - "addl $4, %%esp\n" + "addl $4, %%esp\n\t" /* Jump into the exception handler */ - "jmp *%[Target]\n" + "jmp *%[Target]" : : "c" (RegistrationFrame), "a" (RegistrationFrame->ScopeTable), @@ -215,14 +215,14 @@ { asm volatile ( /* Load the registers */ - "movl 20(%%ecx), %%esp\n" - "movl 24(%%ecx), %%ebp\n" + "movl 20(%%ecx), %%esp\n\t" + "movl 24(%%ecx), %%ebp\n\t" /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ - "addl $4, %%esp\n" + "addl $4, %%esp\n\t" /* Jump into the exception handler */ - "jmp *%[Target]\n" + "jmp *%[Target]" : : "c" (RegistrationFrame), "a" (RegistrationFrame->ScopeTable), @@ -253,7 +253,7 @@ LONG FilterResult; /* Clear the direction flag. */ - asm volatile ("cld\n" : : : "memory"); + asm volatile ("cld" : : : "memory"); /* Save the exception pointers on the stack */ ExceptionPointers.ExceptionRecord = ExceptionRecord; Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Wed Aug 6 23:10:08 2014 @@ -33,11 +33,6 @@ set_image_base(ntoskrnl 0x80800000) endif() -# Linker bug -if(NOT MSVC AND LTCG) - add_target_link_flags(ntoskrnl "-shared") -endif() - target_link_libraries(ntoskrnl cportlib csq Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Aug 6 23:10:08 2014 @@ -687,13 +687,13 @@ __asm__ __volatile__ ( - "subl %1, %%esp\n" - "movl %%esp, %%edi\n" - "movl %2, %%esi\n" - "shrl $2, %1\n" - "rep movsd\n" - "call *%3\n" - "movl %%eax, %0\n" + "subl %1, %%esp\n\t" + "movl %%esp, %%edi\n\t" + "movl %2, %%esi\n\t" + "shrl $2, %1\n\t" + "rep movsd\n\t" + "call *%3\n\t" + "movl %%eax, %0" : "=r"(Result) : "c"(StackBytes), "d"(Arguments), @@ -772,6 +772,7 @@ NTSTATUS KiConvertToGuiThread(VOID) { + NTSTATUS NTAPI PsConvertToGuiThread(VOID); NTSTATUS Result; PVOID StackFrame; @@ -799,7 +800,7 @@ "addl %%esp, %1\n\t" "movl %1, %%ebp" : "=a"(Result), "=r"(StackFrame) - : + : "p"(PsConvertToGuiThread) : "%esp", "%ecx", "%edx", "memory" ); return Result; @@ -819,22 +820,24 @@ VOID KiSwitchToBootStack(IN ULONG_PTR InitialStack) { + VOID NTAPI KiSystemStartupBootStack(VOID); + /* We have to switch to a new stack before continuing kernel initialization */ #ifdef __GNUC__ __asm__ ( - "movl %0, %%esp\n" - "subl %1, %%esp\n" - "pushl %2\n" - "jmp _KiSystemStartupBootStack@0\n" + "movl %0, %%esp\n\t" + "subl %1, %%esp\n\t" + "pushl %2\n\t" + "jmp _KiSystemStartupBootStack@0" : : "c"(InitialStack), "i"(NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH), - "i"(CR0_EM | CR0_TS | CR0_MP) + "i"(CR0_EM | CR0_TS | CR0_MP), + "p"(KiSystemStartupBootStack) : "%esp" ); #elif defined(_MSC_VER) - VOID NTAPI KiSystemStartupBootStack(VOID); __asm { mov esp, InitialStack @@ -858,7 +861,7 @@ #if defined(__GNUC__) __asm__ __volatile__ ( - "iret\n" + "iret" ); #elif defined(_MSC_VER) __asm Modified: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Wed Aug 6 23:10:08 2014 @@ -30,11 +30,6 @@ set_image_base(ntkrnlmp 0x80800000) endif() -# Linker bug -if(NOT MSVC AND LTCG) - add_target_link_flags(ntkrnlmp "-shared") -endif() - target_link_libraries(ntkrnlmp cportlib csq

10 years, 4 months

[jgardou] 63822: [NTOS/MM] - Call the right delete routine for ARM3 section object - Properly free the pages of pagefile-backed segments when those are deleted - Put the right assert at the right p...

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Aug 6 21:53:57 2014 New Revision: 63822 URL: http://svn.reactos.org/svn/reactos?rev=63822&view=rev Log: [NTOS/MM] - Call the right delete routine for ARM3 section object - Properly free the pages of pagefile-backed segments when those are deleted - Put the right assert at the right place in MmUnlinkPageFromList - Remove DPRINT from previous commit which is interesting but noisy Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -2274,6 +2274,12 @@ IN ULONG_PTR Vpn ); +VOID +NTAPI +MiDeleteARM3Section( + PVOID ObjectBody +); + NTSTATUS NTAPI MiQueryMemorySectionName( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -338,10 +338,11 @@ /* We are not on a list anymore */ Pfn->u1.Flink = Pfn->u2.Blink = 0; - ASSERT_LIST_INVARIANT(ListHead); /* Remove one entry from the list */ ListHead->Total--; + + ASSERT_LIST_INVARIANT(ListHead); } PFN_NUMBER @@ -1234,6 +1235,9 @@ 0); } + /* Page should at least have one reference */ + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + /* Check if the share count is now 0 */ ASSERT(Pfn1->u2.ShareCount < 0xF000000); if (!--Pfn1->u2.ShareCount) @@ -1257,7 +1261,7 @@ TempPte.u.Soft.Prototype = 0; TempPte.u.Soft.Protection = Pfn1->OriginalPte.u.Soft.Protection; MI_WRITE_INVALID_PTE(PointerPte, TempPte); - DPRINT("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); + DPRINT1("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); } /* Put the page in transition */ @@ -1266,8 +1270,6 @@ /* PFN lock must be held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - /* Page should at least have one reference */ - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); if (Pfn1->u3.e2.ReferenceCount == 1) { /* Is there still a PFN for this page? */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -608,6 +608,8 @@ SEGMENT_FLAGS SegmentFlags; PSUBSECTION Subsection; PMMPTE PointerPte, LastPte, PteForProto; + PMMPFN Pfn1; + PFN_NUMBER PageFrameIndex; MMPTE TempPte; KIRQL OldIrql; @@ -621,7 +623,7 @@ /* These things are not supported yet */ ASSERT(ControlArea->DereferenceList.Flink == NULL); - ASSERT(!(ControlArea->u.Flags.Image) & !(ControlArea->u.Flags.File)); + ASSERT(!(ControlArea->u.Flags.Image) && !(ControlArea->u.Flags.File)); ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); @@ -661,7 +663,52 @@ TempPte = *PointerPte; ASSERT(SegmentFlags.LargePages == 0); ASSERT(TempPte.u.Hard.Valid == 0); - ASSERT(TempPte.u.Soft.Prototype == 1); + + /* See if we should clean things up */ + if (!(ControlArea->u.Flags.Image) && !(ControlArea->u.Flags.File)) + { + /* + * This is a section backed by the pagefile. Now that it doesn't exist anymore, + * we can give everything back to the system. + */ + ASSERT(TempPte.u.Soft.Prototype == 0); + + if (TempPte.u.Soft.Transition == 1) + { + /* We can give the page back for other use */ + DPRINT1("Releasing page for transition PTE %p\n", PointerPte); + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + + /* As this is a paged-backed section, nobody should reference it anymore (no cache or whatever) */ + ASSERT(Pfn1->u3.ReferenceCount == 0); + + /* And it should be in standby or modified list */ + ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); + + /* Unlink it and put it back in free list */ + MiUnlinkPageFromList(Pfn1); + + /* Temporarily mark this as active and make it free again */ + Pfn1->u3.e1.PageLocation = ActiveAndValid; + MI_SET_PFN_DELETED(Pfn1); + + MiInsertPageInFreeList(PageFrameIndex); + } + else if (TempPte.u.Soft.PageFileHigh != 0) + { + /* Should not happen for now */ + ASSERT(FALSE); + } + } + else + { + /* unsupported for now */ + ASSERT(FALSE); + + /* File-backed section must have prototype PTEs */ + ASSERT(TempPte.u.Soft.Prototype == 1); + } /* Zero the PTE and keep going */ PointerPte->u.Long = 0; @@ -3050,6 +3097,34 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiDeleteARM3Section(PVOID ObjectBody) +{ + PSECTION SectionObject; + PCONTROL_AREA ControlArea; + KIRQL OldIrql; + + SectionObject = (PSECTION)ObjectBody; + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + ASSERT(SectionObject->Segment); + ASSERT(SectionObject->Segment->ControlArea); + + ControlArea = SectionObject->Segment->ControlArea; + + /* Dereference */ + ControlArea->NumberOfSectionReferences--; + ControlArea->NumberOfUserReferences--; + + ASSERT(ControlArea->u.Flags.BeingDeleted == 0); + + /* Check it. It will delete it if there is no more reference to it */ + MiCheckControlArea(ControlArea, OldIrql); +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -423,10 +423,18 @@ /* Drop the reference on the page table. */ MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* Make the page free. For prototypes, it will be made free when deleting the section object */ if (Pfn1->u2.ShareCount == 0) { NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - /* Mark the page temporarily as valid, we're going to make it free soon */ + + /* And it should be in standby or modified list */ + ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); + + /* Unlink it and put it back in free list */ + MiUnlinkPageFromList(Pfn1); Pfn1->u3.e1.PageLocation = ActiveAndValid; /* Bring it back into the free list */ Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -355,8 +355,6 @@ return(STATUS_SUCCESS); } - -extern MMPFNLIST MmModifiedPageListByColor[]; VOID NTAPI MiBalancerThread(PVOID Unused) @@ -427,9 +425,6 @@ KeBugCheck(NO_PAGES_AVAILABLE); } } while (InitialTarget != 0); - - if (MmModifiedPageListByColor[0].Total != 0) - DPRINT1("There are %u pages ready to be paged out in the modified list.\n", MmModifiedPageListByColor[0].Total); } else { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 6 21:53:57 2014 @@ -2623,6 +2623,13 @@ MmpDeleteSection(PVOID ObjectBody) { PROS_SECTION_OBJECT Section = (PROS_SECTION_OBJECT)ObjectBody; + + /* Check if it's an ARM3, or ReactOS section */ + if (!MiIsRosSectionObject(Section)) + { + MiDeleteARM3Section(ObjectBody); + return; + } DPRINT("MmpDeleteSection(ObjectBody %p)\n", ObjectBody); if (Section->AllocationAttributes & SEC_IMAGE)

10 years, 4 months

[jgardou] 63821: [NTOS/MM] - Implement MiResolvePageFileFault - Add a debug print showing how many ARM3 pages could be used by the balancer

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Aug 6 21:53:09 2014 New Revision: 63821 URL: http://svn.reactos.org/svn/reactos?rev=63821&view=rev Log: [NTOS/MM] - Implement MiResolvePageFileFault - Add a debug print showing how many ARM3 pages could be used by the balancer Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Aug 6 21:53:09 2014 @@ -648,6 +648,13 @@ NTAPI MmShowOutOfSpaceMessagePagingFile(VOID); +NTSTATUS +NTAPI +MiReadPageFile( + _In_ PFN_NUMBER Page, + _In_ ULONG PageFileIndex, + _In_ ULONG_PTR PageFileOffset); + /* process.c ****************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Aug 6 21:53:09 2014 @@ -810,6 +810,96 @@ NTSTATUS NTAPI +MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, + _In_ PVOID FaultingAddress, + _In_ PMMPTE PointerPte, + _In_ PEPROCESS CurrentProcess, + _Inout_ KIRQL *OldIrql) +{ + ULONG Color; + PFN_NUMBER Page; + NTSTATUS Status; + MMPTE TempPte = *PointerPte; + KEVENT Event; + PMMPFN Pfn1; + ULONG PageFileIndex = TempPte.u.Soft.PageFileLow; + ULONG_PTR PageFileOffset = TempPte.u.Soft.PageFileHigh; + + /* Things we don't support yet */ + ASSERT(CurrentProcess > HYDRA_PROCESS); + ASSERT(*OldIrql != MM_NOIRQL); + + /* We must hold the PFN lock */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* Some sanity checks */ + ASSERT(TempPte.u.Hard.Valid == 0); + ASSERT(TempPte.u.Soft.PageFileHigh != 0); + ASSERT(TempPte.u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED); + + /* Get any page, it will be overwritten */ + Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); + Page = MiRemoveAnyPage(Color); + + /* Initialize this PFN */ + MiInitializePfn(Page, PointerPte, StoreInstruction); + + /* Sets the PFN as being in IO operation */ + Pfn1 = MI_PFN_ELEMENT(Page); + ASSERT(Pfn1->u1.Event == NULL); + ASSERT(Pfn1->u3.e1.ReadInProgress == 0); + ASSERT(Pfn1->u3.e1.WriteInProgress == 0); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Pfn1->u1.Event = &Event; + Pfn1->u3.e1.ReadInProgress = 1; + + /* We must write the PTE now as the PFN lock will be released while performing the IO operation */ + TempPte.u.Soft.Transition = 1; + TempPte.u.Soft.PageFileLow = 0; + TempPte.u.Soft.Prototype = 0; + TempPte.u.Trans.PageFrameNumber = Page; + + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + + /* Release the PFN lock while we proceed */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, *OldIrql); + + /* Do the paging IO */ + Status = MiReadPageFile(Page, PageFileIndex, PageFileOffset); + + /* Lock the PFN database again */ + *OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Nobody should have changed that while we were not looking */ + ASSERT(Pfn1->u1.Event == &Event); + ASSERT(Pfn1->u3.e1.ReadInProgress == 1); + ASSERT(Pfn1->u3.e1.WriteInProgress == 0); + + if (!NT_SUCCESS(Status)) + { + /* Malheur! */ + ASSERT(FALSE); + Pfn1->u4.InPageError = 1; + Pfn1->u1.ReadStatus = Status; + } + + /* This is now a nice and normal PFN */ + Pfn1->u1.Event = NULL; + Pfn1->u3.e1.ReadInProgress = 0; + + /* And the PTE can finally be valid */ + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, TempPte.u.Trans.Protection, Page); + MI_WRITE_VALID_PTE(PointerPte, TempPte); + + /* Waiters gonna wait */ + KeSetEvent(&Event, IO_NO_INCREMENT, FALSE); + + return Status; +} + +NTSTATUS +NTAPI MiResolveTransitionFault(IN PVOID FaultingAddress, IN PMMPTE PointerPte, IN PEPROCESS CurrentProcess, @@ -846,8 +936,19 @@ /* This is from ARM3 -- Windows normally handles this here */ ASSERT(Pfn1->u4.InPageError == 0); - /* Not supported in ARM3 */ - ASSERT(Pfn1->u3.e1.ReadInProgress == 0); + /* See if we should wait before terminating the fault */ + if (Pfn1->u3.e1.ReadInProgress == 1) + { + DPRINT1("The page is currently being read!\n"); + ASSERT(Pfn1->u1.Event != NULL); + *InPageBlock = Pfn1->u1.Event; + if (PointerPte == Pfn1->PteAddress) + { + DPRINT1("And this if for this particular PTE.\n"); + /* The PTE will be made valid by the thread serving the fault */ + return STATUS_SUCCESS; // FIXME: Maybe something more descriptive + } + } /* Windows checks there's some free pages and this isn't an in-page error */ ASSERT(MmAvailablePages > 0); @@ -1325,27 +1426,46 @@ /* And now release the lock and leave*/ KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + if (InPageBlock != NULL) + { + /* The page is being paged in by another process */ + KeWaitForSingleObject(InPageBlock, WrPageIn, KernelMode, FALSE, NULL); + } + ASSERT(OldIrql == KeGetCurrentIrql()); ASSERT(OldIrql <= APC_LEVEL); ASSERT(KeAreAllApcsDisabled() == TRUE); return Status; } + /* Should we page the data back in ? */ + if (TempPte.u.Soft.PageFileHigh != 0) + { + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Resolve */ + Status = MiResolvePageFileFault(StoreInstruction, Address, PointerPte, Process, &LockIrql); + + /* And now release the lock and leave*/ + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; + } + // // The PTE must be invalid but not completely empty. It must also not be a - // prototype or transition PTE as those scenarii should've been handled above. + // prototype a transition or a paged-out PTE as those scenarii should've been handled above. // These are all Windows checks // ASSERT(TempPte.u.Hard.Valid == 0); ASSERT(TempPte.u.Soft.Prototype == 0); ASSERT(TempPte.u.Soft.Transition == 0); + ASSERT(TempPte.u.Soft.PageFileHigh == 0); ASSERT(TempPte.u.Long != 0); - - // - // No page file software PTEs in ARM3 yet, so this must be a - // demand zero page. This is a ReactOS check. - // - ASSERT(TempPte.u.Soft.PageFileHigh == 0); // // If we got this far, the PTE can only be a demand zero PTE, which is what Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Aug 6 21:53:09 2014 @@ -354,6 +354,9 @@ return(STATUS_SUCCESS); } + + +extern MMPFNLIST MmModifiedPageListByColor[]; VOID NTAPI MiBalancerThread(PVOID Unused) @@ -424,6 +427,9 @@ KeBugCheck(NO_PAGES_AVAILABLE); } } while (InitialTarget != 0); + + if (MmModifiedPageListByColor[0].Total != 0) + DPRINT1("There are %u pages ready to be paged out in the modified list.\n", MmModifiedPageListByColor[0].Total); } else { Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Wed Aug 6 21:53:09 2014 @@ -48,8 +48,8 @@ PFILE_OBJECT FileObject; LARGE_INTEGER MaximumSize; LARGE_INTEGER CurrentSize; - ULONG FreePages; - ULONG UsedPages; + PFN_NUMBER FreePages; + PFN_NUMBER UsedPages; PULONG AllocMap; KSPIN_LOCK AllocMapLock; ULONG AllocMapSize; @@ -68,7 +68,7 @@ #define PAIRS_PER_RUN (1024) -#define MAX_PAGING_FILES (32) +#define MAX_PAGING_FILES (16) /* List of paging files, both used and free */ static PPAGINGFILE PagingFileList[MAX_PAGING_FILES]; @@ -77,7 +77,6 @@ static KSPIN_LOCK PagingFileListLock; /* Number of paging files */ -static ULONG MiPagingFileCount; ULONG MmNumberOfPagingFiles; /* Number of pages that are available for swapping */ @@ -140,7 +139,7 @@ ULONG i; /* Loop through all the paging files */ - for (i = 0; i < MiPagingFileCount; i++) + for (i = 0; i < MmNumberOfPagingFiles; i++) { /* Check if this is one of them */ if (PagingFileList[i]->FileObject == FileObject) return TRUE; @@ -275,34 +274,44 @@ return(Status); } + NTSTATUS NTAPI MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) { - ULONG i; - ULONG_PTR offset; + return MiReadPageFile(Page, FILE_FROM_ENTRY(SwapEntry), OFFSET_FROM_ENTRY(SwapEntry)); +} + +NTSTATUS +NTAPI +MiReadPageFile( + _In_ PFN_NUMBER Page, + _In_ ULONG PageFileIndex, + _In_ ULONG_PTR PageFileOffset) +{ LARGE_INTEGER file_offset; IO_STATUS_BLOCK Iosb; NTSTATUS Status; KEVENT Event; UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; PMDL Mdl = (PMDL)MdlBase; - - DPRINT("MmReadFromSwapPage\n"); - - if (SwapEntry == 0) + PPAGINGFILE PagingFile; + + DPRINT("MiReadSwapFile\n"); + + if (PageFileOffset == 0) { KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } - i = FILE_FROM_ENTRY(SwapEntry); - offset = OFFSET_FROM_ENTRY(SwapEntry); - - if (PagingFileList[i]->FileObject == NULL || - PagingFileList[i]->FileObject->DeviceObject == NULL) - { - DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); + ASSERT(PageFileIndex < MAX_PAGING_FILES); + + PagingFile = PagingFileList[PageFileIndex]; + + if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) + { + DPRINT1("Bad paging file %u\n", PageFileIndex); KeBugCheck(MEMORY_MANAGEMENT); } @@ -310,11 +319,11 @@ MmBuildMdlFromPages(Mdl, &Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; - file_offset.QuadPart = offset * PAGE_SIZE; - file_offset = MmGetOffsetPageFile(PagingFileList[i]->RetrievalPointers, file_offset); + file_offset.QuadPart = PageFileOffset * PAGE_SIZE; + file_offset = MmGetOffsetPageFile(PagingFile->RetrievalPointers, file_offset); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(PagingFileList[i]->FileObject, + Status = IoPageRead(PagingFile->FileObject, Mdl, &file_offset, &Event, @@ -348,7 +357,7 @@ { PagingFileList[i] = NULL; } - MiPagingFileCount = 0; + MmNumberOfPagingFiles = 0; } static ULONG @@ -498,7 +507,7 @@ DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); - if (MiPagingFileCount >= MAX_PAGING_FILES) + if (MmNumberOfPagingFiles >= MAX_PAGING_FILES) { return(STATUS_TOO_MANY_PAGING_FILES); } @@ -800,7 +809,7 @@ } } MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; - MiPagingFileCount++; + MmNumberOfPagingFiles++; KeReleaseSpinLock(&PagingFileListLock, oldIrql); ZwClose(FileHandle);

10 years, 4 months

[hbelusca] 63820: [KERNEL32][CONSRV] - Fix FreeConsole API. - Implement undocumented GetConsoleKeyboardLayoutNameA/W API (same usage as GetKeyboardLayoutName), needed for ConEmu. See some examples ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 6 21:01:23 2014 New Revision: 63820 URL: http://svn.reactos.org/svn/reactos?rev=63820&view=rev Log: [KERNEL32][CONSRV] - Fix FreeConsole API. - Implement undocumented GetConsoleKeyboardLayoutNameA/W API (same usage as GetKeyboardLayoutName), needed for ConEmu. See some examples here: http://www.opensource.apple.com/source/vim/vim-44/src/os_win32.c , and there: https://bitbucket.org/jaroslav/lswitcher/src/700bab23f294814235812c5cb07710… CORE-7931 #comment ConsolepFree fixed in revision 63820. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] Wed Aug 6 21:01:23 2014 @@ -1076,24 +1076,37 @@ WINAPI FreeConsole(VOID) { - // AG: I'm not sure if this is correct (what happens to std handles?) - // but I just tried to reverse what AllocConsole() does... - - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFree), - sizeof(CONSOLE_FREECONSOLE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_FREECONSOLE FreeConsoleRequest = &ApiMessage.Data.FreeConsoleRequest; + HANDLE ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + + /* We must have a non-trivial handle to close */ + if (ConsoleHandle == NULL) // IsConsoleHandle(ConsoleHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Set up the data to send to the Console Server */ + FreeConsoleRequest->ConsoleHandle = ConsoleHandle; + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFree), + sizeof(*FreeConsoleRequest)); + + /* Check for success */ + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* Reset the console handle */ NtCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; + /* Close the associated input handle */ CloseHandle(InputWaitHandle); InputWaitHandle = INVALID_HANDLE_VALUE; @@ -1311,7 +1324,7 @@ BaseSetLastNTError(ApiMessage.Status); } - DPRINT1("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); + DPRINT("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); return GetLargestWindowSizeRequest->Size; } @@ -2602,22 +2615,67 @@ } -/* - * @unimplemented - */ -BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR name) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR name) -{ - STUB; - return 0; +BOOL +IntGetConsoleKeyboardLayoutName(OUT PVOID pszLayoutName, + IN BOOL bAnsi) +{ + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest = &ApiMessage.Data.GetKbdLayoutNameRequest; + + /* Set up the data to send to the Console Server */ + GetKbdLayoutNameRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetKbdLayoutNameRequest->Ansi = bAnsi; + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetKeyboardLayoutName), + sizeof(*GetKbdLayoutNameRequest)); + + /* Check for success */ + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* Retrieve the results */ + _SEH2_TRY + { + /* Copy only KL_NAMELENGTH == 9 characters, ANSI or UNICODE */ + if (bAnsi) + strncpy(pszLayoutName, (PCHAR)GetKbdLayoutNameRequest->LayoutBuffer, KL_NAMELENGTH); + else + wcsncpy(pszLayoutName, (PWCHAR)GetKbdLayoutNameRequest->LayoutBuffer, KL_NAMELENGTH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + return TRUE; +} + +/* + * @implemented (undocumented) + */ +BOOL +WINAPI +GetConsoleKeyboardLayoutNameA(OUT LPSTR pszLayoutName) +{ + return IntGetConsoleKeyboardLayoutName(pszLayoutName, TRUE); +} + +/* + * @implemented (undocumented) + */ +BOOL +WINAPI +GetConsoleKeyboardLayoutNameW(OUT LPWSTR pszLayoutName) +{ + return IntGetConsoleKeyboardLayoutName(pszLayoutName, FALSE); } /* Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Wed Aug 6 21:01:23 2014 @@ -164,6 +164,7 @@ DWORD dwHotKey; DWORD dwStartupFlags; CONSOLE_PROPERTIES; + BOOLEAN ConsoleNeeded; // Used for GUI apps only. LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE ImeDispatcher; @@ -281,7 +282,7 @@ typedef struct { - ULONG Dummy; + HANDLE ConsoleHandle; } CONSOLE_FREECONSOLE, *PCONSOLE_FREECONSOLE; typedef struct @@ -793,6 +794,13 @@ HANDLE EventHandle; } CONSOLE_SETINPUTOUTPUTCP, *PCONSOLE_SETINPUTOUTPUTCP; +typedef struct +{ + HANDLE ConsoleHandle; + CHAR LayoutBuffer[KL_NAMELENGTH * sizeof(WCHAR)]; // Can hold up to 9 wchars + BOOL Ansi; +} CONSOLE_GETKBDLAYOUTNAME, *PCONSOLE_GETKBDLAYOUTNAME; + typedef struct _CONSOLE_API_MESSAGE { PORT_MESSAGE Header; @@ -886,9 +894,10 @@ CONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest; CONSOLE_SETHISTORYMODE SetHistoryModeRequest; - /* Input and Output Code Pages */ + /* Input and Output Code Pages; keyboard */ CONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest; CONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest; + CONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Wed Aug 6 21:01:23 2014 @@ -999,50 +999,63 @@ CSR_API(SrvGetConsoleKeyboardLayoutName) { + NTSTATUS Status; + PCONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetKbdLayoutNameRequest; + PCONSOLE Console; + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* Retrieve the keyboard layout name of the system */ + if (GetKbdLayoutNameRequest->Ansi) + GetKeyboardLayoutNameA((PCHAR)GetKbdLayoutNameRequest->LayoutBuffer); + else + GetKeyboardLayoutNameW((PWCHAR)GetKbdLayoutNameRequest->LayoutBuffer); + + ConSrvReleaseConsole(Console, TRUE); + return STATUS_SUCCESS; +} + +CSR_API(SrvGetConsoleCharType) +{ DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleCharType) +CSR_API(SrvSetConsoleLocalEUDC) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleLocalEUDC) +CSR_API(SrvSetConsoleCursorMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleCursorMode) +CSR_API(SrvGetConsoleCursorMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleCursorMode) +CSR_API(SrvGetConsoleNlsMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleNlsMode) +CSR_API(SrvSetConsoleNlsMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleNlsMode) +CSR_API(SrvGetConsoleLangId) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleLangId) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */

10 years, 4 months

[hbelusca] 63819: [CONSOLE][CONSRV] - Implement the undocumented WM_SETCONSOLEINFO window message (the equivalent of our PM_APPLY_CONSOLE_INFO), sent by the Windows' console control panel applet co...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 6 20:49:10 2014 New Revision: 63819 URL: http://svn.reactos.org/svn/reactos?rev=63819&view=rev Log: [CONSOLE][CONSRV] - Implement the undocumented WM_SETCONSOLEINFO window message (the equivalent of our PM_APPLY_CONSOLE_INFO), sent by the Windows' console control panel applet console.dll, when applying new console settings to the current opened console (and its associated data structure CONSOLE_STATE_INFO). This is used by the FAR plugin MinCE by Andrew Grechkin (see http://code.google.com/p/andrew-grechkin/source/browse/trunk/MinCE/src/setc… for example) - Convert GUI_CONSOLE_INFO::FontSize to COORD, as it should be. See: http://www.catch22.net/sites/default/source/files/setconsoleinfo.c and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf for more information. Modified: branches/condrv_restructure/dll/cpl/console/console.c branches/condrv_restructure/dll/cpl/console/layout.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h Modified: branches/condrv_restructure/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/console.c [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -115,7 +115,8 @@ wcsncpy(GuiInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !! // GuiInfo->FaceName[0] = L'\0'; GuiInfo->FontFamily = FF_DONTCARE; - GuiInfo->FontSize = 0; + GuiInfo->FontSize.X = 0; + GuiInfo->FontSize.Y = 0; GuiInfo->FontWeight = FW_DONTCARE; GuiInfo->UseRasterFonts = TRUE; Modified: branches/condrv_restructure/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/layout.c [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -120,8 +120,8 @@ hBrush = CreateSolidBrush(nbkColor); if (!hBrush) return FALSE; - Font = CreateFontW(LOWORD(GuiInfo->FontSize), - 0, // HIWORD(GuiInfo->FontSize), + Font = CreateFontW(GuiInfo->FontSize.X, + 0, // GuiInfo->FontSize.Y, 0, TA_BASELINE, GuiInfo->FontWeight, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -506,8 +506,8 @@ GuiData->hWindow = hWnd; - GuiData->Font = CreateFontW(LOWORD(GuiData->GuiInfo.FontSize), - 0, // HIWORD(GuiData->GuiInfo.FontSize), + GuiData->Font = CreateFontW(GuiData->GuiInfo.FontSize.X, + 0, // GuiData->GuiInfo.FontSize.Y, 0, TA_BASELINE, GuiData->GuiInfo.FontWeight, @@ -2321,6 +2321,18 @@ break; } + /* + * Undocumented message sent by Windows' console.dll for applying console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ + case WM_SETCONSOLEINFO: + { + GuiApplyWindowsConsoleSettings(GuiData, (HANDLE)wParam); + break; + } + case PM_CONSOLE_BEEP: DPRINT1("Beep !!\n"); Beep(800, 200); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -98,7 +98,8 @@ } else if (!wcscmp(szValueName, L"FontSize")) { - TermInfo->FontSize = Value; + TermInfo->FontSize.X = LOWORD(Value); + TermInfo->FontSize.Y = HIWORD(Value); RetVal = TRUE; } else if (!wcscmp(szValueName, L"FontWeight")) @@ -159,7 +160,10 @@ SetConsoleSetting(L"FaceName", REG_SZ, (wcslen(TermInfo->FaceName) + 1) * sizeof(WCHAR), TermInfo->FaceName, L'\0'); // wcsnlen SetConsoleSetting(L"FontFamily", REG_DWORD, sizeof(DWORD), &TermInfo->FontFamily, FF_DONTCARE); - SetConsoleSetting(L"FontSize", REG_DWORD, sizeof(DWORD), &TermInfo->FontSize, 0); + + Storage = MAKELONG(TermInfo->FontSize.X, TermInfo->FontSize.Y); + SetConsoleSetting(L"FontSize", REG_DWORD, sizeof(DWORD), &Storage, 0); + SetConsoleSetting(L"FontWeight", REG_DWORD, sizeof(DWORD), &TermInfo->FontWeight, FW_DONTCARE); Storage = TermInfo->FullScreen; @@ -200,7 +204,8 @@ wcsncpy(TermInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !! // TermInfo->FaceName[0] = L'\0'; TermInfo->FontFamily = FF_DONTCARE; - TermInfo->FontSize = 0; + TermInfo->FontSize.X = 0; + TermInfo->FontSize.Y = 0; TermInfo->FontWeight = FW_DONTCARE; TermInfo->UseRasterFonts = TRUE; @@ -544,4 +549,180 @@ return; } +/* + * Function for dealing with the undocumented message and structure used by + * Windows' console.dll for setting console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +VOID +GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData, + HANDLE hClientSection) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE Console = GuiData->Console; + PCONSOLE_PROCESS_DATA ProcessData; + HANDLE hSection = NULL; + ULONG ViewSize = 0; + PCONSOLE_STATE_INFO pConInfo = NULL; + CONSOLE_INFO ConInfo; + GUI_CONSOLE_INFO GuiInfo; + SIZE_T Length; + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + + /* Get the console leader process, our client */ + ProcessData = ConSrvGetConsoleLeaderProcess(Console); + + /* Duplicate the section handle for ourselves */ + Status = NtDuplicateObject(ProcessData->Process->ProcessHandle, + hClientSection, + NtCurrentProcess(), + &hSection, + 0, 0, DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error when mapping client handle, Status = %lu\n", Status); + goto Quit; + } + + /* Get a view of the shared section */ + Status = NtMapViewOfSection(hSection, + NtCurrentProcess(), + (PVOID*)&pConInfo, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error when mapping view of file, Status = %lu\n", Status); + goto Quit; + } + + _SEH2_TRY + { + /* Check that the section is well-sized */ + if ( (ViewSize < sizeof(CONSOLE_STATE_INFO)) || + (pConInfo->cbSize != sizeof(CONSOLE_STATE_INFO)) ) + { + DPRINT1("Error: section bad-sized: sizeof(Section) < sizeof(CONSOLE_STATE_INFO)\n"); + Status = STATUS_INVALID_VIEW_SIZE; + _SEH2_YIELD(goto Quit); + } + + // TODO: Check that GuiData->hWindow == pConInfo->hConsoleWindow + + /* Retrieve terminal informations */ + + // Console information + ConInfo.HistoryBufferSize = pConInfo->HistoryBufferSize; + ConInfo.NumberOfHistoryBuffers = pConInfo->NumberOfHistoryBuffers; + ConInfo.HistoryNoDup = !!pConInfo->HistoryNoDup; + ConInfo.QuickEdit = !!pConInfo->QuickEdit; + ConInfo.InsertMode = !!pConInfo->InsertMode; + ConInfo.ScreenBufferSize = pConInfo->ScreenBufferSize; + ConInfo.ConsoleSize = pConInfo->WindowSize; + ConInfo.CursorSize = pConInfo->CursorSize; + ConInfo.ScreenAttrib = pConInfo->ScreenColors; + ConInfo.PopupAttrib = pConInfo->PopupColors; + memcpy(&ConInfo.Colors, pConInfo->ColorTable, sizeof(ConInfo.Colors)); + ConInfo.CodePage = pConInfo->CodePage; + /**ConInfo.ConsoleTitle[MAX_PATH + 1] = pConInfo->ConsoleTitle; // FIXME: memcpy**/ +#if 0 + /* Title of the console, original one corresponding to the one set by the console leader */ + Length = min(sizeof(pConInfo->ConsoleTitle) / sizeof(pConInfo->ConsoleTitle[0]) - 1, + Console->OriginalTitle.Length / sizeof(WCHAR)); + wcsncpy(pSharedInfo->ci.ConsoleTitle, Console->OriginalTitle.Buffer, Length); +#endif + // ULONG ConInfo.InputBufferSize = pConInfo-> + // BOOLEAN ConInfo.CursorBlinkOn = pConInfo-> + // BOOLEAN ConInfo.ForceCursorOff = pConInfo-> + + + // Terminal information + Length = min(wcslen(pConInfo->FaceName) + 1, LF_FACESIZE); // wcsnlen + wcsncpy(GuiInfo.FaceName, pConInfo->FaceName, LF_FACESIZE); + GuiInfo.FaceName[Length] = L'\0'; + + GuiInfo.FontFamily = pConInfo->FontFamily; + GuiInfo.FontSize = pConInfo->FontSize; + GuiInfo.FontWeight = pConInfo->FontWeight; + GuiInfo.FullScreen = !!pConInfo->FullScreen; + GuiInfo.AutoPosition = !!pConInfo->AutoPosition; + GuiInfo.WindowOrigin = pConInfo->WindowPosition; + // BOOL GuiInfo.UseRasterFonts = pConInfo-> + // WORD GuiInfo.ShowWindow = pConInfo-> + + + + /* + * If we don't set the default parameters, + * apply them, otherwise just save them. + */ +#if 0 + if (pConInfo->ShowDefaultParams == FALSE) +#endif + { + /* Set the console informations */ + ConSrvApplyUserSettings(Console, &ConInfo); + + /* Set the terminal informations */ + + // memcpy(&GuiData->GuiInfo, &GuiInfo, sizeof(GUI_CONSOLE_INFO)); + + /* Move the window to the user's values */ + GuiData->GuiInfo.AutoPosition = GuiInfo.AutoPosition; + GuiData->GuiInfo.WindowOrigin = GuiInfo.WindowOrigin; + GuiConsoleMoveWindow(GuiData); + + InvalidateRect(GuiData->hWindow, NULL, TRUE); + + /* + * Apply full-screen mode. + */ + if (GuiInfo.FullScreen != GuiData->GuiInfo.FullScreen) + { + SwitchFullScreen(GuiData, GuiInfo.FullScreen); + } + } + +#if 0 + /* + * Save settings if needed + */ + // FIXME: Do it in the console properties applet ?? + if (SaveSettings) + { + DWORD ProcessId = HandleToUlong(ProcessData->Process->ClientId.UniqueProcess); + ConSrvWriteUserSettings(&ConInfo, ProcessId); + GuiConsoleWriteUserSettings(&GuiInfo, ConInfo.ConsoleTitle, ProcessId); + } +#endif + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("GuiApplyUserSettings - Caught an exception, Status = %08X\n", Status); + } + _SEH2_END; + +Quit: + /* Finally, close the section and return */ + if (hSection) + { + NtUnmapViewOfSection(NtCurrentProcess(), pConInfo); + NtClose(hSection); + } + + LeaveCriticalSection(&Console->Lock); + return; +} + /* EOF */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -14,7 +14,16 @@ #ifndef WM_APP #define WM_APP 0x8000 #endif -#define PM_APPLY_CONSOLE_INFO (WM_APP + 100) +/* Message sent by ReactOS' console.dll for applying console info */ +#define PM_APPLY_CONSOLE_INFO (WM_APP + 100) + +/* + * Undocumented message sent by Windows' console.dll for applying console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +#define WM_SETCONSOLEINFO (WM_USER + 201) /* STRUCTURES *****************************************************************/ @@ -22,9 +31,9 @@ { // FONTSIGNATURE FontSignature; WCHAR FaceName[LF_FACESIZE]; - UINT FontFamily; - DWORD FontSize; - DWORD FontWeight; + ULONG FontFamily; + COORD FontSize; + ULONG FontWeight; BOOL UseRasterFonts; BOOL FullScreen; /* Whether the console is displayed in full-screen or windowed mode */ @@ -34,6 +43,46 @@ BOOL AutoPosition; POINT WindowOrigin; } GUI_CONSOLE_INFO, *PGUI_CONSOLE_INFO; + +/* + * Undocumented structure used by Windows' console.dll for setting console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +#pragma pack(push, 1) +typedef struct _CONSOLE_STATE_INFO +{ + ULONG cbSize; + COORD ScreenBufferSize; + COORD WindowSize; + POINT WindowPosition; // WindowPosX and Y + + COORD FontSize; + ULONG FontFamily; + ULONG FontWeight; + WCHAR FaceName[LF_FACESIZE]; + + ULONG CursorSize; + BOOL FullScreen; + BOOL QuickEdit; + BOOL AutoPosition; + BOOL InsertMode; + + USHORT ScreenColors; // ScreenAttributes + USHORT PopupColors; // PopupAttributes + BOOL HistoryNoDup; + ULONG HistoryBufferSize; + ULONG NumberOfHistoryBuffers; + + COLORREF ColorTable[16]; + + ULONG CodePage; + HWND HWnd; + + WCHAR ConsoleTitle[256]; +} CONSOLE_STATE_INFO, *PCONSOLE_STATE_INFO; +#pragma pack(pop) #ifndef CONSOLE_H__ // If we aren't included by console.dll @@ -59,6 +108,9 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, HANDLE hClientSection, BOOL SaveSettings); +VOID +GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData, + HANDLE hClientSection); #endif Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] Wed Aug 6 20:49:10 2014 @@ -10,6 +10,8 @@ #pragma once /* STRUCTURES *****************************************************************/ + +#pragma pack(push, 1) /* * Structure used to hold terminal-specific information @@ -69,6 +71,8 @@ TERMINAL_INFO TerminalInfo; /* Frontend-specific parameters */ } CONSOLE_PROPS, *PCONSOLE_PROPS; +#pragma pack(pop) + /* FUNCTIONS ******************************************************************/ #ifndef CONSOLE_H__ // If we aren't included by console.dll

10 years, 4 months

[hbelusca] 63818: [KENREL32]: Silent few DPRINTs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 6 20:30:24 2014 New Revision: 63818 URL: http://svn.reactos.org/svn/reactos?rev=63818&view=rev Log: [KENREL32]: Silent few DPRINTs. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Wed Aug 6 20:30:24 2014 @@ -399,7 +399,7 @@ _SEH2_END; NumCells = SizeX * SizeY; - DPRINT1("IntReadConsoleOutput: (%d x %d)\n", SizeX, SizeY); + DPRINT("IntReadConsoleOutput: (%d x %d)\n", SizeX, SizeY); /* * For optimization purposes, Windows (and hence ReactOS, too, for @@ -869,7 +869,7 @@ _SEH2_END; NumCells = SizeX * SizeY; - DPRINT1("IntWriteConsoleOutput: (%d x %d)\n", SizeX, SizeY); + DPRINT("IntWriteConsoleOutput: (%d x %d)\n", SizeX, SizeY); /* * For optimization purposes, Windows (and hence ReactOS, too, for

10 years, 4 months

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 August 2014