wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ddfc5275af0081cba6e834bf9d9e35dcaa17d256.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-10-18 08:48:01 +02:00
parent a78a108cbd
commit 292017c466
6 changed files with 4 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
patches/ntoskrnl-METHOD_OUT_DIRECT/0001-ntoskrnl.exe-Defer-deallocation-of-in_buff-in-dispat.patch
View File

@ -1,42 +0,0 @@
From d8778f1eb6857e13cf2835af713adccd77e2f573 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 16 Oct 2016 08:48:55 +0200
Subject: ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/ntoskrnl.exe/ntoskrnl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 428e700..3c18ee6 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -417,6 +417,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG
{
IRP *irp;
void *out_buff = NULL;
+ void *to_free = NULL;
DEVICE_OBJECT *device;
FILE_OBJECT *file = wine_server_get_ptr( params->ioctl.file );
@@ -435,7 +436,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG
if ((params->ioctl.code & 3) == METHOD_BUFFERED)
{
memcpy( out_buff, in_buff, in_size );
- HeapFree( GetProcessHeap(), 0, in_buff );
+ to_free = in_buff;
in_buff = out_buff;
}
}
@@ -455,6 +456,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG
irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */
dispatch_irp( device, irp, irp_handle );
+ HeapFree( GetProcessHeap(), 0, to_free );
return STATUS_SUCCESS;
}
--
2.9.0

74
patches/ntoskrnl-METHOD_OUT_DIRECT/0002-ntoskrnl.exe-Add-support-for-METHOD_IN_DIRECT-and-ME.patch
View File

@ -1,74 +0,0 @@
From 9dd951a6b25ae670de5c9390ad83cf688b6975f8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 16 Oct 2016 08:51:06 +0200
Subject: ntoskrnl.exe: Add support for METHOD_IN_DIRECT/METHOD_OUT_DIRECT
ioctls.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/ntdll/file.c | 2 ++
dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 7fbde50..cefc1dd 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1561,6 +1561,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event,
req->async.event = wine_server_obj_handle( event );
req->async.cvalue = cvalue;
wine_server_add_data( req, in_buffer, in_size );
+ if ((code & 3) != METHOD_BUFFERED)
+ wine_server_add_data( req, out_buffer, out_size );
wine_server_set_reply( req, out_buffer, out_size );
status = wine_server_call( req );
wait_handle = wine_server_ptr_handle( reply->wait );
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 3c18ee6..912d084 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -428,17 +428,27 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG
TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n",
params->ioctl.code, device, file, in_size, out_size );
- if ((params->ioctl.code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size );
-
if (out_size)
{
- if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY;
- if ((params->ioctl.code & 3) == METHOD_BUFFERED)
+ if ((params->ioctl.code & 3) != METHOD_BUFFERED)
+ {
+ if (in_size < out_size) return STATUS_INVALID_DEVICE_REQUEST;
+ in_size -= out_size;
+ if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY;
+ memcpy( out_buff, (char *)in_buff + in_size, out_size );
+ }
+ else if (out_size > in_size)
{
+ if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY;
memcpy( out_buff, in_buff, in_size );
to_free = in_buff;
in_buff = out_buff;
}
+ else
+ {
+ out_buff = in_buff;
+ out_size = in_size;
+ }
}
irp = IoBuildDeviceIoControlRequest( params->ioctl.code, device, in_buff, in_size, out_buff, out_size,
@@ -449,6 +459,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG
return STATUS_NO_MEMORY;
}
+ if (out_size && (params->ioctl.code & 3) != METHOD_BUFFERED)
+ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, in_buff, in_size );
+
irp->Tail.Overlay.OriginalFileObject = file;
irp->RequestorMode = UserMode;
irp->AssociatedIrp.SystemBuffer = in_buff;
--
2.9.0

92
patches/ntoskrnl-METHOD_OUT_DIRECT/0003-ntoskrnl.exe-Use-MmInitializeMdl-in-IoAllocateMdl.patch
View File

@ -1,92 +0,0 @@
From 0de56912047ef60aba3a80845fc2eeb0cce7188b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 16 Oct 2016 08:53:29 +0200
Subject: ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/ntoskrnl.exe/ntoskrnl.c | 19 ++++---------------
include/ddk/wdm.h | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 912d084..eac81f7 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -744,31 +744,20 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize )
*/
PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN charge_quota, IRP *irp )
{
+ SIZE_T mdl_size;
PMDL mdl;
- ULONG_PTR address = (ULONG_PTR)va;
- ULONG_PTR page_address;
- SIZE_T nb_pages, mdl_size;
TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp);
if (charge_quota)
FIXME("Charge quota is not yet supported\n");
- /* FIXME: We suppose that page size is 4096 */
- page_address = address & ~(4096 - 1);
- nb_pages = (((address + length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1;
-
- mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID);
-
- mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size);
+ mdl_size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length);
+ mdl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size );
if (!mdl)
return NULL;
- mdl->Size = mdl_size;
- mdl->Process = NULL; /* FIXME: IoGetCurrentProcess */
- mdl->StartVa = (PVOID)page_address;
- mdl->ByteCount = length;
- mdl->ByteOffset = address - page_address;
+ MmInitializeMdl( mdl, va, length );
if (!irp) return mdl;
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 3e93469..61de490 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -28,6 +28,15 @@
#define POINTER_ALIGNMENT
#endif
+/* FIXME: We suppose that page size is 4096 */
+#define PAGE_SIZE 0x1000
+#define PAGE_SHIFT 12
+
+#define BYTE_OFFSET(va) ((ULONG)((ULONG_PTR)(va) & (PAGE_SIZE - 1)))
+#define PAGE_ALIGN(va) ((PVOID)((ULONG_PTR)(va) & ~(PAGE_SIZE - 1)))
+#define ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length) \
+ ((BYTE_OFFSET(va) + ((SIZE_T)(length)) + (PAGE_SIZE - 1)) >> PAGE_SHIFT)
+
typedef LONG KPRIORITY;
typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK;
@@ -1035,6 +1044,17 @@ typedef struct _MDL {
} MDL, *PMDL;
typedef MDL *PMDLX;
+typedef ULONG PFN_NUMBER, *PPFN_NUMBER;
+
+static inline void MmInitializeMdl(MDL *mdl, void *va, SIZE_T length)
+{
+ mdl->Next = NULL;
+ mdl->Size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length);
+ mdl->MdlFlags = 0;
+ mdl->StartVa = (void *)PAGE_ALIGN(va);
+ mdl->ByteOffset = BYTE_OFFSET(va);
+ mdl->ByteCount = length;
+}
typedef struct _KTIMER {
DISPATCHER_HEADER Header;
--
2.9.0

87
patches/ntoskrnl-METHOD_OUT_DIRECT/0004-ntoskrnl.exe-Explicitly-set-MappedSystemVa-for-MDLs.patch
View File

@ -1,87 +0,0 @@
From 2c548bab5f9a4f94a47052a67ef8cb6958f08de4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 16 Oct 2016 08:57:21 +0200
Subject: ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/ntoskrnl.exe/ntoskrnl.c | 26 ++++++++++++++++++++++++--
include/ddk/wdm.h | 9 +++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index eac81f7..854d68d 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -820,6 +820,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device,
{
PIRP irp;
PIO_STACK_LOCATION irpsp;
+ MDL *mdl;
TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n",
code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb );
@@ -847,7 +848,16 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device,
case METHOD_IN_DIRECT:
case METHOD_OUT_DIRECT:
irp->AssociatedIrp.SystemBuffer = in_buff;
- IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp );
+
+ mdl = IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp );
+ if (!mdl)
+ {
+ IoFreeIrp( irp );
+ return NULL;
+ }
+
+ mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA;
+ mdl->MappedSystemVa = out_buff;
break;
case METHOD_NEITHER:
irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff;
@@ -882,7 +892,19 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device,
irpsp->CompletionRoutine = NULL;
irp->AssociatedIrp.SystemBuffer = buffer;
- if (device->Flags & DO_DIRECT_IO) IoAllocateMdl( buffer, length, FALSE, FALSE, irp );
+
+ if (device->Flags & DO_DIRECT_IO)
+ {
+ MDL *mdl = IoAllocateMdl( buffer, length, FALSE, FALSE, irp );
+ if (!mdl)
+ {
+ IoFreeIrp( irp );
+ return NULL;
+ }
+
+ mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA;
+ mdl->MappedSystemVa = buffer;
+ }
switch (majorfunc)
{
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 61de490..3dda667 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1305,8 +1305,17 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS);
PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);
PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T);
void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);
+PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG);
MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
+static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority)
+{
+ if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL))
+ return mdl->MappedSystemVa;
+ else
+ return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority);
+}
+
void WINAPI ObDereferenceObject(void*);
NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION);
NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);
--
2.9.0

14
patches/patchinstall.sh
View File

@ -52,13 +52,13 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "eb5339edaca1c09d76b4afa32bdb07c1549e6650"
echo "ddfc5275af0081cba6e834bf9d9e35dcaa17d256"
}
# Show version information
version()
{
echo "Wine Staging 1.9.21"
echo "Wine Staging 1.9.22 (unreleased)"
echo "Copyright (C) 2014-2016 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
@ -5462,19 +5462,11 @@ fi
# Patchset ntoskrnl-METHOD_OUT_DIRECT
# |
# | Modified files:
# | * dlls/hidclass.sys/device.c, dlls/ntdll/file.c, dlls/ntoskrnl.exe/ntoskrnl.c, include/ddk/wdm.h
# | * dlls/hidclass.sys/device.c
# |
if test "$enable_ntoskrnl_METHOD_OUT_DIRECT" -eq 1; then
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0001-ntoskrnl.exe-Defer-deallocation-of-in_buff-in-dispat.patch
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0002-ntoskrnl.exe-Add-support-for-METHOD_IN_DIRECT-and-ME.patch
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0003-ntoskrnl.exe-Use-MmInitializeMdl-in-IoAllocateMdl.patch
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0004-ntoskrnl.exe-Explicitly-set-MappedSystemVa-for-MDLs.patch
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0005-hidclass.sys-Use-MmGetSystemAddressForMdlSafe-to-acc.patch
(
echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl.", 1 },';
echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Add support for METHOD_IN_DIRECT/METHOD_OUT_DIRECT ioctls.", 1 },';
echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl.", 1 },';
echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs.", 1 },';
echo '+ { "Sebastian Lackner", "hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data.", 1 },';
) >> "$patchlist"
fi

2
staging/VERSION
View File

@ -1 +1 @@
Wine Staging 1.9.21
Wine Staging 1.9.22 (unreleased)