Ros-diffs November 2021

ros-diffs@reactos.org

23 participants
97 discussions

[reactos] 03/04: [FREELDR] Switch to RtlZeroMemory() from memset().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60d4a34892d80f9326e19… commit 60d4a34892d80f9326e1947a2e91fec572b9895f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 02:22:00 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 02:22:20 2021 +0100 [FREELDR] Switch to RtlZeroMemory() from memset(). --- boot/freeldr/freeldr/arch/i386/hwacpi.c | 2 +- boot/freeldr/freeldr/arch/i386/hwpci.c | 8 ++++---- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 2 +- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 17 +++++++++-------- boot/freeldr/freeldr/arch/i386/pc/pchw.c | 4 ++-- boot/freeldr/freeldr/arch/i386/pc98/machpc98.c | 5 ++++- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 12 ++++++------ boot/freeldr/freeldr/disk/partition.c | 2 +- boot/freeldr/freeldr/lib/fs/btrfs.c | 2 +- 9 files changed, 29 insertions(+), 25 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwacpi.c b/boot/freeldr/freeldr/arch/i386/hwacpi.c index 9b471116629..120de9ecb57 100644 --- a/boot/freeldr/freeldr/arch/i386/hwacpi.c +++ b/boot/freeldr/freeldr/arch/i386/hwacpi.c @@ -81,7 +81,7 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) return; } - memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); + RtlZeroMemory(PartialResourceList, sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); PartialResourceList->Version = 0; PartialResourceList->Revision = 0; PartialResourceList->Count = 1; diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index 035572b4996..94bd4b59ecd 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -138,7 +138,7 @@ DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 2; @@ -196,7 +196,7 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); /* Create new bus key */ FldrCreateComponentKey(SystemKey, @@ -235,7 +235,7 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -261,7 +261,7 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); } /* Create the bus key */ diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index 4255e5cf0e0..40a3d16466e 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -20,7 +20,7 @@ KeInitializeEvent( IN EVENT_TYPE Type, IN BOOLEAN State) { - memset(Event, 0, sizeof(*Event)); + RtlZeroMemory(Event, sizeof(*Event)); } VOID diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 2f0b3563b87..8ac4139442a 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -124,7 +124,7 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) return NULL; } - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -617,7 +617,8 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, ERR("Failed to allocate resource descriptor\n"); return; } - memset(PartialResourceList, 0, Size); + + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 0; @@ -936,7 +937,7 @@ DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -997,7 +998,7 @@ DetectKeyboardController(PCONFIGURATION_COMPONENT_DATA BusKey) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 3; @@ -1215,7 +1216,8 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) ERR("Failed to allocate resource descriptor\n"); return; } - memset(PartialResourceList, 0, Size); + + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 0; @@ -1318,7 +1320,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 0; @@ -1452,9 +1454,8 @@ VOID __cdecl ChainLoadBiosBootSectorCode( VOID MachInit(const char *CmdLine) { - memset(&MachVtbl, 0, sizeof(MACHVTBL)); - /* Setup vtbl */ + RtlZeroMemory(&MachVtbl, sizeof(MachVtbl)); MachVtbl.ConsPutChar = PcConsPutChar; MachVtbl.ConsKbHit = PcConsKbHit; MachVtbl.ConsGetCh = PcConsGetCh; diff --git a/boot/freeldr/freeldr/arch/i386/pc/pchw.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c index f69de0f3c90..6ade22f7d42 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pchw.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pchw.c @@ -235,7 +235,7 @@ DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) return; } - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -375,7 +375,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; diff --git a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c index 38ddf378378..2ba4707de7a 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c @@ -118,6 +118,9 @@ MachInit(const char *CmdLine) { if (!Pc98ArchTest()) { + ERR("This is not a supported PC98!\n"); + + /* Disable and halt the CPU */ _disable(); __halt(); @@ -126,7 +129,7 @@ MachInit(const char *CmdLine) } /* Setup vtbl */ - RtlZeroMemory(&MachVtbl, sizeof(MACHVTBL)); + RtlZeroMemory(&MachVtbl, sizeof(MachVtbl)); MachVtbl.ConsPutChar = Pc98ConsPutChar; MachVtbl.ConsKbHit = Pc98ConsKbHit; MachVtbl.ConsGetCh = Pc98ConsGetCh; diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index e2f615593cd..0aba6db9c49 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -110,7 +110,7 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) return NULL; } - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -223,7 +223,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) } /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 0; @@ -304,8 +304,6 @@ MachInit(const char *CmdLine) PCI_TYPE1_CFG_BITS PciCfg1; ULONG PciId; - memset(&MachVtbl, 0, sizeof(MACHVTBL)); - /* Check for Xbox by identifying device at PCI 0:0:0, if it's * 0x10DE/0x02A5 then we're running on an Xbox */ @@ -322,19 +320,21 @@ MachInit(const char *CmdLine) PciId = READ_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT); if (PciId != 0x02A510DE) { - ERR("This is not original Xbox!\n"); + ERR("This is not an original Xbox!\n"); /* Disable and halt the CPU */ _disable(); __halt(); - while (TRUE); + while (TRUE) + NOTHING; } /* Set LEDs to red before anything is initialized */ XboxSetLED("rrrr"); /* Setup vtbl */ + RtlZeroMemory(&MachVtbl, sizeof(MachVtbl)); MachVtbl.ConsPutChar = XboxConsPutChar; MachVtbl.ConsKbHit = XboxConsKbHit; MachVtbl.ConsGetCh = XboxConsGetCh; diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 5738238ecd4..7afb6e1edbc 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -299,7 +299,7 @@ DiskGetBrfrPartitionEntry( return FALSE; } - memset(PartitionTableEntry, 0, sizeof(PARTITION_TABLE_ENTRY)); + RtlZeroMemory(PartitionTableEntry, sizeof(PARTITION_TABLE_ENTRY)); PartitionTableEntry->SystemIndicator = XboxPartitions[PartitionNumber - 1].SystemIndicator; PartitionTableEntry->SectorCountBeforePartition = XboxPartitions[PartitionNumber - 1].SectorCountBeforePartition; PartitionTableEntry->PartitionSectorCount = XboxPartitions[PartitionNumber - 1].PartitionSectorCount; diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 6b6a0c87d83..33cfb6e9d9f 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -166,7 +166,7 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes) static inline void init_path(const struct btrfs_super_block *sb, struct btrfs_path *path) { - memset(path, 0, sizeof(*path)); + RtlZeroMemory(path, sizeof(*path)); path->tree_buf = FrLdrTempAlloc(sb->nodesize, TAG_BTRFS_NODE); }

2 years, 10 months

[reactos] 02/04: [FREELDR] Don't hardcode buffer size.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=497fee162209c424e8d3a… commit 497fee162209c424e8d3ab8166208fe0ed821a1e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 02:14:11 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 02:22:18 2021 +0100 [FREELDR] Don't hardcode buffer size. --- boot/freeldr/freeldr/ui/directui.c | 2 +- boot/freeldr/freeldr/ui/tuimenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index d4fec816131..eccb2fbff66 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -356,7 +356,7 @@ UiDrawMenuItem(IN PUI_MENU_INFO MenuInfo, if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { /* Make it a separator line and use menu colors */ - memset(MenuLineText, 0, 80); + memset(MenuLineText, 0, sizeof(MenuLineText)); memset(MenuLineText, 0xC4, (MenuInfo->Right - MenuInfo->Left - 1)); Attribute = ATTR(UiMenuFgColor, UiMenuBgColor); } diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 9b173ac8b7a..58b509f2a38 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -451,7 +451,7 @@ TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, // // Make it a separator line and use menu colors // - memset(MenuLineText, 0, 80); + memset(MenuLineText, 0, sizeof(MenuLineText)); memset(MenuLineText, 0xC4, (MenuInfo->Right - MenuInfo->Left - 1)); Attribute = ATTR(UiMenuFgColor, UiMenuBgColor); }

2 years, 10 months

[reactos] 01/04: [FDEBUG] Switch to ZeroMemory() from memset().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cad040726bdf83e87475… commit 5cad040726bdf83e87475ead7f15f2a6c0614cb5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 19 02:12:23 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 02:22:15 2021 +0100 [FDEBUG] Switch to ZeroMemory() from memset(). --- boot/freeldr/fdebug/fdebug.c | 12 ++++++------ boot/freeldr/fdebug/rs232.c | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/boot/freeldr/fdebug/fdebug.c b/boot/freeldr/fdebug/fdebug.c index 25ecd406e0d..a64581e78de 100644 --- a/boot/freeldr/fdebug/fdebug.c +++ b/boot/freeldr/fdebug/fdebug.c @@ -98,7 +98,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance) { WNDCLASSEX wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(wcex); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = WndProc; @@ -170,9 +170,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); - memset(&ncm, 0, sizeof(NONCLIENTMETRICS)); - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + ZeroMemory(&ncm, sizeof(ncm)); + ncm.cbSize = sizeof(ncm); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); hFont = CreateFontIndirect(&ncm.lfMessageFont); @@ -382,8 +382,8 @@ INT_PTR CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA case WM_COMMAND: if (LOWORD(wParam) == IDC_BROWSE) { - memset(&ofn, 0, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hDlg; ofn.hInstance = hInst; ofn.lpstrFilter = NULL; diff --git a/boot/freeldr/fdebug/rs232.c b/boot/freeldr/fdebug/rs232.c index 8c627415391..095d871bd5d 100644 --- a/boot/freeldr/fdebug/rs232.c +++ b/boot/freeldr/fdebug/rs232.c @@ -98,7 +98,8 @@ BOOL Rs232ConfigurePortWin32(TCHAR* DeviceControlString) DCB dcb; DWORD ErrorCode; - /*if (!GetCommState(hPortHandle, &dcb)) +#if 0 + if (!GetCommState(hPortHandle, &dcb)) { ErrorCode = GetLastError(); @@ -124,10 +125,10 @@ BOOL Rs232ConfigurePortWin32(TCHAR* DeviceControlString) dcb.fDsrSensitivity = FALSE; dcb.fRtsControl = RTS_CONTROL_DISABLE; dcb.fOutxCtsFlow = FALSE; - dcb.fOutxCtsFlow = FALSE;*/ - + dcb.fOutxCtsFlow = FALSE; +#endif - memset(&dcb, 0, sizeof(DCB)); + ZeroMemory(&dcb, sizeof(dcb)); dcb.DCBlength = sizeof(dcb); if (!BuildCommDCB(DeviceControlString, &dcb)) {

2 years, 10 months

[reactos] 01/01: [FREELDR] Diverse improvements and fixes for CORE-12802. (#3466)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5e5e3117c77e4caa8bbd… commit c5e5e3117c77e4caa8bbd1b48df0bcd56155da1a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 19 01:49:55 2021 +0100 [FREELDR] Diverse improvements and fixes for CORE-12802. (#3466) - Move a few lines around. - Switch to RtlZeroMemory() from memset(). - Make while() more explicit. For CORE-12802: - Add/Fix FrLdrHeapAlloc() failure handling and related. Especially, add/fix FrLdrHeapFree() calls. - Add/Improve ERR() to some FrLdrHeapAlloc() failure cases. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- boot/freeldr/freeldr/arch/i386/hwacpi.c | 1 - boot/freeldr/freeldr/arch/i386/hwpci.c | 6 ++-- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 17 ++++++------ boot/freeldr/freeldr/arch/i386/pc/pchw.c | 5 ++-- boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c | 5 ++-- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 6 ++-- boot/freeldr/freeldr/lib/peloader.c | 24 ++++++++++------ boot/freeldr/freeldr/ntldr/winldr.c | 6 ++++ boot/freeldr/freeldr/ntldr/wlregistry.c | 38 ++++++++++++++++++++------ 9 files changed, 73 insertions(+), 35 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwacpi.c b/boot/freeldr/freeldr/arch/i386/hwacpi.c index 345e2c607aa..9b471116629 100644 --- a/boot/freeldr/freeldr/arch/i386/hwacpi.c +++ b/boot/freeldr/freeldr/arch/i386/hwacpi.c @@ -75,7 +75,6 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) PartialResourceList = FrLdrHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize, TAG_HW_RESOURCE_LIST); - if (PartialResourceList == NULL) { ERR("Failed to allocate resource descriptor\n"); diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index c4f0e97488c..035572b4996 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -229,7 +229,8 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (!PartialResourceList) { - ERR("Failed to allocate resource descriptor\n"); + ERR("Failed to allocate resource descriptor! Ignoring remaining PCI buses. (i = %lu, NoBuses = %lu)\n", + i, (ULONG)BusData.NoBuses); return; } @@ -254,7 +255,8 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (!PartialResourceList) { - ERR("Failed to allocate resource descriptor\n"); + ERR("Failed to allocate resource descriptor! Ignoring remaining PCI buses. (i = %lu, NoBuses = %lu)\n", + i, (ULONG)BusData.NoBuses); return; } diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 6b2ee3d7508..2f0b3563b87 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -236,9 +236,9 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) ERR("Failed to allocate resource descriptor\n"); return; } - memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -689,12 +689,13 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetS PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate resource descriptor\n"); - continue; + ERR("Failed to allocate resource descriptor! Ignoring remaining serial ports. (i = %lu, Count = %lu)\n", + i, Count); + break; } - memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 3; @@ -792,12 +793,12 @@ DetectParallelPorts(PCONFIGURATION_COMPONENT_DATA BusKey) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate resource descriptor\n"); - continue; + ERR("Failed to allocate resource descriptor! Ignoring remaining parallel ports. (i = %lu)\n", i); + break; } - memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = (Irq[i] != (ULONG) - 1) ? 2 : 1; @@ -1173,9 +1174,9 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) ERR("Failed to allocate resource descriptor\n"); return; } - memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, sizeof(CM_PARTIAL_RESOURCE_LIST)); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; diff --git a/boot/freeldr/freeldr/arch/i386/pc/pchw.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c index bed2a11f62b..f69de0f3c90 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pchw.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pchw.c @@ -230,7 +230,8 @@ DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate resource descriptor\n"); + ERR("Failed to allocate resource descriptor! Ignoring remaining floppy peripherals. (FloppyNumber = %u)\n", + FloppyNumber); return; } @@ -288,9 +289,9 @@ DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA BusKey) ERR("Failed to allocate resource descriptor\n"); return NULL; } - memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 3; diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c index f0e2c1c0d43..8e4f2355e57 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c @@ -176,7 +176,8 @@ DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate resource descriptor\n"); + ERR("Failed to allocate resource descriptor! Ignoring remaining floppy peripherals. (FloppyNumber = %u, FloppyCount = %u)\n", + FloppyNumber, Pc98GetFloppyCount()); return; } RtlZeroMemory(PartialResourceList, Size); @@ -1113,9 +1114,9 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) ERR("Failed to allocate resource descriptor\n"); return; } - RtlZeroMemory(PartialResourceList, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index eb0f2df4bc8..e2f615593cd 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -106,7 +106,7 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate a full resource descriptor\n"); + ERR("Failed to allocate resource descriptor\n"); return NULL; } @@ -175,9 +175,9 @@ DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) ERR("Failed to allocate resource descriptor\n"); return; } - memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); PartialResourceList->Version = 1; PartialResourceList->Revision = 1; PartialResourceList->Count = 1; @@ -218,7 +218,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - TRACE("Failed to allocate resource descriptor\n"); + ERR("Failed to allocate resource descriptor\n"); return; } diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 64ef1103562..0b5ca0f87b2 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -19,8 +19,8 @@ /* INCLUDES ******************************************************************/ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(PELOADER); /* PRIVATE FUNCTIONS *********************************************************/ @@ -590,7 +590,7 @@ PeLdrAllocateDataTableEntry( OUT PLDR_DATA_TABLE_ENTRY *NewEntry) { PVOID BaseVA = PaToVa(BasePA); - PWSTR Buffer; + PWSTR BaseDllNameBuffer, Buffer; PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; USHORT Length; @@ -603,12 +603,12 @@ PeLdrAllocateDataTableEntry( TAG_WLDR_DTE); if (DataTableEntry == NULL) return FALSE; - RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); /* Get NT headers from the image */ NtHeaders = RtlImageNtHeader(BasePA); /* Initialize corresponding fields of DTE based on NT headers value */ + RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); DataTableEntry->DllBase = BaseVA; DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); @@ -624,12 +624,17 @@ PeLdrAllocateDataTableEntry( FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); return FALSE; } - RtlZeroMemory(Buffer, Length); + + /* Save Buffer, in case of later failure */ + BaseDllNameBuffer = Buffer; DataTableEntry->BaseDllName.Length = Length; DataTableEntry->BaseDllName.MaximumLength = Length; DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); - while (*BaseDllName != 0) + + RtlZeroMemory(Buffer, Length); + Length /= sizeof(WCHAR); + while (Length--) { *Buffer++ = *BaseDllName++; } @@ -640,15 +645,18 @@ PeLdrAllocateDataTableEntry( Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); if (Buffer == NULL) { + FrLdrHeapFree(BaseDllNameBuffer, TAG_WLDR_NAME); FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); return FALSE; } - RtlZeroMemory(Buffer, Length); DataTableEntry->FullDllName.Length = Length; DataTableEntry->FullDllName.MaximumLength = Length; DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); - while (*FullDllName != 0) + + RtlZeroMemory(Buffer, Length); + Length /= sizeof(WCHAR); + while (Length--) { *Buffer++ = *FullDllName++; } @@ -679,7 +687,7 @@ PeLdrAllocateDataTableEntry( /* Insert this DTE to a list in the LPB */ InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); TRACE("Inserting DTE %p, name='%.*S' DllBase=%p\n", DataTableEntry, - DataTableEntry->BaseDllName.Length / 2, + DataTableEntry->BaseDllName.Length / sizeof(WCHAR), VaToPa(DataTableEntry->BaseDllName.Buffer), DataTableEntry->DllBase); diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 68036794941..a4238a4555a 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -170,6 +170,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, /* Allocate the ARC structure */ ArcDiskSig = FrLdrHeapAlloc(sizeof(ARC_DISK_SIGNATURE_EX), 'giSD'); + if (!ArcDiskSig) + { + ERR("Failed to allocate ARC structure! Ignoring remaining ARC disks. (i = %lu, DiskCount = %lu)\n", + i, reactos_disk_count); + break; + } /* Copy the data over */ RtlCopyMemory(ArcDiskSig, &reactos_arc_disk_info[i], sizeof(ARC_DISK_SIGNATURE_EX)); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 5fbe864d3df..7d9d9219183 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -536,10 +536,19 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, /* Get the Name Group */ BufferSize = 4096; GroupNameBuffer = FrLdrHeapAlloc(BufferSize, TAG_WLDR_NAME); + if (!GroupNameBuffer) + { + TRACE_CH(REACTOS, "Failed to allocate buffer\n"); + return; + } rc = RegQueryValue(hGroupKey, L"List", NULL, (PUCHAR)GroupNameBuffer, &BufferSize); TRACE_CH(REACTOS, "RegQueryValue(): rc %d\n", (int)rc); if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "Failed to query the 'List' value (rc %d)\n", (int)rc); + FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); return; + } TRACE_CH(REACTOS, "BufferSize: %d\n", (int)BufferSize); TRACE_CH(REACTOS, "GroupNameBuffer: '%S'\n", GroupNameBuffer); @@ -775,7 +784,6 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, USHORT PathLength; BootDriverEntry = FrLdrHeapAlloc(sizeof(BOOT_DRIVER_LIST_ENTRY), TAG_WLDR_BDE); - if (!BootDriverEntry) return FALSE; @@ -792,7 +800,6 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, BootDriverEntry->FilePath.Length = 0; BootDriverEntry->FilePath.MaximumLength = PathLength; BootDriverEntry->FilePath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); - if (!BootDriverEntry->FilePath.Buffer) { FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); @@ -814,10 +821,9 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, BootDriverEntry->FilePath.Length = 0; BootDriverEntry->FilePath.MaximumLength = PathLength; BootDriverEntry->FilePath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); - if (!BootDriverEntry->FilePath.Buffer) { - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; } @@ -825,7 +831,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) { FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; } @@ -833,7 +839,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) { FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; } @@ -841,7 +847,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) { FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - FrLdrHeapFree(BootDriverEntry, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; } } @@ -852,22 +858,36 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, BootDriverEntry->RegistryPath.MaximumLength = PathLength; BootDriverEntry->RegistryPath.Buffer = FrLdrHeapAlloc(PathLength, TAG_WLDR_NAME); if (!BootDriverEntry->RegistryPath.Buffer) + { + FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; + } Status = RtlAppendUnicodeToString(&BootDriverEntry->RegistryPath, RegistryPath); if (!NT_SUCCESS(Status)) + { + FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; + } Status = RtlAppendUnicodeToString(&BootDriverEntry->RegistryPath, ServiceName); if (!NT_SUCCESS(Status)) + { + FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); return FALSE; + } // Insert entry into the list if (!InsertInBootDriverList(BootDriverListHead, BootDriverEntry)) { // It was already there, so delete our entry - if (BootDriverEntry->FilePath.Buffer) FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); - if (BootDriverEntry->RegistryPath.Buffer) FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); }

2 years, 10 months

[reactos] 01/01: [CRT] stdio/file.c: Import 3 Wine one-liner fixes (#4101)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a6750da12c2f3a26517a… commit 0a6750da12c2f3a26517aec28d54821546da6482 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 18 23:23:12 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 18 23:23:12 2021 +0100 [CRT] stdio/file.c: Import 3 Wine one-liner fixes (#4101) * [FORMATTING][CRT] stdio/file.c: Reduce diff with Wine. * [CRT] _wfreopen(): Fix TRACE() format modifier Import wine-1.4-rc3 f8b29a0 by Eric Pouech. * [CRT] msvcrt_init_io(): Ignore inherited FDs with invalid handles Import wine-6.2-32-g611742d by Paul Gofman, except test part, which shall be WineSync separately. * [CRT] _dup2(): Fix clearing NOINHERIT flag Import wine-6.20-44-g1420d28 by Piotr Caban. --- sdk/lib/crt/stdio/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdk/lib/crt/stdio/file.c b/sdk/lib/crt/stdio/file.c index 40cda33700b..899eeafe03e 100644 --- a/sdk/lib/crt/stdio/file.c +++ b/sdk/lib/crt/stdio/file.c @@ -474,7 +474,7 @@ void msvcrt_init_io(void) count = min(count, MSVCRT_MAX_FILES); for (i = 0; i < count; i++) { - if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) + if ((*wxflag_ptr & WX_OPEN) && GetFileType(*handle_ptr) != FILE_TYPE_UNKNOWN) { fdinfo = get_ioinfo_alloc_fd(i); if(fdinfo != &__badioinfo) @@ -831,16 +831,17 @@ int CDECL _commit(int fd) int ret; TRACE(":fd (%d) handle (%p)\n", fd, info->handle); + if (info->handle == INVALID_HANDLE_VALUE) ret = -1; else if (!FlushFileBuffers(info->handle)) { if (GetLastError() == ERROR_INVALID_HANDLE) { - /* FlushFileBuffers fails for console handles - * so we ignore this error. - */ - ret = 0; + /* FlushFileBuffers fails for console handles + * so we ignore this error. + */ + ret = 0; } else { @@ -992,7 +993,7 @@ int CDECL _dup2(int od, int nd) if (DuplicateHandle(GetCurrentProcess(), info_od->handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - int wxflag = info_od->wxflag & ~_O_NOINHERIT; + int wxflag = info_od->wxflag & ~WX_DONTINHERIT; if (info_nd->wxflag & WX_OPEN) _close(nd); @@ -1669,7 +1670,7 @@ wchar_t * CDECL _wmktemp(wchar_t *pattern) /*static*/ unsigned split_oflags(unsigned oflags) { - int wxflags = 0; + int wxflags = 0; unsigned unsupp; /* until we support everything */ if (oflags & _O_APPEND) wxflags |= WX_APPEND; @@ -1871,7 +1872,7 @@ int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int return *_errno(); } - if (oflags & (_O_WTEXT|_O_U16TEXT|_O_U8TEXT)) + if (oflags & (_O_WTEXT | _O_U16TEXT | _O_U8TEXT)) { if ((access & GENERIC_WRITE) && (creation==CREATE_NEW || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING @@ -3419,7 +3420,7 @@ FILE* CDECL _wfreopen(const wchar_t *path, const wchar_t *mode, FILE* file) { int open_flags, stream_flags, fd; - TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file ? file->_file : -1); + TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file ? file->_file : -1); LOCK_FILES(); if (!file || ((fd = file->_file) < 0))

2 years, 10 months

[reactos] 01/01: [SHELL32] Control panel context menu semantic bugfix (#4078)

by Scott Maday

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83335d3a81090c6870e60… commit 83335d3a81090c6870e607a22f0841207eee503c Author: Scott Maday <idontwantyoutospam(a)gmail.com> AuthorDate: Thu Nov 18 15:41:53 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 18 22:41:53 2021 +0100 [SHELL32] Control panel context menu semantic bugfix (#4078) --- dll/win32/shell32/folders/CControlPanelFolder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 10cac48ac82..e4133520100 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -676,9 +676,9 @@ HRESULT WINAPI CCPLItemMenu::QueryContextMenu( UINT idCmdLast, UINT uFlags) { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, MAKEINTRESOURCEW(IDS_OPEN), MFS_DEFAULT); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst, MFT_STRING, MAKEINTRESOURCEW(IDS_OPEN), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDC_STATIC, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 2); } @@ -699,7 +699,7 @@ HRESULT WINAPI CCPLItemMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); - if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME + if (lpcmi->lpVerb == MAKEINTRESOURCEA(0)) { /* Hardcode the command here; Executing a cpl file would be fine but we also need to run things like console.dll */ WCHAR wszParams[MAX_PATH]; @@ -711,7 +711,7 @@ HRESULT WINAPI CCPLItemMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) /* Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ ShellExecuteW(NULL, NULL, wszFile, wszParams, NULL, 0); } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) //FIXME { CComPtr<IDataObject> pDataObj; LPITEMIDLIST pidl = _ILCreateControlPanel();

2 years, 10 months

[reactos] 01/01: [NTOS:EX] Clarify the situation with the SystemPathInformation class. (#4065)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=712f469671a339b29ccd9… commit 712f469671a339b29ccd9b4e4cb61ae435098286 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 24 18:57:52 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 18 22:37:54 2021 +0100 [NTOS:EX] Clarify the situation with the SystemPathInformation class. (#4065) Since NT 3.51, this information class is trivially implemented. The path to the NT directory is now stored in KUSER_SHARED_DATA as the NtSystemRoot member. Windows Checked builds show the following message and break to the debugger before failing the function as not implemented: EX: SystemPathInformation now available via SharedUserData See https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/ex/sysinfo/qu… and https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/api/ntexapi_x… for more information. --- ntoskrnl/ex/sysinfo.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index bb037466850..7fcc3e8260d 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -861,13 +861,21 @@ QSI_DEF(SystemTimeOfDayInformation) return STATUS_SUCCESS; } -/* Class 4 - Path Information */ +/* Class 4 - Path Information (DEPRECATED) */ QSI_DEF(SystemPathInformation) { - /* FIXME: QSI returns STATUS_BREAKPOINT. Why? */ - DPRINT1("NtQuerySystemInformation - SystemPathInformation not implemented\n"); - - return STATUS_BREAKPOINT; + /* + * Since NT 3.51, this information class is trivially implemented. + * The path to the NT directory is now stored in KUSER_SHARED_DATA + * as the NtSystemRoot member. + * Windows Checked builds show the following message and break to + * the debugger before failing the function as not implemented. + */ +#if DBG + DPRINT1("EX: SystemPathInformation now available via SharedUserData\n"); + // DbgBreakPoint(); // Not needed in ReactOS. +#endif + return STATUS_NOT_IMPLEMENTED; } /* Class 5 - Process Information */ @@ -2830,7 +2838,7 @@ CallQS[] = SI_QX(SystemProcessorInformation), SI_QX(SystemPerformanceInformation), SI_QX(SystemTimeOfDayInformation), - SI_QX(SystemPathInformation), /* should be SI_XX */ + SI_QX(SystemPathInformation), SI_QX(SystemProcessInformation), SI_QX(SystemCallCountInformation), SI_QX(SystemDeviceInformation),

2 years, 10 months

[reactos] 03/03: [NTOS:EX] NtQuerySystemInformation: Use same parameter names as documentation. FStatus --> Status. (#4064)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1200561fcc722564bb179… commit 1200561fcc722564bb1790c0fc36cc3e361a9972 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 24 18:36:47 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 18 22:36:07 2021 +0100 [NTOS:EX] NtQuerySystemInformation: Use same parameter names as documentation. FStatus --> Status. (#4064) --- ntoskrnl/ex/sysinfo.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index e786252fff3..bb037466850 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -2918,13 +2918,13 @@ NTAPI NtQuerySystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, _Out_writes_bytes_to_opt_(SystemInformationLength, *ReturnLength) PVOID SystemInformation, - _In_ ULONG Length, - _Out_opt_ PULONG UnsafeResultLength) + _In_ ULONG SystemInformationLength, + _Out_opt_ PULONG ReturnLength) { - KPROCESSOR_MODE PreviousMode; - ULONG ResultLength = 0; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + ULONG CapturedResultLength = 0; ULONG Alignment = TYPE_ALIGNMENT(ULONG); - NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; PAGED_CODE(); @@ -2949,13 +2949,13 @@ NtQuerySystemInformation( if (SystemInformationClass == SystemKernelDebuggerInformation) Alignment = TYPE_ALIGNMENT(BOOLEAN); - ProbeForWrite(SystemInformation, Length, Alignment); - if (UnsafeResultLength != NULL) - ProbeForWriteUlong(UnsafeResultLength); + ProbeForWrite(SystemInformation, SystemInformationLength, Alignment); + if (ReturnLength != NULL) + ProbeForWriteUlong(ReturnLength); } - if (UnsafeResultLength) - *UnsafeResultLength = 0; + if (ReturnLength) + *ReturnLength = 0; #if (NTDDI_VERSION < NTDDI_VISTA) /* @@ -2971,22 +2971,22 @@ NtQuerySystemInformation( if (CallQS[SystemInformationClass].Query != NULL) { /* Hand the request to a subhandler */ - FStatus = CallQS[SystemInformationClass].Query(SystemInformation, - Length, - &ResultLength); + Status = CallQS[SystemInformationClass].Query(SystemInformation, + SystemInformationLength, + &CapturedResultLength); /* Save the result length to the caller */ - if (UnsafeResultLength) - *UnsafeResultLength = ResultLength; + if (ReturnLength) + *ReturnLength = CapturedResultLength; } } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - FStatus = _SEH2_GetExceptionCode(); + Status = _SEH2_GetExceptionCode(); } _SEH2_END; - return FStatus; + return Status; } __kernel_entry

2 years, 10 months

[reactos] 02/03: [NDK][NTOS:EX] Add/fix SAL annotations for Nt/ZwSetSystemInformation + last parameter type. (#4064)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d484a68ccb267c7de64d4… commit d484a68ccb267c7de64d4116c987cb8d85464830 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 24 17:49:56 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 18 22:36:07 2021 +0100 [NDK][NTOS:EX] Add/fix SAL annotations for Nt/ZwSetSystemInformation + last parameter type. (#4064) --- ntoskrnl/ex/sysinfo.c | 9 +++++---- sdk/include/ndk/exfuncs.h | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 552f9812046..e786252fff3 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -2989,12 +2989,13 @@ NtQuerySystemInformation( return FStatus; } - +__kernel_entry NTSTATUS NTAPI -NtSetSystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN PVOID SystemInformation, - IN ULONG SystemInformationLength) +NtSetSystemInformation( + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _In_reads_bytes_(SystemInformationLength) PVOID SystemInformation, + _In_ ULONG SystemInformationLength) { NTSTATUS Status = STATUS_INVALID_INFO_CLASS; KPROCESSOR_MODE PreviousMode; diff --git a/sdk/include/ndk/exfuncs.h b/sdk/include/ndk/exfuncs.h index e6e78c85ffa..bca4e87010c 100644 --- a/sdk/include/ndk/exfuncs.h +++ b/sdk/include/ndk/exfuncs.h @@ -555,12 +555,13 @@ NtSetSystemEnvironmentValueEx( _Inout_ PULONG Attributes ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, - _In_ PVOID SystemInformation, + _In_reads_bytes_(SystemInformationLength) PVOID SystemInformation, _In_ ULONG SystemInformationLength ); @@ -1000,8 +1001,8 @@ NTSTATUS NTAPI ZwSetSystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, - _In_ PVOID SystemInformation, - _In_ SIZE_T SystemInformationLength + _In_reads_bytes_(SystemInformationLength) PVOID SystemInformation, + _In_ ULONG SystemInformationLength ); #ifdef NTOS_MODE_USER

2 years, 10 months

[reactos] 01/03: [NDK][NTOS:EX] Minor formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7692a620e7c57a06e91f4… commit 7692a620e7c57a06e91f48495053a5a00c3cba5c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 24 17:43:47 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 18 22:36:06 2021 +0100 [NDK][NTOS:EX] Minor formatting. --- ntoskrnl/ex/sysinfo.c | 70 +++++++++++++++++------------------------------ sdk/include/ndk/extypes.h | 12 ++++---- 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 7a57c8d2c33..552f9812046 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1287,7 +1287,6 @@ QSI_DEF(SystemNonPagedPoolInformation) return STATUS_NOT_IMPLEMENTED; } - /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { @@ -2070,7 +2069,6 @@ QSI_DEF(SystemCurrentTimeZoneInformation) return STATUS_SUCCESS; } - SSI_DEF(SystemCurrentTimeZoneInformation) { /* Check user buffer's size */ @@ -2229,7 +2227,6 @@ Leave: return STATUS_SUCCESS; } - /* Class 46 - Set time slip event */ SSI_DEF(SystemTimeSlipNotification) { @@ -2271,7 +2268,6 @@ SSI_DEF(SystemSessionCreate) return Status; } - /* Class 48 - Delete an existing session (TSE) */ SSI_DEF(SystemSessionDetach) { @@ -2293,7 +2289,6 @@ SSI_DEF(SystemSessionDetach) return MmSessionDelete(SessionId); } - /* Class 49 - UNKNOWN */ QSI_DEF(SystemSessionInformation) { @@ -2302,7 +2297,6 @@ QSI_DEF(SystemSessionInformation) return STATUS_NOT_IMPLEMENTED; } - /* Class 50 - System range start address */ QSI_DEF(SystemRangeStartInformation) { @@ -2324,7 +2318,6 @@ QSI_DEF(SystemVerifierInformation) return STATUS_NOT_IMPLEMENTED; } - SSI_DEF(SystemVerifierInformation) { /* FIXME */ @@ -2332,7 +2325,6 @@ SSI_DEF(SystemVerifierInformation) return STATUS_NOT_IMPLEMENTED; } - /* Class 52 */ SSI_DEF(SystemVerifierThunkExtend) { @@ -2341,8 +2333,7 @@ SSI_DEF(SystemVerifierThunkExtend) return STATUS_NOT_IMPLEMENTED; } - -/* Class 53 - A session's processes */ +/* Class 53 - A session's processes */ QSI_DEF(SystemSessionProcessesInformation) { /* FIXME */ @@ -2350,7 +2341,6 @@ QSI_DEF(SystemSessionProcessesInformation) return STATUS_NOT_IMPLEMENTED; } - /* Class 54 - Load & map in system space */ SSI_DEF(SystemLoadGdiDriverInSystemSpaceInformation) { @@ -2359,8 +2349,7 @@ SSI_DEF(SystemLoadGdiDriverInSystemSpaceInformation) return STATUS_NOT_IMPLEMENTED; } - -/* Class 55 - NUMA processor information */ +/* Class 55 - NUMA processor information */ QSI_DEF(SystemNumaProcessorMap) { ULONG MaxEntries, Node; @@ -2406,8 +2395,7 @@ QSI_DEF(SystemNumaProcessorMap) return STATUS_SUCCESS; } - -/* Class 56 - Prefetcher information */ +/* Class 56 - Prefetcher information */ QSI_DEF(SystemPrefetcherInformation) { /* FIXME */ @@ -2415,8 +2403,7 @@ QSI_DEF(SystemPrefetcherInformation) return STATUS_NOT_IMPLEMENTED; } - -/* Class 57 - Extended process information */ +/* Class 57 - Extended process information */ QSI_DEF(SystemExtendedProcessInformation) { /* FIXME */ @@ -2424,8 +2411,7 @@ QSI_DEF(SystemExtendedProcessInformation) return STATUS_NOT_IMPLEMENTED; } - -/* Class 58 - Recommended shared ata alignment */ +/* Class 58 - Recommended shared data alignment */ QSI_DEF(SystemRecommendedSharedDataAlignment) { /* FIXME */ @@ -2433,8 +2419,7 @@ QSI_DEF(SystemRecommendedSharedDataAlignment) return STATUS_NOT_IMPLEMENTED; } - -/* Class 60 - NUMA memory information */ +/* Class 60 - NUMA memory information */ QSI_DEF(SystemNumaAvailableMemory) { ULONG MaxEntries, Node; @@ -2488,7 +2473,7 @@ QSI_DEF(SystemNumaAvailableMemory) return STATUS_SUCCESS; } -/* Class 64 - Extended handle information */ +/* Class 64 - Extended handle information */ QSI_DEF(SystemExtendedHandleInformation) { PSYSTEM_HANDLE_INFORMATION_EX HandleInformation; @@ -2619,7 +2604,7 @@ QSI_DEF(SystemExtendedHandleInformation) return Status; } -/* Class 70 - System object security mode information */ +/* Class 70 - System object security mode information */ QSI_DEF(SystemObjectSecurityMode) { PULONG ObjectSecurityInfo = (PULONG)Buffer; @@ -2635,7 +2620,7 @@ QSI_DEF(SystemObjectSecurityMode) return STATUS_SUCCESS; } -/* Class 73 - Logical processor information */ +/* Class 73 - Logical processor information */ QSI_DEF(SystemLogicalProcessorInformation) { LONG i; @@ -2719,7 +2704,7 @@ QSI_DEF(SystemLogicalProcessorInformation) return Status; } -/* Class 76 - System firmware table information */ +/* Class 76 - System firmware table information */ QSI_DEF(SystemFirmwareTableInformation) { PSYSTEM_FIRMWARE_TABLE_INFORMATION SysFirmwareInfo = (PSYSTEM_FIRMWARE_TABLE_INFORMATION)Buffer; @@ -2839,7 +2824,7 @@ struct _QSSI_CALLS static QSSI_CALLS -CallQS [] = +CallQS[] = { SI_QX(SystemBasicInformation), SI_QX(SystemProcessorInformation), @@ -2922,7 +2907,7 @@ CallQS [] = C_ASSERT(SystemBasicInformation == 0); #define MIN_SYSTEM_INFO_CLASS (SystemBasicInformation) -#define MAX_SYSTEM_INFO_CLASS (sizeof(CallQS) / sizeof(CallQS[0])) +#define MAX_SYSTEM_INFO_CLASS RTL_NUMBER_OF(CallQS) /* * @implemented @@ -2949,7 +2934,7 @@ NtQuerySystemInformation( { #if (NTDDI_VERSION >= NTDDI_VISTA) /* - * Check if the request is valid. + * Check whether the request is valid. */ if (SystemInformationClass < MIN_SYSTEM_INFO_CLASS || SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) @@ -2974,7 +2959,7 @@ NtQuerySystemInformation( #if (NTDDI_VERSION < NTDDI_VISTA) /* - * Check if the request is valid. + * Check whether the request is valid. */ if (SystemInformationClass < MIN_SYSTEM_INFO_CLASS || SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) @@ -2983,14 +2968,12 @@ NtQuerySystemInformation( } #endif - if (NULL != CallQS [SystemInformationClass].Query) + if (CallQS[SystemInformationClass].Query != NULL) { - /* - * Hand the request to a subhandler. - */ - FStatus = CallQS [SystemInformationClass].Query(SystemInformation, - Length, - &ResultLength); + /* Hand the request to a subhandler */ + FStatus = CallQS[SystemInformationClass].Query(SystemInformation, + Length, + &ResultLength); /* Save the result length to the caller */ if (UnsafeResultLength) @@ -3023,8 +3006,7 @@ NtSetSystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, _SEH2_TRY { /* - * If called from user mode, check - * possible unsafe arguments. + * If called from user mode, check possible unsafe arguments. */ if (PreviousMode != KernelMode) { @@ -3032,18 +3014,16 @@ NtSetSystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, } /* - * Check the request is valid. + * Check whether the request is valid. */ if ((SystemInformationClass >= MIN_SYSTEM_INFO_CLASS) && (SystemInformationClass < MAX_SYSTEM_INFO_CLASS)) { - if (NULL != CallQS [SystemInformationClass].Set) + if (CallQS[SystemInformationClass].Set != NULL) { - /* - * Hand the request to a subhandler. - */ - Status = CallQS [SystemInformationClass].Set(SystemInformation, - SystemInformationLength); + /* Hand the request to a subhandler */ + Status = CallQS[SystemInformationClass].Set(SystemInformation, + SystemInformationLength); } } } diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index 360a257dafe..9702cd2b6ea 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -210,7 +210,7 @@ typedef enum _HARDERROR_RESPONSE } HARDERROR_RESPONSE, *PHARDERROR_RESPONSE; // -// System Information Classes for NtQuerySystemInformation +// System Information Classes for NtQuerySystemInformation // typedef enum _SYSTEM_INFORMATION_CLASS { @@ -316,7 +316,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS } SYSTEM_INFORMATION_CLASS; // -// System Information Classes for NtQueryMutant +// System Information Classes for NtQueryMutant // typedef enum _MUTANT_INFORMATION_CLASS { @@ -325,7 +325,7 @@ typedef enum _MUTANT_INFORMATION_CLASS } MUTANT_INFORMATION_CLASS; // -// System Information Classes for NtQueryAtom +// System Information Classes for NtQueryAtom // typedef enum _ATOM_INFORMATION_CLASS { @@ -334,7 +334,7 @@ typedef enum _ATOM_INFORMATION_CLASS } ATOM_INFORMATION_CLASS; // -// System Information Classes for NtQueryTimer +// System Information Classes for NtQueryTimer // typedef enum _TIMER_INFORMATION_CLASS { @@ -342,7 +342,7 @@ typedef enum _TIMER_INFORMATION_CLASS } TIMER_INFORMATION_CLASS; // -// System Information Classes for NtQuerySemaphore +// System Information Classes for NtQuerySemaphore // typedef enum _SEMAPHORE_INFORMATION_CLASS { @@ -350,7 +350,7 @@ typedef enum _SEMAPHORE_INFORMATION_CLASS } SEMAPHORE_INFORMATION_CLASS; // -// System Information Classes for NtQueryEvent +// System Information Classes for NtQueryEvent // typedef enum _EVENT_INFORMATION_CLASS {

2 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2021