You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Removed several patches (accepted upstream).
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 4be020848661860f46ea2ce1091279ea25dc021a Mon Sep 17 00:00:00 2001
|
||||
From 61ec97d56ed90a727ae0b29cc72f1f86300a72ee Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Tue, 4 Nov 2014 18:29:11 -0600
|
||||
Subject: ntoskrnl.exe: Add a stub for IoCsqInitialize.
|
||||
@@ -6,13 +6,10 @@ Subject: ntoskrnl.exe: Add a stub for IoCsqInitialize.
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
include/Makefile.in | 1 +
|
||||
include/ddk/csq.h | 33 +++++++++++++++++++++++++++++++++
|
||||
4 files changed, 47 insertions(+), 1 deletion(-)
|
||||
create mode 100644 include/ddk/csq.h
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index a31b186..03a79c2 100644
|
||||
index 78df9f1..103ae3c 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -33,6 +33,7 @@
|
||||
@@ -23,7 +20,7 @@ index a31b186..03a79c2 100644
|
||||
#include "ddk/ntddk.h"
|
||||
#include "ddk/ntifs.h"
|
||||
#include "wine/unicode.h"
|
||||
@@ -1947,3 +1948,14 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca
|
||||
@@ -1996,3 +1997,14 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca
|
||||
FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification);
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
@@ -39,7 +36,7 @@ index a31b186..03a79c2 100644
|
||||
+ return STATUS_NOT_IMPLEMENTED;
|
||||
+}
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 4ead907..ddb6b72 100644
|
||||
index 3bcf21c..228da29 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -348,7 +348,7 @@
|
||||
@@ -51,57 +48,6 @@ index 4ead907..ddb6b72 100644
|
||||
@ stub IoCsqInsertIrp
|
||||
@ stub IoCsqRemoveIrp
|
||||
@ stub IoCsqRemoveNextIrp
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index e8d2379..633c09d 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -244,6 +244,7 @@ SRCDIR_INCLUDES = \
|
||||
dde.rh \
|
||||
ddeml.h \
|
||||
ddk/compstui.h \
|
||||
+ ddk/csq.h \
|
||||
ddk/hidsdi.h \
|
||||
ddk/imm.h \
|
||||
ddk/mountmgr.h \
|
||||
diff --git a/include/ddk/csq.h b/include/ddk/csq.h
|
||||
new file mode 100644
|
||||
index 0000000..6c75e5c
|
||||
--- /dev/null
|
||||
+++ b/include/ddk/csq.h
|
||||
@@ -0,0 +1,33 @@
|
||||
+/*
|
||||
+ * Copyright (C) the Wine project
|
||||
+ *
|
||||
+ * 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
|
||||
+ */
|
||||
+
|
||||
+#include "ddk/ntddk.h"
|
||||
+
|
||||
+#ifndef __WINE_CSQ_H
|
||||
+#define __WINE_CSQ_H
|
||||
+
|
||||
+typedef struct _IO_CSQ IO_CSQ, *PIO_CSQ;
|
||||
+
|
||||
+typedef VOID (*PIO_CSQ_ACQUIRE_LOCK)(PIO_CSQ Csq, PKIRQL Irql);
|
||||
+typedef VOID (*PIO_CSQ_COMPLETE_CANCELED_IRP)(PIO_CSQ Csq, PIRP Irp);
|
||||
+typedef VOID (*PIO_CSQ_INSERT_IRP)(PIO_CSQ Csq, PIRP Irp);
|
||||
+typedef PIRP (*PIO_CSQ_PEEK_NEXT_IRP)(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext);
|
||||
+typedef VOID (*PIO_CSQ_RELEASE_LOCK)(PIO_CSQ Csq, KIRQL Irql);
|
||||
+typedef VOID (*PIO_CSQ_REMOVE_IRP)(PIO_CSQ Csq, PIRP Irp);
|
||||
+
|
||||
+#endif /* __WINE_CSQ_H */
|
||||
--
|
||||
2.1.3
|
||||
2.2.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user