Ros-diffs October 2024

ros-diffs@reactos.org

20 participants
117 discussions

[reactos] 01/01: [UXTHEME] Add Portuguese Portugal (pt-PT) and Portuguese Brazil (pt-BR) translations (#7418)

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ed33debf45148985f551… commit 5ed33debf45148985f551209ccdb1b45f10c0748 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Thu Oct 3 04:30:56 2024 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 3 10:30:56 2024 +0300 [UXTHEME] Add Portuguese Portugal (pt-PT) and Portuguese Brazil (pt-BR) translations (#7418) Matches corresponding translations in the desk.cpl applet. Addendum to d11582f0e. CORE-5991 --- dll/win32/uxtheme/lang/pt-BR.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/lang/pt-PT.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 6 ++++++ 3 files changed, 44 insertions(+) diff --git a/dll/win32/uxtheme/lang/pt-BR.rc b/dll/win32/uxtheme/lang/pt-BR.rc new file mode 100644 index 00000000000..bbf08688317 --- /dev/null +++ b/dll/win32/uxtheme/lang/pt-BR.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Brazil) resource file + * TRANSLATOR: Copyright 2024 Daniel Victor <ilauncherdeveloper(a)gmail.com> + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Caixa de mensagem" + IDS_ACTIVEWIN "Janela ativa" + IDS_INACTIVEWIN "Janela inativa" + IDS_OK "OK" + IDS_WINTEXT "Texto da janela" +END diff --git a/dll/win32/uxtheme/lang/pt-PT.rc b/dll/win32/uxtheme/lang/pt-PT.rc new file mode 100644 index 00000000000..2b3dc8a5e65 --- /dev/null +++ b/dll/win32/uxtheme/lang/pt-PT.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATOR: Copyright 2024 Daniel Victor <ilauncherdeveloper(a)gmail.com> + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Caixa de mensagem" + IDS_ACTIVEWIN "Janela activa" + IDS_INACTIVEWIN "Janela inactiva" + IDS_OK "OK" + IDS_WINTEXT "Texto da janela" +END diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc index d224472dda0..4d9c6fafa14 100644 --- a/dll/win32/uxtheme/uxtheme.rc +++ b/dll/win32/uxtheme/uxtheme.rc @@ -28,6 +28,12 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif

2 months, 3 weeks

[reactos] 01/01: [USBSTOR] Don't assert on clean up if initization didnt finish (#7412)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a65b6ae9468453f5d2278… commit a65b6ae9468453f5d2278cd526fdfeed3a366b02 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Wed Oct 2 14:21:50 2024 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 2 23:21:50 2024 +0200 [USBSTOR] Don't assert on clean up if initization didnt finish (#7412) During investigation into some of the USB stack issues we've been running into I've found that when a USB storage device is already plugged in during boot and removed before it finishes initialization we run into this assert. The logic in this function removes the pools made for the following entries in DeviceExtension indiscriminately this makes debugging a bit more difficult. Instead of depending on this behavior of ALWAYS being filled with valid data, let's free the following pools ONLY if they're initialized. This change prevents us from bugchecking when USB flash drives are removed early during boot. This makes the debugging experience a little more sane. --- drivers/usb/usbstor/fdo.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c index 40c4626c8d6..92801b1ef4e 100644 --- a/drivers/usb/usbstor/fdo.c +++ b/drivers/usb/usbstor/fdo.c @@ -118,22 +118,16 @@ USBSTOR_FdoHandleRemoveDevice( } // Freeing everything in DeviceExtension - ASSERT( - DeviceExtension->DeviceDescriptor && - DeviceExtension->ConfigurationDescriptor && - DeviceExtension->InterfaceInformation && - DeviceExtension->ResetDeviceWorkItem - ); - - ExFreePoolWithTag(DeviceExtension->DeviceDescriptor, USB_STOR_TAG); - ExFreePoolWithTag(DeviceExtension->ConfigurationDescriptor, USB_STOR_TAG); - ExFreePoolWithTag(DeviceExtension->InterfaceInformation, USB_STOR_TAG); - IoFreeWorkItem(DeviceExtension->ResetDeviceWorkItem); - + if (DeviceExtension->DeviceDescriptor) + ExFreePoolWithTag(DeviceExtension->DeviceDescriptor, USB_STOR_TAG); + if (DeviceExtension->ConfigurationDescriptor) + ExFreePoolWithTag(DeviceExtension->ConfigurationDescriptor, USB_STOR_TAG); + if (DeviceExtension->InterfaceInformation) + ExFreePoolWithTag(DeviceExtension->InterfaceInformation, USB_STOR_TAG); + if (DeviceExtension->ResetDeviceWorkItem) + IoFreeWorkItem(DeviceExtension->ResetDeviceWorkItem); if (DeviceExtension->SerialNumber) - { ExFreePoolWithTag(DeviceExtension->SerialNumber, USB_STOR_TAG); - } // Send the IRP down the stack IoSkipCurrentIrpStackLocation(Irp);

2 months, 3 weeks

[reactos] 04/04: [FREELDR] fs.c: Minor refactoring in ArcOpen(); fix a memory leak (#7385)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dfbe526992849cf53a83… commit 3dfbe526992849cf53a83fae784be2126319150b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 26 21:32:42 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 1 22:15:11 2024 +0200 [FREELDR] fs.c: Minor refactoring in ArcOpen(); fix a memory leak (#7385) - `ArcOpen()`: flatten the registered-device search for-loop. Limit it to just the device search, and exit early. The rest of the initialization is now done outside the loop. - The `DeviceName` string pointer may have been allocated from the heap, for path normalization (see `NormalizeArcDeviceName()`). This pointer is then only used in the device search loop and not nused anymore afterwards. The old code didn't free this pointer and memory could leak. This is now fixed easily, thanks to the loop flattening. - Rename `DEVICE` member `Prefix` to `DeviceName`; SAL-annotate `FsRegisterDevice()`. --- boot/freeldr/freeldr/include/fs.h | 6 +- boot/freeldr/freeldr/lib/fs/fs.c | 135 ++++++++++++++++++++------------------ 2 files changed, 77 insertions(+), 64 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index b3f90bc2a44..a7acd071112 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -52,7 +52,11 @@ FsOpenFile( ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); -VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); +VOID +FsRegisterDevice( + _In_ PCSTR DeviceName, + _In_ const DEVVTBL* FuncTable); + PCWSTR FsGetServiceName(ULONG FileId); VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID* FsGetDeviceSpecific(ULONG FileId); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 80c6b13917c..4bc9f2863f0 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -43,7 +43,7 @@ typedef struct tagDEVICE { LIST_ENTRY ListEntry; const DEVVTBL* FuncTable; - CHAR* Prefix; + PSTR DeviceName; ULONG DeviceId; ULONG ReferenceCount; } DEVICE; @@ -167,75 +167,81 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) if (!DeviceName) return ENOMEM; - /* Search for the device */ if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly) DeviceOpenMode = OpenMode; else DeviceOpenMode = OpenReadWrite; - pEntry = DeviceListHead.Flink; - while (pEntry != &DeviceListHead) + /* Search for the registered device */ + pDevice = NULL; + for (pEntry = DeviceListHead.Flink; + pEntry != &DeviceListHead; + pEntry = pEntry->Flink) { pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); - if (strncmp(pDevice->Prefix, DeviceName, Length) == 0) - { - /* OK, device found. Is it already opened? */ - if (pDevice->ReferenceCount == 0) - { - /* Find some room for the device */ - for (DeviceId = 0; ; ++DeviceId) - { - if (DeviceId >= _countof(FileData)) - return EMFILE; - if (!FileData[DeviceId].FuncTable) - break; - } - - /* Try to open the device */ - FileData[DeviceId].FuncTable = pDevice->FuncTable; - Status = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); - if (Status != ESUCCESS) - { - FileData[DeviceId].FuncTable = NULL; - return Status; - } - else if (!*FileName) - { - /* Done, caller wanted to open the raw device */ - *FileId = DeviceId; - pDevice->ReferenceCount++; - return ESUCCESS; - } - - /* Try to detect the file system */ - for (ULONG fs = 0; fs < _countof(FileSystems); ++fs) - { - FileData[DeviceId].FileFuncTable = FileSystems[fs](DeviceId); - if (FileData[DeviceId].FileFuncTable) - break; - } - if (!FileData[DeviceId].FileFuncTable) - { - /* Error, unable to detect the file system */ - pDevice->FuncTable->Close(DeviceId); - FileData[DeviceId].FuncTable = NULL; - return ENODEV; - } - - pDevice->DeviceId = DeviceId; - } - else - { - DeviceId = pDevice->DeviceId; - } - pDevice->ReferenceCount++; + if (strncmp(pDevice->DeviceName, DeviceName, Length) == 0) break; - } - pEntry = pEntry->Flink; } + + /* Cleanup */ + if (DeviceName != Path) + FrLdrTempFree(DeviceName, TAG_DEVICE_NAME); + DeviceName = NULL; + if (pEntry == &DeviceListHead) return ENODEV; + /* OK, device found. Is it already opened? */ + if (pDevice->ReferenceCount == 0) + { + /* Find some room for the device */ + for (DeviceId = 0; ; ++DeviceId) + { + if (DeviceId >= _countof(FileData)) + return EMFILE; + if (!FileData[DeviceId].FuncTable) + break; + } + + /* Try to open the device */ + FileData[DeviceId].FuncTable = pDevice->FuncTable; + Status = pDevice->FuncTable->Open(pDevice->DeviceName, DeviceOpenMode, &DeviceId); + if (Status != ESUCCESS) + { + FileData[DeviceId].FuncTable = NULL; + return Status; + } + else if (!*FileName) + { + /* Done, caller wanted to open the raw device */ + *FileId = DeviceId; + pDevice->ReferenceCount++; + return ESUCCESS; + } + + /* Try to detect the file system */ + for (ULONG fs = 0; fs < _countof(FileSystems); ++fs) + { + FileData[DeviceId].FileFuncTable = FileSystems[fs](DeviceId); + if (FileData[DeviceId].FileFuncTable) + break; + } + if (!FileData[DeviceId].FileFuncTable) + { + /* Error, unable to detect the file system */ + pDevice->FuncTable->Close(DeviceId); + FileData[DeviceId].FuncTable = NULL; + return ENODEV; + } + + pDevice->DeviceId = DeviceId; + } + else + { + DeviceId = pDevice->DeviceId; + } + pDevice->ReferenceCount++; + /* At this point, device is found and opened. Its file id is stored * in DeviceId, and FileData[DeviceId].FileFuncTable contains what * needs to be called to open the file */ @@ -432,22 +438,25 @@ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); } -VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) +VOID +FsRegisterDevice( + _In_ PCSTR DeviceName, + _In_ const DEVVTBL* FuncTable) { DEVICE* pNewEntry; SIZE_T Length; - TRACE("FsRegisterDevice() Prefix = %s\n", Prefix); + TRACE("FsRegisterDevice(%s)\n", DeviceName); - Length = strlen(Prefix) + 1; + Length = strlen(DeviceName) + 1; pNewEntry = FrLdrTempAlloc(sizeof(DEVICE) + Length, TAG_DEVICE); if (!pNewEntry) return; pNewEntry->FuncTable = FuncTable; pNewEntry->DeviceId = INVALID_FILE_ID; pNewEntry->ReferenceCount = 0; - pNewEntry->Prefix = (CHAR*)(pNewEntry + 1); - RtlCopyMemory(pNewEntry->Prefix, Prefix, Length); + pNewEntry->DeviceName = (PSTR)(pNewEntry + 1); + RtlCopyMemory(pNewEntry->DeviceName, DeviceName, Length); InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); }

2 months, 3 weeks

[reactos] 03/04: [FREELDR] fs.c: Move the "()" -> "(0)" ARC path normalization code into a function (#7385)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=689b9e047542098fb26e9… commit 689b9e047542098fb26e904cc17c002693cbf4af Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 26 21:01:55 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 1 22:14:02 2024 +0200 [FREELDR] fs.c: Move the "()" -> "(0)" ARC path normalization code into a function (#7385) This function will be useful in other places later. --- boot/freeldr/freeldr/lib/fs/fs.c | 102 +++++++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 32 deletions(-) diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 33e21a609f8..80c6b13917c 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -77,16 +77,75 @@ PFS_MOUNT FileSystems[] = /* ARC FUNCTIONS **************************************************************/ +/** + * @brief + * Replace "()" by "(0)" in the given ARC device name, if necessary. + * + * @param[in] DeviceName + * The original ARC device name string to normalize. + * + * @param[in,out] Length + * Points to a SIZE_T variable that: + * - on input, specifies the length of the ARC device name string pointed + * by DeviceName; + * - on output, receives the length of the normalized ARC device name, + * returned by value by this function. + * + * @return + * - On success, returns a string pointer to the normalized ARC device name. + * If the device name string had to be normalized, this returned string is + * allocated from the temporary heap, with TAG_DEVICE_NAME tag. + * Otherwise, the function returns the original device name string pointer. + * - On failure, the function returns NULL. + **/ +PCHAR +NormalizeArcDeviceName( + _In_ PCCH DeviceName, + _Inout_ PSIZE_T Length) +{ + ULONG Count; + SIZE_T NameLength; + PCCH p, End; + PCHAR q, NormName; + + NameLength = *Length; + End = DeviceName + NameLength; + + /* Count the number of "()", which needs to be replaced by "(0)" */ + Count = 0; + for (p = DeviceName; p < End; ++p) + { + if ((p + 1) < End && *p == '(' && *(p + 1) == ')') + ++Count; //, ++p; + } + + if (Count == 0) /* No need to duplicate the device name */ + return (PCHAR)DeviceName; + + /* Return the updated length */ + *Length = NameLength + Count; + + /* Duplicate the device name and replace "()" by "(0)" */ + NormName = FrLdrTempAlloc(*Length, TAG_DEVICE_NAME); + if (!NormName) + return NULL; + for (p = DeviceName, q = NormName; p < End; ++p) + { + *q++ = *p; + if ((p + 1) < End && *p == '(' && *(p + 1) == ')') + *q++ = '0'; //, *q++ = *++p; + } + return NormName; +} + ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { ARC_STATUS Status; - ULONG Count, i; + ULONG i; PLIST_ENTRY pEntry; DEVICE* pDevice; - CHAR* DeviceName; - CHAR* FileName; - CHAR* p; - CHAR* q; + PCHAR DeviceName; + PSTR FileName; SIZE_T Length; OPENMODE DeviceOpenMode; ULONG DeviceId; @@ -100,34 +159,13 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) FileName = strrchr(Path, ')'); if (!FileName) return EINVAL; - FileName++; - - /* Count number of "()", which needs to be replaced by "(0)" */ - Count = 0; - for (p = Path; p != FileName; p++) - { - if (*p == '(' && *(p + 1) == ')') - Count++; - } + ++FileName; - /* Duplicate device name, and replace "()" by "(0)" (if required) */ - Length = FileName - Path + Count; - if (Count != 0) - { - DeviceName = FrLdrTempAlloc(FileName - Path + Count, TAG_DEVICE_NAME); - if (!DeviceName) - return ENOMEM; - for (p = Path, q = DeviceName; p != FileName; p++) - { - *q++ = *p; - if (*p == '(' && *(p + 1) == ')') - *q++ = '0'; - } - } - else - { - DeviceName = Path; - } + /* Normalize the device name, replacing "()" by "(0)" if necessary */ + Length = FileName - Path; + DeviceName = NormalizeArcDeviceName(Path, &Length); + if (!DeviceName) + return ENOMEM; /* Search for the device */ if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly)

2 months, 3 weeks

[reactos] 02/04: [FREELDR] fs.c: Simplify FileId checks; add missing DeviceId invalidation (#7385)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=829ad06179a8710392997… commit 829ad06179a8710392997efb0e9464224e999d8e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 26 20:31:19 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 1 22:14:01 2024 +0200 [FREELDR] fs.c: Simplify FileId checks; add missing DeviceId invalidation (#7385) - Replace a lot of `MAX_FDS` by `_countof(FileData)`; - The duplicated FileId validation logic is wrapped with the `IS_VALID_FILEID()` macro. - When returning an invalid FileId value on purpose, use `INVALID_FILE_ID` instead of `MAX_FDS` (that could vary if the file handle table gets extended). And replace the `(ULONG)-1` also used for that purpose by `INVALID_FILE_ID`. - Add missing DeviceId invalidation: * when failing to open a file handle in `ArcOpen()`; * when registering a new device in `FsRegisterDevice()`. There, having DeviceId always set to zero would tell the code that the corresponding device's file ID is the first one in the table, which is a BUG. (Many devices would have the same file ID...) - In addition: massage a bit some indicial for-loops. --- boot/freeldr/freeldr/include/fs.h | 1 + boot/freeldr/freeldr/lib/fs/fs.c | 53 +++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index 68489c9d087..b3f90bc2a44 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -32,6 +32,7 @@ typedef struct tagDEVVTBL } DEVVTBL; #define MAX_FDS 60 +#define INVALID_FILE_ID ((ULONG)-1) ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); ARC_STATUS ArcClose(ULONG FileId); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 198982b0515..33e21a609f8 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -51,6 +51,9 @@ typedef struct tagDEVICE static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; +#define IS_VALID_FILEID(FileId) \ + ((ULONG)(FileId) < _countof(FileData) && FileData[(ULONG)(FileId)].FuncTable) + typedef const DEVVTBL* (*PFS_MOUNT)(ULONG DeviceId); PFS_MOUNT FileSystems[] = @@ -91,7 +94,7 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) /* Print status message */ TRACE("Opening file '%s'...\n", Path); - *FileId = MAX_FDS; + *FileId = INVALID_FILE_ID; /* Search last ')', which delimits device and path */ FileName = strrchr(Path, ')'); @@ -138,17 +141,17 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); if (strncmp(pDevice->Prefix, DeviceName, Length) == 0) { - /* OK, device found. It is already opened? */ + /* OK, device found. Is it already opened? */ if (pDevice->ReferenceCount == 0) { - /* Search some room for the device */ - for (DeviceId = 0; DeviceId < MAX_FDS; DeviceId++) + /* Find some room for the device */ + for (DeviceId = 0; ; ++DeviceId) { + if (DeviceId >= _countof(FileData)) + return EMFILE; if (!FileData[DeviceId].FuncTable) break; } - if (DeviceId == MAX_FDS) - return EMFILE; /* Try to open the device */ FileData[DeviceId].FuncTable = pDevice->FuncTable; @@ -199,14 +202,14 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) * in DeviceId, and FileData[DeviceId].FileFuncTable contains what * needs to be called to open the file */ - /* Search some room for the device */ - for (i = 0; i < MAX_FDS; i++) + /* Find some room for the file */ + for (i = 0; ; ++i) { + if (i >= _countof(FileData)) + return EMFILE; if (!FileData[i].FuncTable) break; } - if (i == MAX_FDS) - return EMFILE; /* Skip leading path separator, if any */ if (*FileName == '\\' || *FileName == '/') @@ -219,8 +222,10 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) Status = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); if (Status != ESUCCESS) { + FileData[i].DeviceId = INVALID_FILE_ID; FileData[i].FuncTable = NULL; - *FileId = MAX_FDS; + FileData[i].Specific = NULL; + *FileId = INVALID_FILE_ID; } return Status; } @@ -229,37 +234,36 @@ ARC_STATUS ArcClose(ULONG FileId) { ARC_STATUS Status; - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return EBADF; Status = FileData[FileId].FuncTable->Close(FileId); - if (Status == ESUCCESS) { + FileData[FileId].DeviceId = INVALID_FILE_ID; FileData[FileId].FuncTable = NULL; FileData[FileId].Specific = NULL; - FileData[FileId].DeviceId = -1; } return Status; } ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return EBADF; return FileData[FileId].FuncTable->Read(FileId, Buffer, N, Count); } ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return EBADF; return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); } ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return EBADF; return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); } @@ -402,6 +406,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) if (!pNewEntry) return; pNewEntry->FuncTable = FuncTable; + pNewEntry->DeviceId = INVALID_FILE_ID; pNewEntry->ReferenceCount = 0; pNewEntry->Prefix = (CHAR*)(pNewEntry + 1); RtlCopyMemory(pNewEntry->Prefix, Prefix, Length); @@ -411,29 +416,29 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) PCWSTR FsGetServiceName(ULONG FileId) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return NULL; return FileData[FileId].FuncTable->ServiceName; } VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return; FileData[FileId].Specific = Specific; } VOID* FsGetDeviceSpecific(ULONG FileId) { - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + if (!IS_VALID_FILEID(FileId)) return NULL; return FileData[FileId].Specific; } ULONG FsGetDeviceId(ULONG FileId) { - if (FileId >= MAX_FDS) - return (ULONG)-1; + if (FileId >= _countof(FileData)) // !IS_VALID_FILEID(FileId) + return INVALID_FILE_ID; return FileData[FileId].DeviceId; } @@ -442,8 +447,8 @@ VOID FsInit(VOID) ULONG i; RtlZeroMemory(FileData, sizeof(FileData)); - for (i = 0; i < MAX_FDS; i++) - FileData[i].DeviceId = (ULONG)-1; + for (i = 0; i < _countof(FileData); ++i) + FileData[i].DeviceId = INVALID_FILE_ID; InitializeListHead(&DeviceListHead); }

2 months, 3 weeks

[reactos] 01/04: [FREELDR] fs.c: Move the filesystem mount routines list into a table (#7385)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29a0ff73e67e1229c57bc… commit 29a0ff73e67e1229c57bc98bdf9261d69e62d3cf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 26 20:11:23 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 1 22:13:51 2024 +0200 [FREELDR] fs.c: Move the filesystem mount routines list into a table (#7385) This allows to make the code better extendable: adding a new FS mount routine into the table, instead of duplicating also a whole `if (!FileFuncTable) ...` check. Later, this table will be made dynamic, so that new filesystems could be dynamically registered at runtime, and a filesystem could be forced to be mounted by the user (using a specific syntax). --- boot/freeldr/freeldr/lib/fs/fs.c | 48 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 3326b1951d6..198982b0515 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -51,6 +51,27 @@ typedef struct tagDEVICE static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; +typedef const DEVVTBL* (*PFS_MOUNT)(ULONG DeviceId); + +PFS_MOUNT FileSystems[] = +{ +#ifndef _M_ARM + IsoMount, +#endif + FatMount, + BtrFsMount, +#ifndef _M_ARM + NtfsMount, + Ext2Mount, +#endif +#if defined(_M_IX86) || defined(_M_AMD64) +#ifndef UEFIBOOT + PxeMount, +#endif +#endif +}; + + /* ARC FUNCTIONS **************************************************************/ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) @@ -146,28 +167,15 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) } /* Try to detect the file system */ -#ifndef _M_ARM - FileData[DeviceId].FileFuncTable = IsoMount(DeviceId); - if (!FileData[DeviceId].FileFuncTable) -#endif - FileData[DeviceId].FileFuncTable = FatMount(DeviceId); - if (!FileData[DeviceId].FileFuncTable) - FileData[DeviceId].FileFuncTable = BtrFsMount(DeviceId); -#ifndef _M_ARM - if (!FileData[DeviceId].FileFuncTable) - FileData[DeviceId].FileFuncTable = NtfsMount(DeviceId); - if (!FileData[DeviceId].FileFuncTable) - FileData[DeviceId].FileFuncTable = Ext2Mount(DeviceId); -#endif -#if defined(_M_IX86) || defined(_M_AMD64) -#ifndef UEFIBOOT - if (!FileData[DeviceId].FileFuncTable) - FileData[DeviceId].FileFuncTable = PxeMount(DeviceId); -#endif -#endif + for (ULONG fs = 0; fs < _countof(FileSystems); ++fs) + { + FileData[DeviceId].FileFuncTable = FileSystems[fs](DeviceId); + if (FileData[DeviceId].FileFuncTable) + break; + } if (!FileData[DeviceId].FileFuncTable) { - /* Error, unable to detect file system */ + /* Error, unable to detect the file system */ pDevice->FuncTable->Close(DeviceId); FileData[DeviceId].FuncTable = NULL; return ENODEV;

2 months, 3 weeks

[reactos] 01/01: [FREELDR] Change GEOMETRY "Sectors" to "SectorsPerTrack" and introduce a new "Sectors" field (#7379)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a7fe56a5d5033bcb5e87… commit 3a7fe56a5d5033bcb5e8733fe49e7f24b9a2def3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 18:41:44 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 30 12:11:15 2024 +0200 [FREELDR] Change GEOMETRY "Sectors" to "SectorsPerTrack" and introduce a new "Sectors" field (#7379) ---- Thanks to the following testers! - Dmitry Borisov (@disean) for testing on NEC PC-98 emulator; - Justin Miller (@DarkFire01) for testing on UEFI platform; - Stanislav Motylkov (@binarymaster) for testing on Xbox emulator (xemu), both livecd and bootcd. ---- "SectorsPerTrack" is for the legacy Cylinders/Heads/Sectors(PerTrack) scheme. - On BIOS-based PCs, INT 13h can return (for LBA-only drives) an invalid geometry, like: C/H/S = (-1)/(-1)/(-1). This is also what happens in our hwide.c driver (see IdentifyDevice() for ATAPI devices): https://github.com/reactos/reactos/blob/db419efbf26c78e39fb57bcaf4f9e4d915d… as well as on VirtualBox for CD-ROMs: https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Devices/PC/BIOS/disk… - Therefore, we cannot reliably calculate a valid total number of sectors by multiplying the Cylinders*Heads*SectorsPerTrack values. In addition, such a multiplication could overflow a 32-bit ULONG. Thus, a separate ULONGLONG Sectors member is required to hold such a value, that is retrieved differently. For example for ATAPI devices, our hwide.c driver does return a valid TotalSectors value, even though CHS values are invalid. Other platforms, like UEFI, just work using logical block addressing (LBA) values (see EFI_BLOCK_IO_MEDIA). - uefidisk.c : Per the spec, EFI_BLOCK_IO_MEDIA::LastBlock contains "The last LBA on the device. [...] For ATA devices, this is reported in IDENTIFY DEVICE data words 60-61 (i.e., Total number of user addressable logical sectors) _minus one_. For SCSI devices, this is reported in the READ CAPACITY parameter data 'Returned Logical Block Address field' _minus one_." In other words, LastBlock is a zero-based LBA index quantity. The corresponding total number of valid "sectors"/blocks of the device is therefore, (LastBlock + 1). - Cleanup some old disabled code. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 2 +- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 22 ++------ boot/freeldr/freeldr/arch/i386/pc/pcdisk.c | 40 +++++++-------- boot/freeldr/freeldr/arch/i386/pc/pchw.c | 4 +- boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c | 70 +++++++++++++++----------- boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c | 6 +-- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 13 ++--- boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c | 3 +- boot/freeldr/freeldr/arch/uefi/uefidisk.c | 13 ++--- boot/freeldr/freeldr/include/arch/pc/machpc.h | 1 - boot/freeldr/freeldr/include/disk.h | 21 ++++---- 11 files changed, 92 insertions(+), 103 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 421fd38d48c..c804137491e 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -137,7 +137,7 @@ DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) } SectorOffset = 0; - SectorCount = (ULONGLONG)Geometry.Cylinders * Geometry.Heads * Geometry.Sectors; + SectorCount = Geometry.Sectors; } Context = FrLdrTempAlloc(sizeof(DISKCONTEXT), TAG_HW_DISK_CONTEXT); diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 639895ec25b..fff1673feb4 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -121,13 +121,10 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - // EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; - // - // Initialize returned size - // + /* Initialize returned size */ *pSize = 0; /* Set 'Configuration Data' value */ @@ -155,22 +152,11 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ -#if 0 // This is somehow replaced by what PcDiskGetDriveGeometry() does internally. - ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); - if (DiskGetExtendedDriveParameters(DriveNumber, &ExtGeometry, ExtGeometry.Size)) - { - DiskGeometry->BytesPerSector = ExtGeometry.BytesPerSector; - DiskGeometry->NumberOfCylinders = ExtGeometry.Cylinders; - DiskGeometry->SectorsPerTrack = ExtGeometry.SectorsPerTrack; - DiskGeometry->NumberOfHeads = ExtGeometry.Heads; - } - else -#endif if (PcDiskGetDriveGeometry(DriveNumber, &Geometry)) { DiskGeometry->BytesPerSector = Geometry.BytesPerSector; DiskGeometry->NumberOfCylinders = Geometry.Cylinders; - DiskGeometry->SectorsPerTrack = Geometry.Sectors; + DiskGeometry->SectorsPerTrack = Geometry.SectorsPerTrack; DiskGeometry->NumberOfHeads = Geometry.Heads; } else @@ -186,9 +172,7 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry->SectorsPerTrack, DiskGeometry->BytesPerSector); - // - // Return configuration data - // + /* Return configuration data */ *pSize = Size; return PartialResourceList; } diff --git a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c index 28e7fd66a76..1bd498e6730 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c @@ -443,8 +443,12 @@ InitDriveGeometry( Cylinders++; DiskDrive->Geometry.Cylinders = Cylinders; DiskDrive->Geometry.Heads = RegsOut.b.dh + 1; - DiskDrive->Geometry.Sectors = RegsOut.b.cl & 0x3F; - DiskDrive->Geometry.BytesPerSector = 512; /* Just assume 512 bytes per sector */ + DiskDrive->Geometry.SectorsPerTrack = RegsOut.b.cl & 0x3F; + DiskDrive->Geometry.BytesPerSector = 512; /* Just assume 512 bytes per sector */ + + DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders * + DiskDrive->Geometry.Heads * + DiskDrive->Geometry.SectorsPerTrack; TRACE("Regular Int13h(0x%x) returned:\n" "Cylinders : 0x%x\n" @@ -454,7 +458,7 @@ InitDriveGeometry( DriveNumber, DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Heads, - DiskDrive->Geometry.Sectors, RegsOut.b.cl, + DiskDrive->Geometry.SectorsPerTrack, RegsOut.b.cl, DiskDrive->Geometry.BytesPerSector); return Success; @@ -645,40 +649,35 @@ PcDiskReadLogicalSectorsCHS( ULONG RetryCount; DriveGeometry = DiskDrive->Geometry; - if (DriveGeometry.Sectors == 0 || DriveGeometry.Heads == 0) + if (DriveGeometry.SectorsPerTrack == 0 || DriveGeometry.Heads == 0) return FALSE; while (SectorCount > 0) { /* * Calculate the physical disk offsets. - * Note: DriveGeometry.Sectors < 64 + * Note: DriveGeometry.SectorsPerTrack < 64 */ - PhysicalSector = 1 + (UCHAR)(SectorNumber % DriveGeometry.Sectors); - PhysicalHead = (UCHAR)((SectorNumber / DriveGeometry.Sectors) % DriveGeometry.Heads); - PhysicalTrack = (ULONG)((SectorNumber / DriveGeometry.Sectors) / DriveGeometry.Heads); + PhysicalSector = 1 + (UCHAR)(SectorNumber % DriveGeometry.SectorsPerTrack); + PhysicalHead = (UCHAR)((SectorNumber / DriveGeometry.SectorsPerTrack) % DriveGeometry.Heads); + PhysicalTrack = (ULONG)((SectorNumber / DriveGeometry.SectorsPerTrack) / DriveGeometry.Heads); /* Calculate how many sectors we need to read this round */ if (PhysicalSector > 1) { - if (SectorCount >= (DriveGeometry.Sectors - (PhysicalSector - 1))) - NumberOfSectorsToRead = (DriveGeometry.Sectors - (PhysicalSector - 1)); - else - NumberOfSectorsToRead = SectorCount; + NumberOfSectorsToRead = min(SectorCount, + (DriveGeometry.SectorsPerTrack - (PhysicalSector - 1))); } else { - if (SectorCount >= DriveGeometry.Sectors) - NumberOfSectorsToRead = DriveGeometry.Sectors; - else - NumberOfSectorsToRead = SectorCount; + NumberOfSectorsToRead = min(SectorCount, DriveGeometry.SectorsPerTrack); } /* Make sure the read is within the geometry boundaries */ if ((PhysicalHead >= DriveGeometry.Heads) || (PhysicalTrack >= DriveGeometry.Cylinders) || - ((NumberOfSectorsToRead + PhysicalSector) > (DriveGeometry.Sectors + 1)) || - (PhysicalSector > DriveGeometry.Sectors)) + ((NumberOfSectorsToRead + PhysicalSector) > (DriveGeometry.SectorsPerTrack + 1)) || + (PhysicalSector > DriveGeometry.SectorsPerTrack)) { DiskError("Disk read exceeds drive geometry limits.", 0); return FALSE; @@ -817,8 +816,9 @@ PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) /* Extended geometry has been initialized, return it */ Geometry->Cylinders = DiskDrive->ExtGeometry.Cylinders; Geometry->Heads = DiskDrive->ExtGeometry.Heads; - Geometry->Sectors = DiskDrive->ExtGeometry.SectorsPerTrack; + Geometry->SectorsPerTrack = DiskDrive->ExtGeometry.SectorsPerTrack; Geometry->BytesPerSector = DiskDrive->ExtGeometry.BytesPerSector; + Geometry->Sectors = DiskDrive->ExtGeometry.Sectors; } else /* Fall back to legacy BIOS geometry */ @@ -845,7 +845,7 @@ PcDiskGetCacheableBlockCount(UCHAR DriveNumber) if (DiskDrive->Int13ExtensionsSupported) return 64; else - return DiskDrive->Geometry.Sectors; + return DiskDrive->Geometry.SectorsPerTrack; } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/pc/pchw.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c index 4e8249dd99f..e0e24da5108 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pchw.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pchw.c @@ -394,7 +394,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, { Int13Drives[i].DriveSelect = DriveNumber; Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; - Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.Sectors; + Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.SectorsPerTrack; Int13Drives[i].MaxHeads = (USHORT)Geometry.Heads - 1; Int13Drives[i].NumberDrives = DiskCount; @@ -402,7 +402,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, DriveNumber, Geometry.Cylinders - 1, Geometry.Heads - 1, - Geometry.Sectors, + Geometry.SectorsPerTrack, Geometry.BytesPerSector); } } diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c index 71a21e36267..9eef9d45f71 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c @@ -268,11 +268,11 @@ Pc98DiskReadLogicalSectorsCHS( { /* * Calculate the physical disk offsets. - * Note: DriveGeometry.Sectors < 64 + * Note: DriveGeometry.SectorsPerTrack < 64 */ - PhysicalSector = (UCHAR)(SectorNumber % DriveGeometry.Sectors); - PhysicalHead = (UCHAR)((SectorNumber / DriveGeometry.Sectors) % DriveGeometry.Heads); - PhysicalTrack = (ULONG)((SectorNumber / DriveGeometry.Sectors) / DriveGeometry.Heads); + PhysicalSector = (UCHAR)(SectorNumber % DriveGeometry.SectorsPerTrack); + PhysicalHead = (UCHAR)((SectorNumber / DriveGeometry.SectorsPerTrack) % DriveGeometry.Heads); + PhysicalTrack = (ULONG)((SectorNumber / DriveGeometry.SectorsPerTrack) / DriveGeometry.Heads); /* Floppy sectors value always start at 1 */ if (DiskDrive->Type & DRIVE_FDD) @@ -281,24 +281,19 @@ Pc98DiskReadLogicalSectorsCHS( /* Calculate how many sectors we need to read this round */ if (PhysicalSector > 1) { - if (SectorCount >= (DriveGeometry.Sectors - (PhysicalSector - 1))) - NumberOfSectorsToRead = (DriveGeometry.Sectors - (PhysicalSector - 1)); - else - NumberOfSectorsToRead = SectorCount; + NumberOfSectorsToRead = min(SectorCount, + (DriveGeometry.SectorsPerTrack - (PhysicalSector - 1))); } else { - if (SectorCount >= DriveGeometry.Sectors) - NumberOfSectorsToRead = DriveGeometry.Sectors; - else - NumberOfSectorsToRead = SectorCount; + NumberOfSectorsToRead = min(SectorCount, DriveGeometry.SectorsPerTrack); } /* Make sure the read is within the geometry boundaries */ if ((PhysicalHead >= DriveGeometry.Heads) || (PhysicalTrack >= DriveGeometry.Cylinders) || - ((NumberOfSectorsToRead + PhysicalSector) > (DriveGeometry.Sectors + 1)) || - (PhysicalSector > DriveGeometry.Sectors)) + ((NumberOfSectorsToRead + PhysicalSector) > (DriveGeometry.SectorsPerTrack + 1)) || + (PhysicalSector > DriveGeometry.SectorsPerTrack)) { DiskError("Disk read exceeds drive geometry limits.", 0); return FALSE; @@ -439,7 +434,7 @@ InitScsiDrive( DiskDrive->Geometry.Cylinders = RegsOut.w.cx; DiskDrive->Geometry.Heads = RegsOut.b.dh; - DiskDrive->Geometry.Sectors = RegsOut.b.dl; + DiskDrive->Geometry.SectorsPerTrack = RegsOut.b.dl; DiskDrive->Geometry.BytesPerSector = RegsOut.w.bx; DiskDrive->LBASupported = FALSE; DiskDrive->IsRemovable = FALSE; @@ -454,7 +449,7 @@ InitScsiDrive( /* CD-ROM */ DiskDrive->Geometry.Cylinders = 0xFFFF; DiskDrive->Geometry.Heads = 0xFFFF; - DiskDrive->Geometry.Sectors = 0xFFFF; + DiskDrive->Geometry.SectorsPerTrack = 0xFFFF; DiskDrive->Geometry.BytesPerSector = 2048; DiskDrive->Type = DRIVE_CDROM; DiskDrive->LBASupported = TRUE; @@ -465,7 +460,7 @@ InitScsiDrive( /* Magneto-optical drive */ DiskDrive->Geometry.Cylinders = 0xFFFF; DiskDrive->Geometry.Heads = 8; - DiskDrive->Geometry.Sectors = 32; + DiskDrive->Geometry.SectorsPerTrack = 32; DiskDrive->Geometry.BytesPerSector = 512; DiskDrive->Type = DRIVE_MO; DiskDrive->LBASupported = TRUE; @@ -483,6 +478,10 @@ InitScsiDrive( return FALSE; } + DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders * + DiskDrive->Geometry.Heads * + DiskDrive->Geometry.SectorsPerTrack; + DiskDrive->DaUa = DaUa; DiskDrive->Type |= DRIVE_SCSI; DiskDrive->Initialized = TRUE; @@ -495,7 +494,7 @@ InitScsiDrive( DaUa, DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Heads, - DiskDrive->Geometry.Sectors, + DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.BytesPerSector); return TRUE; @@ -513,8 +512,10 @@ InitIdeDrive( { DiskDrive->Geometry.Cylinders = DeviceUnit->Cylinders; DiskDrive->Geometry.Heads = DeviceUnit->Heads; - DiskDrive->Geometry.Sectors = DeviceUnit->Sectors; + DiskDrive->Geometry.SectorsPerTrack = DeviceUnit->Sectors; DiskDrive->Geometry.BytesPerSector = DeviceUnit->SectorSize; + DiskDrive->Geometry.Sectors = DeviceUnit->TotalSectors; + DiskDrive->DaUa = 0xFF; DiskDrive->IdeUnitNumber = UnitNumber; DiskDrive->Type = DRIVE_IDE | DRIVE_CDROM; @@ -530,7 +531,7 @@ InitIdeDrive( UnitNumber, DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Heads, - DiskDrive->Geometry.Sectors, + DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.BytesPerSector); return TRUE; @@ -582,8 +583,13 @@ InitHardDrive( DiskDrive->Geometry.Cylinders = RegsOut.w.cx; DiskDrive->Geometry.Heads = RegsOut.b.dh; - DiskDrive->Geometry.Sectors = RegsOut.b.dl; + DiskDrive->Geometry.SectorsPerTrack = RegsOut.b.dl; DiskDrive->Geometry.BytesPerSector = RegsOut.w.bx; + + DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders * + DiskDrive->Geometry.Heads * + DiskDrive->Geometry.SectorsPerTrack; + DiskDrive->DaUa = DaUa; DiskDrive->Type = DRIVE_IDE; DiskDrive->LBASupported = FALSE; @@ -598,7 +604,7 @@ InitHardDrive( DaUa, DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Heads, - DiskDrive->Geometry.Sectors, + DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.BytesPerSector); return TRUE; @@ -647,14 +653,14 @@ InitFloppyDrive( /* 320 kB 2DD */ DiskDrive->Geometry.Cylinders = 80; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 16; + DiskDrive->Geometry.SectorsPerTrack = 16; } else { /* 1 MB 2HD */ DiskDrive->Geometry.Cylinders = 77; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 26; + DiskDrive->Geometry.SectorsPerTrack = 26; } break; @@ -664,21 +670,21 @@ InitFloppyDrive( /* 1.44 MB 2HD */ DiskDrive->Geometry.Cylinders = 80; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 18; + DiskDrive->Geometry.SectorsPerTrack = 18; } else if (DeviceAddress == 0x70 || DeviceAddress == 0xF0) { /* 720/640 kB 2DD */ DiskDrive->Geometry.Cylinders = 80; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 8; + DiskDrive->Geometry.SectorsPerTrack = 8; } else { /* 1.2 MB 2HC */ DiskDrive->Geometry.Cylinders = 80; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 15; + DiskDrive->Geometry.SectorsPerTrack = 15; } break; @@ -686,7 +692,7 @@ InitFloppyDrive( /* 1.25 MB 2HD */ DiskDrive->Geometry.Cylinders = 77; DiskDrive->Geometry.Heads = 2; - DiskDrive->Geometry.Sectors = 8; + DiskDrive->Geometry.SectorsPerTrack = 8; break; default: @@ -695,6 +701,10 @@ InitFloppyDrive( } DiskDrive->Geometry.BytesPerSector = BytesPerSector; + DiskDrive->Geometry.Sectors = (ULONGLONG)DiskDrive->Geometry.Cylinders * + DiskDrive->Geometry.Heads * + DiskDrive->Geometry.SectorsPerTrack; + DiskDrive->DaUa = DaUa; DiskDrive->Type = DRIVE_FDD; DiskDrive->LBASupported = FALSE; @@ -709,7 +719,7 @@ InitFloppyDrive( DaUa, DiskDrive->Geometry.Cylinders, DiskDrive->Geometry.Heads, - DiskDrive->Geometry.Sectors, + DiskDrive->Geometry.SectorsPerTrack, DiskDrive->Geometry.BytesPerSector); return TRUE; @@ -898,5 +908,5 @@ Pc98DiskGetCacheableBlockCount(UCHAR DriveNumber) if (DiskDrive->LBASupported) return 64; else - return DiskDrive->Geometry.Sectors; + return DiskDrive->Geometry.SectorsPerTrack; } diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c index 98264eec03c..6cff3e86400 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c @@ -349,7 +349,7 @@ Pc98GetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) { DiskGeometry->BytesPerSector = Geometry.BytesPerSector; DiskGeometry->NumberOfCylinders = Geometry.Cylinders; - DiskGeometry->SectorsPerTrack = Geometry.Sectors; + DiskGeometry->SectorsPerTrack = Geometry.SectorsPerTrack; DiskGeometry->NumberOfHeads = Geometry.Heads; } else @@ -423,7 +423,7 @@ DetectBiosDisks( { Int13Drives[i].DriveSelect = DriveNumber; Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; - Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.Sectors; + Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.SectorsPerTrack; Int13Drives[i].MaxHeads = (USHORT)Geometry.Heads - 1; Int13Drives[i].NumberDrives = DiskCount; @@ -431,7 +431,7 @@ DetectBiosDisks( DriveNumber, Geometry.Cylinders - 1, Geometry.Heads - 1, - Geometry.Sectors, + Geometry.SectorsPerTrack, Geometry.BytesPerSector); } } diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 97b38062d84..6c0b094f49b 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -95,13 +95,10 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - //EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; - // - // Initialize returned size - // + /* Initialize returned size */ *pSize = 0; /* Set 'Configuration Data' value */ @@ -129,13 +126,11 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ - //ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); - if (XboxDiskGetDriveGeometry(DriveNumber, &Geometry)) { DiskGeometry->BytesPerSector = Geometry.BytesPerSector; DiskGeometry->NumberOfCylinders = Geometry.Cylinders; - DiskGeometry->SectorsPerTrack = Geometry.Sectors; + DiskGeometry->SectorsPerTrack = Geometry.SectorsPerTrack; DiskGeometry->NumberOfHeads = Geometry.Heads; } else @@ -151,9 +146,7 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry->SectorsPerTrack, DiskGeometry->BytesPerSector); - // - // Return configuration data - // + /* Return configuration data */ *pSize = Size; return PartialResourceList; } diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c index 06e7e2d6691..4afdc99c398 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c @@ -112,8 +112,9 @@ XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) Geometry->Cylinders = DeviceUnit->Cylinders; Geometry->Heads = DeviceUnit->Heads; - Geometry->Sectors = DeviceUnit->Sectors; + Geometry->SectorsPerTrack = DeviceUnit->Sectors; Geometry->BytesPerSector = DeviceUnit->SectorSize; + Geometry->Sectors = DeviceUnit->TotalSectors; return TRUE; } diff --git a/boot/freeldr/freeldr/arch/uefi/uefidisk.c b/boot/freeldr/freeldr/arch/uefi/uefidisk.c index 98d19b346f1..c7e89e92cea 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefidisk.c +++ b/boot/freeldr/freeldr/arch/uefi/uefidisk.c @@ -185,7 +185,7 @@ UefiDiskOpen(CHAR *Path, OPENMODE OpenMode, ULONG *FileId) } SectorOffset = 0; - SectorCount = (ULONGLONG)Geometry.Cylinders * Geometry.Heads * Geometry.Sectors; + SectorCount = Geometry.Sectors; } Context = FrLdrTempAlloc(sizeof(DISKCONTEXT), TAG_HW_DISK_CONTEXT); @@ -577,10 +577,11 @@ UefiDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) UefiDriveNumber = InternalUefiDisk[DriveNumber - FIRST_BIOS_DISK].UefiRootNumber; GlobalSystemTable->BootServices->HandleProtocol(handles[UefiDriveNumber], &bioGuid, (void**)&bio); - Geometry->Cylinders = 1; // Not relevant for the UEFI BIO protocol - Geometry->Heads = 1; // Not relevant for the UEFI BIO protocol - Geometry->Sectors = bio->Media->LastBlock; // Number of sectors per track - Geometry->BytesPerSector = bio->Media->BlockSize; // Number of bytes per sector + Geometry->Cylinders = 1; // Not relevant for the UEFI BIO protocol + Geometry->Heads = 1; // Not relevant for the UEFI BIO protocol + Geometry->SectorsPerTrack = (bio->Media->LastBlock + 1); + Geometry->BytesPerSector = bio->Media->BlockSize; + Geometry->Sectors = (bio->Media->LastBlock + 1); return TRUE; } @@ -592,5 +593,5 @@ UefiDiskGetCacheableBlockCount(UCHAR DriveNumber) TRACE("UefiDiskGetCacheableBlockCount: DriveNumber: %d\n", UefiDriveNumber); GlobalSystemTable->BootServices->HandleProtocol(handles[UefiDriveNumber], &bioGuid, (void**)&bio); - return bio->Media->LastBlock; + return (bio->Media->LastBlock + 1); } diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index 2263d75778c..0f68027eef3 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -58,7 +58,6 @@ extern ULONG FrldrBootPartition; LONG DiskReportError(BOOLEAN bShowError); BOOLEAN DiskResetController(UCHAR DriveNumber); -// BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize); BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY DriveGeometry); diff --git a/boot/freeldr/freeldr/include/disk.h b/boot/freeldr/freeldr/include/disk.h index b08993a5e8f..ec12a8f4b31 100644 --- a/boot/freeldr/freeldr/include/disk.h +++ b/boot/freeldr/freeldr/include/disk.h @@ -21,19 +21,22 @@ #include <reactos/rosioctl.h> +/* FreeLoader-specific disk geometry structure */ typedef struct _GEOMETRY { - ULONG Cylinders; // Number of cylinders on the disk - ULONG Heads; // Number of heads on the disk - ULONG Sectors; // Number of sectors per track - ULONG BytesPerSector; // Number of bytes per sector - + ULONG Cylinders; ///< Number of cylinders on the disk + ULONG Heads; ///< Number of heads on the disk + ULONG SectorsPerTrack; ///< Number of sectors per track + ULONG BytesPerSector; ///< Number of bytes per sector + ULONGLONG Sectors; ///< Total number of disk sectors/LBA blocks } GEOMETRY, *PGEOMETRY; +#include <pshpack1.h> + /* - * Extended disk geometry (Int13 / ah=48h) + * Extended disk geometry (Int13 / AH=48h) + * See also ntdddisk.h DISK_EX_INT13_INFO */ -#include <pshpack1.h> typedef struct _EXTENDED_GEOMETRY { USHORT Size; @@ -44,7 +47,6 @@ typedef struct _EXTENDED_GEOMETRY ULONGLONG Sectors; USHORT BytesPerSector; ULONG PDPTE; - } EXTENDED_GEOMETRY, *PEXTENDED_GEOMETRY; /* @@ -63,7 +65,6 @@ typedef struct _PARTITION_TABLE_ENTRY UCHAR EndCylinder; // Ending cylinder# (low order bits of cylinder #) ULONG SectorCountBeforePartition; // Number of sectors preceding the partition ULONG PartitionSectorCount; // Number of sectors in the partition - } PARTITION_TABLE_ENTRY, *PPARTITION_TABLE_ENTRY; /* @@ -76,8 +77,8 @@ typedef struct _MASTER_BOOT_RECORD USHORT Reserved; /* 0x1BC */ PARTITION_TABLE_ENTRY PartitionTable[4]; /* 0x1BE */ USHORT MasterBootRecordMagic; /* 0x1FE */ - } MASTER_BOOT_RECORD, *PMASTER_BOOT_RECORD; + #include <poppack.h> /*

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