Fix configure changes

patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch

@@ -1,7 +1,7 @@
-From b96844dcc3a0845422e8392614e41148241f54ff Mon Sep 17 00:00:00 2001
+From ae853a70af3455e1da80e89944a1cbc91e787421 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:38:38 +0200
-Subject: win32k.sys: Add stub driver.
+Subject: [PATCH] win32k.sys: Add stub driver.
 
 ---
  configure.ac                    |   1 +
@@ -15,10 +15,10 @@ Subject: win32k.sys: Add stub driver.
  create mode 100644 dlls/win32k.sys/win32k.sys.spec
 
 diff --git a/configure.ac b/configure.ac
-index 5b9af9eece1..34f2a1af63d 100644
+index 9033656..4ce2e89 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3621,6 +3621,7 @@ WINE_CONFIG_DLL(wiaservc,,[clean])
+@@ -3685,6 +3685,7 @@ WINE_CONFIG_DLL(wiaservc)
  WINE_CONFIG_TEST(dlls/wiaservc/tests)
  WINE_CONFIG_DLL(wimgapi)
  WINE_CONFIG_DLL(win32s16.dll16,enable_win16)
@@ -28,7 +28,7 @@ index 5b9af9eece1..34f2a1af63d 100644
  WINE_CONFIG_DLL(windebug.dll16,enable_win16)
 diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
 new file mode 100644
-index 00000000000..615d8335c36
+index 0000000..615d833
 --- /dev/null
 +++ b/dlls/win32k.sys/Makefile.in
 @@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 00000000000..615d8335c36
 +	main.c
 diff --git a/dlls/win32k.sys/main.c b/dlls/win32k.sys/main.c
 new file mode 100644
-index 00000000000..a1ec2d4fa3f
+index 0000000..a1ec2d4
 --- /dev/null
 +++ b/dlls/win32k.sys/main.c
 @@ -0,0 +1,39 @@
@@ -85,7 +85,7 @@ index 00000000000..a1ec2d4fa3f
 +}
 diff --git a/dlls/win32k.sys/win32k.sys.spec b/dlls/win32k.sys/win32k.sys.spec
 new file mode 100644
-index 00000000000..c79439151e4
+index 0000000..c794391
 --- /dev/null
 +++ b/dlls/win32k.sys/win32k.sys.spec
 @@ -0,0 +1,246 @@
@@ -336,10 +336,10 @@ index 00000000000..c79439151e4
 +@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
 +@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 58207ad8824..eb2201b46e3 100755
+index 6b59b32..e476c0d 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -385,6 +385,7 @@ my @dll_groups =
+@@ -410,6 +410,7 @@ my @dll_groups =
   [
    "ntoskrnl.exe",
    "hal",
@@ -348,5 +348,5 @@ index 58207ad8824..eb2201b46e3 100755
  );
  
 -- 
-2.13.1
+2.7.4
 

patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch

@@ -1,4 +1,4 @@
-From 63db6f4c97b04136eaf47c73a16eea4cbf7ae6a8 Mon Sep 17 00:00:00 2001
+From e898a695975defcd91cf6d81ee356937177975d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:41:02 +0200
 Subject: [PATCH] dxgkrnl.sys: Add stub driver.
@@ -15,16 +15,16 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
  create mode 100644 dlls/dxgkrnl.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 588eecb..cf1ba3d 100644
+index 4ce2e89..3d5aef7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3319,6 +3319,7 @@ WINE_CONFIG_LIB(dxerr8)
+@@ -3227,6 +3227,7 @@ WINE_CONFIG_LIB(dxerr8)
  WINE_CONFIG_LIB(dxerr9)
  WINE_CONFIG_DLL(dxgi)
  WINE_CONFIG_TEST(dlls/dxgi/tests)
 +WINE_CONFIG_DLL(dxgkrnl.sys)
  WINE_CONFIG_LIB(dxguid)
- WINE_CONFIG_DLL(dxva2,,[clean])
+ WINE_CONFIG_DLL(dxva2)
  WINE_CONFIG_TEST(dlls/dxva2/tests)
 diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
 new file mode 100644
@@ -116,10 +116,10 @@ index 0000000..c5639c2
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index a76bb0a..f0ff79f 100644
+index 3c55125..c69b880 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2548,6 +2548,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  10,syswow64,stdole2.tlb
  11,,iexplore.exe
  11,,winetest.exe,-
@@ -127,7 +127,7 @@ index a76bb0a..f0ff79f 100644
  12,,fltmgr.sys,-
  12,,mountmgr.sys,-
  12,,ndis.sys,-
-@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2592,6 +2593,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,notepad.exe
  11,,winetest.exe,-
@@ -136,5 +136,5 @@ index a76bb0a..f0ff79f 100644
  12,,mountmgr.sys
  12,,ndis.sys
 -- 
-1.9.1
+2.7.4
 

patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch

@@ -1,4 +1,4 @@
-From cf71906be02cd7ac2862f7066108a32b2bb48de4 Mon Sep 17 00:00:00 2001
+From b1ca94de8e18fd482609c5b6e9ae38126ecfaa65 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:42:32 +0200
 Subject: [PATCH] dxgmms1.sys: Add stub driver.
@@ -15,16 +15,16 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
  create mode 100644 dlls/dxgmms1.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index cf1ba3d..343f4b4 100644
+index 3d5aef7..ab6752a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3320,6 +3320,7 @@ WINE_CONFIG_LIB(dxerr9)
+@@ -3228,6 +3228,7 @@ WINE_CONFIG_LIB(dxerr9)
  WINE_CONFIG_DLL(dxgi)
  WINE_CONFIG_TEST(dlls/dxgi/tests)
  WINE_CONFIG_DLL(dxgkrnl.sys)
 +WINE_CONFIG_DLL(dxgmms1.sys)
  WINE_CONFIG_LIB(dxguid)
- WINE_CONFIG_DLL(dxva2,,[clean])
+ WINE_CONFIG_DLL(dxva2)
  WINE_CONFIG_TEST(dlls/dxva2/tests)
 diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
 new file mode 100644
@@ -92,10 +92,10 @@ index 0000000..686493d
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index f0ff79f..bd83ba2 100644
+index c69b880..03016c1 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys,-
@@ -103,7 +103,7 @@ index f0ff79f..bd83ba2 100644
  12,,fltmgr.sys,-
  12,,mountmgr.sys,-
  12,,ndis.sys,-
-@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2594,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,notepad.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys
@@ -112,5 +112,5 @@ index f0ff79f..bd83ba2 100644
  12,,mountmgr.sys
  12,,ndis.sys
 -- 
-1.9.1
+2.7.4