From b113f99f07b2fac521f0e2efef4b5ef8ab5e0108 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 4 May 2021 17:56:17 -0500 Subject: [PATCH] dxdiag-new-dlls: Remove patch set. From the discussion in , these patches don't seem to be providing any value (all they are doing is causing arbitrarily chosen numbers to be shown in the dialog, which don't reflect anything about actual functionality). A possible benefit of these patches is anticipating their need by other programs. However, (a) most of these DLLs are internal helpers used by other (public) DirectX APIs, (b) the case of a missing DLL is usually quite easy to debug anyway, (c) such a stance leaves us with the maintenance burden of far more code that will never be necessary than code that actually turns out to be useful. Since (1) upstream has appeared reticent to accept them, (2) a proposal for their removal in the bug report met with no apparent objection, (3) they have already caused at least two regressions [however easy to fix], namely bug 50395 and bug 50700, (4) they present a noticeable maintenance burden, if a trivial one, (5) as explained they provide no real benefit, remove them. --- .../0001-d3dpmesh-add-stub-dll.patch | 82 ------------ .../0002-diactfrm-add-stub-dll.patch | 85 ------------ .../0003-dimap-add-stub-dll.patch | 83 ------------ .../0004-dpmodemx-add-stub-dll.patch | 82 ------------ .../0005-dpnhupnp-add-stub-dll.patch | 87 ------------ .../0006-dpvacm-add-stub-dll.patch | 92 ------------- .../0007-dpvvox-add-stub-dll.patch | 86 ------------ .../0008-dsdmoprp-add-stub-dll.patch | 86 ------------ .../0009-dsound3d-add-stub-dll.patch | 83 ------------ .../0010-dxapi.sys-add-stub-dll.patch | 88 ------------- .../0011-dx7vb-add-stub-dll.patch | 86 ------------ .../0012-encapi-add-stub-dll.patch | 86 ------------ .../0013-gcdef-add-stub-dll.patch | 83 ------------ .../0014-qdv-add-stub-dll.patch | 86 ------------ .../0015-qedwipes-add-stub-dll.patch | 82 ------------ .../0016-dpmodemx-Add-stub-SPInit.patch | 77 ----------- patches/dxdiag-new-dlls/definition | 2 - patches/patchinstall.sh | 124 +++++------------- 18 files changed, 36 insertions(+), 1444 deletions(-) delete mode 100644 patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch delete mode 100644 patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch delete mode 100644 patches/dxdiag-new-dlls/definition diff --git a/patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch b/patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch deleted file mode 100644 index 2bbc339d..00000000 --- a/patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ea0fedf84c544522583b39bdd78a30b2d7a52a41 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:41:57 -0500 -Subject: [PATCH] d3dpmesh: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/d3dpmesh/Makefile.in | 6 ++++++ - dlls/d3dpmesh/d3dpmesh.spec | 1 + - dlls/d3dpmesh/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 34 insertions(+) - create mode 100644 dlls/d3dpmesh/Makefile.in - create mode 100644 dlls/d3dpmesh/d3dpmesh.spec - create mode 100644 dlls/d3dpmesh/version.rc - -diff --git a/configure.ac b/configure.ac -index c80e2691f65..25e1ef17993 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3124,6 +3124,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) - WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) - WINE_CONFIG_MAKEFILE(dlls/d3dim) - WINE_CONFIG_MAKEFILE(dlls/d3dim700) -+WINE_CONFIG_MAKEFILE(dlls/d3dpmesh) - WINE_CONFIG_MAKEFILE(dlls/d3drm) - WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) - WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) -diff --git a/dlls/d3dpmesh/Makefile.in b/dlls/d3dpmesh/Makefile.in -new file mode 100644 -index 00000000000..334dacd1090 ---- /dev/null -+++ b/dlls/d3dpmesh/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = d3dpmesh.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/d3dpmesh/d3dpmesh.spec b/dlls/d3dpmesh/d3dpmesh.spec -new file mode 100644 -index 00000000000..d4b9a46bd7a ---- /dev/null -+++ b/dlls/d3dpmesh/d3dpmesh.spec -@@ -0,0 +1 @@ -+@ stub CreateD3DRMPMeshVisual -diff --git a/dlls/d3dpmesh/version.rc b/dlls/d3dpmesh/version.rc -new file mode 100644 -index 00000000000..87e601a95a7 ---- /dev/null -+++ b/dlls/d3dpmesh/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine d3dpmesh" -+#define WINE_FILENAME_STR "d3dpmesh.dll" -+#define WINE_FILEVERSION 5,0,2134,1 -+#define WINE_FILEVERSION_STR "5.0.2134.1" -+#define WINE_PRODUCTVERSION 5,0,2134,1 -+#define WINE_PRODUCTVERSION_STR "5.0.2134.1" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch b/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch deleted file mode 100644 index e6083eea..00000000 --- a/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 08a6b78031ae7b2b9fb042c3d411d4366a19d81c Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:43:09 -0500 -Subject: [PATCH] diactfrm: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/diactfrm/Makefile.in | 6 ++++++ - dlls/diactfrm/diactfrm.spec | 4 ++++ - dlls/diactfrm/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/diactfrm/Makefile.in - create mode 100644 dlls/diactfrm/diactfrm.spec - create mode 100644 dlls/diactfrm/version.rc - -diff --git a/configure.ac b/configure.ac -index 25e1ef17993..8a7a58d413e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3182,6 +3182,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum/tests) - WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) - WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) - WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) -+WINE_CONFIG_MAKEFILE(dlls/diactfrm) - WINE_CONFIG_MAKEFILE(dlls/difxapi) - WINE_CONFIG_MAKEFILE(dlls/dinput) - WINE_CONFIG_MAKEFILE(dlls/dinput/tests) -diff --git a/dlls/diactfrm/Makefile.in b/dlls/diactfrm/Makefile.in -new file mode 100644 -index 00000000000..9f6ec3cd702 ---- /dev/null -+++ b/dlls/diactfrm/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = diactfrm.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/diactfrm/diactfrm.spec b/dlls/diactfrm/diactfrm.spec -new file mode 100644 -index 00000000000..c5fc87af6d5 ---- /dev/null -+++ b/dlls/diactfrm/diactfrm.spec -@@ -0,0 +1,4 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllRegisterServer -+@ stub DllUnregisterServer -diff --git a/dlls/diactfrm/version.rc b/dlls/diactfrm/version.rc -new file mode 100644 -index 00000000000..b6b6692b831 ---- /dev/null -+++ b/dlls/diactfrm/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine diactfrm" -+#define WINE_FILENAME_STR "diactfrm.dll" -+#define WINE_FILEVERSION 5,1,2600,881 -+#define WINE_FILEVERSION_STR "5.1.2600.881" -+#define WINE_PRODUCTVERSION 5,1,2600,881 -+#define WINE_PRODUCTVERSION_STR "5.1.2600.881" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch b/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch deleted file mode 100644 index c791a9fb..00000000 --- a/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 04da45fd650835f28b16c19942e547482b4375e7 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:43:19 -0500 -Subject: [PATCH] dimap: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dimap/Makefile.in | 6 ++++++ - dlls/dimap/dimap.spec | 2 ++ - dlls/dimap/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 35 insertions(+) - create mode 100644 dlls/dimap/Makefile.in - create mode 100644 dlls/dimap/dimap.spec - create mode 100644 dlls/dimap/version.rc - -diff --git a/configure.ac b/configure.ac -index 8a7a58d413e..8dcc30dc4d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3184,6 +3184,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) - WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) - WINE_CONFIG_MAKEFILE(dlls/diactfrm) - WINE_CONFIG_MAKEFILE(dlls/difxapi) -+WINE_CONFIG_MAKEFILE(dlls/dimap) - WINE_CONFIG_MAKEFILE(dlls/dinput) - WINE_CONFIG_MAKEFILE(dlls/dinput/tests) - WINE_CONFIG_MAKEFILE(dlls/dinput8) -diff --git a/dlls/dimap/Makefile.in b/dlls/dimap/Makefile.in -new file mode 100644 -index 00000000000..36c2c363c04 ---- /dev/null -+++ b/dlls/dimap/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dimap.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dimap/dimap.spec b/dlls/dimap/dimap.spec -new file mode 100644 -index 00000000000..cacaa27a2ca ---- /dev/null -+++ b/dlls/dimap/dimap.spec -@@ -0,0 +1,2 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -diff --git a/dlls/dimap/version.rc b/dlls/dimap/version.rc -new file mode 100644 -index 00000000000..d0341dfcb77 ---- /dev/null -+++ b/dlls/dimap/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dimap" -+#define WINE_FILENAME_STR "dimap.dll" -+#define WINE_FILEVERSION 5,1,2600,881 -+#define WINE_FILEVERSION_STR "5.1.2600.881" -+#define WINE_PRODUCTVERSION 5,1,2600,881 -+#define WINE_PRODUCTVERSION_STR "5.1.2600.881" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch b/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch deleted file mode 100644 index 5ae2117b..00000000 --- a/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch +++ /dev/null @@ -1,82 +0,0 @@ -From a7842fd86fc2aa314226bfe204b3f5e89c4314d9 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:02 -0500 -Subject: [PATCH] dpmodemx: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dpmodemx/Makefile.in | 6 ++++++ - dlls/dpmodemx/dpmodemx.spec | 1 + - dlls/dpmodemx/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 34 insertions(+) - create mode 100644 dlls/dpmodemx/Makefile.in - create mode 100644 dlls/dpmodemx/dpmodemx.spec - create mode 100644 dlls/dpmodemx/version.rc - -diff --git a/configure.ac b/configure.ac -index 8dcc30dc4d5..ef321dd2292 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3218,6 +3218,7 @@ WINE_CONFIG_MAKEFILE(dlls/dnsapi/tests) - WINE_CONFIG_MAKEFILE(dlls/dplay) - WINE_CONFIG_MAKEFILE(dlls/dplayx) - WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) -+WINE_CONFIG_MAKEFILE(dlls/dpmodemx) - WINE_CONFIG_MAKEFILE(dlls/dpnaddr) - WINE_CONFIG_MAKEFILE(dlls/dpnet) - WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) -diff --git a/dlls/dpmodemx/Makefile.in b/dlls/dpmodemx/Makefile.in -new file mode 100644 -index 00000000000..c15b7a33112 ---- /dev/null -+++ b/dlls/dpmodemx/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dpmodemx.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec -new file mode 100644 -index 00000000000..c4c4ef212a7 ---- /dev/null -+++ b/dlls/dpmodemx/dpmodemx.spec -@@ -0,0 +1 @@ -+@ stub SPInit -diff --git a/dlls/dpmodemx/version.rc b/dlls/dpmodemx/version.rc -new file mode 100644 -index 00000000000..b0c644aed83 ---- /dev/null -+++ b/dlls/dpmodemx/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dpmodemx" -+#define WINE_FILENAME_STR "dpmodemx.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch b/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch deleted file mode 100644 index 0dfed5a9..00000000 --- a/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 22b5e83162157f99cc7c114defc08c27053b6868 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:43:44 -0500 -Subject: [PATCH] dpnhupnp: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dpnhupnp/Makefile.in | 6 ++++++ - dlls/dpnhupnp/dpnhupnp.spec | 5 +++++ - dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 38 insertions(+) - create mode 100644 dlls/dpnhupnp/Makefile.in - create mode 100644 dlls/dpnhupnp/dpnhupnp.spec - create mode 100644 dlls/dpnhupnp/version.rc - -diff --git a/configure.ac b/configure.ac -index ef321dd2292..8494354b561 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3220,6 +3220,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplayx) - WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) - WINE_CONFIG_MAKEFILE(dlls/dpmodemx) - WINE_CONFIG_MAKEFILE(dlls/dpnaddr) -+WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) - WINE_CONFIG_MAKEFILE(dlls/dpnet) - WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) - WINE_CONFIG_MAKEFILE(dlls/dpnhpast) -diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in -new file mode 100644 -index 00000000000..566ce038f82 ---- /dev/null -+++ b/dlls/dpnhupnp/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dpnhupnp.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec -new file mode 100644 -index 00000000000..acc698e99ab ---- /dev/null -+++ b/dlls/dpnhupnp/dpnhupnp.spec -@@ -0,0 +1,5 @@ -+@ stub DirectPlayNATHelpCreate -+@ stub DllRegisterServer -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc -new file mode 100644 -index 00000000000..21633a49815 ---- /dev/null -+++ b/dlls/dpnhupnp/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" -+#define WINE_FILENAME_STR "dpnhupnp.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch b/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch deleted file mode 100644 index 273d5b92..00000000 --- a/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch +++ /dev/null @@ -1,92 +0,0 @@ -From f9a068def176011ec42e84d370e1708e70de2e2a Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:02 -0500 -Subject: [PATCH] dpvacm: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 3 ++- - dlls/dpvacm/Makefile.in | 6 ++++++ - dlls/dpvacm/dpvacm.spec | 4 ++++ - dlls/dpvacm/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 38 insertions(+), 1 deletion(-) - create mode 100644 dlls/dpvacm/Makefile.in - create mode 100644 dlls/dpvacm/dpvacm.spec - create mode 100644 dlls/dpvacm/version.rc - -diff --git a/configure.ac b/configure.ac -index 8494354b561..749781df38a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3220,11 +3220,12 @@ WINE_CONFIG_MAKEFILE(dlls/dplayx) - WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) - WINE_CONFIG_MAKEFILE(dlls/dpmodemx) - WINE_CONFIG_MAKEFILE(dlls/dpnaddr) --WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) - WINE_CONFIG_MAKEFILE(dlls/dpnet) - WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) - WINE_CONFIG_MAKEFILE(dlls/dpnhpast) -+WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) - WINE_CONFIG_MAKEFILE(dlls/dpnlobby) -+WINE_CONFIG_MAKEFILE(dlls/dpvacm) - WINE_CONFIG_MAKEFILE(dlls/dpvoice) - WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) - WINE_CONFIG_MAKEFILE(dlls/dpwsockx) -diff --git a/dlls/dpvacm/Makefile.in b/dlls/dpvacm/Makefile.in -new file mode 100644 -index 00000000000..e9fcafcfc7a ---- /dev/null -+++ b/dlls/dpvacm/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dpvacm.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dpvacm/dpvacm.spec b/dlls/dpvacm/dpvacm.spec -new file mode 100644 -index 00000000000..fc4ae4a44c0 ---- /dev/null -+++ b/dlls/dpvacm/dpvacm.spec -@@ -0,0 +1,4 @@ -+@ stub DllRegisterServer -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/dpvacm/version.rc b/dlls/dpvacm/version.rc -new file mode 100644 -index 00000000000..7c463bca22e ---- /dev/null -+++ b/dlls/dpvacm/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dpvacm" -+#define WINE_FILENAME_STR "dpvacm.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch b/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch deleted file mode 100644 index a9dc4b5e..00000000 --- a/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 98be083cb6866286bcb73d23f7ed1ac13da857e7 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:02 -0500 -Subject: [PATCH] dpvvox: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dpvvox/Makefile.in | 6 ++++++ - dlls/dpvvox/dpvvox.spec | 4 ++++ - dlls/dpvvox/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/dpvvox/Makefile.in - create mode 100644 dlls/dpvvox/dpvvox.spec - create mode 100644 dlls/dpvvox/version.rc - -diff --git a/configure.ac b/configure.ac -index 749781df38a..ec12df76214 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3228,6 +3228,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnlobby) - WINE_CONFIG_MAKEFILE(dlls/dpvacm) - WINE_CONFIG_MAKEFILE(dlls/dpvoice) - WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) -+WINE_CONFIG_MAKEFILE(dlls/dpvvox) - WINE_CONFIG_MAKEFILE(dlls/dpwsockx) - WINE_CONFIG_MAKEFILE(dlls/drmclien) - WINE_CONFIG_MAKEFILE(dlls/dsdmo) -diff --git a/dlls/dpvvox/Makefile.in b/dlls/dpvvox/Makefile.in -new file mode 100644 -index 00000000000..76c1312e680 ---- /dev/null -+++ b/dlls/dpvvox/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dpvvox.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dpvvox/dpvvox.spec b/dlls/dpvvox/dpvvox.spec -new file mode 100644 -index 00000000000..fc4ae4a44c0 ---- /dev/null -+++ b/dlls/dpvvox/dpvvox.spec -@@ -0,0 +1,4 @@ -+@ stub DllRegisterServer -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/dpvvox/version.rc b/dlls/dpvvox/version.rc -new file mode 100644 -index 00000000000..d4e3a34c0a8 ---- /dev/null -+++ b/dlls/dpvvox/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dpvvox" -+#define WINE_FILENAME_STR "dpvvox.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch b/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch deleted file mode 100644 index d43aeed0..00000000 --- a/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2b847764d114860d9f68eaf0f1c34cddf5bbc5ee Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:44:22 -0500 -Subject: [PATCH] dsdmoprp: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dsdmoprp/Makefile.in | 6 ++++++ - dlls/dsdmoprp/dsdmoprp.spec | 4 ++++ - dlls/dsdmoprp/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/dsdmoprp/Makefile.in - create mode 100644 dlls/dsdmoprp/dsdmoprp.spec - create mode 100644 dlls/dsdmoprp/version.rc - -diff --git a/configure.ac b/configure.ac -index ec12df76214..b69929b6271 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3233,6 +3233,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpwsockx) - WINE_CONFIG_MAKEFILE(dlls/drmclien) - WINE_CONFIG_MAKEFILE(dlls/dsdmo) - WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests) -+WINE_CONFIG_MAKEFILE(dlls/dsdmoprp) - WINE_CONFIG_MAKEFILE(dlls/dsound) - WINE_CONFIG_MAKEFILE(dlls/dsound/tests) - WINE_CONFIG_MAKEFILE(dlls/dsquery) -diff --git a/dlls/dsdmoprp/Makefile.in b/dlls/dsdmoprp/Makefile.in -new file mode 100644 -index 00000000000..b3fcb8c3398 ---- /dev/null -+++ b/dlls/dsdmoprp/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dsdmoprp.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dsdmoprp/dsdmoprp.spec b/dlls/dsdmoprp/dsdmoprp.spec -new file mode 100644 -index 00000000000..a043605127d ---- /dev/null -+++ b/dlls/dsdmoprp/dsdmoprp.spec -@@ -0,0 +1,4 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllRegisterServer -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/dsdmoprp/version.rc b/dlls/dsdmoprp/version.rc -new file mode 100644 -index 00000000000..9a2ca3e1c54 ---- /dev/null -+++ b/dlls/dsdmoprp/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dsdmoprp" -+#define WINE_FILENAME_STR "dsdmoprp.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch b/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch deleted file mode 100644 index d1fb0b80..00000000 --- a/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 852f2fbdbf1d2615a5fdf95f2cee131b4699c291 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:03 -0500 -Subject: [PATCH] dsound3d: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dsound3d/Makefile.in | 6 ++++++ - dlls/dsound3d/dsound3d.spec | 1 + - dlls/dsound3d/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 34 insertions(+) - create mode 100644 dlls/dsound3d/Makefile.in - create mode 100644 dlls/dsound3d/dsound3d.spec - create mode 100644 dlls/dsound3d/version.rc - -diff --git a/configure.ac b/configure.ac -index b69929b6271..da6ada3013b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3236,6 +3236,7 @@ WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests) - WINE_CONFIG_MAKEFILE(dlls/dsdmoprp) - WINE_CONFIG_MAKEFILE(dlls/dsound) - WINE_CONFIG_MAKEFILE(dlls/dsound/tests) -+WINE_CONFIG_MAKEFILE(dlls/dsound3d) - WINE_CONFIG_MAKEFILE(dlls/dsquery) - WINE_CONFIG_MAKEFILE(dlls/dssenh) - WINE_CONFIG_MAKEFILE(dlls/dssenh/tests) -diff --git a/dlls/dsound3d/Makefile.in b/dlls/dsound3d/Makefile.in -new file mode 100644 -index 00000000000..f94afbee5b0 ---- /dev/null -+++ b/dlls/dsound3d/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dsound3d.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dsound3d/dsound3d.spec b/dlls/dsound3d/dsound3d.spec -new file mode 100644 -index 00000000000..9859c231f25 ---- /dev/null -+++ b/dlls/dsound3d/dsound3d.spec -@@ -0,0 +1 @@ -+@ stub CafBiquadCoeffs -\ No newline at end of file -diff --git a/dlls/dsound3d/version.rc b/dlls/dsound3d/version.rc -new file mode 100644 -index 00000000000..77dea7a2f70 ---- /dev/null -+++ b/dlls/dsound3d/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dsound3d" -+#define WINE_FILENAME_STR "dsound3d.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch b/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch deleted file mode 100644 index 83ee3d0a..00000000 --- a/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 338fc447537dd45e07a3c2d9ef8069af910c936f Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:03 -0500 -Subject: [PATCH] dxapi.sys: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dxapi.sys/Makefile.in | 6 ++++++ - dlls/dxapi.sys/dxapi.sys.spec | 7 +++++++ - dlls/dxapi.sys/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 40 insertions(+) - create mode 100644 dlls/dxapi.sys/Makefile.in - create mode 100644 dlls/dxapi.sys/dxapi.sys.spec - create mode 100644 dlls/dxapi.sys/version.rc - -diff --git a/configure.ac b/configure.ac -index d3cb3ed1fd6..86d6912b4e0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3274,6 +3274,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) - WINE_CONFIG_MAKEFILE(dlls/dwrite) - WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) - WINE_CONFIG_MAKEFILE(dlls/dx8vb) -+WINE_CONFIG_MAKEFILE(dlls/dxapi.sys) - WINE_CONFIG_MAKEFILE(dlls/dxdiagn) - WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) - WINE_CONFIG_MAKEFILE(dlls/dxerr8) -diff --git a/dlls/dxapi.sys/Makefile.in b/dlls/dxapi.sys/Makefile.in -new file mode 100644 -index 00000000000..43259f950b5 ---- /dev/null -+++ b/dlls/dxapi.sys/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dxapi.sys -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dxapi.sys/dxapi.sys.spec b/dlls/dxapi.sys/dxapi.sys.spec -new file mode 100644 -index 00000000000..05748b5fe59 ---- /dev/null -+++ b/dlls/dxapi.sys/dxapi.sys.spec -@@ -0,0 +1,7 @@ -+@ stub _DxApi@20 -+@ stub _DxApiGetVersion@0 -+@ stub _DxApiInitialize@32 -+@ stub _DxAutoflipUpdate@20 -+@ stub _DxEnableIRQ@8 -+@ stub _DxLoseObject@8 -+@ stub _DxUpdateCapture@12 -diff --git a/dlls/dxapi.sys/version.rc b/dlls/dxapi.sys/version.rc -new file mode 100644 -index 00000000000..7ecd1565052 ---- /dev/null -+++ b/dlls/dxapi.sys/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dxapi.sys" -+#define WINE_FILENAME_STR "dxapi.sys" -+#define WINE_FILEVERSION 5,0,2180,1 -+#define WINE_FILEVERSION_STR "5.0.2180.1" -+#define WINE_PRODUCTVERSION 5,0,2180,1 -+#define WINE_PRODUCTVERSION_STR "5.0.2180.1" -+ -+#include "wine/wine_common_ver.rc" --- -2.30.1 - diff --git a/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch b/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch deleted file mode 100644 index ee8df5a4..00000000 --- a/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2703aa7a1e1d811924a8fa59fbdf88f44e4ff035 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:03 -0500 -Subject: [PATCH] dx7vb: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/dx7vb/Makefile.in | 6 ++++++ - dlls/dx7vb/dx7vb.spec | 4 ++++ - dlls/dx7vb/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/dx7vb/Makefile.in - create mode 100644 dlls/dx7vb/dx7vb.spec - create mode 100644 dlls/dx7vb/version.rc - -diff --git a/configure.ac b/configure.ac -index 47e8427f6b8..44021303331 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi) - WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) - WINE_CONFIG_MAKEFILE(dlls/dwrite) - WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) -+WINE_CONFIG_MAKEFILE(dlls/dx7vb) - WINE_CONFIG_MAKEFILE(dlls/dx8vb) - WINE_CONFIG_MAKEFILE(dlls/dxapi.sys) - WINE_CONFIG_MAKEFILE(dlls/dxdiagn) -diff --git a/dlls/dx7vb/Makefile.in b/dlls/dx7vb/Makefile.in -new file mode 100644 -index 00000000000..104343c9388 ---- /dev/null -+++ b/dlls/dx7vb/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = dx7vb.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/dx7vb/dx7vb.spec b/dlls/dx7vb/dx7vb.spec -new file mode 100644 -index 00000000000..a043605127d ---- /dev/null -+++ b/dlls/dx7vb/dx7vb.spec -@@ -0,0 +1,4 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllRegisterServer -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/dx7vb/version.rc b/dlls/dx7vb/version.rc -new file mode 100644 -index 00000000000..c401dfb471d ---- /dev/null -+++ b/dlls/dx7vb/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine dx7vb" -+#define WINE_FILENAME_STR "dx7vb.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch b/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch deleted file mode 100644 index cd18049c..00000000 --- a/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 962ea5ce308538f8a208646fc61fa8f95b199b98 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:04 -0500 -Subject: [PATCH] encapi: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/encapi/Makefile.in | 6 ++++++ - dlls/encapi/encapi.spec | 4 ++++ - dlls/encapi/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/encapi/Makefile.in - create mode 100644 dlls/encapi/encapi.spec - create mode 100644 dlls/encapi/version.rc - -diff --git a/configure.ac b/configure.ac -index 44021303331..6d3f37c6905 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3261,6 +3261,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgmms1.sys) - WINE_CONFIG_MAKEFILE(dlls/dxguid) - WINE_CONFIG_MAKEFILE(dlls/dxva2) - WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) -+WINE_CONFIG_MAKEFILE(dlls/encapi) - WINE_CONFIG_MAKEFILE(dlls/esent) - WINE_CONFIG_MAKEFILE(dlls/evr) - WINE_CONFIG_MAKEFILE(dlls/evr/tests) -diff --git a/dlls/encapi/Makefile.in b/dlls/encapi/Makefile.in -new file mode 100644 -index 00000000000..457b9d64d1f ---- /dev/null -+++ b/dlls/encapi/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = encapi.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/encapi/encapi.spec b/dlls/encapi/encapi.spec -new file mode 100644 -index 00000000000..a043605127d ---- /dev/null -+++ b/dlls/encapi/encapi.spec -@@ -0,0 +1,4 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllRegisterServer -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/encapi/version.rc b/dlls/encapi/version.rc -new file mode 100644 -index 00000000000..8f10a2c6ce6 ---- /dev/null -+++ b/dlls/encapi/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine encapi" -+#define WINE_FILENAME_STR "encapi.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch b/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch deleted file mode 100644 index 7cc41a2d..00000000 --- a/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 6d1a2eb383f00334e74a283cc11aeee338946734 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:08 -0500 -Subject: [PATCH] gcdef: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/gcdef/Makefile.in | 6 ++++++ - dlls/gcdef/gcdef.spec | 2 ++ - dlls/gcdef/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 35 insertions(+) - create mode 100644 dlls/gcdef/Makefile.in - create mode 100644 dlls/gcdef/gcdef.spec - create mode 100644 dlls/gcdef/version.rc - -diff --git a/configure.ac b/configure.ac -index 6d3f37c6905..db94b38dcac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3331,6 +3331,7 @@ WINE_CONFIG_MAKEFILE(dlls/fusion/tests) - WINE_CONFIG_MAKEFILE(dlls/fwpuclnt) - WINE_CONFIG_MAKEFILE(dlls/gameux) - WINE_CONFIG_MAKEFILE(dlls/gameux/tests) -+WINE_CONFIG_MAKEFILE(dlls/gcdef) - WINE_CONFIG_MAKEFILE(dlls/gdi.exe16,enable_win16) - WINE_CONFIG_MAKEFILE(dlls/gdi32) - WINE_CONFIG_MAKEFILE(dlls/gdi32/tests) -diff --git a/dlls/gcdef/Makefile.in b/dlls/gcdef/Makefile.in -new file mode 100644 -index 00000000000..162b49d70f8 ---- /dev/null -+++ b/dlls/gcdef/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = gcdef.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/gcdef/gcdef.spec b/dlls/gcdef/gcdef.spec -new file mode 100644 -index 00000000000..cacaa27a2ca ---- /dev/null -+++ b/dlls/gcdef/gcdef.spec -@@ -0,0 +1,2 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -diff --git a/dlls/gcdef/version.rc b/dlls/gcdef/version.rc -new file mode 100644 -index 00000000000..c71136be6e1 ---- /dev/null -+++ b/dlls/gcdef/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine gcdef" -+#define WINE_FILENAME_STR "gcdef.dll" -+#define WINE_FILEVERSION 5,1,2600,881 -+#define WINE_FILEVERSION_STR "5.1.2600.881" -+#define WINE_PRODUCTVERSION 5,1,2600,881 -+#define WINE_PRODUCTVERSION_STR "5.1.2600.881" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch b/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch deleted file mode 100644 index 8a89bfc4..00000000 --- a/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 905724311a9d542122f41ef1eb0b1b98ef0c6897 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:23 -0500 -Subject: [PATCH] qdv: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/qdv/Makefile.in | 6 ++++++ - dlls/qdv/qdv.spec | 4 ++++ - dlls/qdv/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 37 insertions(+) - create mode 100644 dlls/qdv/Makefile.in - create mode 100644 dlls/qdv/qdv.spec - create mode 100644 dlls/qdv/version.rc - -diff --git a/configure.ac b/configure.ac -index db94b38dcac..8e493b3e44b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3627,6 +3627,7 @@ WINE_CONFIG_MAKEFILE(dlls/qasf) - WINE_CONFIG_MAKEFILE(dlls/qasf/tests) - WINE_CONFIG_MAKEFILE(dlls/qcap) - WINE_CONFIG_MAKEFILE(dlls/qcap/tests) -+WINE_CONFIG_MAKEFILE(dlls/qdv) - WINE_CONFIG_MAKEFILE(dlls/qdvd) - WINE_CONFIG_MAKEFILE(dlls/qdvd/tests) - WINE_CONFIG_MAKEFILE(dlls/qedit) -diff --git a/dlls/qdv/Makefile.in b/dlls/qdv/Makefile.in -new file mode 100644 -index 00000000000..487b9b8f881 ---- /dev/null -+++ b/dlls/qdv/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = qdv.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/qdv/qdv.spec b/dlls/qdv/qdv.spec -new file mode 100644 -index 00000000000..a043605127d ---- /dev/null -+++ b/dlls/qdv/qdv.spec -@@ -0,0 +1,4 @@ -+@ stub DllCanUnloadNow -+@ stub DllGetClassObject -+@ stub DllRegisterServer -+@ stub DllUnregisterServer -\ No newline at end of file -diff --git a/dlls/qdv/version.rc b/dlls/qdv/version.rc -new file mode 100644 -index 00000000000..6cf198362a8 ---- /dev/null -+++ b/dlls/qdv/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine qdv" -+#define WINE_FILENAME_STR "qdv.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch b/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch deleted file mode 100644 index 88e08baf..00000000 --- a/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch +++ /dev/null @@ -1,82 +0,0 @@ -From be28c9d2dd113810b120725640879f5d3e8831bb Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Tue, 13 Oct 2020 04:42:24 -0500 -Subject: [PATCH] qedwipes: add stub dll - -Signed-off-by: Austin English ---- - configure.ac | 1 + - dlls/qedwipes/Makefile.in | 6 ++++++ - dlls/qedwipes/qedwipes.spec | 1 + - dlls/qedwipes/version.rc | 26 ++++++++++++++++++++++++++ - 4 files changed, 34 insertions(+) - create mode 100644 dlls/qedwipes/Makefile.in - create mode 100644 dlls/qedwipes/qedwipes.spec - create mode 100644 dlls/qedwipes/version.rc - -diff --git a/configure.ac b/configure.ac -index 8e493b3e44b..3907082c38c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3632,6 +3632,7 @@ WINE_CONFIG_MAKEFILE(dlls/qdvd) - WINE_CONFIG_MAKEFILE(dlls/qdvd/tests) - WINE_CONFIG_MAKEFILE(dlls/qedit) - WINE_CONFIG_MAKEFILE(dlls/qedit/tests) -+WINE_CONFIG_MAKEFILE(dlls/qedwipes) - WINE_CONFIG_MAKEFILE(dlls/qmgr) - WINE_CONFIG_MAKEFILE(dlls/qmgr/tests) - WINE_CONFIG_MAKEFILE(dlls/qmgrprxy) -diff --git a/dlls/qedwipes/Makefile.in b/dlls/qedwipes/Makefile.in -new file mode 100644 -index 00000000000..0e2223ad4b1 ---- /dev/null -+++ b/dlls/qedwipes/Makefile.in -@@ -0,0 +1,6 @@ -+MODULE = qedwipes.dll -+ -+EXTRADLLFLAGS = -Wb,--prefer-native -+ -+ -+RC_SRCS = version.rc -diff --git a/dlls/qedwipes/qedwipes.spec b/dlls/qedwipes/qedwipes.spec -new file mode 100644 -index 00000000000..3a8a8ea0098 ---- /dev/null -+++ b/dlls/qedwipes/qedwipes.spec -@@ -0,0 +1 @@ -+# FIXME: native doesn't export any functions? -diff --git a/dlls/qedwipes/version.rc b/dlls/qedwipes/version.rc -new file mode 100644 -index 00000000000..ce865c2b96f ---- /dev/null -+++ b/dlls/qedwipes/version.rc -@@ -0,0 +1,26 @@ -+/* -+ * Copyright 2020 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 -+ */ -+ -+#define WINE_FILEDESCRIPTION_STR "Wine qedwipes" -+#define WINE_FILENAME_STR "qedwipes.dll" -+#define WINE_FILEVERSION 5,3,2600,5512 -+#define WINE_FILEVERSION_STR "5.3.2600.5512" -+#define WINE_PRODUCTVERSION 5,3,2600,5512 -+#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" -+ -+#include "wine/wine_common_ver.rc" --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch b/patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch deleted file mode 100644 index 97c3dd5f..00000000 --- a/patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b3579602a731dd7398b113f397cd358554af7567 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Sun, 27 Dec 2020 09:57:46 +1100 -Subject: [PATCH] dpmodemx: Add stub SPInit - ---- - dlls/dpmodemx/Makefile.in | 5 ++++- - dlls/dpmodemx/dpmodemx.spec | 2 +- - dlls/dpmodemx/dpmodemx_main.c | 34 ++++++++++++++++++++++++++++++++++ - 3 files changed, 39 insertions(+), 2 deletions(-) - create mode 100644 dlls/dpmodemx/dpmodemx_main.c - -diff --git a/dlls/dpmodemx/Makefile.in b/dlls/dpmodemx/Makefile.in -index c15b7a33112..b7897fb1cf6 100644 ---- a/dlls/dpmodemx/Makefile.in -+++ b/dlls/dpmodemx/Makefile.in -@@ -1,6 +1,9 @@ - MODULE = dpmodemx.dll - --EXTRADLLFLAGS = -Wb,--prefer-native -+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native - - - RC_SRCS = version.rc -+ -+C_SRCS = \ -+ dpmodemx_main.c -diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec -index c4c4ef212a7..2ef9c5bf45c 100644 ---- a/dlls/dpmodemx/dpmodemx.spec -+++ b/dlls/dpmodemx/dpmodemx.spec -@@ -1 +1 @@ --@ stub SPInit -+@ stdcall SPInit(ptr) -diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c -new file mode 100644 -index 00000000000..f35e0804299 ---- /dev/null -+++ b/dlls/dpmodemx/dpmodemx_main.c -@@ -0,0 +1,34 @@ -+/* -+ * -+ * Copyright 2020 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 -+ -+#include "windef.h" -+#include "winbase.h" -+#include "wine/debug.h" -+ -+#include "wine/dplaysp.h" -+ -+WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx); -+ -+HRESULT WINAPI SPInit( LPSPINITDATA lpspData ) -+{ -+ FIXME("Currently not implemented.\n"); -+ return DPERR_UNAVAILABLE; -+} --- -2.20.1 - diff --git a/patches/dxdiag-new-dlls/definition b/patches/dxdiag-new-dlls/definition deleted file mode 100644 index e242eba1..00000000 --- a/patches/dxdiag-new-dlls/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [50293]: native dxdiag complains about missing -Depends: winedevice-Default_Drivers diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d9a881e9..ba72341e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "3ba4412be60dafee310b5d3c71aa762aa8846564" + echo "cda4abac9859ed42c29e8cb2746201a578431a5e" } # Show version information @@ -119,7 +119,6 @@ patch_enable_all () enable_dsound_EAX="$1" enable_dsound_Fast_Mixer="$1" enable_dwrite_FontFallback="$1" - enable_dxdiag_new_dlls="$1" enable_eventfd_synchronization="$1" enable_explorer_Video_Registry_Key="$1" enable_fonts_Missing_Fonts="$1" @@ -409,9 +408,6 @@ patch_enable () dwrite-FontFallback) enable_dwrite_FontFallback="$2" ;; - dxdiag-new-dlls) - enable_dxdiag_new_dlls="$2" - ;; eventfd_synchronization) enable_eventfd_synchronization="$2" ;; @@ -1282,6 +1278,13 @@ if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then enable_winex11__NET_ACTIVE_WINDOW=1 fi +if test "$enable_winedevice_Default_Drivers" -eq 1; then + if test "$enable_ntoskrnl_Stubs" -gt 1; then + abort "Patchset ntoskrnl-Stubs disabled, but winedevice-Default_Drivers depends on that." + fi + enable_ntoskrnl_Stubs=1 +fi + if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then if test "$enable_wined3d_SWVP_shaders" -gt 1; then abort "Patchset wined3d-SWVP-shaders disabled, but wined3d-Indexed_Vertex_Blending depends on that." @@ -1439,20 +1442,6 @@ if test "$enable_ntdll_Junction_Points" -eq 1; then enable_ntdll_NtQueryEaFile=1 fi -if test "$enable_dxdiag_new_dlls" -eq 1; then - if test "$enable_winedevice_Default_Drivers" -gt 1; then - abort "Patchset winedevice-Default_Drivers disabled, but dxdiag-new-dlls depends on that." - fi - enable_winedevice_Default_Drivers=1 -fi - -if test "$enable_winedevice_Default_Drivers" -eq 1; then - if test "$enable_ntoskrnl_Stubs" -gt 1; then - abort "Patchset ntoskrnl-Stubs disabled, but winedevice-Default_Drivers depends on that." - fi - enable_ntoskrnl_Stubs=1 -fi - if test "$enable_dsound_EAX" -eq 1; then if test "$enable_dsound_Fast_Mixer" -gt 1; then abort "Patchset dsound-Fast_Mixer disabled, but dsound-EAX depends on that." @@ -2115,75 +2104,6 @@ if test "$enable_dwrite_FontFallback" -eq 1; then patch_apply dwrite-FontFallback/0006-dwrite-Use-MapCharacters-for-dummy-line-metrics.patch fi -# Patchset ntoskrnl-Stubs -# | -# | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec -# | -if test "$enable_ntoskrnl_Stubs" -eq 1; then - patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch - patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch -fi - -# Patchset winedevice-Default_Drivers -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntoskrnl-Stubs -# | -# | Modified files: -# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c, -# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c, -# | dlls/ntoskrnl.exe/tests/driver.c, dlls/win32k.sys/Makefile.in, dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec, -# | loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles -# | -if test "$enable_winedevice_Default_Drivers" -eq 1; then - patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch -fi - -# Patchset dxdiag-new-dlls -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntoskrnl-Stubs, winedevice-Default_Drivers -# | -# | This patchset fixes the following Wine bugs: -# | * [#50293] : native dxdiag complains about missing -# | -# | Modified files: -# | * configure.ac, dlls/d3dpmesh/Makefile.in, dlls/d3dpmesh/d3dpmesh.spec, dlls/d3dpmesh/version.rc, -# | dlls/diactfrm/Makefile.in, dlls/diactfrm/diactfrm.spec, dlls/diactfrm/version.rc, dlls/dimap/Makefile.in, -# | dlls/dimap/dimap.spec, dlls/dimap/version.rc, dlls/dpmodemx/Makefile.in, dlls/dpmodemx/dpmodemx.spec, -# | dlls/dpmodemx/dpmodemx_main.c, dlls/dpmodemx/version.rc, dlls/dpnhupnp/Makefile.in, dlls/dpnhupnp/dpnhupnp.spec, -# | dlls/dpnhupnp/version.rc, dlls/dpvacm/Makefile.in, dlls/dpvacm/dpvacm.spec, dlls/dpvacm/version.rc, -# | dlls/dpvvox/Makefile.in, dlls/dpvvox/dpvvox.spec, dlls/dpvvox/version.rc, dlls/dsdmoprp/Makefile.in, -# | dlls/dsdmoprp/dsdmoprp.spec, dlls/dsdmoprp/version.rc, dlls/dsound3d/Makefile.in, dlls/dsound3d/dsound3d.spec, -# | dlls/dsound3d/version.rc, dlls/dx7vb/Makefile.in, dlls/dx7vb/dx7vb.spec, dlls/dx7vb/version.rc, -# | dlls/dxapi.sys/Makefile.in, dlls/dxapi.sys/dxapi.sys.spec, dlls/dxapi.sys/version.rc, dlls/encapi/Makefile.in, -# | dlls/encapi/encapi.spec, dlls/encapi/version.rc, dlls/gcdef/Makefile.in, dlls/gcdef/gcdef.spec, dlls/gcdef/version.rc, -# | dlls/qdv/Makefile.in, dlls/qdv/qdv.spec, dlls/qdv/version.rc, dlls/qedwipes/Makefile.in, dlls/qedwipes/qedwipes.spec, -# | dlls/qedwipes/version.rc -# | -if test "$enable_dxdiag_new_dlls" -eq 1; then - patch_apply dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0003-dimap-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0012-encapi-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0014-qdv-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch - patch_apply dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch -fi - # Patchset ntdll-DOS_Attributes # | # | This patchset fixes the following Wine bugs: @@ -3044,6 +2964,16 @@ if test "$enable_ntdll_ext4_case_folder" -eq 1; then patch_apply ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch fi +# Patchset ntoskrnl-Stubs +# | +# | Modified files: +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec +# | +if test "$enable_ntoskrnl_Stubs" -eq 1; then + patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch + patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch +fi + # Patchset nvcuvid-CUDA_Video_Support # | # | This patchset has the following (direct or indirect) dependencies: @@ -4113,6 +4043,24 @@ if test "$enable_winedbg_Process_Arguments" -eq 1; then patch_apply winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch fi +# Patchset winedevice-Default_Drivers +# | +# | This patchset has the following (direct or indirect) dependencies: +# | * ntoskrnl-Stubs +# | +# | Modified files: +# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c, +# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c, +# | dlls/ntoskrnl.exe/tests/driver.c, dlls/win32k.sys/Makefile.in, dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec, +# | loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles +# | +if test "$enable_winedevice_Default_Drivers" -eq 1; then + patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch +fi + # Patchset winemapi-user-xdg-mail # | # | This patchset fixes the following Wine bugs: