Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 75154: [WIN32K:NTUSER] -IntSetThreadDesktop: Don't close the previous desktop handle. Fixes a lot of tests. Based on a patch by Sebastian Gasiorek. CORE-13463
by gadamopoulos＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: gadamopoulos Date: Tue Jun 20 19:26:37 2017 New Revision: 75154 URL: http://svn.reactos.org/svn/reactos?rev=75154&view=rev Log: [WIN32K:NTUSER] -IntSetThreadDesktop: Don't close the previous desktop handle. Fixes a lot of tests. Based on a patch by Sebastian Gasiorek. CORE-13463 Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Jun 20 19:26:37 2017 @@ -2378,7 +2378,6 @@ IN BOOL FreeOnFailure) { PDESKTOP pdesk = NULL, pdeskOld; - HDESK hdeskOld; PTHREADINFO pti; NTSTATUS Status; PCLIENTTHREADINFO pctiOld, pctiNew = NULL; @@ -2467,7 +2466,6 @@ } pdeskOld = pti->rpdesk; - hdeskOld = pti->hdesk; if (pti->pcti != &pti->cti) pctiOld = pti->pcti; else @@ -2515,7 +2513,6 @@ if (pctiOld) DesktopHeapFree(pdeskOld, pctiOld); IntUnmapDesktopView(pdeskOld); ObDereferenceObject(pdeskOld); - ZwClose(hdeskOld); } if (pdesk)

1 0

[gadamopoulos] 75153: [USER32_APITEST] -Initial tests for desktop reference numbers.
by gadamopoulos＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: gadamopoulos Date: Tue Jun 20 19:25:10 2017 New Revision: 75153 URL: http://svn.reactos.org/svn/reactos?rev=75153&view=rev Log: [USER32_APITEST] -Initial tests for desktop reference numbers. Modified: trunk/rostests/apitests/user32/desktop.c Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Tue Jun 20 19:25:10 2017 @@ -246,6 +246,7 @@ NTSTATUS status; OBJECT_BASIC_INFORMATION objectInfo = { 0 }; HDESK hdesk; + HDESK hdesk1; BOOL ret; ULONG baseRefs; @@ -339,6 +340,23 @@ ok(ret == TRUE, "ret = %d\n", ret); hwinsta = open_winsta(winstaName, &error); ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + + /* Test references by SetThreadDesktop */ + hdesk1 = GetThreadDesktop(GetCurrentThreadId()); + ok (hdesk1 != hdesk, "Expected the new desktop not to be the thread desktop\n"); + + check_ref(hdesk, 1, 8); + baseRefs = objectInfo.PointerCount; + ok(baseRefs == 8, "Desktop initially has %lu references, expected 8\n", baseRefs); + check_ref(hdesk, 1, baseRefs); + + SetThreadDesktop(hdesk); + check_ref(hdesk, 1, baseRefs + 1); + ok (GetThreadDesktop(GetCurrentThreadId()) == hdesk, "Expected GetThreadDesktop to return hdesk\n"); + + SetThreadDesktop(hdesk1); + check_ref(hdesk, 1, baseRefs); + ok (GetThreadDesktop(GetCurrentThreadId()) == hdesk1, "Expected GetThreadDesktop to return hdesk1\n"); } START_TEST(desktop)

1 0

[tfaber] 75152: [RTL] - Correctly use the page heap's lock in RtlLockHeap/RtlUnlockHeap when appropriate. Fixes assertion failure when Global/Local memory allocations are performed concurrently wit...
by tfaber＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: tfaber Date: Tue Jun 20 17:15:43 2017 New Revision: 75152 URL: http://svn.reactos.org/svn/reactos?rev=75152&view=rev Log: [RTL] - Correctly use the page heap's lock in RtlLockHeap/RtlUnlockHeap when appropriate. Fixes assertion failure when Global/Local memory allocations are performed concurrently with DPH enabled. Modified: trunk/reactos/sdk/lib/rtl/heap.c trunk/reactos/sdk/lib/rtl/heap.h trunk/reactos/sdk/lib/rtl/heappage.c Modified: trunk/reactos/sdk/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heap.c?rev=751… ============================================================================== --- trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] Tue Jun 20 17:15:43 2017 @@ -2982,7 +2982,11 @@ { PHEAP Heap = (PHEAP)HeapPtr; - // FIXME Check for special heap + /* Check for page heap */ + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + { + return RtlpPageHeapLock(Heap); + } /* Check if it's really a heap */ if (Heap->Signature != HEAP_SIGNATURE) return FALSE; @@ -3015,7 +3019,11 @@ { PHEAP Heap = (PHEAP)HeapPtr; - // FIXME Check for special heap + /* Check for page heap */ + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + { + return RtlpPageHeapUnlock(Heap); + } /* Check if it's really a heap */ if (Heap->Signature != HEAP_SIGNATURE) return FALSE; Modified: trunk/reactos/sdk/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heap.h?rev=751… ============================================================================== --- trunk/reactos/sdk/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/heap.h [iso-8859-1] Tue Jun 20 17:15:43 2017 @@ -436,6 +436,12 @@ SIZE_T Size); BOOLEAN NTAPI +RtlpPageHeapLock(HANDLE HeapPtr); + +BOOLEAN NTAPI +RtlpPageHeapUnlock(HANDLE HeapPtr); + +BOOLEAN NTAPI RtlpPageHeapGetUserInfo(PVOID HeapHandle, ULONG Flags, PVOID BaseAddress, Modified: trunk/reactos/sdk/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heappage.c?rev… ============================================================================== --- trunk/reactos/sdk/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/heappage.c [iso-8859-1] Tue Jun 20 17:15:43 2017 @@ -2349,4 +2349,32 @@ return RtlValidateHeap(DphRoot->NormalHeap, Flags, BlockInfo); } +BOOLEAN +NTAPI +RtlpPageHeapLock(HANDLE HeapPtr) +{ + PDPH_HEAP_ROOT DphRoot; + + /* Get pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return FALSE; + + RtlpDphEnterCriticalSection(DphRoot, DphRoot->HeapFlags); + return TRUE; +} + +BOOLEAN +NTAPI +RtlpPageHeapUnlock(HANDLE HeapPtr) +{ + PDPH_HEAP_ROOT DphRoot; + + /* Get pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return FALSE; + + RtlpDphLeaveCriticalSection(DphRoot); + return TRUE; +} + /* EOF */

1 0

[hbelusca] 75151: [USER.EXE]: Addendum to r75126: add a (dummy) version resource to USER.EXE so as to fix error 1812 "ERROR_RESOURCE_DATA_NOT_FOUND" encountered when starting the DirectX 9.0 instal...
by hbelusca＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: hbelusca Date: Tue Jun 20 16:44:40 2017 New Revision: 75151 URL: http://svn.reactos.org/svn/reactos?rev=75151&view=rev Log: [USER.EXE]: Addendum to r75126: add a (dummy) version resource to USER.EXE so as to fix error 1812 "ERROR_RESOURCE_DATA_NOT_FOUND" encountered when starting the DirectX 9.0 installer. From patch by Stas'M, thanks! CORE-13462 Added: trunk/reactos/subsystems/mvdm/wow16/user/user.rc (with props) Modified: trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/wow16/user… ============================================================================== --- trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt [iso-8859-1] Tue Jun 20 16:44:40 2017 @@ -1,5 +1,5 @@ -add_executable(user user.c) +add_executable(user user.c user.rc) set_module_type(user win32gui ENTRYPOINT mainCRTStartup) add_importlibs(user msvcrt kernel32) add_cd_file(TARGET user DESTINATION reactos/system32 FOR all) Added: trunk/reactos/subsystems/mvdm/wow16/user/user.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/wow16/user… ============================================================================== --- trunk/reactos/subsystems/mvdm/wow16/user/user.rc (added) +++ trunk/reactos/subsystems/mvdm/wow16/user/user.rc [iso-8859-1] Tue Jun 20 16:44:40 2017 @@ -0,0 +1,5 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WOW16 User-interface stub" +#define REACTOS_STR_INTERNAL_NAME "USER" +#define REACTOS_STR_ORIGINAL_FILENAME "USER.EXE" +#include <reactos/version.rc> Propchange: trunk/reactos/subsystems/mvdm/wow16/user/user.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 75150: [NTOS:MM] - In MiDeletePte, check the ReferenceCount of transition PTEs, not the ShareCount (which is actually u2.Blink, since the page is in a modified/standby list). Also don't re...
by tfaber＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: tfaber Date: Tue Jun 20 15:51:47 2017 New Revision: 75150 URL: http://svn.reactos.org/svn/reactos?rev=75150&view=rev Log: [NTOS:MM] - In MiDeletePte, check the ReferenceCount of transition PTEs, not the ShareCount (which is actually u2.Blink, since the page is in a modified/standby list). Also don't reset the PageLocation, since MiDecrementReferenceCount expects it to be anything but ActiveAndValid. Fixes physical page leaks when using DPH, or other code that sets PAGE_NOACCESS. CORE-13311 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c 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] Tue Jun 20 15:51:47 2017 @@ -419,6 +419,9 @@ DPRINT("Pte %p is transitional!\n", PointerPte); + /* Make sure the saved PTE address is valid */ + ASSERT((PMMPTE)((ULONG_PTR)Pfn1->PteAddress & ~0x1) == PointerPte); + /* Destroy the PTE */ MI_ERASE_PTE(PointerPte); @@ -428,17 +431,14 @@ 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) - { - ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - + if (Pfn1->u3.e2.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 temporarily mark it as active */ + /* Unlink it and set its reference count to one */ MiUnlinkPageFromList(Pfn1); Pfn1->u3.e2.ReferenceCount++; - Pfn1->u3.e1.PageLocation = ActiveAndValid; /* This will put it back in free list and clean properly up */ MI_SET_PFN_DELETED(Pfn1); Modified: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtProtectV… ============================================================================== --- trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] Tue Jun 20 15:51:47 2017 @@ -2,6 +2,8 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for the NtProtectVirtualMemory API + * PROGRAMMERS: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + * Thomas Faber <thomas.faber(a)reactos.org> */ #include <apitest.h> @@ -10,13 +12,15 @@ #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> -START_TEST(NtProtectVirtualMemory) +static +void +TestReadWrite(void) { ULONG* allocationStart = NULL; NTSTATUS status; SIZE_T allocationSize; ULONG oldProtection; - + /* Reserve a page */ allocationSize = PAGE_SIZE; status = NtAllocateVirtualMemory(NtCurrentProcess(), @@ -26,7 +30,7 @@ MEM_RESERVE, PAGE_NOACCESS); ok(NT_SUCCESS(status), "Reserving memory failed\n"); - + /* Commit the page (RW) */ status = NtAllocateVirtualMemory(NtCurrentProcess(), (void**)&allocationStart, @@ -35,19 +39,19 @@ MEM_COMMIT, PAGE_READWRITE); ok(NT_SUCCESS(status), "Commiting memory failed\n"); - + /* Try writing it */ StartSeh() { *allocationStart = 0xFF; } EndSeh(STATUS_SUCCESS); - + /* Try reading it */ StartSeh() { ok(*allocationStart == 0xFF, "Memory was not written\n"); } EndSeh(STATUS_SUCCESS); - + /* Set it as read only */ status = NtProtectVirtualMemory(NtCurrentProcess(), (void**)&allocationStart, @@ -56,19 +60,19 @@ &oldProtection); ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); ok(oldProtection == PAGE_READWRITE, "Expected PAGE_READWRITE, got %08lx.\n", oldProtection); - + /* Try writing it */ StartSeh() { *allocationStart = 0xAA; } EndSeh(STATUS_ACCESS_VIOLATION); - + /* Try reading it */ StartSeh() { ok(*allocationStart == 0xFF, "read-only memory were changed.\n"); } EndSeh(STATUS_SUCCESS); - + /* Set it as no access */ status = NtProtectVirtualMemory(NtCurrentProcess(), (void**)&allocationStart, @@ -77,13 +81,13 @@ &oldProtection); ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); ok(oldProtection == PAGE_READONLY, "Expected PAGE_READONLY, got %08lx.\n", oldProtection); - + /* Try writing it */ StartSeh() { *allocationStart = 0xAA; } EndSeh(STATUS_ACCESS_VIOLATION); - + /* Try reading it */ StartSeh() { @@ -110,7 +114,7 @@ { ok(*allocationStart == 0xFF, "Memory content was not preserved.\n"); } EndSeh(STATUS_SUCCESS); - + /* Free memory */ status = NtFreeVirtualMemory(NtCurrentProcess(), (void**)&allocationStart, @@ -118,3 +122,64 @@ MEM_RELEASE); ok(NT_SUCCESS(status), "Failed freeing memory.\n"); } + +/* Regression test for CORE-13311 */ +static +void +TestFreeNoAccess(void) +{ + PVOID Mem; + SIZE_T Size; + NTSTATUS Status; + ULONG Iteration, PageNumber; + PUCHAR Page; + ULONG OldProtection; + + for (Iteration = 0; Iteration < 50000; Iteration++) + { + Mem = NULL; + Size = 16 * PAGE_SIZE; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Mem, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + break; + } + + for (PageNumber = 0; PageNumber < 16; PageNumber++) + { + Page = Mem; + Page += PageNumber * PAGE_SIZE; + ok(*Page == 0, + "[%lu, %lu] Got non-zero memory. %x at %p\n", + Iteration, PageNumber, *Page, Page); + *Page = 123; + } + + Status = NtProtectVirtualMemory(NtCurrentProcess(), + &Mem, + &Size, + PAGE_NOACCESS, + &OldProtection); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_hex(OldProtection, PAGE_READWRITE); + + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Mem, + &Size, + MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + } +} + +START_TEST(NtProtectVirtualMemory) +{ + TestReadWrite(); + TestFreeNoAccess(); +}

1 0

[cfinck] 75149: That shouldn't have been committed in r75125. Thanks Thomas!
by cfinck＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: cfinck Date: Tue Jun 20 14:48:26 2017 New Revision: 75149 URL: http://svn.reactos.org/svn/reactos?rev=75149&view=rev Log: That shouldn't have been committed in r75125. Thanks Thomas! Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Jun 20 14:48:26 2017 @@ -2118,7 +2118,7 @@ HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+localspl" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" ; Winsrv configuration HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012

1 0

[cfinck] 75148: [LOCALSPL] Add the missing root backslash to the symbolic link path. Fixes CORE-13457
by cfinck＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: cfinck Date: Tue Jun 20 06:08:30 2017 New Revision: 75148 URL: http://svn.reactos.org/svn/reactos?rev=75148&view=rev Log: [LOCALSPL] Add the missing root backslash to the symbolic link path. Fixes CORE-13457 Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Tue Jun 20 06:08:30 2017 @@ -127,13 +127,13 @@ const DWORD cchPrintersPath = _countof(wszPrintersPath) - 1; const WCHAR wszSpoolPath[] = L"\\spool"; const DWORD cchSpoolPath = _countof(wszSpoolPath) - 1; - const WCHAR wszSymbolicLinkValue[] = L"REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers"; + const WCHAR wszSymbolicLinkValue[] = L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers"; const DWORD cbSymbolicLinkValue = sizeof(wszSymbolicLinkValue) - sizeof(WCHAR); BOOL bReturnValue = FALSE; DWORD cbData; DWORD dwErrorCode; - HKEY hKey; + HKEY hKey = NULL; // On startup, always create a volatile symbolic link in the registry if it doesn't exist yet. // "SYSTEM\CurrentControlSet\Control\Print\Printers" -> "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers"

1 0

[hbelusca] 75147: [FILESYSTEMS]: Fix printf-like counted string specifiers.
by hbelusca＠svn.reactos.org 20 Jun '17

20 Jun '17

Author: hbelusca Date: Tue Jun 20 00:45:07 2017 New Revision: 75147 URL: http://svn.reactos.org/svn/reactos?rev=75147&view=rev Log: [FILESYSTEMS]: Fix printf-like counted string specifiers. Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c trunk/reactos/drivers/filesystems/fastfat/volume.c trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Tue Jun 20 00:45:07 2017 @@ -49,7 +49,7 @@ DPRINT("Required length %lu\n", (sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength)); DPRINT("LabelLength %hu\n", DeviceObject->Vpb->VolumeLabelLength); - DPRINT("Label %*.S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel); + DPRINT("Label %.*S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel); if (*BufferLength < sizeof(FILE_FS_VOLUME_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Tue Jun 20 00:45:07 2017 @@ -32,7 +32,7 @@ DPRINT("Required length %lu\n", FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + DeviceObject->Vpb->VolumeLabelLength); DPRINT("LabelLength %hu\n", DeviceObject->Vpb->VolumeLabelLength); - DPRINT("Label %*.S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel); + DPRINT("Label %.*S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel); ASSERT(*BufferLength >= sizeof(FILE_FS_VOLUME_INFORMATION)); *BufferLength -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel); Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Tue Jun 20 00:45:07 2017 @@ -115,7 +115,7 @@ sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); DPRINT("LabelLength %hu\n", DeviceObject->Vpb->VolumeLabelLength); - DPRINT("Label %*.S\n", + DPRINT("Label %.*S\n", DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), DeviceObject->Vpb->VolumeLabel);

1 0

[hbelusca] 75146: [NTOS:CM]: Simplify code by using suitable assertion macro.
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 23:18:42 2017 New Revision: 75146 URL: http://svn.reactos.org/svn/reactos?rev=75146&view=rev Log: [NTOS:CM]: Simplify code by using suitable assertion macro. Modified: trunk/reactos/ntoskrnl/config/cmdelay.c Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Mon Jun 19 23:18:42 2017 @@ -356,8 +356,7 @@ PAGED_CODE(); /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(Kcb); /* Make sure it's valid */ if (Kcb->DelayedCloseIndex != CmpDelayedCloseSize) ASSERT(FALSE); @@ -430,8 +429,7 @@ PAGED_CODE(); /* Sanity checks */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(Kcb); if (Kcb->DelayedCloseIndex == CmpDelayedCloseSize) ASSERT(FALSE); /* Get the entry and lock the table */

1 0

[jgardou] 75145: [DDK] - Use FORCEINLINE where appropriate
by jgardou＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: jgardou Date: Mon Jun 19 21:17:17 2017 New Revision: 75145 URL: http://svn.reactos.org/svn/reactos?rev=75145&view=rev Log: [DDK] - Use FORCEINLINE where appropriate Modified: trunk/reactos/sdk/include/ddk/fcb.h trunk/reactos/sdk/include/ddk/rxstruc.h Modified: trunk/reactos/sdk/include/ddk/fcb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fcb.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/fcb.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fcb.h [iso-8859-1] Mon Jun 19 21:17:17 2017 @@ -549,7 +549,7 @@ _In_ BOOLEAN RecursiveFinalize, _In_ BOOLEAN ForceFinalize); -extern INLINE +FORCEINLINE PUNICODE_STRING GET_ALREADY_PREFIXED_NAME( PMRX_SRV_OPEN SrvOpen, Modified: trunk/reactos/sdk/include/ddk/rxstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxstruc.h?… ============================================================================== --- trunk/reactos/sdk/include/ddk/rxstruc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/rxstruc.h [iso-8859-1] Mon Jun 19 21:17:17 2017 @@ -130,7 +130,7 @@ RDBSS_SCAVENGER RdbssScavengerInDeviceObject; } RDBSS_DEVICE_OBJECT, *PRDBSS_DEVICE_OBJECT; -extern INLINE +FORCEINLINE VOID NTAPI RxUnregisterMinirdr(

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