From 5cd622f66709850f168d71b4ae8ea40d59527bdc Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 17 Dec 2020 20:36:01 +1100 Subject: [PATCH] Added dxdiag-new-dlls patchset --- .../0001-d3dpmesh-add-stub-dll.patch | 134 +++++++++++++++ .../0002-diactfrm-add-stub-dll.patch | 137 +++++++++++++++ .../0003-dimap-add-stub-dll.patch | 135 +++++++++++++++ .../0004-dpmodemx-add-stub-dll.patch | 135 +++++++++++++++ .../0005-dpnhupnp-add-stub-dll.patch | 139 +++++++++++++++ .../0006-dpvacm-add-stub-dll.patch | 138 +++++++++++++++ .../0007-dpvvox-add-stub-dll.patch | 138 +++++++++++++++ .../0008-dsdmoprp-add-stub-dll.patch | 138 +++++++++++++++ .../0009-dsound3d-add-stub-dll.patch | 135 +++++++++++++++ .../0010-dxapi.sys-add-stub-dll.patch | 161 ++++++++++++++++++ .../0011-dx7vb-add-stub-dll.patch | 138 +++++++++++++++ .../0012-encapi-add-stub-dll.patch | 138 +++++++++++++++ .../0013-gcdef-add-stub-dll.patch | 135 +++++++++++++++ .../0014-qdv-add-stub-dll.patch | 138 +++++++++++++++ .../0015-qedwipes-add-stub-dll.patch | 134 +++++++++++++++ patches/dxdiag-new-dlls/definition | 2 + patches/patchinstall.sh | 124 ++++++++++---- staging/upstream-commit | 2 +- 18 files changed, 2165 insertions(+), 36 deletions(-) create mode 100644 patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch create mode 100644 patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch create 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 new file mode 100644 index 00000000..57d91c7f --- /dev/null +++ b/patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch @@ -0,0 +1,134 @@ +From 484d1c91138f4122cfa56d9e9cad87d17d97d82c 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 | 8 +++++++ + dlls/d3dpmesh/d3dpmesh.spec | 1 + + dlls/d3dpmesh/d3dpmesh_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/d3dpmesh/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 78 insertions(+) + create mode 100644 dlls/d3dpmesh/Makefile.in + create mode 100644 dlls/d3dpmesh/d3dpmesh.spec + create mode 100644 dlls/d3dpmesh/d3dpmesh_main.c + create mode 100644 dlls/d3dpmesh/version.rc + +diff --git a/configure.ac b/configure.ac +index dafa8489b71..0672b0ad816 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3103,6 +3103,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..2a7546832c2 +--- /dev/null ++++ b/dlls/d3dpmesh/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = d3dpmesh.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ d3dpmesh_main.c ++ ++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/d3dpmesh_main.c b/dlls/d3dpmesh/d3dpmesh_main.c +new file mode 100644 +index 00000000000..3d84a693a45 +--- /dev/null ++++ b/dlls/d3dpmesh/d3dpmesh_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(d3dpmesh); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch b/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch new file mode 100644 index 00000000..55677783 --- /dev/null +++ b/patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch @@ -0,0 +1,137 @@ +From 4bf34b5b1a03c6a92211ed5bbb54e6070c28b569 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 | 8 +++++++ + dlls/diactfrm/diactfrm.spec | 4 ++++ + dlls/diactfrm/diactfrm_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/diactfrm/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/diactfrm/Makefile.in + create mode 100644 dlls/diactfrm/diactfrm.spec + create mode 100644 dlls/diactfrm/diactfrm_main.c + create mode 100644 dlls/diactfrm/version.rc + +diff --git a/configure.ac b/configure.ac +index 0672b0ad816..12efadbab64 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3161,6 +3161,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..7d83e518017 +--- /dev/null ++++ b/dlls/diactfrm/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = diactfrm.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ diactfrm_main.c ++ ++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/diactfrm_main.c b/dlls/diactfrm/diactfrm_main.c +new file mode 100644 +index 00000000000..309374507bb +--- /dev/null ++++ b/dlls/diactfrm/diactfrm_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(diactfrm); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch b/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch new file mode 100644 index 00000000..3234bd38 --- /dev/null +++ b/patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch @@ -0,0 +1,135 @@ +From e60fe7940374842cbf933321d10c1b55161b998f 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 | 8 ++++++++ + dlls/dimap/dimap.spec | 2 ++ + dlls/dimap/dimap_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ + dlls/dimap/version.rc | 26 +++++++++++++++++++++++++ + 5 files changed, 79 insertions(+) + create mode 100644 dlls/dimap/Makefile.in + create mode 100644 dlls/dimap/dimap.spec + create mode 100644 dlls/dimap/dimap_main.c + create mode 100644 dlls/dimap/version.rc + +diff --git a/configure.ac b/configure.ac +index 12efadbab64..f2be9e7db7a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3163,6 +3163,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..05030d9cce6 +--- /dev/null ++++ b/dlls/dimap/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dimap.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dimap_main.c ++ ++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/dimap_main.c b/dlls/dimap/dimap_main.c +new file mode 100644 +index 00000000000..0f393dfb243 +--- /dev/null ++++ b/dlls/dimap/dimap_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dimap); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch b/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch new file mode 100644 index 00000000..9491f162 --- /dev/null +++ b/patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch @@ -0,0 +1,135 @@ +From 17b2eb4b74795bb729025f72459697214bfc7a31 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 | 8 +++++++ + dlls/dpmodemx/dpmodemx.spec | 1 + + dlls/dpmodemx/dpmodemx_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/dpmodemx/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 78 insertions(+) + create mode 100644 dlls/dpmodemx/Makefile.in + create mode 100644 dlls/dpmodemx/dpmodemx.spec + create mode 100644 dlls/dpmodemx/dpmodemx_main.c + create mode 100644 dlls/dpmodemx/version.rc + +diff --git a/configure.ac b/configure.ac +index f2be9e7db7a..c6198dd71b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3197,6 +3197,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..e074ca33164 +--- /dev/null ++++ b/dlls/dpmodemx/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dpmodemx.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dpmodemx_main.c ++ ++RC_SRCS = version.rc +diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec +new file mode 100644 +index 00000000000..14fb05053a8 +--- /dev/null ++++ b/dlls/dpmodemx/dpmodemx.spec +@@ -0,0 +1 @@ ++@ stub SPInit +\ No newline at end of file +diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c +new file mode 100644 +index 00000000000..f5d7a8340ca +--- /dev/null ++++ b/dlls/dpmodemx/dpmodemx_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch b/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch new file mode 100644 index 00000000..303132d3 --- /dev/null +++ b/patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch @@ -0,0 +1,139 @@ +From ccab4054c8596d7383904175d6efaad028268cfc 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 | 8 +++++++ + dlls/dpnhupnp/dpnhupnp.spec | 5 +++++ + dlls/dpnhupnp/dpnhupnp_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 82 insertions(+) + create mode 100644 dlls/dpnhupnp/Makefile.in + create mode 100644 dlls/dpnhupnp/dpnhupnp.spec + create mode 100644 dlls/dpnhupnp/dpnhupnp_main.c + create mode 100644 dlls/dpnhupnp/version.rc + +diff --git a/configure.ac b/configure.ac +index c6198dd71b6..d562902f0f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3199,6 +3199,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..7ac77c99471 +--- /dev/null ++++ b/dlls/dpnhupnp/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dpnhupnp.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dpnhupnp_main.c ++ ++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/dpnhupnp_main.c b/dlls/dpnhupnp/dpnhupnp_main.c +new file mode 100644 +index 00000000000..f7b67d6574f +--- /dev/null ++++ b/dlls/dpnhupnp/dpnhupnp_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch b/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch new file mode 100644 index 00000000..fe0657e1 --- /dev/null +++ b/patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch @@ -0,0 +1,138 @@ +From de1a88b3f30897fc1e99476f81d7e3c883d69d09 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 | 1 + + dlls/dpvacm/Makefile.in | 8 ++++++++ + dlls/dpvacm/dpvacm.spec | 4 ++++ + dlls/dpvacm/dpvacm_main.c | 42 +++++++++++++++++++++++++++++++++++++++ + dlls/dpvacm/version.rc | 26 ++++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/dpvacm/Makefile.in + create mode 100644 dlls/dpvacm/dpvacm.spec + create mode 100644 dlls/dpvacm/dpvacm_main.c + create mode 100644 dlls/dpvacm/version.rc + +diff --git a/configure.ac b/configure.ac +index d562902f0f7..814de0cda49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3204,6 +3204,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnet) + WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) + WINE_CONFIG_MAKEFILE(dlls/dpnhpast) + 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..04d8b9b5f80 +--- /dev/null ++++ b/dlls/dpvacm/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dpvacm.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dpvacm_main.c ++ ++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/dpvacm_main.c b/dlls/dpvacm/dpvacm_main.c +new file mode 100644 +index 00000000000..83fd0ab027c +--- /dev/null ++++ b/dlls/dpvacm/dpvacm_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dpvacm); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch b/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch new file mode 100644 index 00000000..e952a373 --- /dev/null +++ b/patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch @@ -0,0 +1,138 @@ +From bfc43910ce09b06ae1618bc6e2cd1af00526d676 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 | 8 ++++++++ + dlls/dpvvox/dpvvox.spec | 4 ++++ + dlls/dpvvox/dpvvox_main.c | 42 +++++++++++++++++++++++++++++++++++++++ + dlls/dpvvox/version.rc | 26 ++++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/dpvvox/Makefile.in + create mode 100644 dlls/dpvvox/dpvvox.spec + create mode 100644 dlls/dpvvox/dpvvox_main.c + create mode 100644 dlls/dpvvox/version.rc + +diff --git a/configure.ac b/configure.ac +index 814de0cda49..e8505848dc3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3207,6 +3207,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..4107042f785 +--- /dev/null ++++ b/dlls/dpvvox/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dpvvox.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dpvvox_main.c ++ ++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/dpvvox_main.c b/dlls/dpvvox/dpvvox_main.c +new file mode 100644 +index 00000000000..8e813cc13d2 +--- /dev/null ++++ b/dlls/dpvvox/dpvvox_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dpvvox); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch b/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch new file mode 100644 index 00000000..c078e2c4 --- /dev/null +++ b/patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch @@ -0,0 +1,138 @@ +From 26163e8bd3dccff151f336e81e620b5898316af7 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 | 8 +++++++ + dlls/dsdmoprp/dsdmoprp.spec | 4 ++++ + dlls/dsdmoprp/dsdmoprp_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/dsdmoprp/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/dsdmoprp/Makefile.in + create mode 100644 dlls/dsdmoprp/dsdmoprp.spec + create mode 100644 dlls/dsdmoprp/dsdmoprp_main.c + create mode 100644 dlls/dsdmoprp/version.rc + +diff --git a/configure.ac b/configure.ac +index e8505848dc3..5305312d2aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3212,6 +3212,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..ca31aa0d359 +--- /dev/null ++++ b/dlls/dsdmoprp/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dsdmoprp.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dsdmoprp_main.c ++ ++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/dsdmoprp_main.c b/dlls/dsdmoprp/dsdmoprp_main.c +new file mode 100644 +index 00000000000..7a547e5d499 +--- /dev/null ++++ b/dlls/dsdmoprp/dsdmoprp_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dsdmoprp); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch b/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch new file mode 100644 index 00000000..80d453fd --- /dev/null +++ b/patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch @@ -0,0 +1,135 @@ +From 0a577ac59e4c1a8dad7ac90374ecf32aabf51057 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 | 8 +++++++ + dlls/dsound3d/dsound3d.spec | 1 + + dlls/dsound3d/dsound3d_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/dsound3d/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 78 insertions(+) + create mode 100644 dlls/dsound3d/Makefile.in + create mode 100644 dlls/dsound3d/dsound3d.spec + create mode 100644 dlls/dsound3d/dsound3d_main.c + create mode 100644 dlls/dsound3d/version.rc + +diff --git a/configure.ac b/configure.ac +index 5305312d2aa..00bb6bdf015 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3215,6 +3215,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..780faeb9f68 +--- /dev/null ++++ b/dlls/dsound3d/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dsound3d.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dsound3d_main.c ++ ++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/dsound3d_main.c b/dlls/dsound3d/dsound3d_main.c +new file mode 100644 +index 00000000000..0bd7ecdfdf2 +--- /dev/null ++++ b/dlls/dsound3d/dsound3d_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dsound3d); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + 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 new file mode 100644 index 00000000..cfbf0075 --- /dev/null +++ b/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch @@ -0,0 +1,161 @@ +From 79a82bb0fba6786ef42d832b6c35c9a74ff4f71e 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 | 8 +++++++ + dlls/dxapi.sys/dxapi.sys.spec | 7 ++++++ + dlls/dxapi.sys/main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/dxapi.sys/version.rc | 26 ++++++++++++++++++++++ + loader/wine.inf.in | 2 ++ + 6 files changed, 86 insertions(+) + create mode 100644 dlls/dxapi.sys/Makefile.in + create mode 100644 dlls/dxapi.sys/dxapi.sys.spec + create mode 100644 dlls/dxapi.sys/main.c + create mode 100644 dlls/dxapi.sys/version.rc + +diff --git a/configure.ac b/configure.ac +index 11c7eb88a00..794e3207517 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/dxapi.sys) + WINE_CONFIG_MAKEFILE(dlls/dx8vb) + WINE_CONFIG_MAKEFILE(dlls/dxdiagn) + WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) +diff --git a/dlls/dxapi.sys/Makefile.in b/dlls/dxapi.sys/Makefile.in +new file mode 100644 +index 00000000000..53df0e25040 +--- /dev/null ++++ b/dlls/dxapi.sys/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dxapi.sys ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ main.c ++ ++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/main.c b/dlls/dxapi.sys/main.c +new file mode 100644 +index 00000000000..be1e04ec188 +--- /dev/null ++++ b/dlls/dxapi.sys/main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dxapi); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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" +diff --git a/loader/wine.inf.in b/loader/wine.inf.in +index 20d5243aa4b..b4052b146b4 100644 +--- a/loader/wine.inf.in ++++ b/loader/wine.inf.in +@@ -2632,6 +2632,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" + 10,syswow64,stdole2.tlb + 11,,iexplore.exe + 11,,winetest.exe,- ++12,,dxapi.sys,- + 12,,dxgkrnl.sys,- + 12,,dxgmms1.sys,- + 12,,fltmgr.sys,- +@@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" + 11,,iexplore.exe + 11,,notepad.exe + 11,,winetest.exe,- ++12,,dxapi.sys,- + 12,,dxgkrnl.sys + 12,,dxgmms1.sys + 12,,fltmgr.sys +-- +2.29.2 + diff --git a/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch b/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch new file mode 100644 index 00000000..7354b866 --- /dev/null +++ b/patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch @@ -0,0 +1,138 @@ +From a4b06309034e08bfe26f0aa28e8317b0187be11f 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 | 8 ++++++++ + dlls/dx7vb/dx7vb.spec | 4 ++++ + dlls/dx7vb/dx7vb_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ + dlls/dx7vb/version.rc | 26 +++++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/dx7vb/Makefile.in + create mode 100644 dlls/dx7vb/dx7vb.spec + create mode 100644 dlls/dx7vb/dx7vb_main.c + create mode 100644 dlls/dx7vb/version.rc + +diff --git a/configure.ac b/configure.ac +index f9e771f4515..32683ac8d61 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3227,6 +3227,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) + WINE_CONFIG_MAKEFILE(dlls/dwrite) + WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) + WINE_CONFIG_MAKEFILE(dlls/dxapi.sys) ++WINE_CONFIG_MAKEFILE(dlls/dx7vb) + WINE_CONFIG_MAKEFILE(dlls/dx8vb) + WINE_CONFIG_MAKEFILE(dlls/dxdiagn) + WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) +diff --git a/dlls/dx7vb/Makefile.in b/dlls/dx7vb/Makefile.in +new file mode 100644 +index 00000000000..b59a24617e6 +--- /dev/null ++++ b/dlls/dx7vb/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = dx7vb.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ dx7vb_main.c ++ ++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/dx7vb_main.c b/dlls/dx7vb/dx7vb_main.c +new file mode 100644 +index 00000000000..b985f8bd583 +--- /dev/null ++++ b/dlls/dx7vb/dx7vb_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(dx7vb); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch b/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch new file mode 100644 index 00000000..e0075768 --- /dev/null +++ b/patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch @@ -0,0 +1,138 @@ +From 317a6a2e7a0bae37645cb6da6c76f6c8c428da3e 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 | 8 ++++++++ + dlls/encapi/encapi.spec | 4 ++++ + dlls/encapi/encapi_main.c | 42 +++++++++++++++++++++++++++++++++++++++ + dlls/encapi/version.rc | 26 ++++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/encapi/Makefile.in + create mode 100644 dlls/encapi/encapi.spec + create mode 100644 dlls/encapi/encapi_main.c + create mode 100644 dlls/encapi/version.rc + +diff --git a/configure.ac b/configure.ac +index 32683ac8d61..5ca4d461a29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3238,6 +3238,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) + 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..3f305c76e04 +--- /dev/null ++++ b/dlls/encapi/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = encapi.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ encapi_main.c ++ ++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/encapi_main.c b/dlls/encapi/encapi_main.c +new file mode 100644 +index 00000000000..ac16fb3c8e9 +--- /dev/null ++++ b/dlls/encapi/encapi_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(encapi); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch b/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch new file mode 100644 index 00000000..5ffbf1a7 --- /dev/null +++ b/patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch @@ -0,0 +1,135 @@ +From 69a91bc75c9ca7f02008a9a292b55c6b4f4ff503 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 | 8 ++++++++ + dlls/gcdef/gcdef.spec | 2 ++ + dlls/gcdef/gcdef_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ + dlls/gcdef/version.rc | 26 +++++++++++++++++++++++++ + 5 files changed, 79 insertions(+) + create mode 100644 dlls/gcdef/Makefile.in + create mode 100644 dlls/gcdef/gcdef.spec + create mode 100644 dlls/gcdef/gcdef_main.c + create mode 100644 dlls/gcdef/version.rc + +diff --git a/configure.ac b/configure.ac +index 5ca4d461a29..c1d9a23e889 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3308,6 +3308,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..754199cfda3 +--- /dev/null ++++ b/dlls/gcdef/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = gcdef.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ gcdef_main.c ++ ++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/gcdef_main.c b/dlls/gcdef/gcdef_main.c +new file mode 100644 +index 00000000000..0c1758db31f +--- /dev/null ++++ b/dlls/gcdef/gcdef_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(gcdef); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch b/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch new file mode 100644 index 00000000..e0d15502 --- /dev/null +++ b/patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch @@ -0,0 +1,138 @@ +From 5fcbf47b73bc1fddf7141a9fe01dd727f4df56ff 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 | 8 ++++++++ + dlls/qdv/qdv.spec | 4 ++++ + dlls/qdv/qdv_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + dlls/qdv/version.rc | 26 ++++++++++++++++++++++++++ + 5 files changed, 81 insertions(+) + create mode 100644 dlls/qdv/Makefile.in + create mode 100644 dlls/qdv/qdv.spec + create mode 100644 dlls/qdv/qdv_main.c + create mode 100644 dlls/qdv/version.rc + +diff --git a/configure.ac b/configure.ac +index c1d9a23e889..2bb8c05cbcb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3604,6 +3604,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..23445040599 +--- /dev/null ++++ b/dlls/qdv/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = qdv.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ qdv_main.c ++ ++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/qdv_main.c b/dlls/qdv/qdv_main.c +new file mode 100644 +index 00000000000..074230acf59 +--- /dev/null ++++ b/dlls/qdv/qdv_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(qdv); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch b/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch new file mode 100644 index 00000000..c366f621 --- /dev/null +++ b/patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch @@ -0,0 +1,134 @@ +From 523924d5353b9616dabb3ba0614f0b60d6e7012a 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 | 8 +++++++ + dlls/qedwipes/qedwipes.spec | 1 + + dlls/qedwipes/qedwipes_main.c | 42 +++++++++++++++++++++++++++++++++++ + dlls/qedwipes/version.rc | 26 ++++++++++++++++++++++ + 5 files changed, 78 insertions(+) + create mode 100644 dlls/qedwipes/Makefile.in + create mode 100644 dlls/qedwipes/qedwipes.spec + create mode 100644 dlls/qedwipes/qedwipes_main.c + create mode 100644 dlls/qedwipes/version.rc + +diff --git a/configure.ac b/configure.ac +index 2bb8c05cbcb..9b9c9bcec7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3609,6 +3609,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..eff4ffbc813 +--- /dev/null ++++ b/dlls/qedwipes/Makefile.in +@@ -0,0 +1,8 @@ ++MODULE = qedwipes.dll ++ ++EXTRADLLFLAGS = -mno-cygwin ++ ++C_SRCS = \ ++ qedwipes_main.c ++ ++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/qedwipes_main.c b/dlls/qedwipes/qedwipes_main.c +new file mode 100644 +index 00000000000..5085213e24f +--- /dev/null ++++ b/dlls/qedwipes/qedwipes_main.c +@@ -0,0 +1,42 @@ ++/* ++ * ++ * 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" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(qedwipes); ++ ++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ++{ ++ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ ++ switch (reason) ++ { ++ case DLL_WINE_PREATTACH: ++ return FALSE; /* prefer native version */ ++ case DLL_PROCESS_ATTACH: ++ DisableThreadLibraryCalls(instance); ++ break; ++ } ++ ++ return TRUE; ++} +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.29.2 + diff --git a/patches/dxdiag-new-dlls/definition b/patches/dxdiag-new-dlls/definition new file mode 100644 index 00000000..e242eba1 --- /dev/null +++ b/patches/dxdiag-new-dlls/definition @@ -0,0 +1,2 @@ +Fixes: [50293]: native dxdiag complains about missing +Depends: winedevice-Default_Drivers diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7cf78e8f..f7d2dca1 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -123,6 +123,7 @@ 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" @@ -454,6 +455,9 @@ patch_enable () dwrite-FontFallback) enable_dwrite_FontFallback="$2" ;; + dxdiag-new-dlls) + enable_dxdiag_new_dlls="$2" + ;; eventfd_synchronization) enable_eventfd_synchronization="$2" ;; @@ -1414,13 +1418,6 @@ 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." @@ -1646,6 +1643,20 @@ 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." @@ -2361,6 +2372,77 @@ 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/d3dpmesh_main.c, +# | dlls/d3dpmesh/version.rc, dlls/diactfrm/Makefile.in, dlls/diactfrm/diactfrm.spec, dlls/diactfrm/diactfrm_main.c, +# | dlls/diactfrm/version.rc, dlls/dimap/Makefile.in, dlls/dimap/dimap.spec, dlls/dimap/dimap_main.c, 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/dpnhupnp_main.c, dlls/dpnhupnp/version.rc, +# | dlls/dpvacm/Makefile.in, dlls/dpvacm/dpvacm.spec, dlls/dpvacm/dpvacm_main.c, dlls/dpvacm/version.rc, +# | dlls/dpvvox/Makefile.in, dlls/dpvvox/dpvvox.spec, dlls/dpvvox/dpvvox_main.c, dlls/dpvvox/version.rc, +# | dlls/dsdmoprp/Makefile.in, dlls/dsdmoprp/dsdmoprp.spec, dlls/dsdmoprp/dsdmoprp_main.c, dlls/dsdmoprp/version.rc, +# | dlls/dsound3d/Makefile.in, dlls/dsound3d/dsound3d.spec, dlls/dsound3d/dsound3d_main.c, dlls/dsound3d/version.rc, +# | dlls/dx7vb/Makefile.in, dlls/dx7vb/dx7vb.spec, dlls/dx7vb/dx7vb_main.c, dlls/dx7vb/version.rc, +# | dlls/dxapi.sys/Makefile.in, dlls/dxapi.sys/dxapi.sys.spec, dlls/dxapi.sys/main.c, dlls/dxapi.sys/version.rc, +# | dlls/encapi/Makefile.in, dlls/encapi/encapi.spec, dlls/encapi/encapi_main.c, dlls/encapi/version.rc, +# | dlls/gcdef/Makefile.in, dlls/gcdef/gcdef.spec, dlls/gcdef/gcdef_main.c, dlls/gcdef/version.rc, dlls/qdv/Makefile.in, +# | dlls/qdv/qdv.spec, dlls/qdv/qdv_main.c, dlls/qdv/version.rc, dlls/qedwipes/Makefile.in, dlls/qedwipes/qedwipes.spec, +# | dlls/qedwipes/qedwipes_main.c, dlls/qedwipes/version.rc, loader/wine.inf.in +# | +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 +fi + # Patchset ntdll-DOS_Attributes # | # | This patchset fixes the following Wine bugs: @@ -3371,16 +3453,6 @@ if test "$enable_ntdll_x86_64_SegDs" -eq 1; then patch_apply ntdll-x86_64_SegDs/0001-ntdll-Report-SegDs-to-be-identical-to-SegSs-on-x86_6.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: @@ -4714,24 +4786,6 @@ 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: diff --git a/staging/upstream-commit b/staging/upstream-commit index 6070afd0..92b06b54 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -04ddabfdff644561adf0e36050db1bbc63cad83a +ef876fc54e207344b5809f40a59e3d5d610a6fda