March 2018 - Wine-devel - list.winehq.org

[PATCH] winex11: Fix build without Vulkan support
by Nikolay Sivov 22 Mar '18

22 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Maybe it should've been using winediag channel, or WINE_MESSAGE? dlls/winex11.drv/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 27ff72212d..f96ef64137 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -37,10 +37,10 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" -#ifdef SONAME_LIBVULKAN - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +#ifdef SONAME_LIBVULKAN + typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 -- 2.16.2

2 1

[PATCH] winevulkan: Remove excess quotation marks.
by Józef Kucia 22 Mar '18

22 Mar '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- debugstr_a() wraps strings in quotation marks --- dlls/winevulkan/vulkan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9440000614e6..a5b8a96e9115 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -897,7 +897,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * func = wine_vk_get_instance_proc_addr(name); if (func) { - WARN("Returning instance function '%s'.\n", debugstr_a(name)); + WARN("Returning instance function %s.\n", debugstr_a(name)); return func; } @@ -932,7 +932,7 @@ static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, } if (!instance) { - FIXME("Global function '%s' not found\n", debugstr_a(name)); + FIXME("Global function %s not found.\n", debugstr_a(name)); return NULL; } @@ -943,7 +943,7 @@ static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, func = wine_vk_get_device_proc_addr(name); if (func) return func; - FIXME("Unsupported device or instance function: '%s'\n", debugstr_a(name)); + FIXME("Unsupported device or instance function: %s.\n", debugstr_a(name)); return NULL; } -- 2.16.1

1 0

Requesting help with NDR
by Zebediah Figura 22 Mar '18

22 Mar '18

In the course of trying to marshall MSI for bug #18070 I ran into a crash trying to marshall an interface pointer, caused by a double free. I traced the superfluous frees back to dlls/rpcrt4/ndr_ole.c: /*********************************************************************** * NdrInterfacePointerFree [RPCRT4.@] */ void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { LPUNKNOWN pUnk = (LPUNKNOWN)pMemory; TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); if (pUnk) IUnknown_Release(pUnk); } Could anyone shed light on what the purpose of this call is? It doesn't seem to correspond with any AddRef() or QueryInterface() call anywhere else. Presumably it would correspond with NdrInterfacePointerMarshall(), which calls CoMarshalInterface(), but the latter only causes references to be grabbed by the stub manager, and those (as far as I can tell by skimming) are released when SendReceive() is called.

1 0

[PATCH 4/4] fltmgr.sys: Add FltUnregisterFilter stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 0a3b1c6..c217ad3 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -158,6 +158,6 @@ @ stub FltUninitializeFileLock @ stub FltUninitializeOplock @ stub FltUnloadFilter -@ stub FltUnregisterFilter +@ stdcall FltUnregisterFilter(ptr) @ stub FltUntagFile @ stub FltWriteFile diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 08beb02..cedcdb1 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -59,3 +59,8 @@ NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter) return STATUS_SUCCESS; } + +void WINAPI FltUnregisterFilter (PFLT_FILTER filter) +{ + FIXME( "(%p): stub\n", filter ); +} -- 1.9.1

1 0

[PATCH 3/4] fltmgr.sys: Add FltStartFiltering stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 000368f..0a3b1c6 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -150,7 +150,7 @@ @ stub FltSetStreamHandleContext @ stub FltSetVolumeContext @ stub FltSetVolumeInformation -@ stub FltStartFiltering +@ stdcall FltStartFiltering(ptr) @ stub FltSupportsFileContexts @ stub FltSupportsStreamContexts @ stub FltSupportsStreamHandleContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index efe9b7f..08beb02 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -52,3 +52,10 @@ NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION return STATUS_SUCCESS; } + +NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter) +{ + FIXME( "(%p): stub\n", filter ); + + return STATUS_SUCCESS; +} -- 1.9.1

1 0

[PATCH 2/4] fltmgr.sys: Add FltRegisterFilter stub
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index ea84d81..000368f 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -128,7 +128,7 @@ @ stub FltReadFile @ stub FltReferenceContext @ stub FltReferenceFileNameInformation -@ stub FltRegisterFilter +@ stdcall FltRegisterFilter(ptr ptr ptr) @ stub FltReissueSynchronousIo @ stub FltReleaseContext @ stub FltReleaseContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 09c89a1..efe9b7f 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -42,3 +42,13 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) { FIXME( "(%p): stub\n", lock ); } + +NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter) +{ + FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); + + if(filter) + *filter = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +} -- 1.9.1

1 0

[PATCH 1/4] include/ddk: Add fltkernel.h
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

This also updates fltmgr.sys to make use of this new file. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/fltmgr.sys/main.c | 5 +- include/Makefile.in | 1 + include/ddk/fltkernel.h | 667 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 670 insertions(+), 3 deletions(-) create mode 100644 include/ddk/fltkernel.h diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 70ee307..09c89a1 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -25,9 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "ddk/ntddk.h" -#include "ddk/ntifs.h" -#include "ddk/wdm.h" +#include "ddk/fltkernel.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(fltmgr); diff --git a/include/Makefile.in b/include/Makefile.in index 72304d6..d5a3eeb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -153,6 +153,7 @@ SOURCES = \ ddk/compstui.h \ ddk/csq.h \ ddk/d3dkmthk.h \ + ddk/fltkernel.h \ ddk/hidclass.h \ ddk/hidpi.h \ ddk/hidport.h \ diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h new file mode 100644 index 0000000..fb0c4c3 --- /dev/null +++ b/include/ddk/fltkernel.h @@ -0,0 +1,667 @@ +/* + * Copyright (C) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __FLTKERNEL__ +#define __FLTKERNEL__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "ntifs.h" + +typedef struct _FLT_FILTER *PFLT_FILTER; +typedef struct _FLT_INSTANCE *PFLT_INSTANCE; +typedef ULONG FLT_CALLBACK_DATA_FLAGS; +typedef USHORT FLT_CONTEXT_REGISTRATION_FLAGS; +typedef USHORT FLT_CONTEXT_TYPE; +typedef ULONG FLT_FILE_NAME_OPTIONS; +typedef ULONG FLT_FILTER_UNLOAD_FLAGS; +typedef ULONG FLT_INSTANCE_QUERY_TEARDOWN_FLAGS; +typedef ULONG FLT_INSTANCE_SETUP_FLAGS; +typedef ULONG FLT_INSTANCE_TEARDOWN_FLAGS; +typedef ULONG FLT_NORMALIZE_NAME_FLAGS; +typedef ULONG FLT_OPERATION_REGISTRATION_FLAGS; +typedef ULONG FLT_POST_OPERATION_FLAGS; +typedef ULONG FLT_REGISTRATION_FLAGS; +typedef void* PFLT_CONTEXT; + + +#define FLT_VOLUME_CONTEXT 0x0001 +#define FLT_INSTANCE_CONTEXT 0x0002 +#define FLT_FILE_CONTEXT 0x0004 +#define FLT_STREAM_CONTEXT 0x0008 +#define FLT_STREAMHANDLE_CONTEXT 0x0010 +#define FLT_TRANSACTION_CONTEXT 0x0020 + +#define FLTFL_OPERATION_REGISTRATION_SKIP_PAGING_IO 0x00000001 +#define FLTFL_OPERATION_REGISTRATION_SKIP_CACHED_IO 0x00000002 +#define FLTFL_OPERATION_REGISTRATION_SKIP_NON_DASD_IO 0x00000004 + +#define FLTFL_INSTANCE_TEARDOWN_MANUAL 0x00000001 +#define FLTFL_INSTANCE_TEARDOWN_FILTER_UNLOAD 0x00000002 +#define FLTFL_INSTANCE_TEARDOWN_MANDATORY_FILTER_UNLOAD 0x00000004 +#define FLTFL_INSTANCE_TEARDOWN_VOLUME_DISMOUNT 0x00000008 +#define FLTFL_INSTANCE_TEARDOWN_INTERNAL_ERROR 0x00000010 + +/* Belongs in fltuserstructures.h */ +typedef enum _FLT_FILESYSTEM_TYPE +{ + FLT_FSTYPE_UNKNOWN, + FLT_FSTYPE_RAW, + FLT_FSTYPE_NTFS, + FLT_FSTYPE_FAT, + FLT_FSTYPE_CDFS, + FLT_FSTYPE_UDFS, + FLT_FSTYPE_LANMAN, + FLT_FSTYPE_WEBDAV, + FLT_FSTYPE_RDPDR, + FLT_FSTYPE_NFS, + FLT_FSTYPE_MS_NETWARE, + FLT_FSTYPE_NETWARE, + FLT_FSTYPE_BSUDF, + FLT_FSTYPE_MUP, + FLT_FSTYPE_RSFX, + FLT_FSTYPE_ROXIO_UDF1, + FLT_FSTYPE_ROXIO_UDF2, + FLT_FSTYPE_ROXIO_UDF3, + FLT_FSTYPE_TACIT, + FLT_FSTYPE_FS_REC, + FLT_FSTYPE_INCD, + FLT_FSTYPE_INCD_FAT, + FLT_FSTYPE_EXFAT, + FLT_FSTYPE_PSFS, + FLT_FSTYPE_GPFS, + FLT_FSTYPE_NPFS, + FLT_FSTYPE_MSFS, + FLT_FSTYPE_CSVFS, + FLT_FSTYPE_REFS, + FLT_FSTYPE_OPENAFS +} FLT_FILESYSTEM_TYPE, *PFLT_FILESYSTEM_TYPE; + +typedef struct _FLT_NAME_CONTROL +{ + UNICODE_STRING Name; +} FLT_NAME_CONTROL, *PFLT_NAME_CONTROL; + +typedef enum _FLT_PREOP_CALLBACK_STATUS +{ + FLT_PREOP_SUCCESS_WITH_CALLBACK, + FLT_PREOP_SUCCESS_NO_CALLBACK, + FLT_PREOP_PENDING, + FLT_PREOP_DISALLOW_FASTIO, + FLT_PREOP_COMPLETE, + FLT_PREOP_SYNCHRONIZE, + FLT_PREOP_DISALLOW_FSFILTER_IO +} FLT_PREOP_CALLBACK_STATUS, *PFLT_PREOP_CALLBACK_STATUS; + +typedef enum _FLT_POSTOP_CALLBACK_STATUS +{ + FLT_POSTOP_FINISHED_PROCESSING, + FLT_POSTOP_MORE_PROCESSING_REQUIRED, + FLT_POSTOP_DISALLOW_FSFILTER_IO +} FLT_POSTOP_CALLBACK_STATUS, *PFLT_POSTOP_CALLBACK_STATUS; + +typedef struct _FLT_RELATED_CONTEXTS +{ + PFLT_CONTEXT VolumeContext; + PFLT_CONTEXT InstanceContext; + PFLT_CONTEXT FileContext; + PFLT_CONTEXT StreamContext; + PFLT_CONTEXT StreamHandleContext; + PFLT_CONTEXT TransactionContext; +} FLT_RELATED_CONTEXTS, *PFLT_RELATED_CONTEXTS; + +typedef const struct _FLT_RELATED_OBJECTS *PCFLT_RELATED_OBJECTS; + +typedef union _FLT_PARAMETERS +{ + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT FileAttributes; + USHORT ShareAccess; + ULONG POINTER_ALIGNMENT EaLength; + void *EaBuffer; + LARGE_INTEGER AllocationSize; + } Create; + + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + void *Parameters; + } CreatePipe; + +#undef CreateMailslot + struct + { + PIO_SECURITY_CONTEXT SecurityContext; + ULONG Options; + USHORT POINTER_ALIGNMENT Reserved; + USHORT ShareAccess; + void *Parameters; + } CreateMailslot; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + void *ReadBuffer; + PMDL MdlAddress; + } Read; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + void *WriteBuffer; + PMDL MdlAddress; + } Write; + + struct + { + ULONG Length; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; + void *InfoBuffer; + } QueryFileInformation; + + struct + { + ULONG Length; + FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass; + PFILE_OBJECT ParentOfTarget; + union + { + struct + { + BOOLEAN ReplaceIfExists; + BOOLEAN AdvanceOnly; + }; + ULONG ClusterCount; + HANDLE DeleteHandle; + }; + void *InfoBuffer; + } SetFileInformation; + + struct + { + ULONG Length; + void *EaList; + ULONG EaListLength; + ULONG POINTER_ALIGNMENT EaIndex; + void *EaBuffer; + PMDL MdlAddress; + } QueryEa; + + struct + { + ULONG Length; + void *EaBuffer; + PMDL MdlAddress; + } SetEa; + + struct + { + ULONG Length; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; + void *VolumeBuffer; + } QueryVolumeInformation; + + struct + { + ULONG Length; + FS_INFORMATION_CLASS POINTER_ALIGNMENT FsInformationClass; + void *VolumeBuffer; + } SetVolumeInformation; + + union + { + struct + { + ULONG Length; + PUNICODE_STRING FileName; + FILE_INFORMATION_CLASS FileInformationClass; + ULONG POINTER_ALIGNMENT FileIndex; + void *DirectoryBuffer; + PMDL MdlAddress; + } QueryDirectory; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT CompletionFilter; + ULONG POINTER_ALIGNMENT Spare1; + ULONG POINTER_ALIGNMENT Spare2; + void *DirectoryBuffer; + PMDL MdlAddress; + } NotifyDirectory; + + struct + { + ULONG Length; + ULONG POINTER_ALIGNMENT CompletionFilter; + DIRECTORY_NOTIFY_INFORMATION_CLASS POINTER_ALIGNMENT DirectoryNotifyInformationClass; + ULONG POINTER_ALIGNMENT Spare2; + void *DirectoryBuffer; + PMDL MdlAddress; + } NotifyDirectoryEx; + } DirectoryControl; + + union + { + struct + { + PVPB Vpb; + PDEVICE_OBJECT DeviceObject; + } VerifyVolume; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + } Common; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *InputBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Neither; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *SystemBuffer; + } Buffered; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT FsControlCode; + void *InputSystemBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Direct; + } FileSystemControl; + + union + { + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + } Common; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Neither; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *SystemBuffer; + } Buffered; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputSystemBuffer; + void *OutputBuffer; + PMDL OutputMdlAddress; + } Direct; + + struct + { + ULONG OutputBufferLength; + ULONG POINTER_ALIGNMENT InputBufferLength; + ULONG POINTER_ALIGNMENT IoControlCode; + void *InputBuffer; + void *OutputBuffer; + } FastIo; + } DeviceIoControl; + + struct + { + PLARGE_INTEGER Length; + ULONG POINTER_ALIGNMENT Key; + LARGE_INTEGER ByteOffset; + PEPROCESS ProcessId; + BOOLEAN FailImmediately; + BOOLEAN ExclusiveLock; + } LockControl; + + struct + { + SECURITY_INFORMATION SecurityInformation; + ULONG POINTER_ALIGNMENT Length; + void *SecurityBuffer; + PMDL MdlAddress; + } QuerySecurity; + + struct + { + SECURITY_INFORMATION SecurityInformation; + PSECURITY_DESCRIPTOR SecurityDescriptor; + } SetSecurity; + + struct + { + ULONG_PTR ProviderId; + void *DataPath; + ULONG BufferSize; + void *Buffer; + } WMI; + + struct + { + ULONG Length; + PSID StartSid; + PFILE_GET_QUOTA_INFORMATION SidList; + ULONG SidListLength; + void *QuotaBuffer; + PMDL MdlAddress; + } QueryQuota; + + struct + { + ULONG Length; + void *QuotaBuffer; + PMDL MdlAddress; + } SetQuota; + + union + { + struct + { + PCM_RESOURCE_LIST AllocatedResources; + PCM_RESOURCE_LIST AllocatedResourcesTranslated; + } StartDevice; + + struct + { + DEVICE_RELATION_TYPE Type; + } QueryDeviceRelations; + + struct + { + const GUID *InterfaceType; + USHORT Size; + USHORT Version; + PINTERFACE Interface; + void *InterfaceSpecificData; + } QueryInterface; + + struct + { + PDEVICE_CAPABILITIES Capabilities; + } DeviceCapabilities; + + struct + { + PIO_RESOURCE_REQUIREMENTS_LIST IoResourceRequirementList; + } FilterResourceRequirements; + + struct + { + ULONG WhichSpace; + void *Buffer; + ULONG Offset; + ULONG POINTER_ALIGNMENT Length; + } ReadWriteConfig; + + struct + { + BOOLEAN Lock; + } SetLock; + + struct { + BUS_QUERY_ID_TYPE IdType; + } QueryId; + + struct + { + DEVICE_TEXT_TYPE DeviceTextType; + LCID POINTER_ALIGNMENT LocaleId; + } QueryDeviceText; + + struct + { + BOOLEAN InPath; + BOOLEAN Reserved[3]; + DEVICE_USAGE_NOTIFICATION_TYPE POINTER_ALIGNMENT Type; + } UsageNotification; + } Pnp; + + struct + { + FS_FILTER_SECTION_SYNC_TYPE SyncType; + ULONG PageProtection; + PFS_FILTER_SECTION_SYNC_OUTPUT OutputInformation; + } AcquireForSectionSynchronization; + + struct + { + PLARGE_INTEGER EndingOffset; + PERESOURCE *ResourceToRelease; + } AcquireForModifiedPageWriter; + + struct + { + PERESOURCE ResourceToRelease; + } ReleaseForModifiedPageWriter; + + struct + { + PIRP Irp; + void *FileInformation; + PULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + } QueryOpen; + + struct + { + LARGE_INTEGER FileOffset; + ULONG Length; + ULONG POINTER_ALIGNMENT LockKey; + BOOLEAN POINTER_ALIGNMENT CheckForReadOperation; + } FastIoCheckIfPossible; + + struct + { + PIRP Irp; + PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; + } NetworkQueryOpen; + + struct + { + LARGE_INTEGER FileOffset; + ULONG POINTER_ALIGNMENT Length; + ULONG POINTER_ALIGNMENT Key; + PMDL *MdlChain; + } MdlRead; + + struct + { + PMDL MdlChain; + } MdlReadComplete; + + struct + { + LARGE_INTEGER FileOffset; + ULONG POINTER_ALIGNMENT Length; + ULONG POINTER_ALIGNMENT Key; + PMDL *MdlChain; + } PrepareMdlWrite; + + struct + { + LARGE_INTEGER FileOffset; + PMDL MdlChain; + } MdlWriteComplete; + + struct + { + ULONG DeviceType; + } MountVolume; + + struct + { + void *Argument1; + void *Argument2; + void *Argument3; + void *Argument4; + void *Argument5; + LARGE_INTEGER Argument6; + } Others; + +} FLT_PARAMETERS, *PFLT_PARAMETERS; + +typedef struct _FLT_IO_PARAMETER_BLOCK +{ + ULONG IrpFlags; + UCHAR MajorFunction; + UCHAR MinorFunction; + UCHAR OperationFlags; + UCHAR Reserved; + PFILE_OBJECT TargetFileObject; + PFLT_INSTANCE TargetInstance; + FLT_PARAMETERS Parameters; + +} FLT_IO_PARAMETER_BLOCK, *PFLT_IO_PARAMETER_BLOCK; + +typedef struct _FLT_CALLBACK_DATA +{ + FLT_CALLBACK_DATA_FLAGS Flags; + PETHREAD const Thread; + PFLT_IO_PARAMETER_BLOCK const Iopb; + IO_STATUS_BLOCK IoStatus; + struct _FLT_TAG_DATA_BUFFER *TagData; + + union + { + struct + { + LIST_ENTRY QueueLinks; + void *QueueContext[2]; + }; + void *FilterContext[4]; + }; + KPROCESSOR_MODE RequestorMode; +} FLT_CALLBACK_DATA, *PFLT_CALLBACK_DATA; + +typedef void* (WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); +typedef void (WINAPI *PFLT_CONTEXT_CLEANUP_CALLBACK)(PFLT_CONTEXT, FLT_CONTEXT_TYPE); +typedef void (WINAPI *PFLT_CONTEXT_FREE_CALLBACK)(void *, FLT_CONTEXT_TYPE); +typedef NTSTATUS (WINAPI *PFLT_FILTER_UNLOAD_CALLBACK)(FLT_FILTER_UNLOAD_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK)(PCFLT_RELATED_OBJECTS, + FLT_INSTANCE_QUERY_TEARDOWN_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_GENERATE_FILE_NAME)(PFLT_INSTANCE, PFILE_OBJECT,PFLT_CALLBACK_DATA, + FLT_FILE_NAME_OPTIONS,PBOOLEAN, PFLT_NAME_CONTROL); +typedef NTSTATUS (WINAPI *PFLT_INSTANCE_SETUP_CALLBACK)(PCFLT_RELATED_OBJECTS,FLT_INSTANCE_SETUP_FLAGS, + DEVICE_TYPE,FLT_FILESYSTEM_TYPE); +typedef void (WINAPI *PFLT_INSTANCE_TEARDOWN_CALLBACK)(PCFLT_RELATED_OBJECTS, FLT_INSTANCE_TEARDOWN_FLAGS); +typedef void (WINAPI *PFLT_NORMALIZE_CONTEXT_CLEANUP)(void**); +typedef NTSTATUS (WINAPI *PFLT_NORMALIZE_NAME_COMPONENT)(PFLT_INSTANCE, PCUNICODE_STRING, USHORT, + PCUNICODE_STRING,PFILE_NAMES_INFORMATION,ULONG,FLT_NORMALIZE_NAME_FLAGS, void **); +typedef NTSTATUS (WINAPI *PFLT_NORMALIZE_NAME_COMPONENT_EX)(PFLT_INSTANCE, PFILE_OBJECT, PCUNICODE_STRING, + USHORT, PCUNICODE_STRING,PFILE_NAMES_INFORMATION, ULONG, FLT_NORMALIZE_NAME_FLAGS Flags, + void **NormalizationContext); +typedef FLT_PREOP_CALLBACK_STATUS (WINAPI *PFLT_PRE_OPERATION_CALLBACK)(PFLT_CALLBACK_DATA, + PCFLT_RELATED_OBJECTS, void**); +typedef FLT_POSTOP_CALLBACK_STATUS (WINAPI *PFLT_POST_OPERATION_CALLBACK)(PFLT_CALLBACK_DATA, + PCFLT_RELATED_OBJECTS, void*, FLT_POST_OPERATION_FLAGS); +typedef NTSTATUS (WINAPI *PFLT_SECTION_CONFLICT_NOTIFICATION_CALLBACK)(PFLT_INSTANCE, PFLT_CONTEXT, + PFLT_CALLBACK_DATA); +typedef NTSTATUS (WINAPI *PFLT_TRANSACTION_NOTIFICATION_CALLBACK)(PCFLT_RELATED_OBJECTS, PFLT_CONTEXT, ULONG); + +typedef struct _FLT_CONTEXT_REGISTRATION +{ + FLT_CONTEXT_TYPE ContextType; + FLT_CONTEXT_REGISTRATION_FLAGS Flags; + PFLT_CONTEXT_CLEANUP_CALLBACK ContextCleanupCallback; + SIZE_T Size; + ULONG PoolTag; + PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback; + PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback; + void* Reserved1; +} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION; + +typedef const FLT_CONTEXT_REGISTRATION *PCFLT_CONTEXT_REGISTRATION; + +typedef struct _FLT_OPERATION_REGISTRATION +{ + UCHAR MajorFunction; + FLT_OPERATION_REGISTRATION_FLAGS Flags; + PFLT_PRE_OPERATION_CALLBACK PreOperation; + PFLT_POST_OPERATION_CALLBACK PostOperation; + void *Reserved1; +} FLT_OPERATION_REGISTRATION, *PFLT_OPERATION_REGISTRATION; + +typedef struct _FLT_REGISTRATION +{ + USHORT Size; + USHORT Version; + FLT_REGISTRATION_FLAGS Flags; + const FLT_CONTEXT_REGISTRATION *ContextRegistration; + const FLT_OPERATION_REGISTRATION *OperationRegistration; + PFLT_FILTER_UNLOAD_CALLBACK FilterUnloadCallback; + PFLT_INSTANCE_SETUP_CALLBACK InstanceSetupCallback; + PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK InstanceQueryTeardownCallback; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownStartCallback; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownCompleteCallback; + PFLT_GENERATE_FILE_NAME GenerateFileNameCallback; + PFLT_NORMALIZE_NAME_COMPONENT NormalizeNameComponentCallback; + PFLT_NORMALIZE_CONTEXT_CLEANUP NormalizeContextCleanupCallback; + PFLT_TRANSACTION_NOTIFICATION_CALLBACK TransactionNotificationCallback; + PFLT_NORMALIZE_NAME_COMPONENT_EX NormalizeNameComponentExCallback; + PFLT_SECTION_CONFLICT_NOTIFICATION_CALLBACK SectionNotificationCallback; +} FLT_REGISTRATION, *PFLT_REGISTRATION; + + +NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); +NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER); +void WINAPI FltUnregisterFilter (PFLT_FILTER); + +#ifdef __cplusplus +} +#endif + +#endif -- 1.9.1

1 0

[PATCH 6/6] bcrypt: Fix BCryptEncrypt with AES_GCM and no input and no output.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c219c77..b503792 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1469,7 +1469,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp *ret_len = input_len; if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; - if (!output) return STATUS_SUCCESS; + if (input && !output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (auth_info->pbAuthData && (status = key_set_auth_data( key, auth_info->pbAuthData, auth_info->cbAuthData ))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2e0e57e..b35a479 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -640,6 +640,9 @@ static void test_BCryptEncrypt(void) {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; static UCHAR expected_tag3[] = {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; + static UCHAR expected_tag4[] = + {0x4c,0x42,0x83,0x9e,0x8d,0x40,0xf1,0x19,0xd6,0x2b,0x1c,0x66,0x03,0x2b,0x39,0x63}; + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -831,6 +834,21 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 0, "got %u\n", size); + for (i = 0; i < 16; i++) + ok(tag[i] == 0xff, "%u: %02x != %02x\n", i, tag[i], 0xff); + + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, NULL, 0, &auth_info, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 0, "got %u\n", size); + ok(!memcmp(tag, expected_tag4, sizeof(expected_tag4)), "wrong tag\n"); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag4[i], "%u: %02x != %02x\n", i, tag[i], expected_tag4[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); -- 1.9.1

1 0

[PATCH 5/6] bcrypt: Avoid crash in tests when compiling without gnutls support.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 68bee84..c219c77 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1313,12 +1313,19 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; + + if (!(key = heap_alloc( sizeof(*key) ))) + { + *handle = NULL; + return STATUS_NO_MEMORY; + } + key->hdr.magic = MAGIC_KEY; if ((status = key_init( key, alg, secret, secret_len ))) { heap_free( key ); + *handle = NULL; return status; } @@ -1401,11 +1408,15 @@ NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE if (!key_orig || key_orig->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; if (!handle_copy) return STATUS_INVALID_PARAMETER; if (!(key_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*key_copy) ))) + { + *handle_copy = NULL; return STATUS_NO_MEMORY; + } if ((status = key_duplicate( key_orig, key_copy ))) { HeapFree( GetProcessHeap(), 0, key_copy ); + *handle_copy = NULL; return status; } -- 1.9.1

1 0

[PATCH 4/6] bcrypt/tests: Add tests for auth data in AES GCM mode.
by Alistair Leslie-Hughes 22 Mar '18

22 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f67a975..2e0e57e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -610,7 +610,9 @@ static void test_BCryptGenerateSymmetricKey(void) static void test_BCryptEncrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -636,6 +638,8 @@ static void test_BCryptEncrypt(void) {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; static UCHAR expected_tag2[] = {0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd}; + static UCHAR expected_tag3[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; @@ -809,6 +813,24 @@ static void test_BCryptEncrypt(void) for (i = 0; i < 16; i++) ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + /* test with auth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); @@ -831,7 +853,9 @@ static void test_BCryptEncrypt(void) static void test_BCryptDecrypt(void) { static UCHAR nonce[] = - {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60}; + {0x10,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x60,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; static UCHAR secret[] = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; static UCHAR iv[] = @@ -858,6 +882,8 @@ static void test_BCryptDecrypt(void) 0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94}; static UCHAR tag[] = {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0}; + static UCHAR tag2[] = + {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE aes; @@ -1007,6 +1033,20 @@ static void test_BCryptDecrypt(void) ok(size == 32, "got %u\n", size); ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with auuth data */ + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + auth_info.pbTag = tag2; + auth_info.cbTag = sizeof(tag2); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ -- 1.9.1

1 0