Module: wine Branch: master Commit: 115403dc5b346bc634d99a0a2d68960b717b6d93 URL: https://gitlab.winehq.org/wine/wine/-/commit/115403dc5b346bc634d99a0a2d68960...
Author: Vitaly Lipatov lav@etersoft.ru Date: Sun Jul 16 17:10:31 2023 +0300
include: Update COMPRESSION_ defines and move it to ddk/ntifs.h.
---
dlls/ntdll/tests/rtl.c | 1 + include/ddk/ntifs.h | 15 +++++++++++++++ include/winnt.h | 6 ------ 3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 76cecebae34..117d9eed067 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,7 @@ #include "in6addr.h" #include "inaddr.h" #include "ip2string.h" +#include "ddk/ntifs.h" #include "wine/asm.h"
#ifndef __WINE_WINTERNL_H diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index cedd54a66fe..980235abdc9 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -188,6 +188,21 @@ typedef struct _REPARSE_GUID_DATA_BUFFER
#define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer)
+#define COMPRESSION_FORMAT_NONE 0 +#define COMPRESSION_FORMAT_DEFAULT 1 +#define COMPRESSION_FORMAT_LZNT1 2 +#define COMPRESSION_FORMAT_XPRESS 3 +#define COMPRESSION_FORMAT_XPRESS_HUFF 4 +#define COMPRESSION_FORMAT_MAX 4 + +#define COMPRESSION_ENGINE_STANDARD 0x0000 +#define COMPRESSION_ENGINE_MAXIMUM 0x0100 +#define COMPRESSION_ENGINE_HIBER 0x0200 +#define COMPRESSION_ENGINE_MAX 0x0200 + +#define COMPRESSION_FORMAT_MASK 0x00ff +#define COMPRESSION_ENGINE_MASK 0xff00 + BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetRequestorProcess(IRP*); diff --git a/include/winnt.h b/include/winnt.h index ab14bcc80d5..c04f25b29bd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5468,12 +5468,6 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff
-#define COMPRESSION_FORMAT_NONE 0 -#define COMPRESSION_FORMAT_DEFAULT 1 -#define COMPRESSION_FORMAT_LZNT1 2 -#define COMPRESSION_ENGINE_STANDARD 0 -#define COMPRESSION_ENGINE_MAXIMUM 256 - #define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1)