Ros-diffs

ros-diffs@reactos.org

6 participants
80982 discussions

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

by Julen Urizar Compains

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

3 months

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

by Adam Słaboń

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

3 months

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

by Adam Słaboń

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

3 months

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

by Adam Słaboń

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

3 months

[reactos] 05/08: [NTOS:PNP] IoReportTargetDeviceChange: Correct the check for system PnP notifications

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77af26531558a8f4e00a7… commit 77af26531558a8f4e00a73cea1c0cb744b6c89d5 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 00:10:30 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [NTOS:PNP] IoReportTargetDeviceChange: Correct the check for system PnP notifications Now IoReportTargetDeviceChange will process the custom notifications (rather than processing only those that it shouldn't). --- ntoskrnl/io/pnpmgr/pnpreport.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 735760f8c4f..ea23aa13304 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -464,9 +464,9 @@ IoReportTargetDeviceChange(IN PDEVICE_OBJECT PhysicalDeviceObject, ASSERT(notifyStruct->FileObject == NULL); /* Do not handle system PnP events */ - if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || - (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || - (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + if (IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_QUERY_REMOVE) || + IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_REMOVE_CANCELLED) || + IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_REMOVE_COMPLETE)) { return STATUS_INVALID_DEVICE_REQUEST; } @@ -515,9 +515,9 @@ IoReportTargetDeviceChangeAsynchronous(IN PDEVICE_OBJECT PhysicalDeviceObject, ASSERT(notifyStruct->FileObject == NULL); /* Do not handle system PnP events */ - if ((RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_QUERY_REMOVE), sizeof(GUID)) != sizeof(GUID)) || - (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_CANCELLED), sizeof(GUID)) != sizeof(GUID)) || - (RtlCompareMemory(&(notifyStruct->Event), &(GUID_TARGET_DEVICE_REMOVE_COMPLETE), sizeof(GUID)) != sizeof(GUID))) + if (IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_QUERY_REMOVE) || + IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_REMOVE_CANCELLED) || + IsEqualGUID(&(notifyStruct->Event), &GUID_TARGET_DEVICE_REMOVE_COMPLETE)) { return STATUS_INVALID_DEVICE_REQUEST; }

3 months

[reactos] 04/08: [KERNEL32] GetVolumeNameForRoot: Use towupper for uppercasing the drive letter

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56f6734fa5eb03f9355a6… commit 56f6734fa5eb03f9355a62261240997659bd5c63 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 00:04:43 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [KERNEL32] GetVolumeNameForRoot: Use towupper for uppercasing the drive letter Drive letter is a wide character, using the non-Unicode aware toupper could corrupt it. --- dll/win32/kernel32/client/file/mntpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/file/mntpoint.c b/dll/win32/kernel32/client/file/mntpoint.c index 362ed15be82..8fab74c9a8d 100644 --- a/dll/win32/kernel32/client/file/mntpoint.c +++ b/dll/win32/kernel32/client/file/mntpoint.c @@ -61,7 +61,7 @@ GetVolumeNameForRoot(IN LPCWSTR lpszRootPath, { if (NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 1] == L':') { - NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 2] = _toupper(NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 2]); + NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 2] = towupper(NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 2]); } }

3 months

[reactos] 03/08: [FORMAT] Handle unformatted volumes

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=358fecdcf00d8f91cfeb1… commit 358fecdcf00d8f91cfeb1735b79f0aaef9d0c118 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 3 10:53:24 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [FORMAT] Handle unformatted volumes --- base/system/format/format.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/base/system/format/format.c b/base/system/format/format.c index c8805af5e69..29b22f9a27d 100644 --- a/base/system/format/format.c +++ b/base/system/format/format.c @@ -364,7 +364,7 @@ int wmain(int argc, WCHAR *argv[]) FMIFS_MEDIA_FLAG media = FMIFS_HARDDISK; DWORD driveType; WCHAR fileSystem[1024]; - WCHAR volumeName[1024]; + WCHAR volumeName[1024] = {0}; WCHAR input[1024]; DWORD serialNumber; DWORD flags, maxComponent; @@ -475,9 +475,16 @@ int wmain(int argc, WCHAR *argv[]) &serialNumber, &maxComponent, &flags, fileSystem, ARRAYSIZE(fileSystem))) { - K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error(szMsg, GetLastError()); - return -1; + if (GetLastError() == ERROR_UNRECOGNIZED_VOLUME) + { + wcscpy(fileSystem, L"RAW"); + } + else + { + K32LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } } if (QueryDeviceInformation(RootDirectory,

3 months

[reactos] 02/08: [FORMAT] Use QueryDeviceInformation for retrieving the volume size before formatting it

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5a9f22d4eab1b36a240e… commit c5a9f22d4eab1b36a240ef306ec927784219d111 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sat Mar 2 23:56:51 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [FORMAT] Use QueryDeviceInformation for retrieving the volume size before formatting it QueryDeviceInformation returns more reliable volume length and works with unformatted volumes. It will return volume length only on ROS and Vista+ however, so also keep the GetFreeDiskSpaceExW as a fallback for XP/2003. --- base/system/format/format.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/base/system/format/format.c b/base/system/format/format.c index 0d7e642c598..c8805af5e69 100644 --- a/base/system/format/format.c +++ b/base/system/format/format.c @@ -360,6 +360,7 @@ static VOID Usage(LPWSTR ProgramName) int wmain(int argc, WCHAR *argv[]) { int badArg; + DEVICE_INFORMATION DeviceInformation = {0}; FMIFS_MEDIA_FLAG media = FMIFS_HARDDISK; DWORD driveType; WCHAR fileSystem[1024]; @@ -479,7 +480,19 @@ int wmain(int argc, WCHAR *argv[]) return -1; } - if (!GetDiskFreeSpaceExW(RootDirectory, + if (QueryDeviceInformation(RootDirectory, + &DeviceInformation, + sizeof(DeviceInformation))) + { + totalNumberOfBytes.QuadPart = DeviceInformation.SectorSize * + DeviceInformation.SectorCount.QuadPart; + } + + /* QueryDeviceInformation returns more accurate volume length and works with + * unformatted volumes, however it will NOT return volume length on XP/2003. + * Fallback to GetFreeDiskSpaceExW if we did not get any volume length. */ + if (totalNumberOfBytes.QuadPart == 0 && + !GetDiskFreeSpaceExW(RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes))

3 months

[reactos] 01/08: [SDK][FMIFS] Partially implement QueryDeviceInformation

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4838d7bd56f3fa241d8ab… commit 4838d7bd56f3fa241d8ab9a0daa20f81c7045ca1 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sat Mar 2 23:48:33 2024 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 11:16:03 2024 +0200 [SDK][FMIFS] Partially implement QueryDeviceInformation On Windows, QueryDeviceInformation leverages the ifsutil.dll's API. This is a standalone implementation that mimics Vista behaviour. --- dll/win32/fmifs/fmifs.spec | 2 +- dll/win32/fmifs/query.c | 158 +++++++++++++++++++++++++++++++++ sdk/include/reactos/libs/fmifs/fmifs.h | 23 ++++- 3 files changed, 178 insertions(+), 5 deletions(-) diff --git a/dll/win32/fmifs/fmifs.spec b/dll/win32/fmifs/fmifs.spec index 6969e36d8c4..2e038e7b209 100644 --- a/dll/win32/fmifs/fmifs.spec +++ b/dll/win32/fmifs/fmifs.spec @@ -8,7 +8,7 @@ @ stdcall FormatEx(wstr ptr wstr wstr long long ptr) @ stub FormatEx2 @ stdcall QueryAvailableFileSystemFormat(long wstr str str ptr) -@ stub QueryDeviceInformation +@ stdcall QueryDeviceInformation(wstr ptr long) @ stub QueryDeviceInformationByHandle @ stub QueryFileSystemName @ stub QueryLatestFileSystemVersion diff --git a/dll/win32/fmifs/query.c b/dll/win32/fmifs/query.c index 9903275fcac..c05e3fc65f7 100644 --- a/dll/win32/fmifs/query.c +++ b/dll/win32/fmifs/query.c @@ -8,6 +8,12 @@ */ #include "precomp.h" +#include <ntddstor.h> +#include <ntstrsafe.h> + +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> BOOLEAN NTAPI @@ -43,3 +49,155 @@ QueryAvailableFileSystemFormat( return TRUE; } + +/** + * @brief + * Retrieves disk device information. + * + * @param[in] DriveRoot + * String which contains a DOS device name, + * + * @param[in,out] DeviceInformation + * Pointer to buffer with DEVICE_INFORMATION structure which will receive data. + * + * @param[in] BufferSize + * Size of buffer in bytes. + * + * @return + * TRUE if the buffer was large enough and was filled with + * the requested information, FALSE otherwise. + * + * @remarks + * The returned information is mostly related to Sony Memory Stick devices. + * On Vista+ the returned information is disk sector size and volume length in sectors, + * regardless of the type of disk. + * ReactOS implementation returns DEVICE_HOTPLUG flag if inspected device is a hotplug device + * as well as sector size and volume length of disk device. + */ +BOOL +NTAPI +QueryDeviceInformation( + _In_ PWCHAR DriveRoot, + _Out_ PVOID DeviceInformation, + _In_ ULONG BufferSize) +{ + PDEVICE_INFORMATION DeviceInfo = DeviceInformation; + IO_STATUS_BLOCK Iosb; + DISK_GEOMETRY DiskGeometry; + STORAGE_HOTPLUG_INFO HotplugInfo; + GET_LENGTH_INFORMATION LengthInformation; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceName; + HANDLE FileHandle; + NTSTATUS Status; + WCHAR DiskDevice[MAX_PATH]; + WCHAR DriveName[MAX_PATH]; + + /* Buffer should be able to at least hold DeviceFlags */ + if (BufferSize < sizeof(ULONG) || + !NT_SUCCESS(RtlStringCchCopyW(DriveName, ARRAYSIZE(DriveName), DriveRoot))) + { + return FALSE; + } + + if (DriveName[wcslen(DriveName) - 1] != L'\\') + { + /* Append the trailing backslash for GetVolumeNameForVolumeMountPointW */ + if (!NT_SUCCESS(RtlStringCchCatW(DriveName, ARRAYSIZE(DriveName), L"\\"))) + return FALSE; + } + + if (!GetVolumeNameForVolumeMountPointW(DriveName, DiskDevice, ARRAYSIZE(DiskDevice)) || + !RtlDosPathNameToNtPathName_U(DiskDevice, &DeviceName, NULL, NULL)) + { + /* Disk has no volume GUID, fallback to QueryDosDevice */ + DriveName[wcslen(DriveName) - 1] = UNICODE_NULL; + if (!QueryDosDeviceW(DriveName, DiskDevice, ARRAYSIZE(DiskDevice))) + return FALSE; + RtlInitUnicodeString(&DeviceName, DiskDevice); + } + else + { + /* Trim the trailing backslash since we will work with a device object */ + DeviceName.Length -= sizeof(WCHAR); + } + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + return FALSE; + + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_STORAGE_GET_HOTPLUG_INFO, + NULL, + 0, + &HotplugInfo, + sizeof(HotplugInfo)); + if (!NT_SUCCESS(Status)) + goto Quit; + + DeviceInfo->DeviceFlags = 0; + if (HotplugInfo.MediaHotplug || HotplugInfo.DeviceHotplug) + { + /* This is a hotplug device */ + DeviceInfo->DeviceFlags |= DEVICE_HOTPLUG; + } + + /* Other flags that would be set here are related to Sony "Memory Stick" + * type of devices which we do not have any special support for */ + + if (BufferSize >= sizeof(DEVICE_INFORMATION)) + { + /* This is the Vista+ version of the structure. + * We need to also provide disk sector size and volume length in sectors. */ + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DiskGeometry)); + if (!NT_SUCCESS(Status)) + goto Quit; + + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_LENGTH_INFO, + NULL, + 0, + &LengthInformation, + sizeof(LengthInformation)); + if (!NT_SUCCESS(Status)) + goto Quit; + + LengthInformation.Length.QuadPart /= DiskGeometry.BytesPerSector; + DeviceInfo->SectorSize = DiskGeometry.BytesPerSector; + DeviceInfo->SectorCount = LengthInformation.Length; + } + + Status = STATUS_SUCCESS; + +Quit: + NtClose(FileHandle); + return NT_SUCCESS(Status); +} diff --git a/sdk/include/reactos/libs/fmifs/fmifs.h b/sdk/include/reactos/libs/fmifs/fmifs.h index 482b3b02457..27e3950239e 100644 --- a/sdk/include/reactos/libs/fmifs/fmifs.h +++ b/sdk/include/reactos/libs/fmifs/fmifs.h @@ -33,6 +33,20 @@ typedef struct PCHAR Output; } TEXTOUTPUT, *PTEXTOUTPUT; +/* Device information */ +typedef struct _DEVICE_INFORMATION +{ + ULONG DeviceFlags; + ULONG SectorSize; + LARGE_INTEGER SectorCount; +} DEVICE_INFORMATION, *PDEVICE_INFORMATION; + +/* Device information flags */ +#define MEMORYSTICK_FORMAT_CAPABLE 0x10 +#define MEMORYSTICK_SUPPORTS_PROGRESS_BAR 0x20 +#define DEVICE_HOTPLUG 0x40 +#define DEVICE_MEMORYSTICK 0x41 + /* media flags */ typedef enum { @@ -163,11 +177,12 @@ QueryAvailableFileSystemFormat( OUT UCHAR* Minor, OUT BOOLEAN* LatestVersion); -BOOL NTAPI +BOOL +NTAPI QueryDeviceInformation( - IN PWCHAR DriveRoot, - OUT ULONG* Buffer, /* That is probably some 4-bytes structure */ - IN ULONG BufferSize); /* 4 */ + _In_ PWCHAR DriveRoot, + _Out_ PVOID DeviceInformation, + _In_ ULONG BufferSize); BOOL NTAPI QueryFileSystemName(

3 months

[reactos] 01/01: [NTOS:KDBG] Add missing \n to DPRINT() calls (#6018)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8de4d4d2ea171e9739948… commit 8de4d4d2ea171e97399486e4f0215ec4d8bef51e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Oct 7 11:07:47 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 7 11:07:47 2024 +0200 [NTOS:KDBG] Add missing \n to DPRINT() calls (#6018) And demote/promote some DPRINT()/DPRINT1(). --- ntoskrnl/kdbg/kdb_cli.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 50d484accd1..a8ce312f918 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -29,6 +29,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> + #include "kdb.h" #include "../kd/kdterminal.h" @@ -619,7 +620,7 @@ KdbpCmdPrintStruct( { ULONG i; ULONGLONG Result = 0; - PVOID BaseAddress = 0; + PVOID BaseAddress = NULL; ROSSYM_AGGREGATE Aggregate = {0}; UNICODE_STRING ModName = {0}; ANSI_STRING AnsiName = {0}; @@ -641,7 +642,7 @@ KdbpCmdPrintStruct( if (Argc > 3) { ULONG len; PCHAR ArgStart = Argv[3]; - DPRINT1("Trying to get expression\n"); + DPRINT("Trying to get expression\n"); for (i = 3; i < Argc - 1; i++) { len = strlen(Argv[i]); @@ -649,20 +650,18 @@ KdbpCmdPrintStruct( } /* Evaluate the expression */ - DPRINT1("Arg: %s\n", ArgStart); - if (KdbpEvaluateExpression(ArgStart, strlen(ArgStart), &Result)) { + DPRINT("Arg: %s\n", ArgStart); + if (KdbpEvaluateExpression(ArgStart, strlen(ArgStart), &Result)) BaseAddress = (PVOID)(ULONG_PTR)Result; - DPRINT1("BaseAddress: %p\n", BaseAddress); - } } - DPRINT1("BaseAddress: %p\n", BaseAddress); + DPRINT("BaseAddress: %p\n", BaseAddress); KdbpPrintStructInternal(Info, Indent, !!BaseAddress, BaseAddress, &Aggregate); end: RosSymFreeAggregate(&Aggregate); RtlFreeUnicodeString(&ModName); return TRUE; } -#endif +#endif // __ROS_DWARF__ /*!\brief Retrieves the component ID corresponding to a given component name. * @@ -1140,7 +1139,7 @@ KdbpContextFromPrevTss( #endif return TRUE; } -#endif +#endif // _M_IX86 #ifdef _M_AMD64 @@ -3421,7 +3420,7 @@ KdbpCliInit(VOID) FILE_NO_INTERMEDIATE_BUFFERING); if (!NT_SUCCESS(Status)) { - DPRINT("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); + DPRINT1("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%lx)\n", Status); return Status; } @@ -3432,7 +3431,7 @@ KdbpCliInit(VOID) if (!NT_SUCCESS(Status)) { ZwClose(hFile); - DPRINT("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); + DPRINT1("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%lx)\n", Status); return Status; } FileSize = FileStdInfo.EndOfFile.u.LowPart; @@ -3442,7 +3441,7 @@ KdbpCliInit(VOID) if (!FileBuffer) { ZwClose(hFile); - DPRINT("Could not allocate %d bytes for KDBinit file\n", FileSize); + DPRINT1("Could not allocate %d bytes for KDBinit file\n", FileSize); return Status; } @@ -3453,7 +3452,7 @@ KdbpCliInit(VOID) if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { ExFreePool(FileBuffer); - DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status); + DPRINT1("Could not read KDBinit file into memory (Status 0x%lx)\n", Status); return Status; }

3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs