Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/12: [WIN32K] Code formatting.
by Hermès Bélusca-Maïto 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ad90f83d3bfdbebb6143… commit 0ad90f83d3bfdbebb6143e88a01fc2897474d2a8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 24 21:19:14 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 25 00:41:49 2019 +0100 [WIN32K] Code formatting. --- win32ss/gdi/eng/device.c | 14 ++++++-------- win32ss/gdi/eng/pdevobj.c | 30 ++++++++++++++++-------------- win32ss/user/ntuser/display.c | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 6d20e30de55..e5f30aa0bba 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -51,8 +51,8 @@ EngpPopulateDeviceModeList( * This is a REG_MULTI_SZ string */ for (; *pwsz; pwsz += wcslen(pwsz) + 1) { - TRACE("trying driver: %ls\n", pwsz); /* Try to load the display driver */ + TRACE("Trying driver: %ls\n", pwsz); pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY); if (!pldev) { @@ -186,14 +186,14 @@ EngpRegisterGraphicsDevice( return NULL; } - /* Try to open the driver */ + /* Try to open and enable the device */ Status = IoGetDeviceObjectPointer(pustrDeviceName, FILE_READ_DATA | FILE_WRITE_DATA, &pFileObject, &pDeviceObject); if (!NT_SUCCESS(Status)) { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ERR("Could not open device %wZ, 0x%lx\n", pustrDeviceName, Status); ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); return NULL; } @@ -225,13 +225,13 @@ EngpRegisterGraphicsDevice( return NULL; } - /* Copy display driver names */ + /* Copy the display driver names */ pGraphicsDevice->pDiplayDrivers = pwsz; RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, pustrDiplayDrivers->Buffer, pustrDiplayDrivers->Length); - /* Copy description */ + /* Copy the description */ pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); RtlCopyMemory(pGraphicsDevice->pwszDescription, pustrDescription->Buffer, @@ -265,7 +265,7 @@ EngpRegisterGraphicsDevice( if (!gpGraphicsDeviceFirst) gpGraphicsDeviceFirst = pGraphicsDevice; - /* Increment device number */ + /* Increment the device number */ giDevNum++; /* Unlock loader */ @@ -275,7 +275,6 @@ EngpRegisterGraphicsDevice( return pGraphicsDevice; } - PGRAPHICS_DEVICE NTAPI EngpFindGraphicsDevice( @@ -321,7 +320,6 @@ EngpFindGraphicsDevice( return pGraphicsDevice; } - static NTSTATUS EngpFileIoRequest( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 19c2fee06ba..450d37f6785 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -90,15 +90,15 @@ PDEVOBJ_vDeletePDEV( VOID NTAPI -PDEVOBJ_vRelease(PPDEVOBJ ppdev) +PDEVOBJ_vRelease( + _Inout_ PPDEVOBJ ppdev) { /* Lock loader */ EngAcquireSemaphore(ghsemPDEV); /* Decrease reference count */ - --ppdev->cPdevRefs; - - ASSERT(ppdev->cPdevRefs >= 0) ; + InterlockedDecrement(&ppdev->cPdevRefs); + ASSERT(ppdev->cPdevRefs >= 0); /* Check if references are left */ if (ppdev->cPdevRefs == 0) @@ -112,7 +112,7 @@ PDEVOBJ_vRelease(PPDEVOBJ ppdev) } /* Do we have a palette? */ - if(ppdev->ppalSurf) + if (ppdev->ppalSurf) { PALETTE_ShareUnlockPalette(ppdev->ppalSurf); } @@ -125,20 +125,22 @@ PDEVOBJ_vRelease(PPDEVOBJ ppdev) } /* Remove it from list */ - if( ppdev == gppdevList ) - gppdevList = ppdev->ppdevNext ; + if (ppdev == gppdevList) + { + gppdevList = ppdev->ppdevNext; + } else { PPDEVOBJ ppdevCurrent = gppdevList; - BOOL found = FALSE ; + BOOL found = FALSE; while (!found && ppdevCurrent->ppdevNext) { if (ppdevCurrent->ppdevNext == ppdev) found = TRUE; else - ppdevCurrent = ppdevCurrent->ppdevNext ; + ppdevCurrent = ppdevCurrent->ppdevNext; } - if(found) + if (found) ppdevCurrent->ppdevNext = ppdev->ppdevNext; } @@ -152,7 +154,6 @@ PDEVOBJ_vRelease(PPDEVOBJ ppdev) /* Unlock loader */ EngReleaseSemaphore(ghsemPDEV); - } BOOL @@ -320,7 +321,7 @@ PDEVOBJ_pdmMatchDevMode( /* Compare asked DEVMODE fields * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & pdm->dmFields ; + dwFields = pdmCurrent->dmFields & pdm->dmFields; /* For now, we only need those */ if ((dwFields & DM_BITSPERPEL) && @@ -348,6 +349,7 @@ EngpCreatePDEV( { PGRAPHICS_DEVICE pGraphicsDevice; PPDEVOBJ ppdev; + DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm); /* Try to find the GRAPHICS_DEVICE */ @@ -407,7 +409,7 @@ EngpCreatePDEV( ppdev->hSpooler = ppdev->pGraphicsDevice->DeviceObject; // Should we change the ative mode of pGraphicsDevice ? - ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; + ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); /* FIXME! */ ppdev->flFlags = PDEV_DISPLAY; @@ -561,7 +563,7 @@ PDEVOBJ_bSwitchMode( PDEVOBJ_vRelease(ppdevTmp); /* Update primary display capabilities */ - if(ppdev == gppdevPrimary) + if (ppdev == gppdevPrimary) { PDEVOBJ_vGetDeviceCaps(ppdev, &GdiHandleTable->DevCaps); } diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 3f2b99cc229..cebaf8c1148 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -557,7 +557,7 @@ UserEnumRegistryDisplaySettings( ZwClose(hkey); return STATUS_SUCCESS; } - return Status ; + return Status; } NTSTATUS @@ -674,6 +674,7 @@ NtUserEnumDisplaySettings( return Status; } + VOID UserUpdateFullscreen( DWORD flags) @@ -1012,4 +1013,3 @@ NtUserChangeDisplaySettings( return lRet; } -

1 0

[reactos] 01/12: [PCIX][BLUE] Don't hardcode values in KeDelayExecutionThread() call. Remove deprecated code.
by Hermès Bélusca-Maïto 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75f188c20028fe5493ca8… commit 75f188c20028fe5493ca827e8758e01eecfa36f6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 24 21:13:35 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 25 00:41:48 2019 +0100 [PCIX][BLUE] Don't hardcode values in KeDelayExecutionThread() call. Remove deprecated code. --- drivers/bus/pcix/power.c | 2 +- drivers/setup/blue/blue.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/bus/pcix/power.c b/drivers/bus/pcix/power.c index 323bd9553ed..8cac08f390c 100644 --- a/drivers/bus/pcix/power.c +++ b/drivers/bus/pcix/power.c @@ -88,7 +88,7 @@ PciStallForPowerChange(IN PPCI_PDO_EXTENSION PdoExtension, /* Do a wait for the timeout specified instead */ Interval.QuadPart = -10 * TimeoutEntry; Interval.QuadPart -= KeQueryTimeIncrement() - 1; - KeDelayExecutionThread(0, 0, &Interval); + KeDelayExecutionThread(KernelMode, FALSE, &Interval); } } diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 1403c19ef57..7aa4f9d5d2e 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -15,14 +15,6 @@ #define NDEBUG #include <debug.h> -// ROS Internal. Please deprecate. -NTHALAPI -BOOLEAN -NTAPI -HalQueryDisplayOwnership( - VOID -); - /* NOTES ******************************************************************/ /* * [[character][attribute]][[character][attribute]]....

1 0

[reactos] 01/01: [INF] Add the docking station device
by Eric Kohl 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8813a0dff85ac01b30ac9… commit 8813a0dff85ac01b30ac9c41321a3b0087f2b1c9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 24 19:08:20 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 24 19:27:03 2019 +0100 [INF] Add the docking station device --- media/inf/machine.inf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 4bd292611a1..bed48883dee 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -46,6 +46,7 @@ HKR, , Icon, 0, "-27" %*PNP0C0D.DeviceDesc% = NO_DRV,*PNP0C0D %*PNP0C0E.DeviceDesc% = NO_DRV,*PNP0C0E %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F +%*PNP0C15.DeviceDesc% = NO_DRV,*PNP0C15 %SWENUM.DeviceDesc% = SWENUM_Inst, ROOT\SWENUM %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton @@ -169,6 +170,7 @@ GenericMfg = "(Generic system devices)" *PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" @@ -212,6 +214,7 @@ GenericMfg = "(Obecná systémová zařízení)" *PNP0C0D.DeviceDesc = "ACPI víko" *PNP0C0E.DeviceDesc = "ACPI tlačítko spánku" *PNP0C0F.DeviceDesc = "PCI linkové zařízení přerušení" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI tlačítko s pevnou vlastností" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standardní most CPU na PCI" @@ -247,6 +250,7 @@ GenericMfg = "(Generische Systemgeräte)" *PNP0C02.DeviceDesc = "Motherboard Ressourcen" *PNP0C04.DeviceDesc = "mathematischer Koprozessor" *PNP0C0B.DeviceDesc = "ACPI Ventilator" +*PNP0C15.DeviceDesc = "Dockingstation" PCI\CC_0500.DeviceDesc = "Standard PCI RAM-Controller" PCI\CC_0600.DeviceDesc = "Standard CPU zu PCI Brücke" PCI\CC_0601.DeviceDesc = "Standard PCI zu ISA Brücke" @@ -278,6 +282,7 @@ GenericMfg = "(Πρότυπες συσκευές συστήματος)" *PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Πρότυπη γέφυρα από CPU σε PCI" @@ -318,6 +323,7 @@ GenericMfg = "(Dispositivos del sistema estándar)" *PNP0C0D.DeviceDesc = "Tapa ACPI" *PNP0C0E.DeviceDesc = "Botón de suspensión ACPI" *PNP0C0F.DeviceDesc = "Dispositivo de interrupción de enlaces PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Botón de funcionalidad fija ACPI" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Puente CPU-PCI estándar" @@ -357,6 +363,7 @@ GenericMfg = "(Périphériques systèmes génériques)" *PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "Périphérique de bouton de veille ACPI" *PNP0C0F.DeviceDesc = "Périphérique de lien d'interruption PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Bouton de fonction définie ACPI" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Pont standard CPU vers PCI" @@ -392,6 +399,7 @@ GenericMfg = "(標準システムデバイス)" *PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "ACPI スリープボタンデバイス" *PNP0C0F.DeviceDesc = "PCI 割り込みリンクデバイス" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI 固定機能ボタン" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "スタンダード CPU to PCI ブリッジ" @@ -433,6 +441,7 @@ GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C0D.DeviceDesc = "Pokrywa ACPI" *PNP0C0E.DeviceDesc = "Przycisk zasypiania ACPI" *PNP0C0F.DeviceDesc = "Urządzenie PCI interrupt link" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Przycisk ACPI Fixed Feature" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standardowy mostek CPU do PCI" @@ -472,6 +481,7 @@ GenericMfg = "(Dispositivos de sistema padrão)" *PNP0C0D.DeviceDesc = "Tampa ACPI" *PNP0C0E.DeviceDesc = "Botão dormir ACPI" *PNP0C0F.DeviceDesc = "Dispositivo de interrupção de ligações PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Botão de recurso fixo ACPI" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Ponte padrão CPU - PCI" @@ -514,6 +524,7 @@ GenericMfg = "(dispozitiv generic de sistem)" *PNP0C0D.DeviceDesc = "Capac ACPI" *PNP0C0E.DeviceDesc = "Dispozitiv buton de repaus ACPI" *PNP0C0F.DeviceDesc = "Dispozitiv de întrerupere legătură PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Buton de funcție fixă ACPI" PCI\CC_0500.DeviceDesc = "Dispozitiv de control PCI RAM standard" PCI\CC_0600.DeviceDesc = "Punte standard CPU spre PCI" @@ -553,6 +564,7 @@ GenericMfg = "(Стандартные системные устройства)" *PNP0C0D.DeviceDesc = "Крышка ACPI" *PNP0C0E.DeviceDesc = "Кнопка спящего режима ACPI" *PNP0C0F.DeviceDesc = "Контроллер прервываний PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Кнопка фиксированной возможности ACPI" PCI\CC_0500.DeviceDesc = "Стандартный контроллер PCI RAM" PCI\CC_0600.DeviceDesc = "Стандартный процессор на мосте PCI" @@ -590,6 +602,7 @@ GenericMfg = "(Generické systémové zariadenia)" *PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Štandardný most CPU na PCI" @@ -631,6 +644,7 @@ GenericMfg = "(Umûmî Dizge Aygıtları)" *PNP0C0D.DeviceDesc = "ACPI Kapak" *PNP0C0E.DeviceDesc = "ACPI Uyku Düğmesi Aygıtı" *PNP0C0F.DeviceDesc = "PCI Kesme Bağlantı Aygıtı" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI Sâbit Husûsîyet Düğmesi" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Ölçünlü CPU'dan PCI'ya Köprü" @@ -674,6 +688,7 @@ GenericMfg = "(Стандартні системні пристрої)" *PNP0C0D.DeviceDesc = "Кришка ACPI" *PNP0C0E.DeviceDesc = "Кнопка сплячого режиму ACPI" *PNP0C0F.DeviceDesc = "Контроллер переривань PCI" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "Кнопка фіксованої можливості ACPI" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Стандартний міст CPU на PCI" @@ -711,6 +726,7 @@ GenericMfg = "(Standartiniai sisteminiai įrenginiai)" *PNP0C0D.DeviceDesc = "ACPI dangtis" *PNP0C0E.DeviceDesc = "ACPI miego mygtukas" *PNP0C0F.DeviceDesc = "PCI pertraukimo sąsajos įrenginys" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fiksuotos galimybės mygtukas" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standartinis CPU į PCI tiltas" @@ -751,6 +767,7 @@ GenericMfg = "(通用系统设备)" *PNP0C0D.DeviceDesc = "ACPI 盖子" *PNP0C0E.DeviceDesc = "ACPI 休眠按钮设备" *PNP0C0F.DeviceDesc = "PCI 中断链接设备" +*PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI 固定功能按钮" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "标准 CPU - PCI 桥"

1 0

[reactos] 03/03: WIP
by Timo Kreuzer 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cfd5c601f354625a11ee… commit 8cfd5c601f354625a11ee097984cda0c90f93889 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 13 15:28:44 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 18:26:19 2019 +0100 WIP --- ntoskrnl/mm/ARM3/expool.c | 3 +++ ntoskrnl/mm/ARM3/pool.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 00c68f4ab19..bbf6e407f09 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -2016,6 +2016,9 @@ ExAllocatePoolWithTag( Tag = ' GIB'; } ExpInsertPoolTracker(Tag, ROUND_TO_PAGES(NumberOfBytes), OriginalType); +#if DBG + RtlFillMemory(Allocation, NumberOfBytes, 0xCD); +#endif return Allocation; } diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 995b0ce6347..afafcf823ec 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -666,7 +666,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // Return the allocation address to the caller // #if DBG - RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); + RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); #endif return BaseVa; } @@ -680,7 +680,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, if (BaseVa) { #if DBG - RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); + RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); #endif return BaseVa; } @@ -812,7 +812,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); #if DBG - RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); + RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); #endif return BaseVa; } @@ -911,7 +911,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // BaseVa = MiPteToAddress(StartPte); #if DBG - RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); + RtlFillMemoryUlong(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xABABABAB); #endif return BaseVa; }

1 0

[reactos] 02/03: [NTOS] Add compile time option to trace callers of pool allocations
by Timo Kreuzer 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b20755040754506f3f12… commit 8b20755040754506f3f12a30857f8edc5bf83f33 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Mar 8 12:25:19 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 18:26:19 2019 +0100 [NTOS] Add compile time option to trace callers of pool allocations --- ntoskrnl/mm/ARM3/expool.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 647a4d15681..00c68f4ab19 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -22,6 +22,10 @@ #define POOL_BIG_TABLE_ENTRY_FREE 0x1 +/* DEBUGGING ******************************************************************/ + +//#define DBG_NUMBER_OF_FRAMES_TO_CAPTURE 5 + typedef struct _POOL_DPC_CONTEXT { PPOOL_TRACKER_TABLE PoolTrackTable; @@ -1847,9 +1851,14 @@ ExReturnPoolQuota(IN PVOID P) */ PVOID NTAPI -ExAllocatePoolWithTag(IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag) +#ifdef DBG_NUMBER_OF_FRAMES_TO_CAPTURE +ExAllocatePoolWithTagInternal( +#else +ExAllocatePoolWithTag( +#endif + _In_ POOL_TYPE PoolType, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG Tag) { PPOOL_DESCRIPTOR PoolDesc; PLIST_ENTRY ListHead; @@ -2417,6 +2426,33 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, return Allocation; } +#ifdef DBG_NUMBER_OF_FRAMES_TO_CAPTURE +PVOID +NTAPI +ExAllocatePoolWithTag( + _In_ POOL_TYPE PoolType, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG Tag) +{ + SIZE_T FullSize; + PVOID Allocation, *DbgData; + + /* Allocate a larger chunk to add the debug data */ + FullSize = NumberOfBytes + (DBG_NUMBER_OF_FRAMES_TO_CAPTURE + 2) * sizeof(PVOID); + Allocation = ExAllocatePoolWithTagInternal(PoolType, FullSize, Tag); + if (Allocation == NULL) + { + return NULL; + } + + /* Append the debug data, separated by a '####' */ + DbgData = ALIGN_UP_POINTER_BY((PUCHAR)Allocation + NumberOfBytes, sizeof(PVOID)); + DbgData[0] = (PVOID)(ULONG_PTR)'####'; + RtlWalkFrameChain(&DbgData[1], DBG_NUMBER_OF_FRAMES_TO_CAPTURE, 0); + return Allocation; +} +#endif + /* * @implemented */

1 0

[reactos] 01/03: [NTOS] On DBG builds, fill pool allocations with 0xCD and freed pool with 0xDD
by Timo Kreuzer 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24f240be8a5f7b09a0c12… commit 24f240be8a5f7b09a0c122f40384fc63576accfa Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 29 12:06:04 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 18:26:19 2019 +0100 [NTOS] On DBG builds, fill pool allocations with 0xCD and freed pool with 0xDD This matches what the MSVC runtime does with heap allocations on debug builds. --- ntoskrnl/mm/ARM3/expool.c | 42 ++++++++++++++++++++++++++++++++---------- ntoskrnl/mm/ARM3/pool.c | 20 ++++++++++++++++++-- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index bccb0e9bbdd..647a4d15681 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1859,6 +1859,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, ULONG OriginalType; PKPRCB Prcb = KeGetCurrentPrcb(); PGENERAL_LOOKASIDE LookasideList; + PVOID Allocation; // // Some sanity checks @@ -1898,10 +1899,13 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, if (MmUseSpecialPool(NumberOfBytes, Tag)) { // - // Try to allocate using special pool + // Try to allocate using special pool (initialized with random byte) // - Entry = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); - if (Entry) return Entry; + Allocation = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); + if (Allocation != NULL) + { + return Allocation; + } } } } @@ -1922,8 +1926,8 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Allocate pages for it // - Entry = MiAllocatePoolPages(OriginalType, NumberOfBytes); - if (!Entry) + Allocation = MiAllocatePoolPages(OriginalType, NumberOfBytes); + if (Allocation == NULL) { #if DBG // @@ -1995,7 +1999,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // Add a tag for the big page allocation and switch to the generic "BIG" // tag if we failed to do so, then insert a tracker for this alloation. // - if (!ExpAddTagForBigPages(Entry, + if (!ExpAddTagForBigPages(Allocation, Tag, (ULONG)BYTES_TO_PAGES(NumberOfBytes), OriginalType)) @@ -2003,7 +2007,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Tag = ' GIB'; } ExpInsertPoolTracker(Tag, ROUND_TO_PAGES(NumberOfBytes), OriginalType); - return Entry; + return Allocation; } // @@ -2073,7 +2077,11 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry->PoolTag = Tag; (POOL_FREE_BLOCK(Entry))->Flink = NULL; (POOL_FREE_BLOCK(Entry))->Blink = NULL; - return POOL_FREE_BLOCK(Entry); + Allocation = POOL_FREE_BLOCK(Entry); +#if DBG + RtlFillMemory(Allocation, NumberOfBytes, 0xCD); +#endif + return Allocation; } } @@ -2257,7 +2265,11 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry->PoolTag = Tag; (POOL_FREE_BLOCK(Entry))->Flink = NULL; (POOL_FREE_BLOCK(Entry))->Blink = NULL; - return POOL_FREE_BLOCK(Entry); + Allocation = POOL_FREE_BLOCK(Entry); +#if DBG + RtlFillMemory(Allocation, NumberOfBytes, 0xCD); +#endif + return Allocation; } } while (++ListHead != &PoolDesc->ListHeads[POOL_LISTS_PER_PAGE]); @@ -2400,7 +2412,9 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // ExpCheckPoolBlocks(Entry); Entry->PoolTag = Tag; - return POOL_FREE_BLOCK(Entry); + Allocation = POOL_FREE_BLOCK(Entry); + + return Allocation; } /* @@ -2544,6 +2558,10 @@ ExFreePoolWithTag(IN PVOID P, Tag &= ~PROTECTED_POOL; } +#if DBG + RtlFillMemory(P, PageCount * PAGE_SIZE, 0xDD); +#endif + // // Check block tag // @@ -2669,6 +2687,10 @@ ExFreePoolWithTag(IN PVOID P, } } +#if DBG + RtlFillMemory(P, BlockSize * POOL_BLOCK_SIZE - sizeof(*Entry), 0xDD); +#endif + // // Is this allocation small enough to have come from a lookaside list? // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 5d6554bad75..995b0ce6347 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -665,6 +665,9 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Return the allocation address to the caller // +#if DBG + RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); +#endif return BaseVa; } @@ -674,7 +677,13 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, if ((SizeInPages == 1) && (ExQueryDepthSList(&MiNonPagedPoolSListHead))) { BaseVa = InterlockedPopEntrySList(&MiNonPagedPoolSListHead); - if (BaseVa) return BaseVa; + if (BaseVa) + { +#if DBG + RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); +#endif + return BaseVa; + } } // @@ -802,6 +811,9 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // Release the nonpaged pool lock, and return the allocation // KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); +#if DBG + RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); +#endif return BaseVa; } @@ -897,7 +909,11 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Return the address // - return MiPteToAddress(StartPte); + BaseVa = MiPteToAddress(StartPte); +#if DBG + RtlFillMemory(BaseVa, ROUND_TO_PAGES(SizeInBytes), 0xCD); +#endif + return BaseVa; } ULONG

1 0

[reactos] 01/01: [SHELL32_APITEST] DragDrop: Add NULL check of pDropTarget
by Katayama Hirofumi MZ 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14478887df3ce4166bf0d… commit 14478887df3ce4166bf0dd384071cb9ed9bb9d03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 22:48:06 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 24 22:48:15 2019 +0900 [SHELL32_APITEST] DragDrop: Add NULL check of pDropTarget --- modules/rostests/apitests/shell32/DragDrop.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/rostests/apitests/shell32/DragDrop.cpp b/modules/rostests/apitests/shell32/DragDrop.cpp index 8e35834490f..c292353d86a 100644 --- a/modules/rostests/apitests/shell32/DragDrop.cpp +++ b/modules/rostests/apitests/shell32/DragDrop.cpp @@ -272,6 +272,19 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) CoTaskMemFree(pidl); ok_long(hr, S_OK); + if (!pDropTarget) + { + skip("pDropTarget was NULL\n"); + + // clean up + DeleteFileW(s_szSrcTestFile); + DeleteFileW(s_szDestTestFile); + DoDeleteSpecW(s_szDestLinkSpec); + ILFree(pidlDesktop); + + return; + } + // DragEnter POINTL ptl = { 0, 0 }; DWORD dwKeyState = pEntry->dwKeyState;

1 0

[reactos] 01/01: [HNETCFG] CORE-16372 Jansen's hack
by Katayama Hirofumi MZ 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ac96ca431c2d75efd106… commit 0ac96ca431c2d75efd1060122e2294357c7ec554 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 22:36:49 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 24 22:36:49 2019 +0900 [HNETCFG] CORE-16372 Jansen's hack --- dll/win32/hnetcfg/policy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/hnetcfg/policy.c b/dll/win32/hnetcfg/policy.c index 1f5b0daa568..89ca9677be6 100644 --- a/dll/win32/hnetcfg/policy.c +++ b/dll/win32/hnetcfg/policy.c @@ -226,7 +226,11 @@ static HRESULT WINAPI netfw_rules_Item( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %s, %p\n", This, debugstr_w(name), rule); +#ifdef __REACTOS__ + return S_OK; /* CORE-16372 Jansen's hack */ +#else return E_NOTIMPL; +#endif } static HRESULT WINAPI netfw_rules_get__NewEnum(

1 0

[reactos] 01/01: [SHELL32] Set default exe icon (#2076)
by Katayama Hirofumi MZ 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=399854ce31ef8fe42b723… commit 399854ce31ef8fe42b72319e8cbae0e75989cfa3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 19:26:32 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 24 19:26:32 2019 +0900 [SHELL32] Set default exe icon (#2076) The default icon of an exe file was empty if no icon available from exe. CORE-10480 --- dll/win32/shell32/CExtractIcon.cpp | 15 +++++++++++++++ dll/win32/shell32/folders/CFSFolder.cpp | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CExtractIcon.cpp b/dll/win32/shell32/CExtractIcon.cpp index 26bdb4e9307..e24f6c12800 100644 --- a/dll/win32/shell32/CExtractIcon.cpp +++ b/dll/win32/shell32/CExtractIcon.cpp @@ -138,6 +138,21 @@ HRESULT STDMETHODCALLTYPE CExtractIcon::SetNormalIcon( { TRACE("(%p, %s, %d)\n", this, debugstr_w(pszFile), iIcon); + if (lstrcmpiW(PathFindExtensionW(pszFile), L".exe") == 0) + { + if (!PrivateExtractIconExW(pszFile, 0, NULL, NULL, 1)) + { + WCHAR szPath[MAX_PATH]; + GetModuleFileNameW(shell32_hInstance, szPath, _countof(szPath)); + DuplicateString(szPath, &normalIcon.file); + if (!normalIcon.file) + return E_OUTOFMEMORY; + + normalIcon.index = -IDI_SHELL_EXE; + return S_OK; + } + } + DuplicateString(pszFile, &normalIcon.file); if (!normalIcon.file) return E_OUTOFMEMORY; diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index a356bb927a3..6acf3013e43 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -310,7 +310,7 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE if (!wcscmp(L"%1", wTemp)) /* icon is in the file */ { - ILGetDisplayNameExW(psf, pidl, wTemp, 0); + ILGetDisplayNameExW(psf, pidl, wTemp, ILGDN_FORPARSING); icon_idx = 0; }

1 0

[reactos] 01/01: [SHELL32] Shift-Right-Click patch: Plan B (#2082)
by Katayama Hirofumi MZ 24 Nov '19

24 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db5a2fff5d4c3c6431abd… commit db5a2fff5d4c3c6431abde13f21ee33a27e714dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 19:22:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 24 19:22:23 2019 +0900 [SHELL32] Shift-Right-Click patch: Plan B (#2082) Enable "CMD here" without Shift key. CORE-16519 --- boot/bootdata/hivecls.inf | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 5d761961599..d81e9565f6d 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -32,14 +32,12 @@ HKCR,"Directory","",0x00000000,"File Folder" HKCR,"Directory","AlwaysShowExt",0x00000000,"" HKCR,"Directory","NoRecentDocs",0x00000000,"" HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" -HKCR,"Directory\shell\cmd","Extended",0x00000000,"" HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Drive HKCR,"Drive","",0x00000000,"Drive" ;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" -HKCR,"Drive\shell\cmd","Extended",0x00000000,"" HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Clipboard Element

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