Ros-diffs

ros-diffs@reactos.org

13 participants
81035 discussions

[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, 2 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, 2 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, 2 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, 2 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, 2 months

[reactos] 01/01: [SHELL32] Use IS_INTRESOURCE in CCopyToMenu/CMoveToMenu::InvokeCommand

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc70af4c134ba31778b46… commit bc70af4c134ba31778b46686da8fc1c70f0f6d51 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 23 07:55:24 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 23 07:55:24 2023 +0900 [SHELL32] Use IS_INTRESOURCE in CCopyToMenu/CMoveToMenu::InvokeCommand CORE-18426 --- dll/win32/shell32/CCopyToMenu.cpp | 2 +- dll/win32/shell32/CDefView.cpp | 3 +++ dll/win32/shell32/CMoveToMenu.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index a692d7fed53..d3da9d1f5a8 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -319,7 +319,7 @@ CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; TRACE("CCopyToMenu::InvokeCommand(%p)\n", lpici); - if (HIWORD(lpici->lpVerb) == 0) + if (IS_INTRESOURCE(lpici->lpVerb)) { if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdCopyTo) { diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9f12fd09549..876748cd13e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1522,6 +1522,9 @@ 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; diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 5087f5ec37d..a2d35f1ade1 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -323,7 +323,7 @@ CMoveToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; TRACE("CMoveToMenu::InvokeCommand(%p)\n", lpici); - if (HIWORD(lpici->lpVerb) == 0) + if (IS_INTRESOURCE(lpici->lpVerb)) { if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdMoveTo) {

1 year, 2 months

[reactos] 01/01: [COMCTL32] Invalidate LVIS_CUT selected items too (#4218)

by Jesús Sanz del Rey

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855008d97b2c7e1a1b72a… commit 855008d97b2c7e1a1b72ad268b68d83c739ebc6d Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Sat Oct 21 18:51:54 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 21 18:51:54 2023 +0200 [COMCTL32] Invalidate LVIS_CUT selected items too (#4218) This fixes icons that should be drawn transparently not showing as such until window gets repainted. For example, hidden shell folders that are not drawn transparently until the filebrowser window is resized... CORE-16722 --- dll/win32/comctl32/listview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 9d6609ffd71..5bd7e287a8b 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2276,7 +2276,11 @@ static void LISTVIEW_InvalidateSelectedItems(const LISTVIEW_INFO *infoPtr) iterator_frameditems(&i, infoPtr, &infoPtr->rcList); while(iterator_next(&i)) { +#ifdef __REACTOS__ + if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED | LVIS_CUT)) +#else if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED)) +#endif LISTVIEW_InvalidateItem(infoPtr, i.nItem); } iterator_destroy(&i);

1 year, 2 months

[reactos] 01/01: [HDAUDBUS][KS][WDMAUD] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5792)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c03b2ed9bebdc9b68539f… commit c03b2ed9bebdc9b68539f863f8f6ea853989e961 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 20 18:09:03 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 18:09:03 2023 +0200 [HDAUDBUS][KS][WDMAUD] Use ExAllocatePoolZero() and ExFreePoolWithTag() (#5792) And promote/fix 2 DPRINTs as well. --- drivers/ksfilter/ks/filterfactory.c | 3 +-- drivers/ksfilter/ks/misc.c | 12 ++---------- drivers/wdm/audio/hdaudbus/fdo.cpp | 5 ++--- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 13 +++++-------- drivers/wdm/audio/legacy/wdmaud/sup.c | 18 +++--------------- 5 files changed, 13 insertions(+), 38 deletions(-) diff --git a/drivers/ksfilter/ks/filterfactory.c b/drivers/ksfilter/ks/filterfactory.c index aed00b05d92..be907d8df9c 100644 --- a/drivers/ksfilter/ks/filterfactory.c +++ b/drivers/ksfilter/ks/filterfactory.c @@ -247,7 +247,7 @@ IKsFilterFactory_fnInitialize( This->FilterFactory.FilterDescriptor = AllocateItem(NonPagedPool, sizeof(KSFILTER_DESCRIPTOR)); if (!This->FilterFactory.FilterDescriptor) { - DPRINT("out of memory"); + DPRINT1("Out of memory\n"); return STATUS_INSUFFICIENT_RESOURCES; } RtlMoveMemory((PVOID)This->FilterFactory.FilterDescriptor, (PVOID)Descriptor, sizeof(KSFILTER_DESCRIPTOR)); @@ -751,4 +751,3 @@ KsFilterFactoryUpdateCacheData( /* done */ return Status; } - diff --git a/drivers/ksfilter/ks/misc.c b/drivers/ksfilter/ks/misc.c index 5174f850cf0..e2656442d3e 100644 --- a/drivers/ksfilter/ks/misc.c +++ b/drivers/ksfilter/ks/misc.c @@ -22,7 +22,6 @@ CompleteRequest( ASSERT(Irp->IoStatus.Status != STATUS_PENDING); - IoCompleteRequest(Irp, PriorityBoost); } @@ -31,19 +30,14 @@ AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_KS); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_KS); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_KS); } NTSTATUS @@ -172,5 +166,3 @@ KsGetParent( /* return object type */ return (PVOID)BasicHeader->Parent.KsDevice; } - - diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 7088ee933c3..59eaf7d48ec 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -5,6 +5,7 @@ * PURPOSE: HDA Driver Entry * PROGRAMMER: Johannes Anderwald */ + #include "hdaudbus.h" BOOLEAN @@ -217,7 +218,7 @@ HDA_InitCodec( Entry = (PHDA_CODEC_ENTRY)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_ENTRY)); if (!Entry) { - DPRINT1("hda: failed to allocate memory"); + DPRINT1("hda: failed to allocate memory\n"); return STATUS_UNSUCCESSFUL; } @@ -812,5 +813,3 @@ HDA_FDOQueryBusRelations( /* done */ return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 88e82c6b7ed..5522d18033f 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -5,6 +5,7 @@ * PURPOSE: HDA Driver Entry * PROGRAMMER: Johannes Anderwald */ + #include "hdaudbus.h" DRIVER_DISPATCH HDA_Pnp; @@ -19,19 +20,14 @@ AllocateItem( _In_ POOL_TYPE PoolType, _In_ SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_HDA); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_HDA); } VOID FreeItem( __drv_freesMem(Mem) PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_HDA); } NTSTATUS @@ -305,6 +301,7 @@ HDA_Unload( extern "C" { + NTSTATUS NTAPI DriverEntry( @@ -320,4 +317,4 @@ DriverEntry( return STATUS_SUCCESS; } -} +} // extern "C" diff --git a/drivers/wdm/audio/legacy/wdmaud/sup.c b/drivers/wdm/audio/legacy/wdmaud/sup.c index 91334c09bb3..496eabf56e2 100644 --- a/drivers/wdm/audio/legacy/wdmaud/sup.c +++ b/drivers/wdm/audio/legacy/wdmaud/sup.c @@ -21,23 +21,16 @@ AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_WDMAUD); - if (!Item) - return Item; - - RtlZeroMemory(Item, NumberOfBytes); - return Item; + return ExAllocatePoolZero(PoolType, NumberOfBytes, TAG_WDMAUD); } VOID FreeItem( IN PVOID Item) { - ExFreePool(Item); + ExFreePoolWithTag(Item, TAG_WDMAUD); } - - ULONG GetSysAudioDeviceCount( IN PDEVICE_OBJECT DeviceObject) @@ -62,7 +55,6 @@ GetSysAudioDeviceCount( return Count; } - NTSTATUS SetIrpIoStatus( IN PIRP Irp, @@ -72,8 +64,8 @@ SetIrpIoStatus( Irp->IoStatus.Information = Length; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } ULONG @@ -186,7 +178,6 @@ ReadKeyValue( return PartialInformation; } - NTSTATUS CompareProductName( IN HANDLE hSubKey, @@ -248,8 +239,6 @@ CompareProductName( return STATUS_SUCCESS; } - - NTSTATUS FindProductName( IN LPWSTR PnpName, @@ -431,5 +420,4 @@ OpenDevice( } return Status; - }

1 year, 2 months

[reactos] 01/01: [BOOTDATA] vfatfs.sys is packaged for xbox only (#5805)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fed9475cc51f3b5fc40b… commit 1fed9475cc51f3b5fc40bd52bced98c89614dae4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 20 13:19:41 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:19:41 2023 +0200 [BOOTDATA] vfatfs.sys is packaged for xbox only (#5805) Addendum to 14c3936 (0.4.15-dev-5090). CORE-16373 --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index ed359f99bbe..1c084276ce4 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -124,7 +124,6 @@ pci.sys = 1,,,,,,x,4,,,,1,4 scsiport.sys = 1,,,,,,,4,,,,1,4 storport.sys = 1,,,,,,,4,,,,1,4 fastfat.sys = 1,,,,,,x,4,,,,1,4 -vfatfs.sys = 1,,,,,,,4,,,,1,4 btrfs.sys = 1,,,,,,x,4,,,,1,4 ramdisk.sys = 1,,,,,,x,4,,,,1,4 pciide.sys = 1,,,,,,,4,,,,1,4 @@ -282,6 +281,7 @@ halaacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 [Files.xbox] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 +vfatfs.sys = 1,,,,,,,4,,,,1,4 [Files.pc98_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2

1 year, 2 months

[reactos] 01/01: [TASKMGR] Get rid of cplusplus extern c (#5808)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd1d19b3fbf6731eb533… commit ddd1d19b3fbf6731eb5339d5834f7f519caeae39 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Oct 20 13:03:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:03:59 2023 +0200 [TASKMGR] Get rid of cplusplus extern c (#5808) The others in graphctrl.h and graph.h are being handled in the yet-uncommitted PR #5343. --- base/applications/taskmgr/perfdata.h | 15 +++------------ base/applications/taskmgr/perfpage.h | 10 +--------- base/applications/taskmgr/taskmgr.h | 23 +---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 3da4a0fef2b..0a06c4d5cf2 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,17 +1,13 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Counters. + * PURPOSE: Performance Counters * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + (double)((x).LowPart)) typedef struct _PERFDATA @@ -43,9 +39,9 @@ typedef struct _PERFDATA typedef struct _CMD_LINE_CACHE { - DWORD idx; + DWORD idx; LPWSTR str; - ULONG len; + ULONG len; struct _CMD_LINE_CACHE* pnext; } CMD_LINE_CACHE, *PCMD_LINE_CACHE; @@ -99,8 +95,3 @@ ULONG PerfDataGetPhysicalMemorySystemCacheK(void); ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); - - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index e581bd39c3e..fcf270eece3 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,16 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Page. + * PURPOSE: Performance Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - extern HWND hPerformancePage; /* Performance Property Page */ INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -18,7 +14,3 @@ void RefreshPerformancePage(void); void PerformancePage_OnViewShowKernelTimes(void); void PerformancePage_OnViewCPUHistoryOneGraphAll(void); void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index e65ef30221f..fe387718c40 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,29 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Main Header. + * PURPOSE: Main Header * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef _MSC_VER -/*MF -typedef struct _IO_COUNTERS { - ULONGLONG ReadOperationCount; - ULONGLONG WriteOperationCount; - ULONGLONG OtherOperationCount; - ULONGLONG ReadTransferCount; - ULONGLONG WriteTransferCount; - ULONGLONG OtherTransferCount; -} IO_COUNTERS, *PIO_COUNTERS; -*/ -#endif /* _MSC_VER */ - #include "resource.h" #define RUN_APPS_PAGE @@ -100,7 +83,3 @@ void TaskManager_OnTabWndSelChange(void); VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread); - -#ifdef __cplusplus -} -#endif

1 year, 2 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