wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 15dd8e2b981ca32cae94409153627b3300bbeab8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-08-06 08:51:47 +10:00
parent ad822b6405
commit 73f58bac41
10 changed files with 51 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch
View File

@ -1,4 +1,4 @@
From 4e692713dface59a0e717e4ab9e2abf6b8223995 Mon Sep 17 00:00:00 2001
From f22ce02d880a9a6723d202eaf959d1eaa7a4c3df Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sun, 11 Jan 2015 16:29:30 +0100
Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
@ -6,17 +6,17 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
---
dlls/d3dx9_36/d3dx9_private.h | 2 ++
dlls/d3dx9_36/surface.c | 62 +++++++++++++++++++++++++++++++++++++++++++
dlls/d3dx9_36/texture.c | 5 +---
dlls/d3dx9_36/surface.c | 62 +++++++++++++++++++++++++++++++++++
dlls/d3dx9_36/texture.c | 5 +--
3 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index 5a28f2e..158aae3 100644
index 9497343f422..679b57b2626 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN;
HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN;
+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
+ const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN;
@ -24,10 +24,10 @@ index 5a28f2e..158aae3 100644
unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index f5dc799..e0d84fd 100644
index aa9ee891b54..9871d211a7c 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -611,6 +611,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
@@ -636,6 +636,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
return D3D_OK;
}
@ -97,10 +97,10 @@ index f5dc799..e0d84fd 100644
const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
const D3DXIMAGE_INFO *src_info)
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index e2dfab8..9f0e541 100644
index 26d07ca9f66..b743d5cfad0 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1906,10 +1906,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
@@ -1904,10 +1904,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
if (file_format == D3DXIFF_DDS)
@ -113,5 +113,5 @@ index e2dfab8..9f0e541 100644
type = IDirect3DBaseTexture9_GetType(src_texture);
switch (type)
--
1.9.1
2.17.1

68
patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch
View File

@ -1,4 +1,4 @@
From 4595b49c9c878e8a86fcd22dc82a9f5cfadfc7a8 Mon Sep 17 00:00:00 2001
From 0a94974134aa73fa03bd8d011cd84935439cbea4 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Fri, 30 Mar 2018 08:22:02 +0000
Subject: [PATCH] d3dx9_36: add DXTn support
@ -29,7 +29,7 @@ Subject: [PATCH] d3dx9_36: add DXTn support
22 files changed, 118 insertions(+), 32 deletions(-)
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
index 99db5f355..0c3fb8a90 100644
index 99db5f3550e..0c3fb8a9048 100644
--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
@@ -1,6 +1,6 @@
@ -41,7 +41,7 @@ index 99db5f355..0c3fb8a90 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
index 9e54aba2c..4419b18b8 100644
index 9e54aba2cf2..4419b18b865 100644
--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
@@ -1,6 +1,6 @@
@ -53,7 +53,7 @@ index 9e54aba2c..4419b18b8 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
index 104f7c19b..cfc9711ef 100644
index 104f7c19b0e..cfc9711ef94 100644
--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
@@ -1,6 +1,6 @@
@ -65,7 +65,7 @@ index 104f7c19b..cfc9711ef 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
index db04c8310..d598c9bbf 100644
index db04c8310b3..d598c9bbff5 100644
--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
@@ -1,6 +1,6 @@
@ -77,7 +77,7 @@ index db04c8310..d598c9bbf 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
index 8a2b9c690..8e9979092 100644
index 8a2b9c6909a..8e997909280 100644
--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
@@ -1,6 +1,6 @@
@ -89,7 +89,7 @@ index 8a2b9c690..8e9979092 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
index 6e1f45c02..efe538fde 100644
index 6e1f45c0299..efe538fdee2 100644
--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
@@ -1,6 +1,6 @@
@ -101,7 +101,7 @@ index 6e1f45c02..efe538fde 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
index 092a6b154..4a1ee6304 100644
index 092a6b154ee..4a1ee630414 100644
--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
@@ -1,6 +1,6 @@
@ -113,7 +113,7 @@ index 092a6b154..4a1ee6304 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
index 48c67e6e0..dcbb7a01b 100644
index 48c67e6e063..dcbb7a01b6d 100644
--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
@@ -1,6 +1,6 @@
@ -125,7 +125,7 @@ index 48c67e6e0..dcbb7a01b 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
index d51d6a0db..fb89ea7c2 100644
index d51d6a0db4a..fb89ea7c224 100644
--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
@@ -1,6 +1,6 @@
@ -137,7 +137,7 @@ index d51d6a0db..fb89ea7c2 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
index 52cdde13a..487255e43 100644
index 52cdde13ad3..487255e43b0 100644
--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
@@ -1,6 +1,6 @@
@ -149,7 +149,7 @@ index 52cdde13a..487255e43 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
index 37f431228..9b0b500f7 100644
index 37f431228f8..9b0b500f742 100644
--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
@@ -1,6 +1,6 @@
@ -161,7 +161,7 @@ index 37f431228..9b0b500f7 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
index 4441b5f6e..ac4291359 100644
index 4441b5f6e79..ac42913598e 100644
--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
@@ -1,6 +1,6 @@
@ -173,7 +173,7 @@ index 4441b5f6e..ac4291359 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index 5e76ab7f5..c95dc0707 100644
index 5e76ab7f5c9..c95dc070767 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -1,7 +1,7 @@
@ -186,7 +186,7 @@ index 5e76ab7f5..c95dc0707 100644
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 57d9818cd..f05bad5ab 100644
index 9871d211a7c..0a40cd24fa6 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -25,6 +25,8 @@
@ -198,7 +198,7 @@ index 57d9818cd..f05bad5ab 100644
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**);
@@ -1772,6 +1774,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
@@ -1900,6 +1902,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
}
}
@ -223,7 +223,7 @@ index 57d9818cd..f05bad5ab 100644
/************************************************************
* D3DXLoadSurfaceFromMemory
*
@@ -1811,10 +1831,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
@@ -1939,10 +1959,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
{
const struct pixel_format_desc *srcformatdesc, *destformatdesc;
IDirect3DSurface9 *surface;
@ -237,7 +237,7 @@ index 57d9818cd..f05bad5ab 100644
TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n",
dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format,
@@ -1895,18 +1917,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
@@ -2023,18 +2045,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
}
else /* Stretching or format conversion. */
{
@ -252,7 +252,7 @@ index 57d9818cd..f05bad5ab 100644
+ (!post_convert && !is_conversion_to_supported(destformatdesc)))
{
FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format);
unlock_surface(dst_surface, &lockrect, surface, FALSE);
unlock_surface(dst_surface, dst_rect, surface, FALSE);
return E_NOTIMPL;
}
@ -307,7 +307,7 @@ index 57d9818cd..f05bad5ab 100644
}
else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
{
@@ -1915,12 +1984,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
@@ -2043,12 +2112,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
/* Always apply a point filter until D3DX_FILTER_LINEAR,
* D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
@ -328,23 +328,23 @@ index 57d9818cd..f05bad5ab 100644
}
}
- return unlock_surface(dst_surface, &lockrect, surface, TRUE);
- return unlock_surface(dst_surface, dst_rect, surface, TRUE);
+done:
+ if (pre_convert)
+ HeapFree(GetProcessHeap(), 0, tmp_src_memory);
+ if (post_convert)
+ HeapFree(GetProcessHeap(), 0, tmp_dst_memory);
+
+ unlock_surface(dst_surface, &lockrect, surface, TRUE);
+ unlock_surface(dst_surface, dst_rect, surface, TRUE);
+ return hr;
}
/************************************************************
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
index 56b79d80c..8614cec4c 100644
index 4a10492a08f..d59ff028ace 100644
--- a/dlls/d3dx9_36/tests/surface.c
+++ b/dlls/d3dx9_36/tests/surface.c
@@ -1225,7 +1225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
@@ -1242,7 +1242,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@ -353,7 +353,7 @@ index 56b79d80c..8614cec4c 100644
check_release((IUnknown*)newsurf, 1);
check_release((IUnknown*)tex, 0);
}
@@ -1251,7 +1251,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
@@ -1268,7 +1268,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@ -362,7 +362,7 @@ index 56b79d80c..8614cec4c 100644
check_release((IUnknown*)newsurf, 1);
check_release((IUnknown*)tex, 0);
}
@@ -1264,10 +1264,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
@@ -1281,10 +1281,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@ -376,7 +376,7 @@ index 56b79d80c..8614cec4c 100644
check_release((IUnknown*)newsurf, 1);
check_release((IUnknown*)tex, 0);
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
index ea0a04807..a710cef03 100644
index ea0a04807b4..a710cef030a 100644
--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
@@ -1,6 +1,6 @@
@ -388,7 +388,7 @@ index ea0a04807..a710cef03 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
index af62f823d..543a482af 100644
index af62f823d5e..543a482afed 100644
--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
@@ -1,6 +1,6 @@
@ -400,7 +400,7 @@ index af62f823d..543a482af 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
index ab71712d4..cacb0c00d 100644
index ab71712d4c6..cacb0c00dfa 100644
--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
@@ -1,6 +1,6 @@
@ -412,7 +412,7 @@ index ab71712d4..cacb0c00d 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
index 76428d2fd..a58a99ef2 100644
index 76428d2fd84..a58a99ef227 100644
--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
@@ -1,6 +1,6 @@
@ -424,7 +424,7 @@ index 76428d2fd..a58a99ef2 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
index d3647f895..93fb6b508 100644
index d3647f895d6..93fb6b508ac 100644
--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
@@ -1,6 +1,6 @@
@ -436,7 +436,7 @@ index d3647f895..93fb6b508 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
index 88bd746da..197d0d45b 100644
index 88bd746dae1..197d0d45be2 100644
--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
@@ -1,6 +1,6 @@
@ -448,7 +448,7 @@ index 88bd746da..197d0d45b 100644
DELAYIMPORTS = windowscodecs
diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
index 2f6b8634a..17895954a 100644
index 2f6b8634ab8..17895954a85 100644
--- a/dlls/d3dx9_43/Makefile.in
+++ b/dlls/d3dx9_43/Makefile.in
@@ -1,6 +1,6 @@
@ -460,5 +460,5 @@ index 2f6b8634a..17895954a 100644
DELAYIMPORTS = windowscodecs
--
2.21.0
2.17.1

25
patches/mailing-list-patches/0012-strmbase-Remove-unused-wine-unicode.h-import.patch
View File

@ -1,25 +0,0 @@
From 616ad4e053abdc48810064993caef067a3452587 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 8 Jul 2019 11:24:39 -0500
Subject: [PATCH] strmbase: Remove unused wine/unicode.h import.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/strmbase/strmbase_private.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h
index 439ab9aefa..06fbe62a42 100644
--- a/dlls/strmbase/strmbase_private.h
+++ b/dlls/strmbase/strmbase_private.h
@@ -31,7 +31,6 @@
#include "wine/heap.h"
#include "wine/list.h"
#include "wine/strmbase.h"
-#include "wine/unicode.h"
/* Quality Control */
typedef struct QualityControlImpl {
--
2.17.1

26
patches/mailing-list-patches/0013-qedit-Build-with-msvcrt.patch
View File

@ -1,26 +0,0 @@
From b263d3d0958c18b2b8f105b87c27f9cbee176503 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 8 Jul 2019 11:24:43 -0500
Subject: [PATCH] qedit: Build with msvcrt.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/qedit/Makefile.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index b47ee260ab..4891328c7a 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -1,6 +1,8 @@
MODULE = qedit.dll
IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
main.c \
mediadet.c \
--
2.17.1

40
patches/mailing-list-patches/0014-qedit-Share-source-with-strmbase.patch
View File

@ -1,40 +0,0 @@
From 4018f0ee2e502ded20bc907e3baa47ca348a61b8 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 8 Jul 2019 11:24:42 -0500
Subject: [PATCH] qedit: Share source with strmbase.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/qedit/Makefile.in | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 4891328c7a..c5bf8f9cac 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -1,12 +1,21 @@
MODULE = qedit.dll
-IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
+IMPORTS = strmiids uuid oleaut32 ole32 advapi32
+PARENTSRC = ../strmbase
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
+ dispatch.c \
+ enumpins.c \
+ filter.c \
main.c \
mediadet.c \
+ mediatype.c \
nullrenderer.c \
+ pin.c \
+ pospass.c \
+ qualitycontrol.c \
+ renderer.c \
samplegrabber.c \
timeline.c
--
2.17.1

53
patches/mailing-list-patches/0015-evr-Build-with-msvcrt.patch
View File

@ -1,53 +0,0 @@
From 4b3eebfae7a5a03f3c1644c65d5f1c00af0c4ae3 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 8 Jul 2019 11:24:41 -0500
Subject: [PATCH] evr: Build with msvcrt.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/evr/Makefile.in | 2 ++
dlls/evr/evr.c | 1 -
dlls/evr/main.c | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
index dc7989e835..053d80e61d 100644
--- a/dlls/evr/Makefile.in
+++ b/dlls/evr/Makefile.in
@@ -1,6 +1,8 @@
MODULE = evr.dll
IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
evr.c \
main.c
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index b64b0468ac..655ca79b0d 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -18,7 +18,6 @@
#define COBJMACROS
-#include "config.h"
#include "wine/debug.h"
#include <stdio.h>
diff --git a/dlls/evr/main.c b/dlls/evr/main.c
index ba48207326..000ed7c55b 100644
--- a/dlls/evr/main.c
+++ b/dlls/evr/main.c
@@ -18,8 +18,6 @@
#define COBJMACROS
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
--
2.17.1

39
patches/mailing-list-patches/0016-evr-Share-source-with-strmbase.patch
View File

@ -1,39 +0,0 @@
From 29294a8ce4ae5114396464e8aa177e267881e734 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 8 Jul 2019 11:24:40 -0500
Subject: [PATCH] evr: Share source with strmbase.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
---
dlls/evr/Makefile.in | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
index 053d80e61d..e605ce227c 100644
--- a/dlls/evr/Makefile.in
+++ b/dlls/evr/Makefile.in
@@ -1,10 +1,19 @@
MODULE = evr.dll
-IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32
+IMPORTS = mfuuid strmiids uuid ole32 oleaut32
+PARENTSRC = ../strmbase
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
+ dispatch.c \
+ enumpins.c \
evr.c \
- main.c
+ filter.c \
+ main.c \
+ mediatype.c \
+ pin.c \
+ pospass.c \
+ qualitycontrol.c \
+ renderer.c
IDL_SRCS = evr_classes.idl
--
2.17.1

40
patches/mailing-list-patches/0034-msvcrt-Do-not-use-casting-in-min-max-macros.patch
View File

@ -1,40 +0,0 @@
From 2d1a3062bcb0e0716168c75b9c4ccef17189a47d Mon Sep 17 00:00:00 2001
From: Peter Dons Tychsen <pdt@dontech.dk>
Date: Sun, 21 Jul 2019 23:38:02 +0200
Subject: [PATCH] msvcrt: Do not use casting in min/max macros
Macros like ULLONG_MAX are meant to be able to be used in macro conditionals like "#if (UULONG_MAX >= 1)". This is not possible as there are casts in them currently which of course the preprocessor cannot parse.
Fix this by using type prefixes instead which the preprocessor does understand.
This makes libraries like "libtom" compile with Wine headers.
Signed-off-by: Peter Dons Tychsen <pdt@dontech.dk>
---
include/msvcrt/limits.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h
index 13bab8679ba..8d3a0387cd3 100644
--- a/include/msvcrt/limits.h
+++ b/include/msvcrt/limits.h
@@ -30,13 +30,13 @@
#define LONG_MAX 0x7fffffffL
#define ULONG_MAX 0xffffffffUL
-#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff)
+#define LLONG_MAX ((0x7fffffffLL << 32) | 0xffffffff)
#define LLONG_MIN (-LLONG_MAX-1)
-#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
+#define ULLONG_MAX ((0xffffffffULL << 32) | 0xffffffff)
-#define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff)
+#define _I64_MAX ((0x7fffffffLL << 32) | 0xffffffff)
#define _I64_MIN (-_I64_MAX-1)
-#define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
+#define _UI64_MAX ((0xffffffffULL << 32) | 0xffffffff)
#define I64_MIN _I64_MIN
#define I64_MAX _I64_MAX
--
2.17.1

27
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "21c1ab7a737246f63a0ce6a6262d6953cd23ab0f"
echo "15dd8e2b981ca32cae94409153627b3300bbeab8"
}
# Show version information
@ -2047,11 +2047,10 @@ fi
# |
# | Modified files:
# | * configure, configure.ac, dlls/cryptext/Makefile.in, dlls/cryptext/cryptext.spec, dlls/cryptext/cryptext_main.c,
# | dlls/cryptext/tests/Makefile.in, dlls/cryptext/tests/cryptext.c, dlls/evr/Makefile.in, dlls/evr/evr.c, dlls/evr/main.c,
# | dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl_private.h, dlls/ntoskrnl.exe/pnp.c, dlls/qedit/Makefile.in,
# | dlls/strmbase/strmbase_private.h, dlls/user32/rawinput.c, dlls/user32/tests/input.c, dlls/winebus.sys/bus.h,
# | dlls/winebus.sys/bus_iohid.c, dlls/winebus.sys/bus_sdl.c, dlls/winebus.sys/bus_udev.c, dlls/winebus.sys/main.c,
# | dlls/winex11.drv/mouse.c, include/msvcrt/limits.h, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in,
# | dlls/cryptext/tests/Makefile.in, dlls/cryptext/tests/cryptext.c, dlls/ntoskrnl.exe/ntoskrnl.c,
# | dlls/ntoskrnl.exe/ntoskrnl_private.h, dlls/ntoskrnl.exe/pnp.c, dlls/user32/rawinput.c, dlls/user32/tests/input.c,
# | dlls/winebus.sys/bus.h, dlls/winebus.sys/bus_iohid.c, dlls/winebus.sys/bus_sdl.c, dlls/winebus.sys/bus_udev.c,
# | dlls/winebus.sys/main.c, dlls/winex11.drv/mouse.c, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in,
# | programs/wineboot/Makefile.in, programs/wineboot/wineboot.c
# |
if test "$enable_mailing_list_patches" -eq 1; then
@ -2061,15 +2060,9 @@ if test "$enable_mailing_list_patches" -eq 1; then
patch_apply mailing-list-patches/0004-winebus.sys-Initialize-and-teardown-the-HID-backends.patch
patch_apply mailing-list-patches/0005-ntoskrnl.exe-IoInvalidateDeviceRelations-receives-th.patch
patch_apply mailing-list-patches/0006-cryptext-Implement-CryptExtOpenCER.patch
patch_apply mailing-list-patches/0012-strmbase-Remove-unused-wine-unicode.h-import.patch
patch_apply mailing-list-patches/0013-qedit-Build-with-msvcrt.patch
patch_apply mailing-list-patches/0014-qedit-Share-source-with-strmbase.patch
patch_apply mailing-list-patches/0015-evr-Build-with-msvcrt.patch
patch_apply mailing-list-patches/0016-evr-Share-source-with-strmbase.patch
patch_apply mailing-list-patches/0017-user32-Also-scan-for-mouse-devices-in-GetRawInputDev.patch
patch_apply mailing-list-patches/0020-winebus.sys-Report-the-native-product-string-for-som.patch
patch_apply mailing-list-patches/0028-wine.inf-Remove-registration-for-the-winebus-service.patch
patch_apply mailing-list-patches/0034-msvcrt-Do-not-use-casting-in-min-max-macros.patch
patch_apply mailing-list-patches/0035-winex11.drv-Ignore-XGrabPointer-induced-warp-events-.patch
patch_apply mailing-list-patches/0037-ntoskrnl-Update-the-interface-if-it-is-already-in-th.patch
patch_apply mailing-list-patches/0038-winebus-Use-the-SDL-joystick-index-as-device-id-inst.patch
@ -2080,15 +2073,9 @@ if test "$enable_mailing_list_patches" -eq 1; then
printf '%s\n' '+ { "Zebediah Figura", "winebus.sys: Initialize and teardown the HID backends while the bus FDO is still extant.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "cryptext: Implement CryptExtOpenCER.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "strmbase: Remove unused wine/unicode.h import.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "qedit: Build with msvcrt.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "qedit: Share source with strmbase.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "evr: Build with msvcrt.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "evr: Share source with strmbase.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "user32: Also scan for mouse devices in GetRawInputDeviceList().", 1 },';
printf '%s\n' '+ { "Rémi Bernon", "winebus.sys: Report the native product string for some Xbox gamepads.", 1 },';
printf '%s\n' '+ { "Zebediah Figura", "wine.inf: Remove registration for the winebus service.", 1 },';
printf '%s\n' '+ { "Peter Dons Tychsen", "msvcrt: Do not use casting in min/max macros.", 1 },';
printf '%s\n' '+ { "Rémi Bernon", "winex11.drv: Ignore XGrabPointer-induced warp events as well.", 1 },';
printf '%s\n' '+ { "Rémi Bernon", "ntoskrnl: Update the interface if it is already in the device_interfaces tree.", 1 },';
printf '%s\n' '+ { "Rémi Bernon", "winebus: Use the SDL joystick index as device id instead of instance id.", 1 },';
@ -6762,13 +6749,11 @@ fi
# Patchset wined3d-CSMT_Main
# |
# | Modified files:
# | * dlls/wined3d/adapter_gl.c, dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
# | * dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
# |
if test "$enable_wined3d_CSMT_Main" -eq 1; then
patch_apply wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
patch_apply wined3d-CSMT_Main/0045-wined3d-Improve-wined3d_cs_emit_update_sub_resource.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Reset context before destruction.", 1 },';
printf '%s\n' '+ { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
) >> "$patchlist"
fi

24
patches/wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
View File

@ -1,24 +0,0 @@
From 7e7ce73cacdefd54003b4b97dc295c5be2f36f8f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 19 Feb 2017 08:29:23 +0100
Subject: wined3d: Reset context before destruction.
---
dlls/wined3d/adapter_gl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 1f4ba793e..a39c78424 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -4595,6 +4595,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device)
{
TRACE("device %p.\n", device);
+ context_set_current(NULL);
wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device);
wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT);
}
--
2.21.0