wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b8719736c5a022fa9c50f64adfc3ef58b40460f2.

Browse Source
This commit is contained in:
Zebediah Figura
2021-02-18 20:16:43 -06:00
parent 811467bf6a
commit aa8a3d90cb
33 changed files with 301 additions and 3157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch
View File

@ -1,4 +1,4 @@
From 5706ea39b9a1074431d13e4c7354e0432af819a3 Mon Sep 17 00:00:00 2001
From 43cd59c9043af0c515b558c8dfeafdcabb93215c Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Thu, 4 Apr 2019 02:25:00 +0300
Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
@ -11,10 +11,10 @@ Signed-off-by: Paul Gofman <gofmanp@gmail.com>
2 files changed, 141 insertions(+), 7 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 5bd5b2c7091..010fed30396 100644
index 33066329407..11a881522d9 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4776,7 +4776,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
@@ -4775,7 +4775,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
struct wined3d_texture *wined3d_texture = NULL;
@ -24,7 +24,7 @@ index 5bd5b2c7091..010fed30396 100644
if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
wined3d_texture = surf->wined3d_texture;
@@ -4812,19 +4813,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
@@ -4811,19 +4812,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
@ -59,10 +59,10 @@ index 5bd5b2c7091..010fed30396 100644
static const struct tss_lookup
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index d438132764f..1c6c227cc6b 100644
index 6e003fbfb7e..30f2282c12c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -359,7 +359,7 @@ static IDirectDraw4 *create_ddraw(void)
@@ -427,7 +427,7 @@ static IDirectDraw4 *create_ddraw(void)
return ddraw4;
}
@ -71,7 +71,7 @@ index d438132764f..1c6c227cc6b 100644
{
IDirectDrawSurface4 *surface, *ds;
IDirect3DDevice3 *device = NULL;
@@ -379,6 +379,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
@@ -447,6 +447,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
surface_desc.dwSize = sizeof(surface_desc);
surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
@ -80,7 +80,7 @@ index d438132764f..1c6c227cc6b 100644
surface_desc.dwWidth = 640;
surface_desc.dwHeight = 480;
@@ -407,7 +409,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
@@ -475,7 +477,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
}
memset(&z_fmt, 0, sizeof(z_fmt));
@ -90,7 +90,7 @@ index d438132764f..1c6c227cc6b 100644
if (FAILED(hr) || !z_fmt.dwSize)
{
IDirect3D3_Release(d3d3);
@@ -419,6 +422,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
@@ -487,6 +490,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
surface_desc.dwSize = sizeof(surface_desc);
surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
@ -99,7 +99,7 @@ index d438132764f..1c6c227cc6b 100644
U4(surface_desc).ddpfPixelFormat = z_fmt;
surface_desc.dwWidth = 640;
surface_desc.dwHeight = 480;
@@ -441,7 +446,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
@@ -509,7 +514,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
return NULL;
}
@ -109,7 +109,7 @@ index d438132764f..1c6c227cc6b 100644
IDirect3D3_Release(d3d3);
IDirectDrawSurface4_Release(surface);
if (FAILED(hr))
@@ -450,6 +456,11 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
@@ -518,6 +524,11 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
return device;
}
@ -121,8 +121,8 @@ index d438132764f..1c6c227cc6b 100644
static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
{
IDirect3DViewport3 *viewport;
@@ -17867,6 +17878,116 @@ done:
IDirectDraw4_Release(ddraw);
@@ -18331,6 +18342,116 @@ static void run_for_each_device_type(void (*test_func)(const GUID *))
test_func(&IID_IDirect3DRGBDevice);
}
+static void test_texture_wrong_caps_(BOOL software)
@ -238,7 +238,7 @@ index d438132764f..1c6c227cc6b 100644
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -17999,6 +18120,7 @@ START_TEST(ddraw4)
@@ -18463,6 +18584,7 @@ START_TEST(ddraw4)
test_gdi_surface();
test_alphatest();
test_clipper_refcount();
@ -247,5 +247,5 @@ index d438132764f..1c6c227cc6b 100644
test_d32_support();
test_surface_format_conversion_alpha();
--
2.28.0
2.20.1

76
patches/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 484d1c91138f4122cfa56d9e9cad87d17d97d82c Mon Sep 17 00:00:00 2001
From ea0fedf84c544522583b39bdd78a30b2d7a52a41 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:41:57 -0500
Subject: [PATCH] d3dpmesh: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/d3dpmesh_main.c
create mode 100644 dlls/d3dpmesh/version.rc
diff --git a/configure.ac b/configure.ac
index dafa8489b71..0672b0ad816 100644
index c80e2691f65..25e1ef17993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3103,6 +3103,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47)
@@ -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)
@ -30,16 +28,14 @@ index dafa8489b71..0672b0ad816 100644
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
index 00000000000..334dacd1090
--- /dev/null
+++ b/dlls/d3dpmesh/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = d3dpmesh.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ d3dpmesh_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/d3dpmesh/d3dpmesh.spec b/dlls/d3dpmesh/d3dpmesh.spec
@ -49,54 +45,6 @@ index 00000000000..d4b9a46bd7a
+++ 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 <stdarg.h>
+
+#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
@ -130,5 +78,5 @@ index 00000000000..87e601a95a7
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 4bf34b5b1a03c6a92211ed5bbb54e6070c28b569 Mon Sep 17 00:00:00 2001
From 08a6b78031ae7b2b9fb042c3d411d4366a19d81c Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:43:09 -0500
Subject: [PATCH] diactfrm: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/diactfrm_main.c
create mode 100644 dlls/diactfrm/version.rc
diff --git a/configure.ac b/configure.ac
index 0672b0ad816..12efadbab64 100644
index 25e1ef17993..8a7a58d413e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3161,6 +3161,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum/tests)
@@ -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)
@ -30,16 +28,14 @@ index 0672b0ad816..12efadbab64 100644
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
index 00000000000..9f6ec3cd702
--- /dev/null
+++ b/dlls/diactfrm/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = diactfrm.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ diactfrm_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/diactfrm/diactfrm.spec b/dlls/diactfrm/diactfrm.spec
@ -52,54 +48,6 @@ index 00000000000..c5fc87af6d5
+@ 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 <stdarg.h>
+
+#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
@ -133,5 +81,5 @@ index 00000000000..b6b6692b831
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From e60fe7940374842cbf933321d10c1b55161b998f Mon Sep 17 00:00:00 2001
From 04da45fd650835f28b16c19942e547482b4375e7 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:43:19 -0500
Subject: [PATCH] dimap: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dimap_main.c
create mode 100644 dlls/dimap/version.rc
diff --git a/configure.ac b/configure.ac
index 12efadbab64..f2be9e7db7a 100644
index 8a7a58d413e..8dcc30dc4d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3163,6 +3163,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests)
@@ -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)
@ -30,16 +28,14 @@ index 12efadbab64..f2be9e7db7a 100644
WINE_CONFIG_MAKEFILE(dlls/dinput8)
diff --git a/dlls/dimap/Makefile.in b/dlls/dimap/Makefile.in
new file mode 100644
index 00000000000..05030d9cce6
index 00000000000..36c2c363c04
--- /dev/null
+++ b/dlls/dimap/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dimap.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dimap_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dimap/dimap.spec b/dlls/dimap/dimap.spec
@ -50,54 +46,6 @@ index 00000000000..cacaa27a2ca
@@ -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 <stdarg.h>
+
+#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
@ -131,5 +79,5 @@ index 00000000000..d0341dfcb77
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 17b2eb4b74795bb729025f72459697214bfc7a31 Mon Sep 17 00:00:00 2001
From 1772676c96491d8e5a2c4d8cd43c12196b972bc5 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:02 -0500
Subject: [PATCH] dpmodemx: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dpmodemx_main.c
create mode 100644 dlls/dpmodemx/version.rc
diff --git a/configure.ac b/configure.ac
index f2be9e7db7a..c6198dd71b6 100644
index 8dcc30dc4d5..ef321dd2292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3197,6 +3197,7 @@ WINE_CONFIG_MAKEFILE(dlls/dnsapi/tests)
@@ -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)
@ -30,16 +28,14 @@ index f2be9e7db7a..c6198dd71b6 100644
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
index 00000000000..c15b7a33112
--- /dev/null
+++ b/dlls/dpmodemx/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dpmodemx.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dpmodemx_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec
@ -50,54 +46,6 @@ index 00000000000..14fb05053a8
@@ -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 <stdarg.h>
+
+#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
@ -131,5 +79,5 @@ index 00000000000..b0c644aed83
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From ccab4054c8596d7383904175d6efaad028268cfc Mon Sep 17 00:00:00 2001
From 22b5e83162157f99cc7c114defc08c27053b6868 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:43:44 -0500
Subject: [PATCH] dpnhupnp: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dpnhupnp_main.c
create mode 100644 dlls/dpnhupnp/version.rc
diff --git a/configure.ac b/configure.ac
index c6198dd71b6..d562902f0f7 100644
index ef321dd2292..8494354b561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3199,6 +3199,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplayx)
@@ -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)
@ -30,16 +28,14 @@ index c6198dd71b6..d562902f0f7 100644
WINE_CONFIG_MAKEFILE(dlls/dpnhpast)
diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in
new file mode 100644
index 00000000000..7ac77c99471
index 00000000000..566ce038f82
--- /dev/null
+++ b/dlls/dpnhupnp/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dpnhupnp.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dpnhupnp_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec
@ -54,54 +50,6 @@ index 00000000000..acc698e99ab
+@ 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 <stdarg.h>
+
+#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
@ -135,5 +83,5 @@ index 00000000000..21633a49815
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

82
patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch
View File

@ -1,28 +1,32 @@
From de1a88b3f30897fc1e99476f81d7e3c883d69d09 Mon Sep 17 00:00:00 2001
From f9a068def176011ec42e84d370e1708e70de2e2a Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:02 -0500
Subject: [PATCH] dpvacm: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dpvacm_main.c
create mode 100644 dlls/dpvacm/version.rc
diff --git a/configure.ac b/configure.ac
index d562902f0f7..814de0cda49 100644
index 8494354b561..749781df38a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3204,6 +3204,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnet)
@@ -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)
@ -30,16 +34,14 @@ index d562902f0f7..814de0cda49 100644
WINE_CONFIG_MAKEFILE(dlls/dpwsockx)
diff --git a/dlls/dpvacm/Makefile.in b/dlls/dpvacm/Makefile.in
new file mode 100644
index 00000000000..04d8b9b5f80
index 00000000000..e9fcafcfc7a
--- /dev/null
+++ b/dlls/dpvacm/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dpvacm.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dpvacm_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dpvacm/dpvacm.spec b/dlls/dpvacm/dpvacm.spec
@ -53,54 +55,6 @@ index 00000000000..fc4ae4a44c0
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +88,5 @@ index 00000000000..7c463bca22e
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From bfc43910ce09b06ae1618bc6e2cd1af00526d676 Mon Sep 17 00:00:00 2001
From 98be083cb6866286bcb73d23f7ed1ac13da857e7 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:02 -0500
Subject: [PATCH] dpvvox: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dpvvox_main.c
create mode 100644 dlls/dpvvox/version.rc
diff --git a/configure.ac b/configure.ac
index 814de0cda49..e8505848dc3 100644
index 749781df38a..ec12df76214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3207,6 +3207,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnlobby)
@@ -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)
@ -30,16 +28,14 @@ index 814de0cda49..e8505848dc3 100644
WINE_CONFIG_MAKEFILE(dlls/dsdmo)
diff --git a/dlls/dpvvox/Makefile.in b/dlls/dpvvox/Makefile.in
new file mode 100644
index 00000000000..4107042f785
index 00000000000..76c1312e680
--- /dev/null
+++ b/dlls/dpvvox/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dpvvox.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dpvvox_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dpvvox/dpvvox.spec b/dlls/dpvvox/dpvvox.spec
@ -53,54 +49,6 @@ index 00000000000..fc4ae4a44c0
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +82,5 @@ index 00000000000..d4e3a34c0a8
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 26163e8bd3dccff151f336e81e620b5898316af7 Mon Sep 17 00:00:00 2001
From 2b847764d114860d9f68eaf0f1c34cddf5bbc5ee Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:44:22 -0500
Subject: [PATCH] dsdmoprp: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dsdmoprp_main.c
create mode 100644 dlls/dsdmoprp/version.rc
diff --git a/configure.ac b/configure.ac
index e8505848dc3..5305312d2aa 100644
index ec12df76214..b69929b6271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3212,6 +3212,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpwsockx)
@@ -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)
@ -30,16 +28,14 @@ index e8505848dc3..5305312d2aa 100644
WINE_CONFIG_MAKEFILE(dlls/dsquery)
diff --git a/dlls/dsdmoprp/Makefile.in b/dlls/dsdmoprp/Makefile.in
new file mode 100644
index 00000000000..ca31aa0d359
index 00000000000..b3fcb8c3398
--- /dev/null
+++ b/dlls/dsdmoprp/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dsdmoprp.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dsdmoprp_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dsdmoprp/dsdmoprp.spec b/dlls/dsdmoprp/dsdmoprp.spec
@ -53,54 +49,6 @@ index 00000000000..a043605127d
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +82,5 @@ index 00000000000..9a2ca3e1c54
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 0a577ac59e4c1a8dad7ac90374ecf32aabf51057 Mon Sep 17 00:00:00 2001
From 852f2fbdbf1d2615a5fdf95f2cee131b4699c291 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:03 -0500
Subject: [PATCH] dsound3d: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dsound3d_main.c
create mode 100644 dlls/dsound3d/version.rc
diff --git a/configure.ac b/configure.ac
index 5305312d2aa..00bb6bdf015 100644
index b69929b6271..da6ada3013b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3215,6 +3215,7 @@ WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests)
@@ -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)
@ -30,16 +28,14 @@ index 5305312d2aa..00bb6bdf015 100644
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
index 00000000000..f94afbee5b0
--- /dev/null
+++ b/dlls/dsound3d/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dsound3d.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dsound3d_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dsound3d/dsound3d.spec b/dlls/dsound3d/dsound3d.spec
@ -50,54 +46,6 @@ index 00000000000..9859c231f25
@@ -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 <stdarg.h>
+
+#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
@ -131,5 +79,5 @@ index 00000000000..77dea7a2f70
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

78
patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 79a82bb0fba6786ef42d832b6c35c9a74ff4f71e Mon Sep 17 00:00:00 2001
From c4e663329366c37bca65a0beb83d656afea45ecc Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:03 -0500
Subject: [PATCH] dxapi.sys: add stub dll
@ -6,41 +6,37 @@ Subject: [PATCH] dxapi.sys: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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 ++++++++++++++++++++++
dlls/dxapi.sys/Makefile.in | 6 ++++++
dlls/dxapi.sys/dxapi.sys.spec | 7 +++++++
dlls/dxapi.sys/version.rc | 26 ++++++++++++++++++++++++++
loader/wine.inf.in | 2 ++
6 files changed, 86 insertions(+)
5 files changed, 42 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
index da6ada3013b..47e8427f6b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi)
WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
@@ -3248,6 +3248,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/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..53df0e25040
index 00000000000..43259f950b5
--- /dev/null
+++ b/dlls/dxapi.sys/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dxapi.sys
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dxapi.sys/dxapi.sys.spec b/dlls/dxapi.sys/dxapi.sys.spec
@ -56,54 +52,6 @@ index 00000000000..05748b5fe59
+@ 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 <stdarg.h>
+
+#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
@ -157,5 +105,5 @@ index 20d5243aa4b..b4052b146b4 100644
12,,dxgmms1.sys
12,,fltmgr.sys
--
2.29.2
2.20.1

80
patches/dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch
View File

@ -1,45 +1,41 @@
From a4b06309034e08bfe26f0aa28e8317b0187be11f Mon Sep 17 00:00:00 2001
From 2703aa7a1e1d811924a8fa59fbdf88f44e4ff035 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:03 -0500
Subject: [PATCH] dx7vb: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/dx7vb_main.c
create mode 100644 dlls/dx7vb/version.rc
diff --git a/configure.ac b/configure.ac
index f9e771f4515..32683ac8d61 100644
index 47e8427f6b8..44021303331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3227,6 +3227,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
@@ -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/dx7vb)
WINE_CONFIG_MAKEFILE(dlls/dx8vb)
WINE_CONFIG_MAKEFILE(dlls/dxapi.sys)
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
index 00000000000..104343c9388
--- /dev/null
+++ b/dlls/dx7vb/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = dx7vb.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ dx7vb_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/dx7vb/dx7vb.spec b/dlls/dx7vb/dx7vb.spec
@ -53,54 +49,6 @@ index 00000000000..a043605127d
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +82,5 @@ index 00000000000..c401dfb471d
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0012-encapi-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 317a6a2e7a0bae37645cb6da6c76f6c8c428da3e Mon Sep 17 00:00:00 2001
From 962ea5ce308538f8a208646fc61fa8f95b199b98 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:04 -0500
Subject: [PATCH] encapi: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/encapi_main.c
create mode 100644 dlls/encapi/version.rc
diff --git a/configure.ac b/configure.ac
index 32683ac8d61..5ca4d461a29 100644
index 44021303331..6d3f37c6905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3238,6 +3238,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
@@ -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)
@ -30,16 +28,14 @@ index 32683ac8d61..5ca4d461a29 100644
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
index 00000000000..457b9d64d1f
--- /dev/null
+++ b/dlls/encapi/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = encapi.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ encapi_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/encapi/encapi.spec b/dlls/encapi/encapi.spec
@ -53,54 +49,6 @@ index 00000000000..a043605127d
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +82,5 @@ index 00000000000..8f10a2c6ce6
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 69a91bc75c9ca7f02008a9a292b55c6b4f4ff503 Mon Sep 17 00:00:00 2001
From 6d1a2eb383f00334e74a283cc11aeee338946734 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:08 -0500
Subject: [PATCH] gcdef: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/gcdef_main.c
create mode 100644 dlls/gcdef/version.rc
diff --git a/configure.ac b/configure.ac
index 5ca4d461a29..c1d9a23e889 100644
index 6d3f37c6905..db94b38dcac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3308,6 +3308,7 @@ WINE_CONFIG_MAKEFILE(dlls/fusion/tests)
@@ -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)
@ -30,16 +28,14 @@ index 5ca4d461a29..c1d9a23e889 100644
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
index 00000000000..162b49d70f8
--- /dev/null
+++ b/dlls/gcdef/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = gcdef.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ gcdef_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/gcdef/gcdef.spec b/dlls/gcdef/gcdef.spec
@ -50,54 +46,6 @@ index 00000000000..cacaa27a2ca
@@ -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 <stdarg.h>
+
+#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
@ -131,5 +79,5 @@ index 00000000000..c71136be6e1
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

70
patches/dxdiag-new-dlls/0014-qdv-add-stub-dll.patch
View File

@ -1,4 +1,4 @@
From 5fcbf47b73bc1fddf7141a9fe01dd727f4df56ff Mon Sep 17 00:00:00 2001
From 905724311a9d542122f41ef1eb0b1b98ef0c6897 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:23 -0500
Subject: [PATCH] qdv: add stub dll
@ -6,21 +6,19 @@ Subject: [PATCH] qdv: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
configure.ac | 1 +
dlls/qdv/Makefile.in | 8 ++++++++
dlls/qdv/Makefile.in | 6 ++++++
dlls/qdv/qdv.spec | 4 ++++
dlls/qdv/qdv_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++
dlls/qdv/version.rc | 26 ++++++++++++++++++++++++++
5 files changed, 81 insertions(+)
4 files changed, 37 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
index db94b38dcac..8e493b3e44b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3604,6 +3604,7 @@ WINE_CONFIG_MAKEFILE(dlls/qasf)
@@ -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)
@ -30,16 +28,14 @@ index c1d9a23e889..2bb8c05cbcb 100644
WINE_CONFIG_MAKEFILE(dlls/qedit)
diff --git a/dlls/qdv/Makefile.in b/dlls/qdv/Makefile.in
new file mode 100644
index 00000000000..23445040599
index 00000000000..487b9b8f881
--- /dev/null
+++ b/dlls/qdv/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = qdv.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ qdv_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/qdv/qdv.spec b/dlls/qdv/qdv.spec
@ -53,54 +49,6 @@ index 00000000000..a043605127d
+@ 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 <stdarg.h>
+
+#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
@ -134,5 +82,5 @@ index 00000000000..6cf198362a8
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

76
patches/dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch
View File

@ -1,26 +1,24 @@
From 523924d5353b9616dabb3ba0614f0b60d6e7012a Mon Sep 17 00:00:00 2001
From be28c9d2dd113810b120725640879f5d3e8831bb Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 13 Oct 2020 04:42:24 -0500
Subject: [PATCH] qedwipes: add stub dll
Signed-off-by: Austin English <austinenglish@gmail.com>
---
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(+)
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/qedwipes_main.c
create mode 100644 dlls/qedwipes/version.rc
diff --git a/configure.ac b/configure.ac
index 2bb8c05cbcb..9b9c9bcec7d 100644
index 8e493b3e44b..3907082c38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3609,6 +3609,7 @@ WINE_CONFIG_MAKEFILE(dlls/qdvd)
@@ -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)
@ -30,16 +28,14 @@ index 2bb8c05cbcb..9b9c9bcec7d 100644
WINE_CONFIG_MAKEFILE(dlls/qmgrprxy)
diff --git a/dlls/qedwipes/Makefile.in b/dlls/qedwipes/Makefile.in
new file mode 100644
index 00000000000..eff4ffbc813
index 00000000000..0e2223ad4b1
--- /dev/null
+++ b/dlls/qedwipes/Makefile.in
@@ -0,0 +1,8 @@
@@ -0,0 +1,6 @@
+MODULE = qedwipes.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -Wb,--prefer-native
+
+C_SRCS = \
+ qedwipes_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/qedwipes/qedwipes.spec b/dlls/qedwipes/qedwipes.spec
@ -49,54 +45,6 @@ index 00000000000..3a8a8ea0098
+++ 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 <stdarg.h>
+
+#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
@ -130,5 +78,5 @@ index 00000000000..ce865c2b96f
+
+#include "wine/wine_common_ver.rc"
--
2.29.2
2.20.1

71
patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch
View File

@ -1,13 +1,30 @@
From a615211907b65642807cdad546a0eaf12e39f43c Mon Sep 17 00:00:00 2001
From 6fe8944830f612188c670f2c5d5f26c8fd572ca2 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sun, 27 Dec 2020 09:57:46 +1100
Subject: [PATCH] dpmodemx: Add stub SPInit
---
dlls/dpmodemx/dpmodemx.spec | 2 +-
dlls/dpmodemx/dpmodemx_main.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
dlls/dpmodemx/Makefile.in | 5 ++++-
dlls/dpmodemx/dpmodemx.spec | 2 +-
dlls/dpmodemx/dpmodemx_main.c | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 40 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 14fb05053a8..e3beb3f8cc7 100644
--- a/dlls/dpmodemx/dpmodemx.spec
@ -18,28 +35,46 @@ index 14fb05053a8..e3beb3f8cc7 100644
+@ stdcall SPInit(ptr)
\ No newline at end of file
diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c
index f5d7a8340ca..5d322783b40 100644
--- a/dlls/dpmodemx/dpmodemx_main.c
new file mode 100644
index 00000000000..d87be210165
--- /dev/null
+++ b/dlls/dpmodemx/dpmodemx_main.c
@@ -23,6 +23,8 @@
#include "winbase.h"
#include "wine/debug.h"
@@ -0,0 +1,35 @@
+/*
+ *
+ * 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 <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+#include "wine/dplaysp.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx);
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
@@ -40,3 +42,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
return TRUE;
}
+WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx);
+
+HRESULT WINAPI SPInit( LPSPINITDATA lpspData )
+{
+ FIXME("Currently not implemented.\n");
+ return DPERR_UNAVAILABLE;
+}
+
--
2.29.2
2.20.1

48
patches/ntdll-NtAlertThreadByThreadId/0013-ntdll-Reimplement-SRW-locks-on-top-of-Win32-futexes.patch
View File

@ -1,4 +1,4 @@
From 9f1b410e28ff85e4b7f6a36539e159f913c0ff05 Mon Sep 17 00:00:00 2001
From 328517d4516b3767ff21c6ffe4f45b29989edfea Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sun, 22 Nov 2020 20:51:10 -0600
Subject: [PATCH] ntdll: Reimplement SRW locks on top of Win32 futexes.
@ -13,10 +13,10 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
5 files changed, 141 insertions(+), 502 deletions(-)
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 42b62a2cd87..d4944951dc6 100644
index 225216cbe2a..950a5047752 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -161,127 +161,23 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu
@@ -160,127 +160,23 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu
return RtlRunOnceComplete( once, 0, context ? *context : NULL );
}
@ -159,7 +159,7 @@ index 42b62a2cd87..d4944951dc6 100644
/***********************************************************************
* RtlInitializeSRWLock (NTDLL.@)
@@ -308,11 +204,36 @@ void WINAPI RtlInitializeSRWLock( RTL_SRWLOCK *lock )
@@ -307,11 +203,36 @@ void WINAPI RtlInitializeSRWLock( RTL_SRWLOCK *lock )
*/
void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
{
@ -200,7 +200,7 @@ index 42b62a2cd87..d4944951dc6 100644
}
/***********************************************************************
@@ -324,34 +245,34 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
@@ -323,34 +244,34 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
*/
void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock )
{
@ -259,7 +259,7 @@ index 42b62a2cd87..d4944951dc6 100644
}
/***********************************************************************
@@ -359,11 +280,23 @@ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock )
@@ -358,11 +279,23 @@ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock )
*/
void WINAPI RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock )
{
@ -287,7 +287,7 @@ index 42b62a2cd87..d4944951dc6 100644
}
/***********************************************************************
@@ -371,11 +304,22 @@ void WINAPI RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock )
@@ -370,11 +303,22 @@ void WINAPI RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock )
*/
void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock )
{
@ -314,7 +314,7 @@ index 42b62a2cd87..d4944951dc6 100644
}
/***********************************************************************
@@ -387,13 +331,28 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock )
@@ -386,13 +330,28 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock )
*/
BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
{
@ -348,7 +348,7 @@ index 42b62a2cd87..d4944951dc6 100644
}
/***********************************************************************
@@ -401,20 +360,29 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
@@ -400,20 +359,29 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock )
*/
BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock )
{
@ -391,10 +391,10 @@ index 42b62a2cd87..d4944951dc6 100644
/***********************************************************************
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index d5e8153b313..05a45916714 100644
index f161040ff43..8e5e8410d1c 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1584,12 +1584,6 @@ static struct unix_funcs unix_funcs =
@@ -1595,12 +1595,6 @@ static struct unix_funcs unix_funcs =
#endif
DbgUiIssueRemoteBreakin,
RtlGetSystemTimePrecise,
@ -408,10 +408,10 @@ index d5e8153b313..05a45916714 100644
ntdll_ceil,
ntdll_cos,
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 68c2e560938..baa1ab0e786 100644
index d4092438644..b67f5fc8f10 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -115,8 +115,6 @@ static inline ULONGLONG monotonic_counter(void)
@@ -114,8 +114,6 @@ static inline ULONGLONG monotonic_counter(void)
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1
@ -420,7 +420,7 @@ index 68c2e560938..baa1ab0e786 100644
static int futex_private = 128;
@@ -130,16 +128,6 @@ static inline int futex_wake( const int *addr, int val )
@@ -129,16 +127,6 @@ static inline int futex_wake( const int *addr, int val )
return syscall( __NR_futex, addr, FUTEX_WAKE | futex_private, val, NULL, 0, 0 );
}
@ -437,7 +437,7 @@ index 68c2e560938..baa1ab0e786 100644
static inline int use_futexes(void)
{
static int supported = -1;
@@ -157,16 +145,6 @@ static inline int use_futexes(void)
@@ -156,16 +144,6 @@ static inline int use_futexes(void)
return supported;
}
@ -454,7 +454,7 @@ index 68c2e560938..baa1ab0e786 100644
#endif
@@ -2449,290 +2427,3 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG
@@ -2390,290 +2368,3 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG
return NtWaitForSingleObject( ntdll_get_thread_data()->tid_alert_event, FALSE, timeout );
#endif
}
@ -746,10 +746,10 @@ index 68c2e560938..baa1ab0e786 100644
-
-#endif
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index f3a85dcd8d4..182aa86e68f 100644
index dc6d5462c0c..ffc701b1c27 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -99,12 +99,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON
@@ -98,12 +98,6 @@ extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULON
extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN;
extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN;
extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN;
@ -763,19 +763,19 @@ index f3a85dcd8d4..182aa86e68f 100644
extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index 31f2c3a5cd8..db7540dc1b7 100644
index 046418e50e3..a90aa183287 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -27,7 +27,7 @@
@@ -26,7 +26,7 @@
struct _DISPATCHER_CONTEXT;
/* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 111
+#define NTDLL_UNIXLIB_VERSION 112
-#define NTDLL_UNIXLIB_VERSION 112
+#define NTDLL_UNIXLIB_VERSION 113
struct unix_funcs
{
@@ -40,14 +40,6 @@ struct unix_funcs
@@ -39,14 +39,6 @@ struct unix_funcs
NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );
LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void);
@ -791,5 +791,5 @@ index 31f2c3a5cd8..db7540dc1b7 100644
double (CDECL *atan)( double d );
double (CDECL *ceil)( double d );
--
2.30.0
2.20.1

252
patches/odbccp32-SQLWriteDSNToIni/0001-odbccp32-Implement-SQLWriteDSNToIni-W.patch
View File

@ -1,252 +0,0 @@
From 97de1cf5ea27e1da413cd628e8eb3ec1d4f9fd38 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 26 Nov 2020 21:57:29 +1100
Subject: [PATCH] odbccp32: Implement SQLWriteDSNToIni/W
Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50150
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/odbccp32/odbccp32.c | 96 +++++++++++++++++++++++++++++++--
dlls/odbccp32/tests/misc.c | 108 +++++++++++++++++++++++++++++++++++++
2 files changed, 199 insertions(+), 5 deletions(-)
diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c
index 420f206b700..53ca70c0b9f 100644
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -1691,16 +1691,102 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN)
BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver)
{
+ BOOL ret = FALSE;
+ HKEY hkey, hkeydriver;
+ WCHAR *filename = NULL;
+ DWORD size = 0, type;
+
+ TRACE("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver));
+
clear_errors();
- FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver));
- return TRUE;
+
+ if (!SQLValidDSNW(lpszDSN))
+ {
+ push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn);
+ return FALSE;
+ }
+
+ /* It doesn't matter if we cannot find the driver, windows just writes a blank value. */
+ if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS)
+ {
+ HKEY hkeydriver;
+
+ if ((ret = RegOpenKeyW(hkey, lpszDriver, &hkeydriver)) == ERROR_SUCCESS)
+ {
+ ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, NULL, &size);
+ /* Windows ignores the fact the driver key is missing */
+ if(ret == ERROR_SUCCESS && type == REG_SZ && size)
+ {
+ filename = HeapAlloc(GetProcessHeap(), 0, size);
+ if(!filename)
+ {
+ RegCloseKey(hkeydriver);
+ RegCloseKey(hkey);
+ push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem);
+
+ return FALSE;
+ }
+ ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, filename, &size);
+ }
+
+ RegCloseKey(hkeydriver);
+ }
+
+ RegCloseKey(hkey);
+ }
+
+ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ODBC\\ODBC.INI", &hkey) == ERROR_SUCCESS)
+ {
+ HKEY sources;
+
+ if (RegCreateKeyW(hkey, L"ODBC Data Sources", &sources) == ERROR_SUCCESS)
+ {
+ RegSetValueExW(sources, lpszDSN, 0, REG_SZ, (BYTE*)lpszDriver, (lstrlenW(lpszDriver)+1)*sizeof(WCHAR));
+ RegCloseKey(sources);
+ }
+
+ RegDeleteTreeW(hkey, lpszDSN);
+
+ if (RegCreateKeyW(hkey, lpszDSN, &hkeydriver) == ERROR_SUCCESS)
+ {
+ if (filename)
+ RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)filename, (lstrlenW(filename)+1)*sizeof(WCHAR));
+ else
+ RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)L"", sizeof(L""));
+
+ RegCloseKey(hkeydriver);
+ ret = TRUE;
+ }
+
+ RegCloseKey(hkey);
+ }
+
+ if (!ret)
+ push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed);
+
+ heap_free(filename);
+
+ return ret;
}
BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver)
{
- clear_errors();
- FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver));
- return TRUE;
+ BOOL ret = FALSE;
+ WCHAR *dsn, *driver;
+
+ TRACE("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver));
+
+ dsn = SQLInstall_strdup(lpszDSN);
+ driver = SQLInstall_strdup(lpszDriver);
+ if (dsn && driver)
+ ret = SQLWriteDSNToIniW(dsn, driver);
+ else
+ push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem);
+
+ heap_free(dsn);
+ heap_free(driver);
+
+ return ret;
}
BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName,
diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c
index 0120504227d..f52dcee7acd 100644
--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -771,6 +771,113 @@ static void test_SQLConfigDataSource(void)
check_error(ODBC_ERROR_COMPONENT_NOT_FOUND);
}
+static void test_SQLWriteDSNToIni(void)
+{
+ BOOL ret;
+ char buffer[MAX_PATH];
+ char path[MAX_PATH];
+ DWORD type, size;
+
+ SQLSetConfigMode(ODBC_SYSTEM_DSN);
+
+ ret = SQLWriteDSNToIni("wine_dbs", "SQL Server");
+ if (!ret)
+ {
+ win_skip("Doesn't have permission to write a System DSN\n");
+ return;
+ }
+
+ if(ret)
+ {
+ HKEY hkey;
+ LONG res;
+
+ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0,
+ KEY_READ, &hkey);
+ ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n");
+ if (res == ERROR_SUCCESS)
+ {
+ type = 0xdeadbeef;
+ size = MAX_PATH;
+
+ memset(buffer, 0, sizeof(buffer));
+ res = RegQueryValueExA(hkey, "wine_dbs", NULL, &type, (BYTE *)buffer, &size);
+ ok(res == ERROR_SUCCESS, "RegGetValueA failed\n");
+ ok(type == REG_SZ, "got %u\n", type);
+ ok(!strcmp(buffer, "SQL Server"), "incorrect string '%s'\n", buffer);
+
+ RegCloseKey(hkey);
+ }
+
+ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_dbs", 0,
+ KEY_READ, &hkey);
+ ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n");
+ if (res == ERROR_SUCCESS)
+ {
+ type = 0xdeadbeef;
+ size = MAX_PATH;
+
+ memset(path, 0, sizeof(path));
+ res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size);
+ ok(res == ERROR_SUCCESS, "RegGetValueA failed\n");
+ ok(type == REG_SZ, "got %u\n", type);
+ /* WINE doesn't have a 'SQL Server' driver available */
+ todo_wine ok(strlen(path) != 0, "Invalid value\n");
+
+ RegCloseKey(hkey);
+ }
+
+ ret = SQLRemoveDSNFromIni("wine_dbs");
+ ok(ret, "got %d\n", ret);
+ }
+
+ /* Show that values are writen, even though an invalid driver was specified. */
+ ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)");
+ ok(ret, "got %d\n", ret);
+ if(ret)
+ {
+ HKEY hkey;
+ LONG res;
+
+ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0,
+ KEY_READ, &hkey);
+ ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n");
+ if (res == ERROR_SUCCESS)
+ {
+ type = 0xdeadbeef;
+ size = MAX_PATH;
+
+ memset(buffer, 0, sizeof(buffer));
+ res = RegQueryValueExA(hkey, "wine_mis", NULL, &type, (BYTE *)buffer, &size);
+ ok(res == ERROR_SUCCESS, "RegGetValueA failed\n");
+ ok(type == REG_SZ, "got %u\n", type);
+ ok(!strcmp(buffer, "Missing Access Driver (*.mis)"), "incorrect string '%s'\n", buffer);
+
+ RegCloseKey(hkey);
+ }
+
+ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_mis", 0,
+ KEY_READ, &hkey);
+ ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n");
+ if (res == ERROR_SUCCESS)
+ {
+ type = 0xdeadbeef;
+ size = MAX_PATH;
+
+ memset(path, 0, sizeof(path));
+ res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size);
+ ok(res == ERROR_SUCCESS, "RegGetValueA failed\n");
+ ok(type == REG_SZ, "got %u\n", type);
+ ok(strlen(path) == 0, "Invalid value\n");
+
+ RegCloseKey(hkey);
+ }
+
+ ret = SQLRemoveDSNFromIni("wine_mis");
+ ok(ret, "got %d\n", ret);
+ }
+}
+
START_TEST(misc)
{
test_SQLConfigMode();
@@ -785,4 +892,5 @@ START_TEST(misc)
test_SQLValidDSN();
test_SQLValidDSNW();
test_SQLConfigDataSource();
+ test_SQLWriteDSNToIni();
}
--
2.29.2

1
patches/odbccp32-SQLWriteDSNToIni/definition
View File

@ -1 +0,0 @@
Fixes: [50150]: odbccp32: Implement SQLWriteDSNToIni/W

Some files were not shown because too many files have changed in this diff Show More