Ros-diffs October 2024

ros-diffs@reactos.org

20 participants
117 discussions

[reactos] 01/01: [SHELL32] Remove view related items from File menu (#7429)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4cb10f5966470f90aeeb… commit f4cb10f5966470f90aeeb7d885e4737a72e89522 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Tue Oct 8 18:17:24 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 8 18:17:24 2024 +0200 [SHELL32] Remove view related items from File menu (#7429) CORE-19778 --- dll/win32/shell32/CDefView.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 3344ebfe0e5..95f4a9bff14 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1807,11 +1807,15 @@ HRESULT CDefView::FillFileMenu() return hr; // TODO: filter or something + if (!selcount) + { + DeleteMenu(hmenu, FCIDM_SHVIEW_VIEW, MF_BYCOMMAND); + DeleteMenu(hmenu, FCIDM_SHVIEW_ARRANGE, MF_BYCOMMAND); + DeleteMenu(hmenu, FCIDM_SHVIEW_REFRESH, MF_BYCOMMAND); + } Shell_MergeMenus(hFileMenu, hmenu, 0, 0, 0xFFFF, MM_ADDSEPARATOR | MM_SUBMENUSHAVEIDS); - ::DestroyMenu(hmenu); - return S_OK; }

2 months, 2 weeks

[reactos] 02/02: [CMLIB] Fix GCC13 print formatting '%lu' warning (#7408)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee5338ff135f5d958c447… commit ee5338ff135f5d958c447efb0ae7f8c1b993eb50 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 16:24:25 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 17:48:03 2024 +0200 [CMLIB] Fix GCC13 print formatting '%lu' warning (#7408) CORE-19724 sdk/lib/cmlib/cmcheck.c: Print the HCELL_INDEX indices in hexadecimal. ------------------ sdk/lib/cmlib/cmcheck.c:321:60: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'ULONG' {aka 'unsigned int'} [-Wformat=] and at lines 341, 357, 374, 554, 579, 733, 760, 801, 984, 1003, 1458, 1476, 1521, 1551, 1670 sdk/lib/cmlib/cmcheck.c:1251:65: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'HCELL_INDEX' {aka 'unsigned int'} [-Wformat=] and at lines 1282, 1303, 1551 sdk/lib/cmlib/cmcheck.c:1326:79: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'LONG' {aka 'int'} [-Wformat=] sdk/lib/cmlib/cmcheck.c:1684:76: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'CM_CHECK_REGISTRY_STATUS' {aka 'unsigned int'} [-Wformat=] and at line 1711 ------------------ sdk/lib/cmlib/cmheal.c:223:108: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'ULONG' {aka 'unsigned int'} [-Wformat=] and at lines 240, 319, 335 sdk/lib/cmlib/cmheal.c:480:79: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'int' [-Wformat=] ------------------ sdk/lib/cmlib/hiveinit.c:976:62: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'ULONG' {aka 'unsigned int'} [-Wformat=] and at lines 988, 1492 --- sdk/lib/cmlib/cmcheck.c | 49 +++++++++++++++++++++++++----------------------- sdk/lib/cmlib/cmheal.c | 11 ++++++----- sdk/lib/cmlib/hivecell.c | 12 ++++++------ sdk/lib/cmlib/hiveinit.c | 6 +++--- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/sdk/lib/cmlib/cmcheck.c b/sdk/lib/cmlib/cmcheck.c index 0c1d82b0555..88de8b75215 100644 --- a/sdk/lib/cmlib/cmcheck.c +++ b/sdk/lib/cmlib/cmcheck.c @@ -318,7 +318,7 @@ CmpValidateValueListByCount( ValueListData, FixHive)) { - DPRINT1("The value cell is NIL (at index %lu, list count %lu)\n", + DPRINT1("The value cell is NIL (at index %u, list count %u)\n", ListCountIndex, ListCount); return CM_CHECK_REGISTRY_VALUE_CELL_NIL; } @@ -338,7 +338,7 @@ CmpValidateValueListByCount( ValueListData, FixHive)) { - DPRINT1("The value cell is not allocated (at index %lu, list count %lu)\n", + DPRINT1("The value cell is not allocated (at index %u, list count %u)\n", ListCountIndex, ListCount); return CM_CHECK_REGISTRY_VALUE_CELL_UNALLOCATED; } @@ -354,7 +354,7 @@ CmpValidateValueListByCount( ValueData = (PCELL_DATA)HvGetCell(Hive, ValueCell); if (!ValueData) { - DPRINT1("Cell data of the value cell not found (at index %lu, value count %lu)\n", + DPRINT1("Cell data of the value cell not found (at index %u, value count %u)\n", ListCountIndex, ListCount); return CM_CHECK_REGISTRY_VALUE_CELL_DATA_NOT_FOUND; } @@ -371,7 +371,7 @@ CmpValidateValueListByCount( ValueListData, FixHive)) { - DPRINT1("The total size is bigger than the actual cell size (total size %lu, cell size %lu, at index %lu)\n", + DPRINT1("The total size is bigger than the actual cell size (total size %u, cell size %u, at index %u)\n", TotalValueNameLength, ValueDataSize, ListCountIndex); return CM_CHECK_REGISTRY_VALUE_CELL_SIZE_NOT_SANE; } @@ -551,7 +551,7 @@ CmpValidateValueList( TotalValueLength = ValueListCount * sizeof(HCELL_INDEX); if (TotalValueLength > ValueSize) { - DPRINT1("The value list is bigger than the cell (value list size %lu, cell size %lu)\n", + DPRINT1("The value list is bigger than the cell (value list size %u, cell size %u)\n", TotalValueLength, ValueSize); return CM_CHECK_REGISTRY_VALUE_LIST_SIZE_NOT_SANE; } @@ -576,7 +576,7 @@ CmpValidateValueList( /* Log how much values have been removed */ if (ValuesRemoved > 0) { - DPRINT1("Values removed in the list -- %lu\n", ValuesRemoved); + DPRINT1("%u values removed in the list\n", ValuesRemoved); } } @@ -730,7 +730,7 @@ CmpValidateSubKeyList( CellData, FixHive)) { - DPRINT1("The subkeys list has invalid count (subkeys count %lu, root key index count %lu)\n", + DPRINT1("The subkeys list has invalid count (subkeys count %u, root key index count %u)\n", SubKeyCounts, RootKeyIndex->Count); return CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT; } @@ -757,7 +757,7 @@ CmpValidateSubKeyList( KeyIndexCell = RootKeyIndex->List[RootIndex]; if (!HvIsCellAllocated(Hive, KeyIndexCell)) { - DPRINT1("The key index cell is not allocated at index %lu\n", RootIndex); + DPRINT1("The key index cell is not allocated at index %u\n", RootIndex); *DoRepair = TRUE; return CM_CHECK_REGISTRY_KEY_INDEX_CELL_UNALLOCATED; } @@ -798,7 +798,7 @@ CmpValidateSubKeyList( CellData, FixHive)) { - DPRINT1("The subkeys list has invalid count (subkeys count %lu, total leaf count %lu)\n", + DPRINT1("The subkeys list has invalid count (subkeys count %u, total leaf count %u)\n", SubKeyCounts, TotalLeafCount); return CM_CHECK_REGISTRY_BAD_SUBKEY_COUNT; } @@ -981,7 +981,7 @@ CmpValidateKey( CellSize = HvGetCellSize(Hive, CellData); if (CellSize > CMP_KEY_SIZE_THRESHOLD) { - DPRINT1("The cell size is above the threshold size (size %lu)\n", CellSize); + DPRINT1("The cell size is above the threshold size (size %u)\n", CellSize); return CM_CHECK_REGISTRY_CELL_SIZE_NOT_SANE; } @@ -1000,7 +1000,8 @@ CmpValidateKey( TotalKeyNameLength = NameLength + FIELD_OFFSET(CM_KEY_NODE, Name); if (TotalKeyNameLength > CellSize) { - DPRINT1("The key is too big than the cell (key size %lu, cell size %lu)\n", TotalKeyNameLength, CellSize); + DPRINT1("The key is too big than the cell (key size %u, cell size %u)\n", + TotalKeyNameLength, CellSize); return CM_CHECK_REGISTRY_KEY_TOO_BIG_THAN_CELL; } @@ -1248,7 +1249,7 @@ RestartValidation: */ if (!CmpRepairParentKey(Hive, CurrentCell, ParentCell, FixHive)) { - DPRINT1("The key is corrupt (current cell %lu, parent cell %lu)\n", + DPRINT1("The key is corrupt (current cell 0x%x, parent cell 0x%x)\n", CurrentCell, ParentCell); CmpFree(WorkState, WorkStateLength); return CmStatusCode; @@ -1279,8 +1280,8 @@ RestartValidation: */ if (!CmpRepairParentKey(Hive, CurrentCell, ParentCell, FixHive)) { - DPRINT1("The lexicographical order is invalid (sibling %lu, current cell %lu)\n", - CurrentCell, WorkState[StackDepth - CMP_PRIOR_STACK].Sibling); + DPRINT1("The lexicographical order is invalid (sibling 0x%x, current cell 0x%x)\n", + CurrentCell, WorkState[StackDepth - CMP_PRIOR_STACK].Sibling); CmpFree(WorkState, WorkStateLength); return CM_CHECK_REGISTRY_BAD_LEXICOGRAPHICAL_ORDER; } @@ -1300,7 +1301,7 @@ RestartValidation: KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CurrentCell); if (!KeyNode) { - DPRINT1("Couldn't get the node of key (current cell %lu)\n", CurrentCell); + DPRINT1("Couldn't get the node of key (current cell 0x%x)\n", CurrentCell); CmpFree(WorkState, WorkStateLength); return CM_CHECK_REGISTRY_NODE_NOT_FOUND; } @@ -1323,7 +1324,7 @@ RestartValidation: ChildSubKeyCell = CmpFindSubKeyByNumber(Hive, KeyNode, WorkState[StackDepth].ChildCellIndex); if (ChildSubKeyCell == HCELL_NIL) { - DPRINT1("Couldn't get the child subkey cell (at stack index %lu)\n", StackDepth); + DPRINT1("Couldn't get the child subkey cell (at stack index %d)\n", StackDepth); CmpFree(WorkState, WorkStateLength); return CM_CHECK_REGISTRY_SUBKEY_NOT_FOUND; } @@ -1455,7 +1456,7 @@ HvValidateBin( * free space (aka Size == 0) which is a * no go for a bin. */ - DPRINT1("The free cell exceeds the bin size or cell size equal to 0 (cell 0x%p, cell size %d, bin size %lu)\n", + DPRINT1("The free cell exceeds the bin size or cell size equal to 0 (cell 0x%p, cell size %d, bin size %u)\n", Cell, Cell->Size, Bin->Size); return CM_CHECK_REGISTRY_BAD_FREE_CELL; } @@ -1473,7 +1474,7 @@ HvValidateBin( * that exceeds the boundary of the * bin size. */ - DPRINT1("The allocated cell exceeds the bin size (cell 0x%p, cell size %d, bin size %lu)\n", + DPRINT1("The allocated cell exceeds the bin size (cell 0x%p, cell size %d, bin size %u)\n", Cell, abs(Cell->Size), Bin->Size); return CM_CHECK_REGISTRY_BAD_ALLOC_CELL; } @@ -1518,7 +1519,7 @@ HvValidateHive( /* Is the hive signature valid? */ if (Hive->Signature != HV_HHIVE_SIGNATURE) { - DPRINT1("Hive's signature corrupted (signature %lu)\n", Hive->Signature); + DPRINT1("Hive's signature corrupted (signature %u)\n", Hive->Signature); return CM_CHECK_REGISTRY_HIVE_CORRUPT_SIGNATURE; } @@ -1548,7 +1549,7 @@ HvValidateHive( if (Bin->Size > (StorageLength * HBLOCK_SIZE) || (Bin->FileOffset / HBLOCK_SIZE) != BlockIndex) { - DPRINT1("Bin size or offset is corrupt (bin size %lu, file offset %lu, storage length %lu)\n", + DPRINT1("Bin size or offset is corrupt (bin size %u, file offset %u, storage length %u)\n", Bin->Size, Bin->FileOffset, StorageLength); return CM_CHECK_REGISTRY_BIN_SIZE_OR_OFFSET_CORRUPT; } @@ -1667,7 +1668,7 @@ CmCheckRegistry( CM_CHECK_REGISTRY_VALIDATE_HIVE | CM_CHECK_REGISTRY_FIX_HIVE)) { - DPRINT1("Invalid flag for registry check given (flag %lu)\n", Flags); + DPRINT1("Invalid flag for registry check given (flag %u)\n", Flags); return CM_CHECK_REGISTRY_INVALID_PARAMETER; } @@ -1681,7 +1682,8 @@ CmCheckRegistry( CmStatusCode = HvValidateHive(Hive); if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) { - DPRINT1("The hive is not valid (hive 0x%p, check status code %lu)\n", Hive, CmStatusCode); + DPRINT1("The hive is not valid (hive 0x%p, check status code %u)\n", + Hive, CmStatusCode); return CmStatusCode; } } @@ -1708,7 +1710,8 @@ CmCheckRegistry( CmStatusCode = CmpValidateRegistryInternal(Hive, Flags, FALSE, ShouldFixHive); if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) { - DPRINT1("The hive is not valid (hive 0x%p, check status code %lu)\n", Hive, CmStatusCode); + DPRINT1("The hive is not valid (hive 0x%p, check status code %u)\n", + Hive, CmStatusCode); return CmStatusCode; } diff --git a/sdk/lib/cmlib/cmheal.c b/sdk/lib/cmlib/cmheal.c index 9489d621bed..08b526ff04a 100644 --- a/sdk/lib/cmlib/cmheal.c +++ b/sdk/lib/cmlib/cmheal.c @@ -220,7 +220,7 @@ CmpRemoveSubkeyInRoot( HvReleaseCell(Hive, LeafCell); HvMarkCellDirty(Hive, LeafCell, FALSE); CmpRemoveFastIndexKeyCell(FastIndex, LeafCountIndex, TRUE); - DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, index %lu)\n", + DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, index %u)\n", FastIndex, LeafCountIndex); return TRUE; } @@ -237,7 +237,7 @@ CmpRemoveSubkeyInRoot( HvReleaseCell(Hive, LeafCell); HvMarkCellDirty(Hive, LeafCell, FALSE); CmpRemoveIndexKeyCell(Leaf, LeafCountIndex); - DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %lu)\n", + DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %u)\n", Leaf, LeafCountIndex); return TRUE; } @@ -316,7 +316,7 @@ CmpRemoveSubKeyInLeaf( * rather than that of the fast index. */ Leaf->Count--; - DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, leaf index %lu)\n", + DPRINT1("The offending key cell has BEEN FOUND in fast index (fast index 0x%p, leaf index %u)\n", FastIndex, LeafIndex); return TRUE; } @@ -332,7 +332,7 @@ CmpRemoveSubKeyInLeaf( { HvMarkCellDirty(Hive, KeyNode->SubKeyLists[Stable], FALSE); CmpRemoveIndexKeyCell(Leaf, LeafIndex); - DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %lu)\n", + DPRINT1("The offending key cell has BEEN FOUND in leaf (leaf 0x%p, index %u)\n", Leaf, LeafIndex); return TRUE; } @@ -477,7 +477,8 @@ CmpRepairParentKey( * if for whatever reason we reach here then something * is seriously wrong. */ - DPRINT1("The key index signature is invalid (KeyIndex->Signature == %lu)", KeyIndex->Signature); + DPRINT1("The key index signature is invalid (KeyIndex->Signature == %u)", + KeyIndex->Signature); ASSERT(FALSE); } diff --git a/sdk/lib/cmlib/hivecell.c b/sdk/lib/cmlib/hivecell.c index 2354631ad8c..8630d87c67f 100644 --- a/sdk/lib/cmlib/hivecell.c +++ b/sdk/lib/cmlib/hivecell.c @@ -26,7 +26,7 @@ HvpGetCellHeader( { PVOID Block; - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive 0x%p, CellIndex 0x%x\n", __FUNCTION__, RegistryHive, CellIndex); ASSERT(CellIndex != HCELL_NIL); @@ -116,7 +116,7 @@ HvMarkCellDirty( ASSERT(RegistryHive->ReadOnly == FALSE); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive 0x%p, CellIndex 0x%x, HoldingLock %u\n", __FUNCTION__, RegistryHive, CellIndex, HoldingLock); if (HvGetCellType(CellIndex) != Stable) @@ -367,7 +367,7 @@ HvAllocateCell( ASSERT(RegistryHive->ReadOnly == FALSE); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive 0x%p, Size 0x%x, %s, Vicinity 0x%x\n", __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); /* Round to 16 bytes multiple. */ @@ -411,7 +411,7 @@ HvAllocateCell( FreeCell->Size = -FreeCell->Size; RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex 0x%x\n", __FUNCTION__, FreeCellOffset); return FreeCellOffset; @@ -431,7 +431,7 @@ HvReallocateCell( ASSERT(CellIndex != HCELL_NIL); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive 0x%p, CellIndex 0x%x, Size 0x%x\n", __FUNCTION__, RegistryHive, CellIndex, Size); Storage = HvGetCellType(CellIndex); @@ -477,7 +477,7 @@ HvFreeCell( ASSERT(RegistryHive->ReadOnly == FALSE); - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive 0x%p, CellIndex 0x%x\n", __FUNCTION__, RegistryHive, CellIndex); Free = HvpGetCellHeader(RegistryHive, CellIndex); diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index d79c9dadad3..133232de613 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -973,7 +973,7 @@ HvpRecoverDataFromLog( HBLOCK_SIZE); if (!Success) { - DPRINT1("Failed to read the dirty block (index %lu)\n", BlockIndex); + DPRINT1("Failed to read the dirty block (index %u)\n", BlockIndex); return Fail; } @@ -985,7 +985,7 @@ HvpRecoverDataFromLog( HBLOCK_SIZE); if (!Success) { - DPRINT1("Failed to write dirty block to hive (index %lu)\n", BlockIndex); + DPRINT1("Failed to write dirty block to hive (index %u)\n", BlockIndex); return Fail; } @@ -1489,7 +1489,7 @@ HvInitialize( default: { - DPRINT1("Invalid operation type (OperationType = %lu)\n", OperationType); + DPRINT1("Invalid operation type (OperationType = %u)\n", OperationType); return STATUS_INVALID_PARAMETER; } }

2 months, 2 weeks

[reactos] 01/02: [CABMAN] Fix GCC13 buffer format overflow warning (#7408)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0f8b40d5a369979d02a4… commit a0f8b40d5a369979d02a4706f4dce0e89c77910b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 16:08:20 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 17:47:46 2024 +0200 [CABMAN] Fix GCC13 buffer format overflow warning (#7408) CORE-19724 sdk/tools/cabman/dfp.cxx:1136:36: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=] 1136 | sprintf(InfLine, "%s=%s", GetFileName(SrcName).c_str(), DstName); | ^ sdk/tools/cabman/dfp.cxx:1136:20: note: 'sprintf' output 2 or more bytes (assuming 4097) into a destination of size 4096 --- sdk/tools/cabman/cabinet.h | 5 +++++ sdk/tools/cabman/dfp.cxx | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 1697588bbfc..b3516ff2c8c 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -36,10 +36,15 @@ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] #endif +#ifndef _countof +#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) +#endif + #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" +#define snprintf _snprintf #define strcasecmp _stricmp #define strdup _strdup #else diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index 575b48f0816..498c81ff7b8 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -1031,7 +1031,7 @@ ULONG CDFParser::PerformFileCopy() char ch; char SrcName[PATH_MAX]; char DstName[PATH_MAX]; - char InfLine[PATH_MAX]; + char InfLine[PATH_MAX*2+1]; // To hold: GetFileName(SrcName) "=" DstName char Options[128]; char BaseFilename[PATH_MAX]; @@ -1076,7 +1076,7 @@ ULONG CDFParser::PerformFileCopy() } // options (it may be empty) - SkipSpaces (); + SkipSpaces(); if (CurrentToken != TokenEnd) { @@ -1133,12 +1133,13 @@ ULONG CDFParser::PerformFileCopy() switch (Status) { case CAB_STATUS_SUCCESS: - sprintf(InfLine, "%s=%s", GetFileName(SrcName).c_str(), DstName); + snprintf(InfLine, _countof(InfLine) - 1, + "%s=%s", GetFileName(SrcName).c_str(), DstName); WriteInfLine(InfLine); break; case CAB_STATUS_CANNOT_OPEN: - if (strstr(Options,"optional")) + if (strstr(Options, "optional")) { Status = CAB_STATUS_SUCCESS; printf("Optional file skipped (does not exist): %s.\n", SrcName);

2 months, 2 weeks

[reactos] 01/01: [ISAPNP] Detect I/O ports at runtime (#7411)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10b08aa2bbc831faf5c15… commit 10b08aa2bbc831faf5c15afced425c442618c325 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Mon Oct 7 20:10:08 2024 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 7 16:10:08 2024 +0200 [ISAPNP] Detect I/O ports at runtime (#7411) Improve the driver's portability. CORE-17977 --- drivers/bus/isapnp/hardware.c | 10 ++++++++-- drivers/bus/isapnp/isapnp.c | 26 ++++++++++++++++---------- drivers/bus/isapnp/isapnphw.h | 12 +++++------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 443fb787bbd..7a50c2740bd 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -20,13 +20,19 @@ #endif /* UNIT_TEST */ +ULONG IsaConfigPorts[2] = +{ + ISAPNP_WRITE_DATA_PCAT, + ISAPNP_ADDRESS_PCAT +}; + static inline VOID WriteAddress( _In_ UCHAR Address) { - WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS, Address); + WRITE_PORT_UCHAR(UlongToPtr(IsaConfigPorts[1]), Address); } static @@ -35,7 +41,7 @@ VOID WriteData( _In_ UCHAR Data) { - WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_DATA, Data); + WRITE_PORT_UCHAR(UlongToPtr(IsaConfigPorts[0]), Data); } static diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 2450d367413..6b498812773 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -28,6 +28,8 @@ LIST_ENTRY BusListHead; #endif /* UNIT_TEST */ +extern ULONG IsaConfigPorts[2]; + /* FUNCTIONS ******************************************************************/ static @@ -822,7 +824,6 @@ IsaPnpCreateReadPortDORequirements( ULONG ResourceCount, ListSize, i; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_DESCRIPTOR Descriptor; - const ULONG Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; const ULONG ReadPorts[] = { 0x274, 0x3E4, 0x204, 0x2E4, 0x354, 0x2F4 }; PAGED_CODE(); @@ -840,7 +841,7 @@ IsaPnpCreateReadPortDORequirements( * [...] * [IO descriptor: Read Port X - 1, optional] */ - ResourceCount = RTL_NUMBER_OF(Ports) * 2 + RTL_NUMBER_OF(ReadPorts); + ResourceCount = RTL_NUMBER_OF(IsaConfigPorts) * 2 + RTL_NUMBER_OF(ReadPorts); } else { @@ -857,7 +858,7 @@ IsaPnpCreateReadPortDORequirements( * [IO descriptor: Read Port X, required] * [IO descriptor: Read Port X, optional] */ - ResourceCount = (RTL_NUMBER_OF(Ports) + RTL_NUMBER_OF(ReadPorts)) * 2; + ResourceCount = (RTL_NUMBER_OF(IsaConfigPorts) + RTL_NUMBER_OF(ReadPorts)) * 2; } ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (ResourceCount - 1); @@ -875,7 +876,7 @@ IsaPnpCreateReadPortDORequirements( Descriptor = &RequirementsList->List[0].Descriptors[0]; /* Store the Data port and the Address port */ - for (i = 0; i < RTL_NUMBER_OF(Ports) * 2; i++) + for (i = 0; i < RTL_NUMBER_OF(IsaConfigPorts) * 2; i++) { if ((i % 2) == 0) { @@ -886,7 +887,7 @@ IsaPnpCreateReadPortDORequirements( Descriptor->u.Port.Length = 0x01; Descriptor->u.Port.Alignment = 0x01; Descriptor->u.Port.MinimumAddress.LowPart = - Descriptor->u.Port.MaximumAddress.LowPart = Ports[i / 2]; + Descriptor->u.Port.MaximumAddress.LowPart = IsaConfigPorts[i / 2]; } else { @@ -965,7 +966,6 @@ CODE_SEG("PAGE") PCM_RESOURCE_LIST IsaPnpCreateReadPortDOResources(VOID) { - const USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; ULONG ListSize, i; PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; @@ -973,7 +973,7 @@ IsaPnpCreateReadPortDOResources(VOID) PAGED_CODE(); ListSize = sizeof(CM_RESOURCE_LIST) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (RTL_NUMBER_OF(Ports) - 1); + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (RTL_NUMBER_OF(IsaConfigPorts) - 1); ResourceList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!ResourceList) return NULL; @@ -982,16 +982,16 @@ IsaPnpCreateReadPortDOResources(VOID) ResourceList->List[0].InterfaceType = Internal; ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = RTL_NUMBER_OF(Ports); + ResourceList->List[0].PartialResourceList.Count = RTL_NUMBER_OF(IsaConfigPorts); Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - for (i = 0; i < RTL_NUMBER_OF(Ports); i++) + for (i = 0; i < RTL_NUMBER_OF(IsaConfigPorts); i++) { Descriptor->Type = CmResourceTypePort; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; Descriptor->u.Port.Length = 0x01; - Descriptor->u.Port.Start.LowPart = Ports[i]; + Descriptor->u.Port.Start.LowPart = IsaConfigPorts[i]; Descriptor++; } @@ -1415,6 +1415,12 @@ DriverEntry( { DPRINT("%s(%p, %wZ)\n", __FUNCTION__, DriverObject, RegistryPath); + if (IsNEC_98) + { + IsaConfigPorts[0] = ISAPNP_WRITE_DATA_PC98; + IsaConfigPorts[1] = ISAPNP_ADDRESS_PC98; + } + DriverObject->MajorFunction[IRP_MJ_CREATE] = IsaCreateClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IsaCreateClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IsaForwardOrIgnore; diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index 5eb62746450..a5cb7a7d98c 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -13,13 +13,11 @@ extern "C" { #endif -#if defined(SARCH_PC98) -#define ISAPNP_ADDRESS 0x259 -#define ISAPNP_WRITE_DATA 0xA59 -#else -#define ISAPNP_ADDRESS 0x279 -#define ISAPNP_WRITE_DATA 0xA79 -#endif +#define ISAPNP_ADDRESS_PCAT 0x279 +#define ISAPNP_WRITE_DATA_PCAT 0xA79 + +#define ISAPNP_ADDRESS_PC98 0x259 +#define ISAPNP_WRITE_DATA_PC98 0xA59 #define ISAPNP_READPORT 0x00 #define ISAPNP_SERIALISOLATION 0x01

2 months, 2 weeks

[reactos] 02/02: [APITESTS] Add tests for CAtlList::AddHeadList and CAtlList::AddTailList

by Vitaly Orekhov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50a72881be93938639d25… commit 50a72881be93938639d25ca4d772594476667415 Author: Vitaly Orekhov <crce2000(a)mail.ru> AuthorDate: Fri Sep 27 23:39:50 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 15:41:28 2024 +0200 [APITESTS] Add tests for CAtlList::AddHeadList and CAtlList::AddTailList --- modules/rostests/apitests/atl/CAtlList.cpp | 45 ++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index f9c2933beef..b0db7bba758 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -113,9 +113,54 @@ test_SwapElements() ok_list(list, "3,1,2,"); } +static void +test_AppendListToTail() +{ + CAtlList<int> list; + list.AddTail(1); + list.AddTail(2); + list.AddTail(0); + ok_list(list, "1,2,0,"); + + CAtlList<int> list_tail; + list_tail.AddTail(8); + list_tail.AddTail(1); + list_tail.AddTail(0); + ok_list(list_tail, "8,1,0,"); + + list.AddTailList(&list_tail); + ok_list(list, "1,2,0,8,1,0,"); + + list_tail.AddTailList(&list); + ok_list(list_tail, "8,1,0,1,2,0,8,1,0,"); +} + +static void +test_AppendListToHead() +{ + CAtlList<int> list_head; + list_head.AddHead(0); + list_head.AddHead(0); + list_head.AddHead(2); + ok_list(list_head, "2,0,0,"); + + CAtlList<int> list; + list.AddHead(8); + list.AddHead(9); + list.AddHead(7); + ok_list(list, "7,9,8,"); + + list.AddHeadList(&list_head); + ok_list(list, "2,0,0,7,9,8,"); + + list_head.AddHeadList(&list); + ok_list(list_head, "2,0,0,7,9,8,2,0,0,"); +} START_TEST(CAtlList) { test_BasicCases(); test_SwapElements(); + test_AppendListToTail(); + test_AppendListToHead(); }

2 months, 2 weeks

[reactos] 01/02: [ATL] Implement CAtlList::AddHeadList and CAtlList::AddTailList

by Vitaly Orekhov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=103d84448ffbaebc51a74… commit 103d84448ffbaebc51a7451eb3f4f12f32f1538c Author: Vitaly Orekhov <crce2000(a)mail.ru> AuthorDate: Fri Sep 27 23:09:30 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 15:41:28 2024 +0200 [ATL] Implement CAtlList::AddHeadList and CAtlList::AddTailList What about a convenient way to append CAtlList to each other? --- sdk/lib/atl/atlcoll.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index 1068deeacc5..8351a3a6f56 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -480,6 +480,9 @@ public: POSITION AddHead(INARGTYPE element); POSITION AddTail(INARGTYPE element); + void AddHeadList(_In_ const CAtlList<E, ETraits>* plNew); + void AddTailList(_In_ const CAtlList<E, ETraits>* plNew); + E RemoveHead(); E RemoveTail(); @@ -639,6 +642,24 @@ POSITION CAtlList<E, ETraits>::AddTail(INARGTYPE element) return (POSITION)Node; } +template <typename E, class ETraits> +void CAtlList<E, ETraits>::AddHeadList(_In_ const CAtlList<E, ETraits>* plNew) +{ + ATLASSERT(plNew != NULL && plNew != this); + POSITION pos = plNew->GetTailPosition(); + while (pos) + AddHead(plNew->GetPrev(pos)); +} + +template <typename E, class ETraits> +void CAtlList<E, ETraits>::AddTailList(_In_ const CAtlList<E, ETraits>* plNew) +{ + ATLASSERT(plNew != NULL && plNew != this); + POSITION pos = plNew->GetHeadPosition(); + while (pos) + AddTail(plNew->GetNext(pos)); +} + template<typename E, class ETraits> E CAtlList<E, ETraits>::RemoveHead() {

2 months, 2 weeks

[reactos] 01/01: [USER32] Hackfix for CORE-17902 - The cursoricon (copyimage) that returns NULL to render - LR_COPYFROMRESOURCE (#6886)

by Julen Urizar Compains

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3ec7cdd4821ae3372d58… commit d3ec7cdd4821ae3372d58466900e4518c982a360 Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Mon Oct 7 12:46:02 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 7 05:46:02 2024 -0500 [USER32] Hackfix for CORE-17902 - The cursoricon (copyimage) that returns NULL to render - LR_COPYFROMRESOURCE (#6886) * [USER32] Hackfix for CORE-17902 - The cursoricon (copyimage) that returns NULL to render - LR_COPYFROMRESOURCE --------- Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- win32ss/user/user32/windows/cursoricon.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index 586deb7a728..53c98456e81 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -2044,7 +2044,15 @@ HANDLE WINAPI CopyImage( return BITMAP_CopyImage(hImage, cxDesired, cyDesired, fuFlags); case IMAGE_CURSOR: case IMAGE_ICON: - return CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); + /* HACK: Copying bitmaps with LR_COPYFROMRESOURCE flag fails. CORE-17902. + * This is a way to return the original bit map if we need + * the icons to show up. We need a simpler test. */ + { + HANDLE handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags); + if (!handle && (fuFlags & (LR_COPYFROMRESOURCE|LR_COPYRETURNORG))) + handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, (fuFlags & ~LR_COPYFROMRESOURCE)); + return handle; + } default: SetLastError(ERROR_INVALID_PARAMETER); break;

2 months, 2 weeks

[reactos] 08/08: [KERNEL32] GetDriveTypeW: Fix the case with unformatted volumes and volume GUID names

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32e65f2f8d0445fbb9389… commit 32e65f2f8d0445fbb93893487fc6fc4fccc0f3ff Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 21:02:06 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [KERNEL32] GetDriveTypeW: Fix the case with unformatted volumes and volume GUID names Fix the case when GetDriveTypeW would return DRIVE_NO_ROOT_DIR when it got a volume GUID name and had to access an unformatted volume. Fixes Rufus not being able to find an unformatted volume after writting new MBR. --- dll/win32/kernel32/client/file/disk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/kernel32/client/file/disk.c b/dll/win32/kernel32/client/file/disk.c index 12751c6b1ad..07d0c15b85e 100644 --- a/dll/win32/kernel32/client/file/disk.c +++ b/dll/win32/kernel32/client/file/disk.c @@ -608,6 +608,9 @@ GetDriveTypeW(IN LPCWSTR lpRootPathName) return DRIVE_NO_ROOT_DIR; } + /* We will work with a device object, so trim the trailing backslash now */ + PathName.Length -= sizeof(WCHAR); + /* Let's probe for it, by forcing open failure! */ RetryOpen = TRUE; InitializeObjectAttributes(&ObjectAttributes, &PathName,

2 months, 2 weeks

[reactos] 07/08: [FMIFS] Improve FormatEx and Chkdsk

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c5cd20b9de38568fc488… commit 5c5cd20b9de38568fc48801f9259bf211c94ce37 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 00:27:49 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [FMIFS] Improve FormatEx and Chkdsk - Remove the hack for missing IOCTL_MOUNTDEV_QUERY_DEVICE_NAME - Handle DriveRoot without a trailing backslash --- dll/win32/fmifs/chkdsk.c | 45 +++++++++++++++++++++++++++------------------ dll/win32/fmifs/format.c | 45 +++++++++++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 36 deletions(-) diff --git a/dll/win32/fmifs/chkdsk.c b/dll/win32/fmifs/chkdsk.c index c3be682eeea..5a24a3f8645 100644 --- a/dll/win32/fmifs/chkdsk.c +++ b/dll/win32/fmifs/chkdsk.c @@ -8,6 +8,7 @@ */ #include "precomp.h" +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -30,31 +31,38 @@ Chkdsk( UNICODE_STRING usDriveRoot; NTSTATUS Status; BOOLEAN Success = FALSE; + WCHAR DriveName[MAX_PATH]; WCHAR VolumeName[MAX_PATH]; - //CURDIR CurDir; Provider = GetProvider(Format); if (!Provider) { /* Unknown file system */ - Callback(DONE, 0, &Success); - return; + goto Quit; } -#if 1 - DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); - swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); - RtlCreateUnicodeString(&usDriveRoot, VolumeName); - /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ -#else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, RTL_NUMBER_OF(VolumeName)) || - !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) + if (!NT_SUCCESS(RtlStringCchCopyW(DriveName, ARRAYSIZE(DriveName), DriveRoot))) + goto Quit; + + if (DriveName[wcslen(DriveName) - 1] != L'\\') { - /* Report an error */ - Callback(DONE, 0, &Success); - return; + /* Append the trailing backslash for GetVolumeNameForVolumeMountPointW */ + if (!NT_SUCCESS(RtlStringCchCatW(DriveName, ARRAYSIZE(DriveName), L"\\"))) + goto Quit; } -#endif + + if (!GetVolumeNameForVolumeMountPointW(DriveName, VolumeName, ARRAYSIZE(VolumeName))) + { + /* Couldn't get a volume GUID path, try checking using a parameter provided path */ + DPRINT1("Couldn't get a volume GUID path for drive %S\n", DriveName); + wcscpy(VolumeName, DriveName); + } + + if (!RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, NULL)) + goto Quit; + + /* Trim the trailing backslash since we will work with a device object */ + usDriveRoot.Length -= sizeof(WCHAR); DPRINT("Chkdsk() - %S\n", Format); Status = STATUS_SUCCESS; @@ -72,10 +80,11 @@ Chkdsk( if (!Success) DPRINT1("Chkdsk() failed with Status 0x%lx\n", Status); - /* Report success */ - Callback(DONE, 0, &Success); - RtlFreeUnicodeString(&usDriveRoot); + +Quit: + /* Report result */ + Callback(DONE, 0, &Success); } /* EOF */ diff --git a/dll/win32/fmifs/format.c b/dll/win32/fmifs/format.c index 82fa203b1e4..ecab033f98e 100644 --- a/dll/win32/fmifs/format.c +++ b/dll/win32/fmifs/format.c @@ -9,6 +9,7 @@ */ #include "precomp.h" +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -50,8 +51,8 @@ FormatEx( BOOLEAN Success = FALSE; BOOLEAN BackwardCompatible = FALSE; // Default to latest FS versions. MEDIA_TYPE MediaType; + WCHAR DriveName[MAX_PATH]; WCHAR VolumeName[MAX_PATH]; - //CURDIR CurDir; // // TODO: Convert filesystem Format into ULIB format string. @@ -61,24 +62,31 @@ FormatEx( if (!Provider) { /* Unknown file system */ - Callback(DONE, 0, &Success); - return; + goto Quit; } -#if 1 - DPRINT1("Warning: use GetVolumeNameForVolumeMountPointW() instead!\n"); - swprintf(VolumeName, L"\\??\\%c:", towupper(DriveRoot[0])); - RtlCreateUnicodeString(&usDriveRoot, VolumeName); - /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ -#else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, RTL_NUMBER_OF(VolumeName)) || - !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) + if (!NT_SUCCESS(RtlStringCchCopyW(DriveName, ARRAYSIZE(DriveName), DriveRoot))) + goto Quit; + + if (DriveName[wcslen(DriveName) - 1] != L'\\') { - /* Report an error */ - Callback(DONE, 0, &Success); - return; + /* Append the trailing backslash for GetVolumeNameForVolumeMountPointW */ + if (!NT_SUCCESS(RtlStringCchCatW(DriveName, ARRAYSIZE(DriveName), L"\\"))) + goto Quit; } -#endif + + if (!GetVolumeNameForVolumeMountPointW(DriveName, VolumeName, ARRAYSIZE(VolumeName))) + { + /* Couldn't get a volume GUID path, try formatting using a parameter provided path */ + DPRINT1("Couldn't get a volume GUID path for drive %S\n", DriveName); + wcscpy(VolumeName, DriveName); + } + + if (!RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, NULL)) + goto Quit; + + /* Trim the trailing backslash since we will work with a device object */ + usDriveRoot.Length -= sizeof(WCHAR); RtlInitUnicodeString(&usLabel, Label); @@ -119,10 +127,11 @@ FormatEx( if (!Success) DPRINT1("Format() failed\n"); - /* Report success */ - Callback(DONE, 0, &Success); - RtlFreeUnicodeString(&usDriveRoot); + +Quit: + /* Report result */ + Callback(DONE, 0, &Success); } /* EOF */

2 months, 2 weeks

[reactos] 06/08: [NTOS:PNP] PiNotifyTargetDeviceChange: Don't free incorrect buffer

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d18b12ff7a39f86abbf1… commit 1d18b12ff7a39f86abbf1d98f9b40821dd003094 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 00:17:39 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [NTOS:PNP] PiNotifyTargetDeviceChange: Don't free incorrect buffer --- ntoskrnl/io/pnpmgr/pnpnotify.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpnotify.c b/ntoskrnl/io/pnpmgr/pnpnotify.c index cc169aba171..35a503bfe2d 100644 --- a/ntoskrnl/io/pnpmgr/pnpnotify.c +++ b/ntoskrnl/io/pnpmgr/pnpnotify.c @@ -315,7 +315,8 @@ PiNotifyTargetDeviceChange( } KeReleaseGuardedMutex(&PiNotifyTargetDeviceLock); - ExFreePoolWithTag(notificationStruct, TAG_PNP_NOTIFY); + if (notificationStruct != CustomNotification) + ExFreePoolWithTag(notificationStruct, TAG_PNP_NOTIFY); ObDereferenceObject(DeviceObject); }

2 months, 2 weeks

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2024