Removed patch for IoCsqInitialize (accepted upstream).

README.md

@@ -170,7 +170,7 @@ Included bug fixes and improvements
 * Workaround for shlwapi URLs with relative paths
 * XEMBED support for embedding Wine windows inside Linux applications
 * nVidia driver for high-end laptop cards does not list all supported resolutions
-* vSphere needs IoCsqInitialize ([Wine Bug #36777](https://bugs.winehq.org/show_bug.cgi?id=36777))
+* ~~vSphere needs IoCsqInitialize~~ ([Wine Bug #36777](https://bugs.winehq.org/show_bug.cgi?id=36777))
 * wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
 * wininet should allow Accept-Encoding header for HTTP/1.0 ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))
 

debian/changelog

@@ -27,9 +27,9 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
   * Removed patch to export SHILCreateFromPath by name (accepted upstream).
   * Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream).
   * Removed patch for wine64 support on FreeBSD (accepted upstream).
+  * Removed patch for IoCsqInitialize (accepted upstream).
   * Partially removed patches for ntdll DOS attributes (accepted upstream).
   * Partially removed patches for UTF7 support (accepted upstream).
-  * Partially removed patches for IoCsqInitialize (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 15 Dec 2014 22:42:09 +0100
 
 wine-compholio (1.7.33) unstable; urgency=low

patches/Makefile

@@ -83,7 +83,6 @@ PATCHLIST := \
 	ntdll-User_Shared_Data.ok \
 	ntdll-WRITECOPY.ok \
 	ntoskrnl-Emulator.ok \
-	ntoskrnl-IoCsqInitialize.ok \
 	ntoskrnl-Irp_Status.ok \
 	ntoskrnl-KeSetSystemAffinityThread.ok \
 	ntoskrnl-Stub_FileObject.ok \
@@ -1258,21 +1257,6 @@ ntoskrnl-Emulator.ok: ntdll-User_Shared_Data.ok
 		echo '+    { "Sebastian Lackner", "ntoskrnl: Add TRACEs for instruction emulator on x86_64 to simplify debugging.", 1 },'; \
 	) > ntoskrnl-Emulator.ok
 
-# Patchset ntoskrnl-IoCsqInitialize
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#36777] vSphere needs IoCsqInitialize
-# |
-# | Modified files:
-# |   *	dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-# |
-.INTERMEDIATE: ntoskrnl-IoCsqInitialize.ok
-ntoskrnl-IoCsqInitialize.ok:
-	$(call APPLY_FILE,ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch)
-	@( \
-		echo '+    { "Austin English", "ntoskrnl.exe: Add a stub for IoCsqInitialize.", 1 },'; \
-	) > ntoskrnl-IoCsqInitialize.ok
-
 # Patchset ntoskrnl-Irp_Status
 # |
 # | This patchset fixes the following Wine bugs:

patches/ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch

@@ -1,53 +0,0 @@
-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.
-
----
- dlls/ntoskrnl.exe/ntoskrnl.c        | 12 ++++++++++++
- dlls/ntoskrnl.exe/ntoskrnl.exe.spec |  2 +-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index 78df9f1..103ae3c 100644
---- a/dlls/ntoskrnl.exe/ntoskrnl.c
-+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
-@@ -33,6 +33,7 @@
- #include "winternl.h"
- #include "excpt.h"
- #include "winioctl.h"
-+#include "ddk/csq.h"
- #include "ddk/ntddk.h"
- #include "ddk/ntifs.h"
- #include "wine/unicode.h"
-@@ -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;
- }
-+
-+/*****************************************************
-+ *           IoCsqInitialize  (NTOSKRNL.EXE.@)
-+ */
-+NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_CSQ_REMOVE_IRP remove_irp,
-+                                PIO_CSQ_PEEK_NEXT_IRP peek_irp, PIO_CSQ_ACQUIRE_LOCK acquire_lock,
-+                                PIO_CSQ_RELEASE_LOCK release_lock, PIO_CSQ_COMPLETE_CANCELED_IRP complete_irp)
-+{
-+    FIXME("(%p %p %p %p %p %p %p) stub\n", csq, insert_irp, remove_irp, peek_irp, acquire_lock, release_lock, complete_irp);
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index 3bcf21c..228da29 100644
---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-@@ -348,7 +348,7 @@
- @ stdcall IoCreateSymbolicLink(ptr ptr)
- @ stdcall IoCreateSynchronizationEvent(ptr ptr)
- @ stub IoCreateUnprotectedSymbolicLink
--@ stub IoCsqInitialize
-+@ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr)
- @ stub IoCsqInsertIrp
- @ stub IoCsqRemoveIrp
- @ stub IoCsqRemoveNextIrp
--- 
-2.2.1
-

patches/ntoskrnl-IoCsqInitialize/definition

@@ -1 +0,0 @@
-Fixes: [36777] vSphere needs IoCsqInitialize