Added patches to implement ntoskrnl driver testing framework.

README.md

@@ -37,7 +37,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [18]:**
+**Bugfixes and features included in the next upcoming release [19]:**
 
 * Add stub for KeWaitForMultipleObjects
 * Add stubs for D3DXCreateAnimationController interface
@@ -50,6 +50,7 @@ Included bug fixes and improvements
 * Fix init of LONGLONG variable with a negative value in TGA decoder
 * Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
 * Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
+* Implement ntoskrnl driver testing framework.
 * Implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes ([Wine Bug #29238](https://bugs.winehq.org/show_bug.cgi?id=29238))
 * Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))

debian/changelog

@@ -14,6 +14,7 @@ wine-staging (1.7.35) UNRELEASED; urgency=low
   * Added patch to implement stubs for D3DXCreateAnimationController interface.
   * Added patch to implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes.
   * Added patch to fix cursor clip regression / broken raw input in multiple games.
+  * Added patches to implement ntoskrnl driver testing framework.
   * Removed patch to fix RandR on some broken nVidia systems (accepted upstream).
   * Removed patch to set last error on success in WSARecv (accepted upstream).
   * Removed patch to fix handling of subdirectory in FtpFindFirstFile (accepted upstream).

patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch

@@ -11,14 +11,12 @@ diff --git a/tools/makedep.c b/tools/makedep.c
 index 54aab45..d68bc03 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
-@@ -161,6 +161,7 @@ struct makefile
-     const char     *top_src_dir;
+@@ -162,4 +162,5 @@ struct makefile
      const char     *top_obj_dir;
      const char     *parent_dir;
 +    const char     *parent_spec;
      const char     *module;
      const char     *testdll;
-     const char     *staticlib;
 @@ -2081,7 +2082,13 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
          char *spec_file = NULL;
  
@@ -34,14 +32,12 @@ index 54aab45..d68bc03 100644
          for (i = 0; i < make->delayimports.count; i++)
              strarray_add( &all_libs, strmake( "-l%s", make->delayimports.str[i] ));
          for (i = 0; i < make->imports.count; i++)
-@@ -2597,6 +2604,7 @@ static void update_makefile( const char *path )
-     strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" ));
+@@ -2598,4 +2605,5 @@ static void update_makefile( const char *path )
  
      make->parent_dir    = get_expanded_make_variable( make, "PARENTSRC" );
 +    make->parent_spec   = get_expanded_make_variable( make, "PARENTSPEC" );
      make->module        = get_expanded_make_variable( make, "MODULE" );
      make->testdll       = get_expanded_make_variable( make, "TESTDLL" );
-     make->staticlib     = get_expanded_make_variable( make, "STATICLIB" );
 -- 
 2.1.3
 

patches/ntoskrnl-DriverTest/definition

@@ -0,0 +1 @@
+Fixes: Implement ntoskrnl driver testing framework.

patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch

@@ -41,8 +41,7 @@ index 73e67bb..f76fa4d 100644
  
  dnl Disable winetest too if tests are disabled
  enable_winetest=${enable_winetest:-$enable_tests}
-@@ -3125,6 +3131,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
- WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
+@@ -3128,4 +3134,7 @@ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
  WINE_CONFIG_DLL(ntprint)
  WINE_CONFIG_TEST(dlls/ntprint/tests)
 +WINE_CONFIG_DLL(nvapi,enable_win32)
@@ -50,7 +49,6 @@ index 73e67bb..f76fa4d 100644
 +WINE_CONFIG_DLL(nvapi64,enable_win64)
  WINE_CONFIG_DLL(nvcuda)
  WINE_CONFIG_TEST(dlls/nvcuda/tests)
- WINE_CONFIG_DLL(objsel,,[clean])
 diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
 new file mode 100644
 index 0000000..606177f

patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch

@@ -19,14 +19,12 @@ diff --git a/configure.ac b/configure.ac
 index b67a7e7..6e3108b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3125,6 +3125,7 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
- WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
+@@ -3128,4 +3128,5 @@ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
  WINE_CONFIG_DLL(ntprint)
  WINE_CONFIG_TEST(dlls/ntprint/tests)
 +WINE_CONFIG_DLL(nvcuda)
  WINE_CONFIG_DLL(objsel,,[clean])
  WINE_CONFIG_DLL(odbc32,,[implib])
- WINE_CONFIG_DLL(odbccp32,,[implib])
 diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
 new file mode 100644
 index 0000000..4b33278

patches/patchinstall.sh

@@ -127,6 +127,7 @@ patch_enable_all ()
 	enable_ntdll_User_Shared_Data="$1"
 	enable_ntdll_WRITECOPY="$1"
 	enable_ntdll_WinSqm="$1"
+	enable_ntoskrnl_DriverTest="$1"
 	enable_ntoskrnl_Emulator="$1"
 	enable_ntoskrnl_KeWaitForMultipleObjects="$1"
 	enable_nvapi_Stub_DLL="$1"
@@ -408,6 +409,9 @@ patch_enable ()
 		ntdll-WinSqm)
 			enable_ntdll_WinSqm="$2"
 			;;
+		ntoskrnl-DriverTest)
+			enable_ntoskrnl_DriverTest="$2"
+			;;
 		ntoskrnl-Emulator)
 			enable_ntoskrnl_Emulator="$2"
 			;;
@@ -2177,6 +2181,25 @@ if test "$enable_ntdll_WinSqm" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset ntoskrnl-DriverTest
+# |
+# | Modified files:
+# |   *	aclocal.m4, configure.ac, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, dlls/ntoskrnl.exe/tests/Makefile.in,
+# | 	dlls/ntoskrnl.exe/tests/driver.sys/Makefile.in, dlls/ntoskrnl.exe/tests/driver.sys/driver.c,
+# | 	dlls/ntoskrnl.exe/tests/driver.sys/driver.h, dlls/ntoskrnl.exe/tests/driver.sys/driver.sys.spec,
+# | 	dlls/ntoskrnl.exe/tests/driver.sys/test.c, dlls/ntoskrnl.exe/tests/driver.sys/test.h,
+# | 	dlls/ntoskrnl.exe/tests/driver.sys/util.h, dlls/ntoskrnl.exe/tests/ntoskrnl.c, include/wine/test.h,
+# | 	tools/make_makefiles, tools/makedep.c
+# |
+if test "$enable_ntoskrnl_DriverTest" -eq 1; then
+	patch_apply ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch
+	patch_apply ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch
+	(
+		echo '+    { "Sebastian Lackner", "ntoskrnl.exe/tests: Add initial driver testing framework and corrsponding changes to Makefile system.", 2 },';
+		echo '+    { "Michael Müller", "ntoskrnl.exe/tests: Add kernel compliant test functions.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntoskrnl-Emulator
 # |
 # | This patchset fixes the following Wine bugs: