Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/06: [LDR] Add debug logging when we encountered an exception in dll/tls callbacks. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55053f0099c0f29f5e7d7… commit 55053f0099c0f29f5e7d7fba5c87b46599f0b3b7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 29 17:13:42 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [LDR] Add debug logging when we encountered an exception in dll/tls callbacks. CORE-14532 --- dll/ntdll/include/ntdllp.h | 6 +++--- dll/ntdll/ldr/ldrapi.c | 3 ++- dll/ntdll/ldr/ldrinit.c | 27 ++++++++++++++++----------- dll/ntdll/ldr/ldrutils.c | 13 +++++++------ 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 29ade67b45..934a4b2205 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -62,9 +62,9 @@ VOID NTAPI LdrpInitializeThread(IN PCONTEXT Context); NTSTATUS NTAPI LdrpInitializeTls(VOID); NTSTATUS NTAPI LdrpAllocateTls(VOID); VOID NTAPI LdrpFreeTls(VOID); -VOID NTAPI LdrpCallTlsInitializers(PVOID BaseAddress, ULONG Reason); -BOOLEAN NTAPI LdrpCallInitRoutine(PDLL_INIT_ROUTINE EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); -NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); +VOID NTAPI LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN ULONG Reason); +BOOLEAN NTAPI LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, IN PVOID BaseAddress, IN ULONG Reason, IN PVOID Context); +NTSTATUS NTAPI LdrpInitializeProcess(IN PCONTEXT Context, IN PVOID SystemArgument1); VOID NTAPI LdrpInitFailure(NTSTATUS Status); VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry); VOID NTAPI LdrpEnsureLoaderLockIsHeld(VOID); diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index d9da842374..15f36bb2be 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1485,7 +1485,8 @@ LdrUnloadDll(IN PVOID BaseAddress) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 96af326062..058a128bdf 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -561,7 +561,7 @@ LdrpInitializeThread(IN PCONTEXT Context) if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_ATTACH); } } @@ -581,7 +581,8 @@ LdrpInitializeThread(IN PCONTEXT Context) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_ATTACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -610,7 +611,7 @@ LdrpInitializeThread(IN PCONTEXT Context) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_ATTACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -818,7 +819,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) if (LdrEntry->TlsIndex && Context) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_ATTACH); } /* Call the Entrypoint */ @@ -835,6 +836,8 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DllStatus = FALSE; + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_ATTACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -889,7 +892,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_ATTACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -996,7 +999,7 @@ LdrShutdownProcess(VOID) if (LdrEntry->TlsIndex) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_DETACH); } /* Call the Entrypoint */ @@ -1009,7 +1012,8 @@ LdrShutdownProcess(VOID) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -1034,7 +1038,7 @@ LdrShutdownProcess(VOID) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_DETACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1123,7 +1127,7 @@ LdrShutdownThread(VOID) if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_DETACH); } } @@ -1141,7 +1145,8 @@ LdrShutdownThread(VOID) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -1167,7 +1172,7 @@ LdrShutdownThread(VOID) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_DETACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5459d4a5d2..5f55938d13 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -470,7 +470,7 @@ LdrpUpdateLoadCount2(IN PLDR_DATA_TABLE_ENTRY LdrEntry, VOID NTAPI -LdrpCallTlsInitializers(IN PVOID BaseAddress, +LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN ULONG Reason) { PIMAGE_TLS_DIRECTORY TlsDirectory; @@ -478,7 +478,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, ULONG Size; /* Get the TLS Directory */ - TlsDirectory = RtlImageDirectoryEntryToData(BaseAddress, + TlsDirectory = RtlImageDirectoryEntryToData(LdrEntry->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &Size); @@ -497,7 +497,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, if (ShowSnaps) { DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n", - BaseAddress, TlsDirectory, Array); + LdrEntry->DllBase, TlsDirectory, Array); } /* Loop the array */ @@ -510,12 +510,12 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, if (ShowSnaps) { DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n", - BaseAddress, Callback); + LdrEntry->DllBase, Callback); } /* Call it */ LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, - BaseAddress, + LdrEntry->DllBase, Reason, NULL); } @@ -524,7 +524,8 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("LDR: Exception 0x%x during Tls Callback(%u) for %wZ\n", + _SEH2_GetExceptionCode(), Reason, &LdrEntry->BaseDllName); } _SEH2_END; }

1 0

01/06: [LDR] Protect calls from LdrpCallInitRoutine and LdrpCallTlsInitializers with SEH. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfff8ed0d82e433b9f620… commit dfff8ed0d82e433b9f620b3ac77ce38ecfa42d05 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 21:51:20 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:00 2018 +0200 [LDR] Protect calls from LdrpCallInitRoutine and LdrpCallTlsInitializers with SEH. CORE-14532 --- dll/ntdll/ldr/ldrapi.c | 16 +++- dll/ntdll/ldr/ldrinit.c | 190 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 139 insertions(+), 67 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index 6e4019c600..d9da842374 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1476,10 +1476,18 @@ LdrUnloadDll(IN PVOID BaseAddress) LdrEntry->EntryPointActivationContext); /* Call the entrypoint */ - LdrpCallInitRoutine(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - NULL); + _SEH2_TRY + { + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Release the context */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index dc0a3701cc..96af326062 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -552,30 +552,38 @@ LdrpInitializeThread(IN PCONTEXT Context) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Make sure we're not shutting down */ + if (!LdrpShutdownInProgress) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + } + } + /* Make sure we're not shutting down */ if (!LdrpShutdownInProgress) { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread attaching, %p/%p\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint, + NtCurrentTeb()->RealClientId.UniqueProcess, + NtCurrentTeb()->RealClientId.UniqueThread); + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_THREAD_ATTACH, + NULL); } } - - /* Make sure we're not shutting down */ - if (!LdrpShutdownInProgress) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread attaching, %p/%p\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint, - NtCurrentTeb()->RealClientId.UniqueProcess, - NtCurrentTeb()->RealClientId.UniqueThread); - LdrpCallInitRoutine(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_THREAD_ATTACH, - NULL); + /* Do nothing */ } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -599,8 +607,16 @@ LdrpInitializeThread(IN PCONTEXT Context) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -796,23 +812,31 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex && Context) + _SEH2_TRY { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); - } + /* Check if it has TLS */ + if (LdrEntry->TlsIndex && Context) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + } - /* Call the Entrypoint */ - if (ShowSnaps) + /* Call the Entrypoint */ + if (ShowSnaps) + { + DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", + &LdrEntry->BaseDllName, EntryPoint); + } + DllStatus = LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_ATTACH, + Context); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", - &LdrEntry->BaseDllName, EntryPoint); + DllStatus = FALSE; } - DllStatus = LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_ATTACH, - Context); + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -862,8 +886,16 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -958,20 +990,28 @@ LdrShutdownProcess(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); - } + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); + } - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread detaching\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - (PVOID)1); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint); + LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + (PVOID)1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -991,8 +1031,16 @@ LdrShutdownProcess(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -1066,28 +1114,36 @@ LdrShutdownThread(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Make sure we're not shutting down */ + if (!LdrpShutdownInProgress) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + } + } + /* Make sure we're not shutting down */ if (!LdrpShutdownInProgress) { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint); + LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_THREAD_DETACH, + NULL); } } - - /* Make sure we're not shutting down */ - if (!LdrpShutdownInProgress) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread detaching\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_THREAD_DETACH, - NULL); + /* Do nothing */ } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -1108,8 +1164,16 @@ LdrShutdownThread(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx);

1 0

05/05: [NTOSKRNL] Don't use anonymus allocations for MM objects
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ea68d0510aafddec1334… commit 1ea68d0510aafddec1334d3465fa47f03f391ca5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:29:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Don't use anonymus allocations for MM objects --- ntoskrnl/mm/pagefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 29cfdbc820..bbf3d94d3c 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -651,13 +651,13 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_FLOPPY_VOLUME; } - PagingFile = ExAllocatePool(NonPagedPool, sizeof(*PagingFile)); + PagingFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*PagingFile), TAG_MM); if (PagingFile == NULL) { ObDereferenceObject(FileObject); ZwClose(FileHandle); ExFreePoolWithTag(Buffer, TAG_MM); - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory(PagingFile, sizeof(*PagingFile)); @@ -677,11 +677,11 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, TAG_MM); if (PagingFile->AllocMap == NULL) { - ExFreePool(PagingFile); + ExFreePoolWithTag(PagingFile, TAG_MM); ObDereferenceObject(FileObject); ZwClose(FileHandle); ExFreePoolWithTag(Buffer, TAG_MM); - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } RtlInitializeBitMap(PagingFile->AllocMap, @@ -698,7 +698,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, MmSwapSpaceMessage = FALSE; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* EOF */

1 0

04/05: [NTOSKRNL] Keep page file name along the page file and free it on shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34e8f45122982e43a7f73… commit 34e8f45122982e43a7f73ebed7d71d43d31020cc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:24:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Keep page file name along the page file and free it on shutdown --- ntoskrnl/include/internal/mm.h | 1 + ntoskrnl/mm/pagefile.c | 97 +++++++++++++++++++++++++++++++----------- ntoskrnl/mm/shutdown.c | 5 +++ 3 files changed, 77 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 6f0972da40..38b34cd74f 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -434,6 +434,7 @@ typedef struct _MMPAGING_FILE PFN_NUMBER UsedPages; PRTL_BITMAP AllocMap; KSPIN_LOCK AllocMapLock; + UNICODE_STRING PageFileName; } MMPAGING_FILE, *PMMPAGING_FILE; diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 2859a35fd1..29cfdbc820 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -376,11 +376,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, ULONG AllocMapSize; ULONG Count; KPROCESSOR_MODE PreviousMode; - UNICODE_STRING CapturedFileName; + UNICODE_STRING PageFileName; LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; FILE_FS_DEVICE_INFORMATION FsDeviceInfo; SECURITY_DESCRIPTOR SecurityDescriptor; PACL Dacl; + PWSTR Buffer; DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); @@ -403,6 +404,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeInitialSize = ProbeForReadLargeInteger(InitialSize); SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); + + PageFileName.Length = FileName->Length; + PageFileName.MaximumLength = FileName->MaximumLength; + PageFileName.Buffer = FileName->Buffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -415,6 +420,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeInitialSize = *InitialSize; SafeMaximumSize = *MaximumSize; + + PageFileName.Length = FileName->Length; + PageFileName.MaximumLength = FileName->MaximumLength; + PageFileName.Buffer = FileName->Buffer; } /* Pagefiles can't be larger than 4GB and ofcourse the minimum should be @@ -432,20 +441,55 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_INVALID_PARAMETER_MIX; } - Status = ProbeAndCaptureUnicodeString(&CapturedFileName, - PreviousMode, - FileName); - if (!NT_SUCCESS(Status)) + /* Validate name length */ + if (PageFileName.Length > 128 * sizeof(WCHAR)) + { + return STATUS_OBJECT_NAME_INVALID; + } + + /* We won't care about any potential UNICODE_NULL */ + PageFileName.MaximumLength = PageFileName.Length; + /* Allocate a buffer to keep name copy */ + Buffer = ExAllocatePoolWithTag(PagedPool, PageFileName.Length, TAG_MM); + if (Buffer == NULL) { - return(Status); + return STATUS_INSUFFICIENT_RESOURCES; } + /* Copy name */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (PageFileName.Length != 0) + { + ProbeForRead(PageFileName.Buffer, PageFileName.Length, sizeof(WCHAR)); + } + + RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(Buffer, TAG_MM); + + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); + } + + /* Erase caller's buffer with ours */ + PageFileName.Buffer = Buffer; + /* Create the security descriptor for the page file */ Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); if (!NT_SUCCESS(Status)) { - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -455,8 +499,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Dacl = ExAllocatePoolWithTag(PagedPool, Count, 'lcaD'); if (Dacl == NULL) { - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INSUFFICIENT_RESOURCES; } @@ -465,8 +508,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -475,8 +517,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -485,8 +526,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -495,13 +535,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } InitializeObjectAttributes(&ObjectAttributes, - &CapturedFileName, + &PageFileName, OBJ_KERNEL_HANDLE, NULL, &SecurityDescriptor); @@ -551,13 +590,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); } - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); if (!NT_SUCCESS(Status)) { DPRINT1("Failed creating page file: %lx\n", Status); ExFreePoolWithTag(Dacl, 'lcaD'); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } /* Set the security descriptor */ @@ -568,6 +606,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ExFreePoolWithTag(Dacl, 'lcaD'); ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } } @@ -584,7 +623,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status) || !NT_SUCCESS(IoStatus.Status)) { ZwClose(FileHandle); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } Status = ObReferenceObjectByHandle(FileHandle, @@ -596,7 +636,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ZwClose(FileHandle); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } /* Deny page file creation on a floppy disk */ @@ -606,6 +647,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ObDereferenceObject(FileObject); ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_FLOPPY_VOLUME; } @@ -614,7 +656,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ObDereferenceObject(FileObject); ZwClose(FileHandle); - return(STATUS_NO_MEMORY); + ExFreePoolWithTag(Buffer, TAG_MM); + return STATUS_NO_MEMORY; } RtlZeroMemory(PagingFile, sizeof(*PagingFile)); @@ -626,6 +669,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PagingFile->FreePages = (ULONG)(SafeInitialSize.QuadPart / PAGE_SIZE); PagingFile->UsedPages = 0; KeInitializeSpinLock(&PagingFile->AllocMapLock); + PagingFile->PageFileName = PageFileName; AllocMapSize = sizeof(RTL_BITMAP) + (((PagingFile->FreePages + 31) / 32) * sizeof(ULONG)); PagingFile->AllocMap = ExAllocatePoolWithTag(NonPagedPool, @@ -636,7 +680,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, ExFreePool(PagingFile); ObDereferenceObject(FileObject); ZwClose(FileHandle); - return(STATUS_NO_MEMORY); + ExFreePoolWithTag(Buffer, TAG_MM); + return STATUS_NO_MEMORY; } RtlInitializeBitMap(PagingFile->AllocMap, diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index d4093015ff..c80cc527a3 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -25,6 +25,11 @@ MiShutdownSystem(VOID) /* Loop through all the paging files */ for (i = 0; i < MmNumberOfPagingFiles; i++) { + /* Free page file name */ + ASSERT(MmPagingFile[i]->PageFileName.Buffer != NULL); + ExFreePoolWithTag(MmPagingFile[i]->PageFileName.Buffer, TAG_MM); + MmPagingFile[i]->PageFileName.Buffer = NULL; + /* And close them */ ZwClose(MmPagingFile[i]->FileHandle); }

1 0

03/05: [NTOSKRNL] Dereference page file objects in MM shutdown phase 1
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aaadf39db0108057d5c3… commit 5aaadf39db0108057d5c3aaf983233e567715a27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:23:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Dereference page file objects in MM shutdown phase 1 Hack the call the MM shutdown phase 1 --- ntoskrnl/mm/shutdown.c | 13 +++++++++++++ ntoskrnl/po/poshtdwn.c | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index 50522dd4e8..d4093015ff 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -39,8 +39,21 @@ MmShutdownSystem(IN ULONG Phase) { MiShutdownSystem(); } + else if (Phase == 1) + { + ULONG i; + + /* Loop through all the paging files */ + for (i = 0; i < MmNumberOfPagingFiles; i++) + { + /* And dereference them */ + ObDereferenceObject(MmPagingFile[i]->FileObject); + } + } else { + ASSERT(Phase == 2); + UNIMPLEMENTED; } } diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 070cf67e54..8a33157fd0 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -294,6 +294,11 @@ PopGracefulShutdown(IN PVOID Context) IoShutdownSystem(1); CcWaitForCurrentLazyWriterActivity(); + /* FIXME: Calling Mm shutdown phase 1 here to get page file dereference + * but it shouldn't be called here. Only phase 2 should be called. + */ + MmShutdownSystem(1); + /* Note that here, we should broadcast the power IRP to devices */ /* In this step, the HAL disables any wake timers */

1 0

02/05: [NTOSKRNL] Close page files (and delete them!) on shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3814a822f1de78266e1d0… commit 3814a822f1de78266e1d0b82429c146a6a448cc7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 07:52:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Close page files (and delete them!) on shutdown --- ntoskrnl/include/internal/mm.h | 18 ++++++++++++++++++ ntoskrnl/mm/pagefile.c | 20 +------------------- ntoskrnl/mm/shutdown.c | 9 +++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index f7b08a2d0f..6f0972da40 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -102,6 +102,8 @@ typedef ULONG_PTR SWAPENTRY; #define SESSION_POOL_MASK 32 #define VERIFIER_POOL_MASK 64 +#define MAX_PAGING_FILES (16) + // FIXME: use ALIGN_UP_BY #define MM_ROUND_UP(x,s) \ ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1))) @@ -421,6 +423,22 @@ typedef struct _MM_PAGED_POOL_INFO extern MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; +/* Page file information */ +typedef struct _MMPAGING_FILE +{ + PFILE_OBJECT FileObject; + HANDLE FileHandle; + LARGE_INTEGER MaximumSize; + LARGE_INTEGER CurrentSize; + PFN_NUMBER FreePages; + PFN_NUMBER UsedPages; + PRTL_BITMAP AllocMap; + KSPIN_LOCK AllocMapLock; +} +MMPAGING_FILE, *PMMPAGING_FILE; + +extern PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; + typedef VOID (*PMM_ALTER_REGION_FUNC)( PMMSUPPORT AddressSpace, diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 347ffec4a5..2859a35fd1 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -36,30 +36,12 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif - -/* TYPES *********************************************************************/ - -typedef struct _MMPAGING_FILE -{ - PFILE_OBJECT FileObject; - HANDLE FileHandle; - LARGE_INTEGER MaximumSize; - LARGE_INTEGER CurrentSize; - PFN_NUMBER FreePages; - PFN_NUMBER UsedPages; - PRTL_BITMAP AllocMap; - KSPIN_LOCK AllocMapLock; -} -MMPAGING_FILE, *PMMPAGING_FILE; - /* GLOBALS *******************************************************************/ #define PAIRS_PER_RUN (1024) -#define MAX_PAGING_FILES (16) - /* List of paging files, both used and free */ -static PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; +PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; /* Lock for examining the list of paging files */ static KSPIN_LOCK PagingFileListLock; diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index 68549983bf..50522dd4e8 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -20,6 +20,15 @@ VOID MiShutdownSystem(VOID) { + ULONG i; + + /* Loop through all the paging files */ + for (i = 0; i < MmNumberOfPagingFiles; i++) + { + /* And close them */ + ZwClose(MmPagingFile[i]->FileHandle); + } + UNIMPLEMENTED; }

1 0

01/05: [NTOSKRNL] Stub MM shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d793f196df4eb5ca7dcd4… commit d793f196df4eb5ca7dcd4b4656f34ad5b611aa50 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 07:42:57 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Stub MM shutdown --- ntoskrnl/include/internal/mm.h | 4 ++++ ntoskrnl/mm/shutdown.c | 37 +++++++++++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 1 + ntoskrnl/po/poshtdwn.c | 1 + 4 files changed, 43 insertions(+) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 8d0234b4aa..f7b08a2d0f 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1474,6 +1474,10 @@ NTAPI MmSetSessionLocaleId( _In_ LCID LocaleId); +/* shutdown.c *****************************************************************/ + +VOID +MmShutdownSystem(IN ULONG Phase); /* virtual.c *****************************************************************/ diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c new file mode 100644 index 0000000000..68549983bf --- /dev/null +++ b/ntoskrnl/mm/shutdown.c @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/shutdown.c + * PURPOSE: Memory Manager Shutdown + * PROGRAMMERS: + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +MiShutdownSystem(VOID) +{ + UNIMPLEMENTED; +} + +VOID +MmShutdownSystem(IN ULONG Phase) +{ + if (Phase == 0) + { + MiShutdownSystem(); + } + else + { + UNIMPLEMENTED; + } +} diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 94e0dc8055..147691bd4c 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -226,6 +226,7 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/region.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/rmap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/section.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/shutdown.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/devicemap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obdir.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obhandle.c diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 719f8b8b93..070cf67e54 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -283,6 +283,7 @@ PopGracefulShutdown(IN PVOID Context) ExShutdownSystem(); /* Note that modified pages should be written here (MiShutdownSystem) */ + MmShutdownSystem(0); /* Flush all user files before we start shutting down IO */ /* This is where modified pages are written back by the IO manager */

1 0

01/01: [UMPNPMGR] Partially implement ReenumerateDeviceInstance which is needed by the Lenovo T400 network driver installer
by Eric Kohl 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d26058a8e1b61da85ce8… commit 9d26058a8e1b61da85ce8f2a4f81fc7dcae63112 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 12 22:19:05 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 12 22:26:22 2018 +0200 [UMPNPMGR] Partially implement ReenumerateDeviceInstance which is needed by the Lenovo T400 network driver installer --- base/services/umpnpmgr/umpnpmgr.c | 36 +++++++++++++++++++++++++++++++----- sdk/include/ndk/cmtypes.h | 7 +++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 478bcc7825..02eaf05b3a 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -1959,11 +1959,36 @@ DisableDeviceInstance(LPWSTR pszDeviceInstance) static CONFIGRET -ReenumerateDeviceInstance(LPWSTR pszDeviceInstance) +ReenumerateDeviceInstance( + _In_ LPWSTR pszDeviceInstance, + _In_ ULONG ulFlags) { - DPRINT("ReenumerateDeviceInstance: not implemented\n"); - /* FIXME */ - return CR_CALL_NOT_IMPLEMENTED; + PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA EnumerateDeviceData; + CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; + + DPRINT1("ReenumerateDeviceInstance(%S 0x%08lx)\n", + pszDeviceInstance, ulFlags); + + if (ulFlags & ~CM_REENUMERATE_BITS) + return CR_INVALID_FLAG; + + if (ulFlags & CM_REENUMERATE_RETRY_INSTALLATION) + { + DPRINT1("CM_REENUMERATE_RETRY_INSTALLATION not implemented!\n"); + } + + RtlInitUnicodeString(&EnumerateDeviceData.DeviceInstance, + pszDeviceInstance); + EnumerateDeviceData.Flags = 0; + + Status = NtPlugPlayControl(PlugPlayControlEnumerateDevice, + &EnumerateDeviceData, + sizeof(PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + + return ret; } @@ -2004,7 +2029,8 @@ PNP_DeviceInstanceAction( break; case PNP_DEVINST_REENUMERATE: - ret = ReenumerateDeviceInstance(pszDeviceInstance1); + ret = ReenumerateDeviceInstance(pszDeviceInstance1, + ulFlags); break; default: diff --git a/sdk/include/ndk/cmtypes.h b/sdk/include/ndk/cmtypes.h index 1d58d93b68..2b854923cf 100644 --- a/sdk/include/ndk/cmtypes.h +++ b/sdk/include/ndk/cmtypes.h @@ -445,6 +445,13 @@ typedef struct _PLUGPLAY_EVENT_BLOCK // Plug and Play Control Classes // +// Class 0x00 +typedef struct _PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Flags; +} PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA, *PPLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA; + //Class 0x09 typedef struct _PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA {

1 0

01/01: [SYSTEMINFO] Fix various bugs and add SMBIOS support
by Stanislav Motylkov 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a91df2330848ad794534c… commit a91df2330848ad794534ca864ce1c04078b33f80 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 31 18:57:58 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 21:18:31 2018 +0200 [SYSTEMINFO] Fix various bugs and add SMBIOS support --- .../sysutils/systeminfo/CMakeLists.txt | 5 ++ .../applications/sysutils/systeminfo/systeminfo.c | 66 +++++++++++++++++----- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt index 4d6413e342..69f1690297 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt @@ -1,5 +1,10 @@ +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp + ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + add_executable(systeminfo systeminfo.c systeminfo.rc) set_module_type(systeminfo win32cui) +target_link_libraries(systeminfo udmihelp) add_importlibs(systeminfo user32 advapi32 netapi32 shlwapi iphlpapi ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET systeminfo DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c index 12818ecc5e..e0adc2d5a7 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c +++ b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c @@ -27,6 +27,8 @@ #include <shlwapi.h> #include <iphlpapi.h> #include <winsock2.h> +#include <udmihelp.h> +#include <dmilib.h> #include "resource.h" @@ -62,7 +64,7 @@ RegGetSZ(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR lpBuf, DWORD c wprintf(L"Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); dwBytes = 0; } - else + else if (dwBytes == 0) { wcscpy(lpBuf, L"N/A"); dwBytes = 6; @@ -173,7 +175,7 @@ FormatDateTime(time_t Time, LPWSTR lpBuf) /* Copy time now */ i += swprintf(lpBuf + i, L", "); - i += 2; + GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, BUFFER_SIZE - i); } @@ -236,6 +238,8 @@ AllSysInfo(VOID) HKEY hKey; PIP_ADAPTER_ADDRESSES pAdapters; ULONG cbAdapters; + PVOID SMBiosBuf; + PCHAR DmiStrings[ID_STRINGS_MAX] = { 0 }; if (!GetSystemDirectoryW(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) { @@ -319,23 +323,34 @@ AllSysInfo(VOID) swprintf(Buf, Tmp, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); PrintRow(IDS_UP_TIME, FALSE, L"%s", Buf); + // prepare SMBIOS data + SMBiosBuf = LoadSMBiosData(DmiStrings); + //getting System Manufacturer; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Manufacturer for Win >= 6.0 swprintf(Tmp, L"%s\\oeminfo.ini", szSystemDir); GetPrivateProfileStringW(L"General", L"Manufacturer", - L"To Be Filled By O.E.M.", + L"", Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); + if (wcslen(Buf) == 0 && SMBiosBuf) + { + GetSMBiosStringW(DmiStrings[SYS_VENDOR], Buf, _countof(Buf), FALSE); + } PrintRow(IDS_SYS_MANUFACTURER, FALSE, L"%s", Buf); //getting System Model; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Model for Win >= 6.0 GetPrivateProfileStringW(L"General", L"Model", - L"To Be Filled By O.E.M.", + L"", Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); + if (wcslen(Buf) == 0 && SMBiosBuf) + { + GetSMBiosStringW(DmiStrings[SYS_PRODUCT], Buf, _countof(Buf), FALSE); + } PrintRow(IDS_SYS_MODEL, FALSE, L"%s", Buf); //getting System type @@ -375,21 +390,44 @@ AllSysInfo(VOID) } //getting BIOS Version - RegGetSZ(HKEY_LOCAL_MACHINE, - L"HARDWARE\\DESCRIPTION\\System", - L"SystemBiosVersion", - Buf, - BUFFER_SIZE); + if (SMBiosBuf) + { + j = GetSMBiosStringW(DmiStrings[BIOS_VENDOR], Buf, BUFFER_SIZE, TRUE); + if (j + 1 < BUFFER_SIZE) + { + Buf[j++] = L' '; + Buf[j] = L'\0'; + } + GetSMBiosStringW(DmiStrings[BIOS_VERSION], Buf + j, BUFFER_SIZE - j, TRUE); + } + else + { + RegGetSZ(HKEY_LOCAL_MACHINE, + L"HARDWARE\\DESCRIPTION\\System", + L"SystemBiosVersion", + Buf, + BUFFER_SIZE); + } PrintRow(IDS_BIOS_VERSION, FALSE, L"%s", Buf); //gettings BIOS date - RegGetSZ(HKEY_LOCAL_MACHINE, - L"HARDWARE\\DESCRIPTION\\System", - L"SystemBiosDate", - Buf, - BUFFER_SIZE); + if (SMBiosBuf) + { + GetSMBiosStringW(DmiStrings[BIOS_DATE], Buf, BUFFER_SIZE, TRUE); + } + else + { + RegGetSZ(HKEY_LOCAL_MACHINE, + L"HARDWARE\\DESCRIPTION\\System", + L"SystemBiosDate", + Buf, + BUFFER_SIZE); + } PrintRow(IDS_BIOS_DATE, FALSE, L"%s", Buf); + // clean SMBIOS data + FreeSMBiosData(SMBiosBuf); + //getting ReactOS Directory if (!GetWindowsDirectoryW(Buf, BUFFER_SIZE)) wprintf(L"Error! GetWindowsDirectory failed.");

1 0

01/01: [WIN32SS][FONT] Fix font metrics (#713)
by Katayama Hirofumi MZ 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35f62fc5ba0b69e7335ff… commit 35f62fc5ba0b69e7335ff41400cb3b45660f4557 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 12 22:12:13 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 15:12:13 2018 +0200 [WIN32SS][FONT] Fix font metrics (#713) Fix vertical alignment and Aspect penalty; improve font penalty system; fixes for Wine tests. This is an update of #706. See CORE-11536 for more details. The display of the following programs is fixed: - Total Commander 8.52 setup: font displayed too large - CORE-11620. - Effective File Search 6.8.1 german localization text rendering issues - CORE-14378. - Font garbage in register splash screen in Foxit Reader 7.1.5 - CORE-9767. - Calipers-1 is not displayed correctly - CORE-14302. - Some MSI-installers draw their dialogs too large (example: Click-N-Type Virtual Keyboard 3.03.0412) - CORE-13161. - Irfanview 4.50: font in zoom combobox displayed too large - CORE-14396. - Rufus: The window and controls are displayed larger than necessary - CORE-14461. --- base/shell/explorer/trayclock.cpp | 2 +- win32ss/gdi/eng/engobjects.h | 4 + win32ss/gdi/ntgdi/freetype.c | 245 ++++++++++++++++++++++++++++++-------- win32ss/gdi/ntgdi/text.c | 4 +- win32ss/user/ntuser/draw.c | 1 + win32ss/user/ntuser/painting.c | 2 +- win32ss/user/rtl/text.c | 4 +- 7 files changed, 208 insertions(+), 54 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 9575783639..b4e85d951c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -534,7 +534,7 @@ LRESULT CTrayClockWnd::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH hPrevFont = (HFONT) SelectObject(hDC, hFont); - rcClient.top = (rcClient.bottom / 2) - (CurrentSize.cy / 2); + rcClient.top = (rcClient.bottom - CurrentSize.cy) / 2; rcClient.bottom = rcClient.top + CurrentSize.cy; for (i = 0, line = 0; diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index c79832aff9..dc579664e6 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -160,8 +160,12 @@ typedef struct _FONTGDI { LONG tmDescent; LONG tmInternalLeading; LONG EmHeight; + LONG Magic; } FONTGDI, *PFONTGDI; +/* The initialized 'Magic' value in FONTGDI */ +#define FONTGDI_MAGIC 0x20110311 + typedef struct _PATHGDI { PATHOBJ PathObj; } PATHGDI; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 9d380c0566..31d68a1615 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -805,6 +805,9 @@ WeightFromStyle(const char *style_name) return FW_NORMAL; } +static FT_Error +IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight); + static INT FASTCALL IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, PSHARED_FACE SharedFace, FT_Long FontIndex, INT CharSetIndex) @@ -1024,6 +1027,10 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, DPRINT("Num glyphs: %d\n", Face->num_glyphs); DPRINT("CharSet: %d\n", FontGDI->CharSet); + IntLockFreeType(); + IntRequestFontSize(NULL, FontGDI, 0, 0); + IntUnLockFreeType(); + /* Add this font resource to the font table */ Entry->Font = FontGDI; Entry->NotEnum = (Characteristics & FR_NOT_ENUM); @@ -1535,7 +1542,6 @@ static BOOL face_has_symbol_charmap(FT_Face ft_face) return FALSE; } - static void FASTCALL FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, TT_OS2 *pOS2, TT_HoriHeader *pHori, @@ -1595,16 +1601,14 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, Descent = pOS2->usWinDescent; } -#if 0 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */ - TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6; - TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6; -#else /* This (ros) code was previously affected by a FreeType bug, but it works now */ - TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* Units above baseline */ - TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* Units below baseline */ -#endif - TM->tmInternalLeading = (FT_MulFix(Ascent + Descent - Face->units_per_EM, YScale) + 32) >> 6; - + if (FontGDI->Magic != FONTGDI_MAGIC) + { + IntRequestFontSize(NULL, FontGDI, 0, 0); + } + TM->tmAscent = FontGDI->tmAscent; + TM->tmDescent = FontGDI->tmDescent; TM->tmHeight = TM->tmAscent + TM->tmDescent; + TM->tmInternalLeading = FontGDI->tmInternalLeading; /* MSDN says: * el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender))) @@ -3023,39 +3027,104 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } -static INT -IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG Width, LONG Height) +static FT_Error +IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) { + FT_Error error; FT_Size_RequestRec req; FT_Face face = FontGDI->SharedFace->Face; + TT_OS2 *pOS2; + TT_HoriHeader *pHori; + FT_WinFNT_HeaderRec WinFNT; + LONG Ascent, Descent, Sum, EmHeight64; + + lfWidth = abs(lfWidth); + if (lfHeight == 0) + { + if (lfWidth == 0) + { + DPRINT("lfHeight and lfWidth are zero.\n"); + lfHeight = -16; + } + else + { + lfHeight = lfWidth; + } + } - if (Width < 0) - Width = -Width; + if (lfHeight == -1) + lfHeight = -2; + + ASSERT_FREETYPE_LOCK_HELD(); + pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); + pHori = (TT_HoriHeader *)FT_Get_Sfnt_Table(face, FT_SFNT_HHEA); - if (Height < 0) + if (!pOS2 || !pHori) { - Height = -Height; + error = FT_Get_WinFNT_Header(face, &WinFNT); + if (error) + return error; + + FontGDI->tmHeight = WinFNT.pixel_height; + FontGDI->tmAscent = WinFNT.ascent; + FontGDI->tmDescent = FontGDI->tmHeight - FontGDI->tmAscent; + FontGDI->tmInternalLeading = WinFNT.internal_leading; + FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; + FontGDI->EmHeight = max(FontGDI->EmHeight, 1); + FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX); + FontGDI->Magic = FONTGDI_MAGIC; + + req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; + req.width = 0; + req.height = (FT_Long)(FontGDI->EmHeight << 6); + req.horiResolution = 0; + req.vertResolution = 0; + return FT_Request_Size(face, &req); } - if (Height == 0) + + if (lfHeight > 0) { - Height = dc->ppdev->devinfo.lfDefaultFont.lfHeight; + /* case (A): lfHeight is positive */ + Sum = pOS2->usWinAscent + pOS2->usWinDescent; + if (Sum == 0) + { + Ascent = pHori->Ascender; + Descent = -pHori->Descender; + Sum = Ascent + Descent; + } + else + { + Ascent = pOS2->usWinAscent; + Descent = pOS2->usWinDescent; + } + + FontGDI->tmAscent = FT_MulDiv(lfHeight, Ascent, Sum); + FontGDI->tmDescent = FT_MulDiv(lfHeight, Descent, Sum); + FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent; + FontGDI->tmInternalLeading = FontGDI->tmHeight - FT_MulDiv(lfHeight, face->units_per_EM, Sum); } - if (Height == 0) + else if (lfHeight < 0) { - Height = Width; + /* case (B): lfHeight is negative */ + FontGDI->tmAscent = FT_MulDiv(-lfHeight, pOS2->usWinAscent, face->units_per_EM); + FontGDI->tmDescent = FT_MulDiv(-lfHeight, pOS2->usWinDescent, face->units_per_EM); + FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent; + FontGDI->tmInternalLeading = FontGDI->tmHeight + lfHeight; } - if (Height < 1) - Height = 1; + FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; + FontGDI->EmHeight = max(FontGDI->EmHeight, 1); + FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX); + FontGDI->Magic = FONTGDI_MAGIC; - if (Width > 0xFFFFU) - Width = 0xFFFFU; - if (Height > 0xFFFFU) - Height = 0xFFFFU; + if (lfHeight > 0) + EmHeight64 = (FontGDI->EmHeight << 6) + 31; + else + EmHeight64 = (FontGDI->EmHeight << 6); req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; - req.width = (FT_Long)(Width << 6); - req.height = (FT_Long)(Height << 6); + req.width = 0; + req.height = EmHeight64; req.horiResolution = 0; req.vertResolution = 0; return FT_Request_Size(face, &req); @@ -3255,13 +3324,23 @@ ftGdiGetGlyphOutline( IntLockFreeType(); - /* Scaling transform */ - /*if (aveWidth)*/ + /* Width scaling transform */ + if (widthRatio != 1.0) { + FT_Matrix scaleMat; + scaleMat.xx = FT_FixedFromFloat(widthRatio); + scaleMat.xy = 0; + scaleMat.yx = 0; + scaleMat.yy = FT_FixedFromFloat(1.0); + + FT_Matrix_Multiply(&scaleMat, &transMat); + needsTransform = TRUE; + } + /* World transform */ + { FT_Matrix ftmatrix; FLOATOBJ efTemp; - PMATRIX pmx = DC_pmxWorldToDevice(dc); /* Create a freetype matrix, by converting to 16.16 fixpoint format */ @@ -3281,8 +3360,11 @@ ftGdiGetGlyphOutline( FLOATOBJ_MulLong(&efTemp, 0x00010000); ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); - FT_Matrix_Multiply(&ftmatrix, &transMat); - needsTransform = TRUE; + if (memcmp(&ftmatrix, &identityMat, sizeof(identityMat)) != 0) + { + FT_Matrix_Multiply(&ftmatrix, &transMat); + needsTransform = TRUE; + } } /* Rotation transform */ @@ -3719,8 +3801,9 @@ TextIntGetTextExtentPoint(PDC dc, previous = glyph_index; String++; } - ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */ - descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */ + ASSERT(FontGDI->Magic == FONTGDI_MAGIC); + ascender = FontGDI->tmAscent; /* Units above baseline */ + descender = FontGDI->tmDescent; /* Units below baseline */ IntUnLockFreeType(); Size->cx = (TotalWidth + 32) >> 6; @@ -3947,10 +4030,12 @@ ftGdiGetTextMetricsW( FontGDI = ObjToGDI(TextObj->Font, FONT); Face = FontGDI->SharedFace->Face; + IntLockFreeType(); Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc)); IntUnLockFreeType(); + if (0 != Error) { DPRINT1("Error in setting pixel sizes: %u\n", Error); @@ -4061,7 +4146,6 @@ GetFontPenalty(const LOGFONTW * LogFont, ASSERT(Otm); ASSERT(LogFont); - /* FIXME: Aspect Penalty 30 */ /* FIXME: IntSizeSynth Penalty 20 */ /* FIXME: SmallPenalty Penalty 1 */ /* FIXME: FaceNameSubst Penalty 500 */ @@ -4132,7 +4216,7 @@ GetFontPenalty(const LOGFONTW * LogFont, Byte = (LogFont->lfPitchAndFamily & 0x0F); if (Byte == DEFAULT_PITCH) Byte = VARIABLE_PITCH; - if (Byte == FIXED_PITCH) + if ((Byte & FIXED_PITCH) || (Byte & MONO_FONT)) { if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH) { @@ -4142,7 +4226,7 @@ GetFontPenalty(const LOGFONTW * LogFont, Penalty += 15000; } } - if (Byte == VARIABLE_PITCH) + if (Byte & VARIABLE_PITCH) { if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)) { @@ -4193,12 +4277,37 @@ GetFontPenalty(const LOGFONTW * LogFont, Byte = (LogFont->lfPitchAndFamily & 0xF0); if (Byte != FF_DONTCARE) { - if (Byte != (TM->tmPitchAndFamily & 0xF0)) + if (Byte & FF_MODERN) + { + if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH) + { + /* FixedPitch Penalty 15000 */ + /* Requested a fixed pitch font, but the candidate is a + variable pitch font. */ + Penalty += 15000; + } + } + + if ((Byte & FF_ROMAN) || (Byte & FF_SWISS)) + { + if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)) + { + /* PitchVariable Penalty 350 */ + /* Requested a variable pitch font, but the candidate is not a + variable pitch font. */ + Penalty += 350; + } + } + +#define FF_MASK (FF_DECORATIVE | FF_SCRIPT | FF_SWISS) + if ((Byte & FF_MASK) != (TM->tmPitchAndFamily & FF_MASK)) { /* Family Penalty 9000 */ /* Requested a family, but the candidate's family is different. */ Penalty += 9000; } +#undef FF_MASK + if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE) { /* FamilyUnknown Penalty 8000 */ @@ -4373,6 +4482,22 @@ GetFontPenalty(const LOGFONTW * LogFont, Penalty += 2; } + if (TM->tmAveCharWidth >= 5 && TM->tmHeight >= 5) + { + if (TM->tmAveCharWidth / TM->tmHeight >= 3) + { + /* Aspect Penalty 30 */ + /* The aspect rate is >= 3. It seems like a bad font. */ + Penalty += ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30; + } + else if (TM->tmHeight / TM->tmAveCharWidth >= 3) + { + /* Aspect Penalty 30 */ + /* The aspect rate is >= 3. It seems like a bad font. */ + Penalty += ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30; + } + } + if (Penalty < 200) { DPRINT("WARNING: Penalty:%ld < 200: RequestedNameW:%ls, " @@ -4431,6 +4556,10 @@ FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty, /* update FontObj if lowest penalty */ if (Otm) { + IntLockFreeType(); + IntRequestFontSize(NULL, FontGDI, LogFont->lfWidth, LogFont->lfHeight); + IntUnLockFreeType(); + OtmSize = IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm); if (!OtmSize) continue; @@ -4546,7 +4675,23 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) } else { + UNICODE_STRING FaceName; PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); + + IntLockFreeType(); + IntRequestFontSize(NULL, FontGdi, pLogFont->lfWidth, pLogFont->lfHeight); + IntUnLockFreeType(); + + RtlInitUnicodeString(&FaceName, NULL); + IntGetFontLocalizedName(&FaceName, FontGdi->SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID); + + /* truncated copy */ + FaceName.Length = (USHORT)min(FaceName.Length, (LF_FACESIZE - 1) * sizeof(WCHAR)); + FaceName.MaximumLength = (USHORT)(FaceName.Length + sizeof(UNICODE_NULL)); + RtlCopyMemory(TextObj->FaceName, FaceName.Buffer, FaceName.MaximumLength); + + RtlFreeUnicodeString(&FaceName); + // Need hdev, when freetype is loaded need to create DEVOBJ for // Consumer and Producer. TextObj->Font->iUniq = 1; // Now it can be cached. @@ -5298,33 +5443,35 @@ GreExtTextOutW( goto Cleanup; } + /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) { pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice); - fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); - fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); + fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; + fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; } else { pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; FtSetCoordinateTransform(face, pmxWorldToDevice); - fixAscender = face->size->metrics.ascender; - fixDescender = face->size->metrics.descender; + fixAscender = FontGDI->tmAscent << 6; + fixDescender = FontGDI->tmDescent << 6; } /* * Process the vertical alignment and determine the yoff. */ - - if (pdcattr->lTextAlign & TA_BASELINE) +#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) + if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) yoff = 0; - else if (pdcattr->lTextAlign & TA_BOTTOM) - yoff = -fixDescender >> 6; + else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + yoff = -(fixDescender >> 6); else /* TA_TOP */ yoff = fixAscender >> 6; +#undef VALIGN_MASK use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -5501,7 +5648,7 @@ GreExtTextOutW( DestRect.left = BackgroundLeft; DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); + DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { @@ -5641,7 +5788,7 @@ GreExtTextOutW( DestRect.left = BackgroundLeft; DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); + DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index 5c7e3664f2..ec0503fa46 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -513,12 +513,12 @@ NtGdiGetTextFaceW( TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + fLen = wcslen(TextObj->FaceName) + 1; if (FaceName != NULL) { Count = min(Count, fLen); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + Status = MmCopyToCaller(FaceName, TextObj->FaceName, Count * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { TEXTOBJ_UnlockText(TextObj); diff --git a/win32ss/user/ntuser/draw.c b/win32ss/user/ntuser/draw.c index 7046453f93..f648287c55 100644 --- a/win32ss/user/ntuser/draw.c +++ b/win32ss/user/ntuser/draw.c @@ -814,6 +814,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags) lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; + lf.lfQuality = NONANTIALIASED_QUALITY; RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); hFont = GreCreateFontIndirectW(&lf); /* save font and text color */ diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 6a8b2a9bf7..4ffcdab989 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -2147,7 +2147,7 @@ UserDrawCaptionText( { // Faster while in setup. GreExtTextOutW( hDc, lpRc->left, - lpRc->top + (lpRc->bottom - lpRc->top) / 2 - Size.cy / 2, // DT_SINGLELINE && DT_VCENTER + lpRc->top + (lpRc->bottom - lpRc->top - Size.cy) / 2, // DT_SINGLELINE && DT_VCENTER ETO_CLIPPED, (RECTL *)lpRc, Text->Buffer, diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index f1ed9d714d..9ab726c80a 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -1157,8 +1157,10 @@ INT WINAPI DrawTextExWorker( HDC hdc, } else { -#endif + y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2; +#else y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); +#endif #ifdef __REACTOS__ } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs