Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/09: Revert "[NTOS:MM/x64] Temporarily release AddressCreationLock in MmCreateVirtualMappingUnsafeEx"

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de3958dc2b626626d017b… commit de3958dc2b626626d017be102c04eb75b3cce56d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 10 02:42:11 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 Revert "[NTOS:MM/x64] Temporarily release AddressCreationLock in MmCreateVirtualMappingUnsafeEx" This reverts commit e685b25e35c9d6dfbe2139ac71f7378b1f9e6d0f. --- ntoskrnl/mm/i386/page.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index eeccef94346..df13cb013e2 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -637,9 +637,6 @@ MmCreateVirtualMappingUnsafeEx( PMMPTE PointerPte; MMPTE TempPte; ULONG_PTR Pte; -#ifdef _M_AMD64 - BOOLEAN LockReleased = FALSE; -#endif DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %x)\n", Process, Address, flProtect, Page); @@ -668,15 +665,6 @@ MmCreateVirtualMappingUnsafeEx( if (!MiSynchronizeSystemPde(MiAddressToPde(Address))) MiFillSystemPageDirectory(Address, PAGE_SIZE); #endif - -#ifdef _M_AMD64 - /* This is a temporary hack, because we can incur a recursive page fault when accessing the PDE */ - if (PsIdleProcess->AddressCreationLock.Owner == KeGetCurrentThread()) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - LockReleased = TRUE; - } -#endif } else { @@ -727,15 +715,6 @@ MmCreateVirtualMappingUnsafeEx( MiIncrementPageTableReferences(Address); MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); } -#ifdef _M_AMD64 - else - { - if (LockReleased) - { - MmLockAddressSpace(MmGetKernelAddressSpace()); - } - } -#endif return(STATUS_SUCCESS); }

1 year, 10 months

[reactos] 04/09: [NTOS:MM] Fix bugs in MmAccessFault

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a662bedab8310ac4c15e1… commit a662bedab8310ac4c15e1337e584e5f5835d14f5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 10 02:10:52 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Fix bugs in MmAccessFault - Acquire the appropriate working set lock when calling MmLocateMemoryAreaByAddress - Do not access MemoryArea without holding the lock (otherwise it can be pulled away under our feet) - Fix range check for paged pool --- ntoskrnl/mm/mmfault.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/mmfault.c b/ntoskrnl/mm/mmfault.c index 68e31ba1281..cfd6d756d15 100644 --- a/ntoskrnl/mm/mmfault.c +++ b/ntoskrnl/mm/mmfault.c @@ -213,6 +213,7 @@ MmAccessFault(IN ULONG FaultCode, { PMEMORY_AREA MemoryArea = NULL; NTSTATUS Status; + BOOLEAN IsArm3Fault = FALSE; /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) @@ -239,19 +240,40 @@ MmAccessFault(IN ULONG FaultCode, /* Is there a ReactOS address space yet? */ if (MmGetKernelAddressSpace()) { - /* Check if this is an ARM3 memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); - if (!(MemoryArea) && (Address <= MM_HIGHEST_USER_ADDRESS)) + if (Address > MM_HIGHEST_USER_ADDRESS) + { + /* Check if this is an ARM3 memory area */ + MiLockWorkingSetShared(PsGetCurrentThread(), &MmSystemCacheWs); + MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); + + if ((MemoryArea != NULL) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3)) + { + IsArm3Fault = TRUE; + } + + MiUnlockWorkingSetShared(PsGetCurrentThread(), &MmSystemCacheWs); + } + else { /* Could this be a VAD fault from user-mode? */ + MiLockProcessWorkingSetShared(PsGetCurrentProcess(), PsGetCurrentThread()); MemoryArea = MmLocateMemoryAreaByAddress(MmGetCurrentAddressSpace(), Address); + + if ((MemoryArea != NULL) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3)) + { + IsArm3Fault = TRUE; + } + + MiUnlockProcessWorkingSetShared(PsGetCurrentProcess(), PsGetCurrentThread()); } } /* Is this an ARM3 memory area, or is there no address space yet? */ - if (((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3)) || - (!(MemoryArea) && ((ULONG_PTR)Address >= (ULONG_PTR)MmPagedPoolStart)) || - (!MmGetKernelAddressSpace())) + if (IsArm3Fault || + ((MemoryArea == NULL) && + ((ULONG_PTR)Address >= (ULONG_PTR)MmPagedPoolStart) && + ((ULONG_PTR)Address < (ULONG_PTR)MmPagedPoolEnd)) || + (!MmGetKernelAddressSpace())) { /* This is an ARM3 fault */ DPRINT("ARM3 fault %p\n", MemoryArea);

1 year, 10 months

[reactos] 03/09: [NTOS:MM] Handle page table faults in MmArmAccessFault

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84d0586ca40c21ae4d2b3… commit 84d0586ca40c21ae4d2b3a68137bc3e88423d463 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 10 22:37:21 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Handle page table faults in MmArmAccessFault These faults are handled by ARM³ and we don't need to check for a memory area. They can be recursive faults (e.g. from MiDeleteSystemPageableVm), so we might be holding the WS lock already. Passing it straight to ARM³ allows to acquire the WS lock below to look up the memory area. --- ntoskrnl/mm/mmfault.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/mmfault.c b/ntoskrnl/mm/mmfault.c index 7937f7b5e5b..68e31ba1281 100644 --- a/ntoskrnl/mm/mmfault.c +++ b/ntoskrnl/mm/mmfault.c @@ -227,11 +227,12 @@ MmAccessFault(IN ULONG FaultCode, #endif } - /* Handle shared user page, which doesn't have a VAD / MemoryArea */ - if (PAGE_ALIGN(Address) == (PVOID)MM_SHARED_USER_DATA_VA) + /* Handle shared user page / page table, which don't have a VAD / MemoryArea */ + if ((PAGE_ALIGN(Address) == (PVOID)MM_SHARED_USER_DATA_VA) || + MI_IS_PAGE_TABLE_ADDRESS(Address)) { /* This is an ARM3 fault */ - DPRINT("ARM3 fault %p\n", MemoryArea); + DPRINT("ARM3 fault %p\n", Address); return MmArmAccessFault(FaultCode, Address, Mode, TrapInformation); }

1 year, 10 months

[reactos] 02/09: [NTOS:MM] Fix address space locking in MiProtectVirtualMemory

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8b57f0a6ba6061ce8102… commit a8b57f0a6ba6061ce810290b7d8e64ac5b73e7f3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 9 22:01:56 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Fix address space locking in MiProtectVirtualMemory --- ntoskrnl/mm/ARM3/virtual.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index e0804520435..ec081c8110d 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -2213,6 +2213,9 @@ MiProtectVirtualMemory(IN PEPROCESS Process, PETHREAD Thread = PsGetCurrentThread(); TABLE_SEARCH_RESULT Result; + /* We must be attached */ + ASSERT(Process == PsGetCurrentProcess()); + /* Calculate base address for the VAD */ StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1)); @@ -2225,11 +2228,22 @@ MiProtectVirtualMemory(IN PEPROCESS Process, return STATUS_INVALID_PAGE_PROTECTION; } + /* Lock the address space and make sure the process isn't already dead */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + if (Process->VmDeleted) + { + DPRINT1("Process is dying\n"); + Status = STATUS_PROCESS_IS_TERMINATING; + goto FailPath; + } + /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { /* Evil hack */ + MmUnlockAddressSpace(AddressSpace); return MiRosProtectVirtualMemory(Process, BaseAddress, NumberOfBytesToProtect, @@ -2237,16 +2251,6 @@ MiProtectVirtualMemory(IN PEPROCESS Process, OldAccessProtection); } - /* Lock the address space and make sure the process isn't already dead */ - AddressSpace = MmGetCurrentAddressSpace(); - MmLockAddressSpace(AddressSpace); - if (Process->VmDeleted) - { - DPRINT1("Process is dying\n"); - Status = STATUS_PROCESS_IS_TERMINATING; - goto FailPath; - } - /* Get the VAD for this address range, and make sure it exists */ Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, EndingAddress >> PAGE_SHIFT,

1 year, 10 months

[reactos] 01/09: [NTOS:MM] Add ASSERTS to MmLockAddressSpace to guarantee lock ordering

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d701b4b05c465e1e01ab… commit 6d701b4b05c465e1e01abd911949c9645e193f0f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 9 21:39:35 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Add ASSERTS to MmLockAddressSpace to guarantee lock ordering --- ntoskrnl/include/internal/mm.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index f637014794a..d1dad7a25c1 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1690,6 +1690,12 @@ FORCEINLINE VOID MmLockAddressSpace(PMMSUPPORT AddressSpace) { + ASSERT(!PsGetCurrentThread()->OwnsProcessWorkingSetExclusive); + ASSERT(!PsGetCurrentThread()->OwnsProcessWorkingSetShared); + ASSERT(!PsGetCurrentThread()->OwnsSystemWorkingSetExclusive); + ASSERT(!PsGetCurrentThread()->OwnsSystemWorkingSetShared); + ASSERT(!PsGetCurrentThread()->OwnsSessionWorkingSetExclusive); + ASSERT(!PsGetCurrentThread()->OwnsSessionWorkingSetShared); KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); }

1 year, 10 months

[reactos] 01/01: [MSPAINT] Show out-of-memory message (#5817)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab199cc147afab56d975d… commit ab199cc147afab56d975d100ebbc5816e5993aed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 25 02:35:49 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 25 02:35:49 2023 +0900 [MSPAINT] Show out-of-memory message (#5817) - Improve ImageModel::PushImageForUndo. - Use FormatMessage in newly added ShowOutOfMemory function. - Call ShowOutOfMemory() when out of memory. CORE-19227, CORE-19094 --- base/applications/mspaint/common.h | 1 + base/applications/mspaint/dib.cpp | 3 +++ base/applications/mspaint/history.cpp | 31 +++++++++++++++++++++++++------ base/applications/mspaint/history.h | 3 ++- base/applications/mspaint/main.cpp | 12 ++++++++++++ 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 3dda6703441..125a9cb53a6 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -43,6 +43,7 @@ enum HITTEST // hit /* FUNCTIONS ********************************************************/ +void ShowOutOfMemory(void); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index eede3325c55..2c13cc2f785 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -228,7 +228,10 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) COLORREF white = RGB(255, 255, 255); HBITMAP hBitmap = CreateColorDIB(registrySettings.BMPWidth, registrySettings.BMPHeight, white); if (hBitmap == NULL) + { + ShowOutOfMemory(); return NULL; + } HDC hScreenDC = ::GetDC(NULL); g_xDpi = (float)::GetDeviceCaps(hScreenDC, LOGPIXELSX); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 2d28cb5def2..003d0ab5877 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -116,13 +116,31 @@ void ImageModel::ClearHistory() m_redoSteps = 0; } +void ImageModel::PushImageForUndo() +{ + HBITMAP hbm = CopyBitmap(); + if (hbm) + { + ShowOutOfMemory(); + return; + } + + PushImageForUndo(hbm); +} + void ImageModel::PushImageForUndo(HBITMAP hbm) { ATLTRACE("%s: %d\n", __FUNCTION__, m_currInd); + if (hbm == NULL) + { + ShowOutOfMemory(); + return; + } + // Go to the next item with an HBITMAP or current item ::DeleteObject(m_hBms[(m_currInd + 1) % HISTORYSIZE]); - m_hBms[(m_currInd + 1) % HISTORYSIZE] = (hbm ? hbm : CopyDIBImage(m_hBms[m_currInd])); + m_hBms[(m_currInd + 1) % HISTORYSIZE] = hbm; m_currInd = (m_currInd + 1) % HISTORYSIZE; ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); @@ -145,7 +163,10 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) // Create an HBITMAP HBITMAP hbmCropped = CreateDIBWithProperties(nWidth, nHeight); if (!hbmCropped) + { + ShowOutOfMemory(); return; + } // Select the HBITMAP by memory DC HDC hdcMem = ::CreateCompatibleDC(m_hDrawingDC); @@ -251,8 +272,7 @@ void ImageModel::RotateNTimes90Degrees(int iN) case 3: { HBITMAP hbm = Rotate90DegreeBlt(m_hDrawingDC, GetWidth(), GetHeight(), iN == 1, FALSE); - if (hbm) - PushImageForUndo(hbm); + PushImageForUndo(hbm); break; } case 2: @@ -294,8 +314,7 @@ void ImageModel::PushBlackAndWhite() HBITMAP hNewBitmap = ConvertToBlackAndWhite(hBitmap); UnlockBitmap(hBitmap); - if (hNewBitmap) - PushImageForUndo(hNewBitmap); + PushImageForUndo(hNewBitmap); } HBITMAP ImageModel::LockBitmap() @@ -319,7 +338,7 @@ void ImageModel::SelectionClone(BOOL bUndoable) return; if (bUndoable) - PushImageForUndo(CopyBitmap()); + PushImageForUndo(); selectionModel.DrawSelection(m_hDrawingDC, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 24f1e09cd13..093dd1c34dd 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -19,7 +19,8 @@ public: HDC GetDC(); BOOL CanUndo() const { return m_undoSteps > 0; } BOOL CanRedo() const { return m_redoSteps > 0; } - void PushImageForUndo(HBITMAP hbm = NULL); + void PushImageForUndo(); + void PushImageForUndo(HBITMAP hbm); void ResetToPrevious(void); void Undo(BOOL bClearRedo = FALSE); void Redo(void); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index ac1a037ddae..63db53f02de 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -22,6 +22,18 @@ CMainWindow mainWindow; /* FUNCTIONS ********************************************************/ +void ShowOutOfMemory(void) +{ + WCHAR szText[256]; + ::FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + ERROR_OUTOFMEMORY, + 0, + szText, _countof(szText), + NULL); + mainWindow.MessageBox(szText, NULL, MB_ICONERROR); +} + // get file name extension from filter string static BOOL FileExtFromFilter(LPTSTR pExt, OPENFILENAME *pOFN)

1 year, 10 months

[reactos] 01/01: [NTOS:LPC] Fix input parameter for ProbeAndCaptureUnicodeString (#5815)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=501c2bdd63c4d4b97c4bc… commit 501c2bdd63c4d4b97c4bc3b54241abe53e0fabdf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 22 21:57:59 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 23 18:18:45 2023 +0200 [NTOS:LPC] Fix input parameter for ProbeAndCaptureUnicodeString (#5815) Addendum to commit b3c55b9e6 (PR #4399). Passing &CapturedObjectName as pointer to be probed and captured would fail if e.g. PreviousMode == UserMode, since that pointer is always in kernel space. Instead, pass the original user-mode pointer. Bug caught by Timo Kreuzer ;) --- ntoskrnl/lpc/create.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/lpc/create.c b/ntoskrnl/lpc/create.c index 7c017b6b7e1..2f4d5b9622a 100644 --- a/ntoskrnl/lpc/create.c +++ b/ntoskrnl/lpc/create.c @@ -83,8 +83,9 @@ LpcpCreatePort(OUT PHANDLE PortHandle, } else { - if (ObjectAttributes->ObjectName) - CapturedObjectName = *(ObjectAttributes->ObjectName); + ObjectName = ObjectAttributes->ObjectName; + if (ObjectName) + CapturedObjectName = *ObjectName; } /* Normalize the buffer pointer in case we don't have @@ -96,7 +97,7 @@ LpcpCreatePort(OUT PHANDLE PortHandle, /* Capture the port name for DPRINT only - ObCreateObject does its * own capture. As it is used only for debugging, ignore any failure; * the string is zeroed out in such case. */ - ProbeAndCaptureUnicodeString(&CapturedPortName, PreviousMode, &CapturedObjectName); + ProbeAndCaptureUnicodeString(&CapturedPortName, PreviousMode, ObjectName); LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", &CapturedPortName); ReleaseCapturedUnicodeString(&CapturedPortName, PreviousMode); #endif

1 year, 10 months

[reactos] 01/01: [BDASUP][PORTCLS][SYSAUDIO][USB] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5811)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b54477d47f943561bed0… commit 5b54477d47f943561bed08df8e6feee2d5d0e839 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Oct 23 18:16:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 23 18:16:59 2023 +0200 [BDASUP][PORTCLS][SYSAUDIO][USB] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5811) --- drivers/multimedia/bdasup/bdasup.c | 20 ++++---------------- drivers/usb/usbccgp/misc.c | 14 ++------------ drivers/usb/usbstor/misc.c | 10 +--------- drivers/usb/usbstor_new/misc.c | 22 ++-------------------- drivers/wdm/audio/backpln/portcls/pool.cpp | 9 +-------- drivers/wdm/audio/sysaudio/main.c | 14 ++++---------- 6 files changed, 14 insertions(+), 75 deletions(-) diff --git a/drivers/multimedia/bdasup/bdasup.c b/drivers/multimedia/bdasup/bdasup.c index df3de2a13d9..b300d88d828 100644 --- a/drivers/multimedia/bdasup/bdasup.c +++ b/drivers/multimedia/bdasup/bdasup.c @@ -1,6 +1,8 @@ #include "precomp.h" +#define TAG_BDASUP 'SadB' + const GUID KSPROPSETID_BdaPinControl = {0xded49d5, 0xa8b7, 0x4d5d, {0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d}}; const GUID KSMETHODSETID_BdaDeviceConfiguration = {0x71985f45, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; const GUID KSPROPSETID_BdaTopology = {0xa14ee835, 0x0a23, 0x11d3, {0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; @@ -24,7 +26,6 @@ KSPROPERTY_ITEM FilterPropertyItem[] = DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(BdaPropertyNodeDescriptors, NULL) }; - KSPROPERTY_SET FilterPropertySet = { &KSPROPSETID_BdaTopology, @@ -90,28 +91,21 @@ KSAUTOMATION_TABLE PinAutomationTable = NULL }; - PVOID AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_BDASUP); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_BDASUP); } - PBDA_FILTER_INSTANCE_ENTRY GetFilterInstanceEntry( IN PKSFILTERFACTORY FilterFactory) @@ -141,7 +135,6 @@ GetFilterInstanceEntry( InstanceEntry = NULL; } - /* release spin lock */ KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); @@ -245,7 +238,6 @@ FreeFilterInstance( KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); } - /* @implemented */ @@ -339,7 +331,6 @@ BdaCreateFilterFactoryEx( /* release spin lock */ KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); - if (ppKSFilterFactory) { /* store result */ @@ -450,7 +441,6 @@ BdaCreatePin( } } - DPRINT("BdaCreatePin Result %x PinId %u\n", Status, PinId); return Status; } @@ -543,8 +533,6 @@ BdaInitFilter( return Status; } - - /* @implemented */ diff --git a/drivers/usb/usbccgp/misc.c b/drivers/usb/usbccgp/misc.c index 5edd293838f..9242fcf0a31 100644 --- a/drivers/usb/usbccgp/misc.c +++ b/drivers/usb/usbccgp/misc.c @@ -95,17 +95,8 @@ AllocateItem( IN POOL_TYPE PoolType, IN ULONG ItemSize) { - /* Allocate item */ - PVOID Item = ExAllocatePoolWithTag(PoolType, ItemSize, USBCCPG_TAG); - - if (Item) - { - /* Zero item */ - RtlZeroMemory(Item, ItemSize); - } - - /* Return element */ - return Item; + /* Allocate, zero and return item */ + return ExAllocatePoolZero(PoolType, ItemSize, USBCCPG_TAG); } VOID @@ -123,7 +114,6 @@ DumpFunctionDescriptor( { ULONG Index, SubIndex; - DPRINT("FunctionCount %lu\n", FunctionDescriptorCount); for (Index = 0; Index < FunctionDescriptorCount; Index++) { diff --git a/drivers/usb/usbstor/misc.c b/drivers/usb/usbstor/misc.c index 71af4c1fd61..7165cc1d433 100644 --- a/drivers/usb/usbstor/misc.c +++ b/drivers/usb/usbstor/misc.c @@ -12,7 +12,6 @@ #define NDEBUG #include <debug.h> - IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; NTSTATUS @@ -126,14 +125,7 @@ AllocateItem( IN POOL_TYPE PoolType, IN ULONG ItemSize) { - PVOID Item = ExAllocatePoolWithTag(PoolType, ItemSize, USB_STOR_TAG); - - if (Item) - { - RtlZeroMemory(Item, ItemSize); - } - - return Item; + return ExAllocatePoolZero(PoolType, ItemSize, USB_STOR_TAG); } VOID diff --git a/drivers/usb/usbstor_new/misc.c b/drivers/usb/usbstor_new/misc.c index 6b60cf828e7..861acb11cd7 100644 --- a/drivers/usb/usbstor_new/misc.c +++ b/drivers/usb/usbstor_new/misc.c @@ -55,7 +55,6 @@ USBSTOR_SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp) // IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); - // // call driver // @@ -101,13 +100,11 @@ USBSTOR_GetBusInterface( ASSERT(DeviceObject); ASSERT(BusInterface); - // // initialize event // KeInitializeEvent(&Event, NotificationEvent, FALSE); - // // create irp // @@ -194,7 +191,6 @@ USBSTOR_SyncUrbRequest( // KeInitializeEvent(&Event, NotificationEvent, FALSE); - // // get next stack location // @@ -252,22 +248,9 @@ AllocateItem( IN ULONG ItemSize) { // - // allocate item + // allocate, zero and return item // - PVOID Item = ExAllocatePoolWithTag(PoolType, ItemSize, USB_STOR_TAG); - - if (Item) - { - // - // zero item - // - RtlZeroMemory(Item, ItemSize); - } - - // - // return element - // - return Item; + return ExAllocatePoolZero(PoolType, ItemSize, USB_STOR_TAG); } VOID @@ -333,7 +316,6 @@ USBSTOR_ClassRequest( return Status; } - NTSTATUS USBSTOR_GetMaxLUN( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/wdm/audio/backpln/portcls/pool.cpp b/drivers/wdm/audio/backpln/portcls/pool.cpp index cd39f61c3fb..63ee67edcdd 100644 --- a/drivers/wdm/audio/backpln/portcls/pool.cpp +++ b/drivers/wdm/audio/backpln/portcls/pool.cpp @@ -11,7 +11,6 @@ #ifndef YDEBUG #define NDEBUG #endif - #include <debug.h> PVOID @@ -20,12 +19,7 @@ AllocateItem( IN SIZE_T NumberOfBytes, IN ULONG Tag) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, Tag); } VOID @@ -33,6 +27,5 @@ FreeItem( IN PVOID Item, IN ULONG Tag) { - ExFreePoolWithTag(Item, Tag); } diff --git a/drivers/wdm/audio/sysaudio/main.c b/drivers/wdm/audio/sysaudio/main.c index ee7946146f3..12e5b2aacfc 100644 --- a/drivers/wdm/audio/sysaudio/main.c +++ b/drivers/wdm/audio/sysaudio/main.c @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> +#define TAG_SYSAUDIO 'AsyS' + const GUID KSCATEGORY_SYSAUDIO = {0xA7C7A5B1L, 0x5AF3, 0x11D1, {0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07}}; const GUID KSCATEGORY_AUDIO_DEVICE = {0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; const GUID KSCATEGORY_PREFERRED_WAVEOUT_DEVICE = {0xD6C5066EL, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; @@ -25,22 +27,16 @@ AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_SYSAUDIO); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_SYSAUDIO); } - VOID NTAPI SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) @@ -88,7 +84,6 @@ SysAudio_Shutdown( return STATUS_SUCCESS; } - NTSTATUS NTAPI SysAudio_Pnp( @@ -222,7 +217,6 @@ SysAudio_AddDevice( /* register shutdown notification */ IoRegisterShutdownNotification(DeviceObject); - /* Done */ return STATUS_SUCCESS;

1 year, 10 months

[reactos] 01/01: [HOTPLUG] Add device properties dialog support (#5812)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f5c59a0b3e3b731f118c… commit 7f5c59a0b3e3b731f118c7654972c88b2418fa82 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Mon Oct 23 18:53:08 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 23 18:53:08 2023 +0700 [HOTPLUG] Add device properties dialog support (#5812) Clicking at "Properties" button or right-click menu now opens properties dialog for the selected device. --- dll/cpl/hotplug/hotplug.c | 75 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 7f2930f26cc..15dea9c7583 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -157,13 +157,13 @@ InsertDeviceTreeItem( tvItem.hParent = hParent; tvItem.hInsertAfter = TVI_LAST; - tvItem.item.mask = TVIF_STATE | TVIF_TEXT /*| TVIF_PARAM*/ | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvItem.item.state = TVIS_EXPANDED; tvItem.item.stateMask = TVIS_EXPANDED; tvItem.item.pszText = szDisplayName; tvItem.item.iImage = nClassImage; tvItem.item.iSelectedImage = nClassImage; - tvItem.item.lParam = (LPARAM)NULL; + tvItem.item.lParam = (LPARAM)DevInst; return TreeView_InsertItem(hwndDeviceTree, &tvItem); } @@ -344,6 +344,69 @@ ShowContextMenu( } +static +DEVINST +GetSelectedDeviceInst( + _In_ HWND hwndDeviceTree) +{ + HTREEITEM hTreeItem; + TVITEMW item; + + hTreeItem = TreeView_GetSelection(hwndDeviceTree); + if (hTreeItem == NULL) + return 0; + + ZeroMemory(&item, sizeof(item)); + item.mask = TVIF_PARAM; + item.hItem = hTreeItem; + + TreeView_GetItem(hwndDeviceTree, &item); + + return item.lParam; +} + +static +VOID +ShowDeviceProperties( + _In_ HWND hwndParent, + _In_ DEVINST DevInst) +{ + ULONG ulSize; + CONFIGRET cr; + LPWSTR pszDevId; + + cr = CM_Get_Device_ID_Size(&ulSize, DevInst, 0); + if (cr != CR_SUCCESS || ulSize == 0) + return; + + /* Take the terminating NULL into account */ + ulSize++; + + pszDevId = HeapAlloc(GetProcessHeap(), 0, ulSize * sizeof(WCHAR)); + if (pszDevId == NULL) + return; + + cr = CM_Get_Device_IDW(DevInst, pszDevId, ulSize, 0); + if (cr == CR_SUCCESS) + { + typedef int (WINAPI *PFDEVICEPROPERTIESW)(HWND, LPCWSTR, LPCWSTR, BOOL); + HMODULE hDevMgrDll; + PFDEVICEPROPERTIESW pDevicePropertiesW; + + hDevMgrDll = LoadLibraryW(L"devmgr.dll"); + if (hDevMgrDll != NULL) + { + pDevicePropertiesW = (PFDEVICEPROPERTIESW)GetProcAddress(hDevMgrDll, "DevicePropertiesW"); + if (pDevicePropertiesW != NULL) + pDevicePropertiesW(hwndParent, NULL, pszDevId, FALSE); + + FreeLibrary(hDevMgrDll); + } + } + + HeapFree(GetProcessHeap(), 0, pszDevId); +} + INT_PTR CALLBACK SafeRemovalDlgProc( @@ -434,6 +497,14 @@ SafeRemovalDlgProc( } } break; + + case IDC_SAFE_REMOVE_PROPERTIES: + case IDM_PROPERTIES: + { + HWND hwndDevTree = GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE); + ShowDeviceProperties(hwndDlg, GetSelectedDeviceInst(hwndDevTree)); + break; + } } break;

1 year, 10 months

[reactos] 01/01: [SHELL32] Revert CDefView change at bc70af4

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f86e11aa254572807675… commit 6f86e11aa2545728076756231ac76fbe151ee121 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 23 08:13:20 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 23 08:13:29 2023 +0900 [SHELL32] Revert CDefView change at bc70af4 CORE-18426 --- dll/win32/shell32/CDefView.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 876748cd13e..9f12fd09549 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1522,9 +1522,6 @@ HRESULT CDefView::InvokeContextMenuCommand(CComPtr<IContextMenu> &pCM, UINT uCom cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.hwnd = m_hWnd; - if (uCommand==FCIDM_SHVIEW_COPYTO) cmi.lpVerb = "copyto"; - if (uCommand==FCIDM_SHVIEW_MOVETO) cmi.lpVerb = "moveto"; - if (GetKeyState(VK_SHIFT) & 0x8000) cmi.fMask |= CMIC_MASK_SHIFT_DOWN;

1 year, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs