From cff94a4cb1c3abd0f4f639d2f69d5f5260b5ba45 Mon Sep 17 00:00:00 2001 From: jpb Date: Fri, 24 Nov 2023 07:33:13 +0000 Subject: [PATCH] Revert "[PSDK][SHELLBTRFS] Get rid of FILE_INFO_BY_HANDLE_CLASS.MaximumFileInfoByHandlesClass (#6003)" This reverts commit e2ada69d2fa9718b8b5d864bcb7b3830b2302aa7. --- dll/shellext/shellbtrfs/reactos.cpp | 4 ++-- sdk/include/psdk/winbase.h | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dll/shellext/shellbtrfs/reactos.cpp b/dll/shellext/shellbtrfs/reactos.cpp index f6f81bb113e..e44e6125cdc 100644 --- a/dll/shellext/shellbtrfs/reactos.cpp +++ b/dll/shellext/shellbtrfs/reactos.cpp @@ -153,7 +153,7 @@ NTSTATUS WINAPI RtlUTF8ToUnicodeN(PWSTR uni_dest, ULONG uni_bytes_max, } /* Quick and dirty table for conversion */ -FILE_INFORMATION_CLASS ConvertToFileInfo[MaximumFileInfoByHandleClass] = +FILE_INFORMATION_CLASS ConvertToFileInfo[MaximumFileInfoByHandlesClass] = { FileBasicInformation, FileStandardInformation, FileNameInformation, FileRenameInformation, FileDispositionInformation, FileAllocationInformation, FileEndOfFileInformation, FileStreamInformation, @@ -186,7 +186,7 @@ SetFileInformationByHandle(HANDLE hFile, FileInfoClass = (FILE_INFORMATION_CLASS)-1; /* Attempt to convert the class */ - if (FileInformationClass < MaximumFileInfoByHandleClass) + if (FileInformationClass < MaximumFileInfoByHandlesClass) { FileInfoClass = ConvertToFileInfo[FileInformationClass]; } diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 1d3f68ae49b..397ad4d92cc 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1007,16 +1007,7 @@ typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileIdInfo, FileIdExtdDirectoryInfo, FileIdExtdDirectoryRestartInfo, -#endif -#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) || defined(__REACTOS__) - FileDispositionInfoEx, - FileRenameInfoEx, -#endif -#if (NTDDI_VERSION >= NTDDI_WIN10_19H1) || defined(__REACTOS__) - FileCaseSensitiveInfo, - FileNormalizedNameInfo, -#endif - MaximumFileInfoByHandleClass + MaximumFileInfoByHandlesClass } FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; typedef struct _FILE_ID_BOTH_DIR_INFO {