wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 1316520a8029c0a99b358d1cd754294634d1855a.

Browse Source 
[ntoskrnl-METHOD_OUT_DIRECT]
Removed patch to implement support for METHOD_OUT_DIRECT ioctls (accepted
upstream).

[wined3d-CSMT_Main]
Temporarily disable patchset.
This commit is contained in:
Sebastian Lackner
2016-10-30 23:03:30 +01:00
parent 6997fa0121
commit 5c0d70c70e
18 changed files with 118 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch
View File

@@ -1,39 +0,0 @@
From 0cd3973a47317aff488c63eeb33ddedb2cba2b50 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Sat, 15 Oct 2016 17:27:41 +0200
Subject: include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.
---
include/evntrace.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/evntrace.h b/include/evntrace.h
index b54cd11..bb1ce03 100644
--- a/include/evntrace.h
+++ b/include/evntrace.h
@@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES
ULONG LoggerNameOffset;
} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;
-typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR;
-
typedef struct _ENABLE_TRACE_PARAMETERS
{
- ULONG Version;
- ULONG EnableProperty;
- ULONG ControlFlags;
- GUID SourceId;
- PEVENT_FILTER_DESCRIPTOR EnableFilterDesc;
- ULONG FilterDescCount;
+ ULONG Version;
+ ULONG EnableProperty;
+ ULONG ControlFlags;
+ GUID SourceId;
+ struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc;
+ ULONG FilterDescCount;
} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS;
#define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
--
2.9.0