Added patch for stub driver tdi.sys.

README.md

@@ -34,8 +34,9 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [2]:**
+**Bug fixes and features included in the next upcoming release [3]:**
 
+* Add a stub driver for tdi.sys ([Wine Bug #35693](https://bugs.winehq.org/show_bug.cgi?id=35693))
 * Fix broken textures in XIII Century: Death or Glory ([Wine Bug #25419](https://bugs.winehq.org/show_bug.cgi?id=25419))
 * Improve detection of symbol charset for old truetype fonts ([Wine Bug #33117](https://bugs.winehq.org/show_bug.cgi?id=33117))
 

patch-tools/changelog

@@ -9,6 +9,7 @@ wine-staging (1.8~rc1) UNRELEASED; urgency=low
   * Added patch to avoid leaking output name in sfnt2fon if specified multiple
     times.
   * Added patch to fix a possible leak in codeview_dump_symbols.
+  * Added patch for stub driver tdi.sys.
  -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 15 Nov 2015 21:20:51 +0100
 
 wine-staging (1.7.55) unstable; urgency=low

patches/patchinstall.sh

@@ -278,6 +278,7 @@ patch_enable_all ()
 	enable_shell32_UnixFS="$1"
 	enable_shlwapi_AssocGetPerceivedType="$1"
 	enable_shlwapi_UrlCombine="$1"
+	enable_tdi_sys_Stub_Driver="$1"
 	enable_user32_DeferWindowPos="$1"
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
@@ -944,6 +945,9 @@ patch_enable ()
 		shlwapi-UrlCombine)
 			enable_shlwapi_UrlCombine="$2"
 			;;
+		tdi.sys-Stub_Driver)
+			enable_tdi_sys_Stub_Driver="$2"
+			;;
 		user32-DeferWindowPos)
 			enable_user32_DeferWindowPos="$2"
 			;;
@@ -5461,6 +5465,21 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset tdi.sys-Stub_Driver
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#35693] Add a stub driver for tdi.sys
+# |
+# | Modified files:
+# |   *	configure.ac, dlls/tdi.sys/Makefile.in, dlls/tdi.sys/main.c, dlls/tdi.sys/tdi.sys.spec, loader/wine.inf.in
+# |
+if test "$enable_tdi_sys_Stub_Driver" -eq 1; then
+	patch_apply tdi.sys-Stub_Driver/0001-tdi.sys-add-a-stub-dll-try-3.patch
+	(
+		echo '+    { "Austin English", "tdi.sys: Add a stub dll.", 3 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-DeferWindowPos
 # |
 # | This patchset fixes the following Wine bugs:

patches/tdi.sys-Stub_Driver/0001-tdi.sys-add-a-stub-dll-try-3.patch

@@ -0,0 +1,169 @@
+From d65fcbf168bd3c3bfa6729040e83575139be008e Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Mon, 16 Nov 2015 19:24:21 -0600
+Subject: tdi.sys: add a stub dll (try 3)
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac              |  1 +
+ dlls/tdi.sys/Makefile.in  |  5 +++++
+ dlls/tdi.sys/main.c       | 38 ++++++++++++++++++++++++++++++++
+ dlls/tdi.sys/tdi.sys.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++
+ loader/wine.inf.in        |  2 ++
+ 5 files changed, 102 insertions(+)
+ create mode 100644 dlls/tdi.sys/Makefile.in
+ create mode 100644 dlls/tdi.sys/main.c
+ create mode 100644 dlls/tdi.sys/tdi.sys.spec
+
+diff --git a/configure.ac b/configure.ac
+index 2d2a168..38ffab4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3224,6 +3224,7 @@ WINE_CONFIG_DLL(t2embed)
+ WINE_CONFIG_DLL(tapi32,,[implib])
+ WINE_CONFIG_DLL(taskschd,,[clean])
+ WINE_CONFIG_TEST(dlls/taskschd/tests)
++WINE_CONFIG_DLL(tdi.sys)
+ WINE_CONFIG_DLL(toolhelp.dll16,enable_win16)
+ WINE_CONFIG_DLL(traffic)
+ WINE_CONFIG_DLL(twain.dll16,enable_win16)
+diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in
+new file mode 100644
+index 0000000..1b5f5f3
+--- /dev/null
++++ b/dlls/tdi.sys/Makefile.in
+@@ -0,0 +1,5 @@
++MODULE    = tdi.sys
++EXTRADLLFLAGS = -Wb,--subsystem,native
++
++C_SRCS = \
++	main.c
+diff --git a/dlls/tdi.sys/main.c b/dlls/tdi.sys/main.c
+new file mode 100644
+index 0000000..d9fbcb1
+--- /dev/null
++++ b/dlls/tdi.sys/main.c
+@@ -0,0 +1,38 @@
++/*
++ * tdi.sys
++ *
++ * Copyright 2015 Austin English
++ *
++ * 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 <stdarg.h>
++
++#include "ntstatus.h"
++#define WIN32_NO_STATUS
++#include "windef.h"
++#include "winbase.h"
++#include "winternl.h"
++#include "ddk/wdm.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(tdi);
++
++NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
++{
++    TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
++
++    return STATUS_SUCCESS;
++}
+diff --git a/dlls/tdi.sys/tdi.sys.spec b/dlls/tdi.sys/tdi.sys.spec
+new file mode 100644
+index 0000000..9e3d2e4
+--- /dev/null
++++ b/dlls/tdi.sys/tdi.sys.spec
+@@ -0,0 +1,56 @@
++@ stub CTEAllocateString
++@ stub CTEBlock
++@ stub CTEBlockWithTracker
++@ stub CTEInitEvent
++@ stub CTEInitString
++@ stub CTEInitTimer
++@ stub CTEInitialize
++@ stub CTEInsertBlockTracker
++@ stub CTELogEvent
++@ stub CTERemoveBlockTracker
++@ stub CTEScheduleCriticalEvent
++@ stub CTEScheduleDelayedEvent
++@ stub CTEScheduleEvent
++@ stub CTESignal
++@ stub CTEStartTimer
++@ stub CTESystemUpTime
++@ stub DllInitialize
++@ stub DllUnload
++@ stub TdiBuildNetbiosAddress
++@ stub TdiBuildNetbiosAddressEa
++@ stub TdiCopyBufferToMdl
++@ stub TdiCopyBufferToMdlWithReservedMappingAtDpcLevel
++@ stub TdiCopyMdlChainToMdlChain
++@ stub TdiCopyMdlToBuffer
++@ stub TdiDefaultChainedRcvDatagramHandler
++@ stub TdiDefaultChainedRcvExpeditedHandler
++@ stub TdiDefaultChainedReceiveHandler
++@ stub TdiDefaultConnectHandler
++@ stub TdiDefaultDisconnectHandler
++@ stub TdiDefaultErrorHandler
++@ stub TdiDefaultRcvDatagramHandler
++@ stub TdiDefaultRcvExpeditedHandler
++@ stub TdiDefaultReceiveHandler
++@ stub TdiDefaultSendPossibleHandler
++@ stub TdiDeregisterAddressChangeHandler
++@ stub TdiDeregisterDeviceObject
++@ stub TdiDeregisterNetAddress
++@ stub TdiDeregisterNotificationHandler
++@ stub TdiDeregisterPnPHandlers
++@ stub TdiDeregisterProvider
++@ stub TdiEnumerateAddresses
++@ stub TdiGet9FTriageBlock
++@ stub TdiInitialize
++@ stub TdiMapUserRequest
++@ stub TdiMatchPdoWithChainedReceiveContext
++@ stub TdiOpenNetbiosAddress
++@ stub TdiPnPPowerComplete
++@ stub TdiPnPPowerRequest
++@ stub TdiProviderReady
++@ stub TdiRegisterAddressChangeHandler
++@ stub TdiRegisterDeviceObject
++@ stub TdiRegisterNetAddress
++@ stub TdiRegisterNotificationHandler
++@ stub TdiRegisterPnPHandlers
++@ stub TdiRegisterProvider
++@ stub TdiReturnChainedReceives
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index c8de5f9..4fed21f 100644
+--- a/loader/wine.inf.in
++++ b/loader/wine.inf.in
+@@ -2512,6 +2512,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 12,,fltmgr.sys,-
+ 12,,mountmgr.sys,-
+ 12,,ndis.sys,-
++12,,tdi.sys,-
+ ; skip .NET fake dlls in Wine Mono package
+ 11,,aspnet_regiis.exe,-
+ 11,,ngen.exe,-
+@@ -2552,6 +2553,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 12,,fltmgr.sys
+ 12,,mountmgr.sys
+ 12,,ndis.sys
++12,,tdi.sys
+ ; skip .NET fake dlls in Wine Mono package
+ 11,,aspnet_regiis.exe,-
+ 11,,ngen.exe,-
+-- 
+2.6.2
+

patches/tdi.sys-Stub_Driver/definition

@@ -0,0 +1 @@
+Fixes: [35693] Add a stub driver for tdi.sys