wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 07e249e431c5009fa6ab8d274b4a8fe62a286358

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-05-17 08:58:11 +10:00
parent 1b7ebd3bb8
commit 071fe01910
6 changed files with 155 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch Normal file
View File

@ -0,0 +1,39 @@
From 16defa342cfa6b1ebf0d3b46b3e4225ad4218d23 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 17 May 2019 09:10:46 +1000
Subject: [PATCH] include: Stop macro redefined on the mac build
---
include/winerror.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/include/winerror.h b/include/winerror.h
index 32680e0..d58aee8 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -66,6 +66,22 @@
#define SEVERITY_SUCCESS 0
#define SEVERITY_ERROR 1
+#undef MAKE_HRESULT
+#undef SUCCEEDED
+#undef FAILED
+#undef IS_ERROR
+#undef HRESULT_FACILITY
+#undef S_OK
+#undef S_FALSE
+#undef E_NOTIMPL
+#undef E_NOINTERFACE
+#undef E_POINTER
+#undef E_ABORT
+#undef E_FAIL
+#undef E_UNEXPECTED
+#undef E_HANDLE
+#undef E_OUTOFMEMORY
+#undef E_INVALIDARG
#define MAKE_HRESULT(sev,fac,code) \
((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) )
--
1.9.1

28
patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch
View File

@ -1,19 +1,19 @@
From 91682accdd60ed9d3aac6492acbf6deff814e820 Mon Sep 17 00:00:00 2001
From e4983ad839806d62c4fce982c5d5c24466adffa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 9 Mar 2017 16:27:23 +0100
Subject: [PATCH] ntdll: Fill process kernel and user time.
---
dlls/ntdll/nt.c | 6 ++-
dlls/ntdll/nt.c | 6 +++-
dlls/ntdll/ntdll_misc.h | 5 +++
dlls/ntdll/thread.c | 84 +++++++++++++++++++++++------------------
dlls/ntdll/thread.c | 84 ++++++++++++++++++++++++++++---------------------
3 files changed, 58 insertions(+), 37 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index d2a4b1d35af..258798fcdee 100644
index 4f1ff61..454f209 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2451,6 +2451,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2482,6 +2482,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
{
SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
SYSTEM_PROCESS_INFORMATION* last = NULL;
@ -21,7 +21,7 @@ index d2a4b1d35af..258798fcdee 100644
HANDLE hSnap = 0;
WCHAR procname[1024];
WCHAR* exename;
@@ -2488,7 +2489,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2519,7 +2520,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (Length >= len + procstructlen)
{
@ -30,7 +30,7 @@ index d2a4b1d35af..258798fcdee 100644
* vmCounters, ioCounters
*/
@@ -2506,6 +2507,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2537,6 +2538,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
@ -41,10 +41,10 @@ index d2a4b1d35af..258798fcdee 100644
len += procstructlen;
}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 4835885d6c5..40bf66f1d24 100644
index ff2bb82..38f7f23 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -260,7 +260,12 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
@@ -268,6 +268,10 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*);
void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
@ -55,10 +55,14 @@ index 4835885d6c5..40bf66f1d24 100644
/* string functions */
int __cdecl NTDLL_tolower( int c );
int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
@@ -275,4 +279,5 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
/* time functions */
ULONGLONG WINAPI get_tick_count64( void );
#define NtGetTickCount get_tick_count64
+
#endif
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index e4336ab1237..4279ae77099 100644
index 70320af..8dac113 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -149,6 +149,53 @@ static ULONG_PTR get_image_addr(void)
@ -115,7 +119,7 @@ index e4336ab1237..4279ae77099 100644
/***********************************************************************
* thread_init
*
@@ -908,42 +955,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
@@ -902,42 +949,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
#ifdef __linux__
/* only /proc provides exact values for a specific thread */
if (unix_pid != -1 && unix_tid != -1)
@ -160,5 +164,5 @@ index e4336ab1237..4279ae77099 100644
/* get values for current process instead */
--
2.20.1
1.9.1

20
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "042e0625695a82aa71ddf825c693680d5d8aa0dd"
echo "07e249e431c5009fa6ab8d274b4a8fe62a286358"
}
# Show version information
@ -153,6 +153,7 @@ patch_enable_all ()
enable_httpapi_HttpCreateServerSession="$1"
enable_imagehlp_BindImageEx="$1"
enable_imm32_message_on_focus="$1"
enable_include_macos_compile="$1"
enable_include_winsock="$1"
enable_inseng_Implementation="$1"
enable_iphlpapi_System_Ping="$1"
@ -588,6 +589,9 @@ patch_enable ()
imm32-message_on_focus)
enable_imm32_message_on_focus="$2"
;;
include-macos-compile)
enable_include_macos_compile="$2"
;;
include-winsock)
enable_include_winsock="$2"
;;
@ -4070,6 +4074,18 @@ if test "$enable_imm32_message_on_focus" -eq 1; then
) >> "$patchlist"
fi
# Patchset include-macos-compile
# |
# | Modified files:
# | * include/winerror.h
# |
if test "$enable_include_macos_compile" -eq 1; then
patch_apply include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Stop macro redefined on the mac build.", 1 },';
) >> "$patchlist"
fi
# Patchset include-winsock
# |
# | Modified files:
@ -7397,6 +7413,7 @@ if test "$enable_xaudio2_revert" -eq 1; then
patch_apply xaudio2-revert/0005-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch
patch_apply xaudio2-revert/0006-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch
patch_apply xaudio2-revert/0007-Revert-xaudio2-Rewrite-to-use-FAudio.patch
patch_apply xaudio2-revert/0008-xaudio2_7-Fix-build.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Fix 32-bit build.\".", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2_7/tests: Remove redundant not-NULL checks (coccinellery).\".", 1 },';
@ -7405,6 +7422,7 @@ if test "$enable_xaudio2_revert" -eq 1; then
printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters.\".", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Fix uninitialized variable access (Valgrind).\".", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Rewrite to use FAudio.\".", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Fix build.", 1 },';
) >> "$patchlist"
fi

33
patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch
View File

@ -1,4 +1,4 @@
From 8dd3d1b76f5b90d0adaf7905f91fdc11e7389f86 Mon Sep 17 00:00:00 2001
From e6228bde99103e0fbb08c98e0b76f6a518274c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 11 Feb 2016 03:20:33 +0100
Subject: [PATCH] setupapi: Handle the case that a full driver path is passed
@ -6,14 +6,14 @@ Subject: [PATCH] setupapi: Handle the case that a full driver path is passed
---
dlls/setupapi/devinst.c | 26 ++++++++++++++++++++++++--
dlls/setupapi/tests/devinst.c | 23 +++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
dlls/setupapi/tests/devinst.c | 25 +++++++++++++++++++++++--
2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 0452d7a5..8b9aae85 100644
index d0fe0b3..cf2d304 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2332,8 +2332,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
@@ -2438,8 +2438,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
&enumStrKey);
if (!l)
{
@ -47,10 +47,10 @@ index 0452d7a5..8b9aae85 100644
}
}
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 0e6a1c0a..fce81ea0 100644
index 9107d82..a887bdd 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1331,6 +1331,28 @@ static void test_device_interface_key(void)
@@ -1881,6 +1881,28 @@ static void test_device_interface_key(void)
SetupDiDestroyDeviceInfoList(set);
}
@ -76,17 +76,26 @@ index 0e6a1c0a..fce81ea0 100644
+ SetupDiDestroyDeviceInfoList(set);
+}
+
START_TEST(devinst)
static void test_device_install_params(void)
{
HKEY hkey;
@@ -1355,6 +1377,7 @@ START_TEST(devinst)
SP_DEVINFO_DATA device = {sizeof(device)};
@@ -1948,8 +1970,6 @@ static void test_device_install_params(void)
ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue);
ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved);
ok(!strcasecmp(params.DriverPath, "C:\\windows"), "Got driver path %s.\n", params.DriverPath);
-
- SetupDiDestroyDeviceInfoList(set);
}
START_TEST(devinst)
@@ -1978,6 +1998,7 @@ START_TEST(devinst)
test_registry_property_a();
test_registry_property_w();
test_get_inf_class();
+ testSetupDiGetClassDevsA();
test_devnode();
test_device_interface_key();
}
test_device_install_params();
--
2.19.1
1.9.1

72
patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Support-indexed-vertex-blending.patch
View File

@ -1,22 +1,22 @@
From dffaaf874063543271f23679fb04e81246021dde Mon Sep 17 00:00:00 2001
From 25a35989280c737958a1b5a0a2222c6b3d312439 Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Mon, 25 Feb 2019 20:28:35 +0300
Subject: [PATCH 5/5] wined3d: Support indexed vertex blending.
Subject: [PATCH] wined3d: Support indexed vertex blending.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
---
dlls/d3d9/tests/visual.c | 6 +-
dlls/wined3d/glsl_shader.c | 172 ++++++++++++++++++++++++++-----
dlls/wined3d/glsl_shader.c | 172 +++++++++++++++++++++++++++++++++------
dlls/wined3d/utils.c | 1 +
dlls/wined3d/vertexdeclaration.c | 9 ++
dlls/wined3d/wined3d_private.h | 11 +-
dlls/wined3d/wined3d_private.h | 11 ++-
5 files changed, 169 insertions(+), 30 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 6d9bdcf3da..befb961245 100644
index 5d5ca38..f3493a3 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -21673,7 +21673,7 @@ static void do_test_indexed_vertex_blending(IDirect3DDevice9 *device, const char
@@ -21678,7 +21678,7 @@ static void do_test_indexed_vertex_blending(IDirect3DDevice9 *device, const char
ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
if (caps.MaxVertexBlendMatrixIndex < 7 || caps.MaxVertexBlendMatrices < 4)
{
@ -25,7 +25,7 @@ index 6d9bdcf3da..befb961245 100644
test_id_str, caps.MaxVertexBlendMatrices, caps.MaxVertexBlendMatrixIndex);
return;
}
@@ -21830,7 +21830,7 @@ static void test_indexed_vertex_blending(void)
@@ -21835,7 +21835,7 @@ static void test_indexed_vertex_blending(void)
memset(&caps, 0, sizeof(caps));
hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
@ -34,7 +34,7 @@ index 6d9bdcf3da..befb961245 100644
caps.MaxVertexBlendMatrixIndex);
do_test_indexed_vertex_blending(device,"IVB software");
@@ -21856,7 +21856,7 @@ static void test_indexed_vertex_blending(void)
@@ -21861,7 +21861,7 @@ static void test_indexed_vertex_blending(void)
memset(&caps, 0, sizeof(caps));
hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
@ -44,7 +44,7 @@ index 6d9bdcf3da..befb961245 100644
hr = IDirect3DDevice9_SetSoftwareVertexProcessing(device, FALSE);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index e48560c0b5..2361a81bd7 100644
index e3f3da0..aec384f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -150,6 +150,9 @@ struct shader_glsl_priv
@ -65,7 +65,7 @@ index e48560c0b5..2361a81bd7 100644
GLint projection_matrix_location;
GLint normal_matrix_location;
GLint texture_matrix_location[WINED3D_MAX_TEXTURES];
@@ -1865,10 +1869,10 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
@@ -1610,10 +1614,10 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
{
unsigned int base, count;
@ -78,7 +78,7 @@ index e48560c0b5..2361a81bd7 100644
if (priv->ubo_vs_c == -1)
{
GL_EXTCALL(glGenBuffers(1, &priv->ubo_vs_c));
@@ -1881,6 +1885,21 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
@@ -1626,6 +1630,21 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base, priv->ubo_vs_c));
checkGLcall("glBindBufferBase");
}
@ -100,7 +100,7 @@ index e48560c0b5..2361a81bd7 100644
ctx_data->ubo_bound = TRUE;
}
@@ -1927,28 +1946,41 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
@@ -1672,28 +1691,41 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
}
if (update_mask & WINED3D_SHADER_CONST_FFP_MODELVIEW)
@ -156,7 +156,7 @@ index e48560c0b5..2361a81bd7 100644
}
}
@@ -9253,8 +9285,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -8991,8 +9023,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
{
{"vec4", "ffp_attrib_position"}, /* WINED3D_FFP_POSITION */
{"vec4", "ffp_attrib_blendweight"}, /* WINED3D_FFP_BLENDWEIGHT */
@ -166,7 +166,7 @@ index e48560c0b5..2361a81bd7 100644
{"vec3", "ffp_attrib_normal"}, /* WINED3D_FFP_NORMAL */
{"float", "ffp_attrib_psize"}, /* WINED3D_FFP_PSIZE */
{"vec4", "ffp_attrib_diffuse"}, /* WINED3D_FFP_DIFFUSE */
@@ -9270,6 +9301,9 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -9008,6 +9039,9 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
string_buffer_clear(buffer);
shader_glsl_add_version_declaration(buffer, gl_info);
@ -176,7 +176,7 @@ index e48560c0b5..2361a81bd7 100644
if (shader_glsl_use_explicit_attrib_location(gl_info))
shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n");
@@ -9284,7 +9318,18 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -9022,7 +9056,18 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
}
shader_addline(buffer, "\n");
@ -196,7 +196,7 @@ index e48560c0b5..2361a81bd7 100644
shader_addline(buffer, "uniform mat4 ffp_projection_matrix;\n");
shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n");
shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", WINED3D_MAX_TEXTURES);
@@ -9346,6 +9391,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -9084,6 +9129,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
shader_addline(buffer, "\nvoid main()\n{\n");
shader_addline(buffer, "float m;\n");
shader_addline(buffer, "vec3 r;\n");
@ -205,7 +205,7 @@ index e48560c0b5..2361a81bd7 100644
for (i = 0; i < ARRAY_SIZE(attrib_info); ++i)
{
@@ -9375,8 +9422,21 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -9113,8 +9160,21 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
shader_addline(buffer, "ffp_attrib_blendweight[%u] -= ffp_attrib_blendweight[%u];\n", settings->vertexblends, i);
shader_addline(buffer, "vec4 ec_pos = vec4(0.0);\n");
@ -229,7 +229,7 @@ index e48560c0b5..2361a81bd7 100644
shader_addline(buffer, "gl_Position = ffp_projection_matrix * ec_pos;\n");
if (settings->clipping)
@@ -9400,7 +9460,19 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
@@ -9138,7 +9198,19 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
else
{
for (i = 0; i < settings->vertexblends + 1; ++i)
@ -250,7 +250,7 @@ index e48560c0b5..2361a81bd7 100644
}
if (settings->normalize)
@@ -10265,6 +10337,28 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
@@ -10003,6 +10075,28 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
string_buffer_sprintf(name, "ffp_modelview_matrix[%u]", i);
vs->modelview_matrix_location[i] = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer));
}
@ -279,7 +279,7 @@ index e48560c0b5..2361a81bd7 100644
vs->projection_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_projection_matrix"));
vs->normal_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_normal_matrix"));
for (i = 0; i < WINED3D_MAX_TEXTURES; ++i)
@@ -10844,7 +10938,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
@@ -10582,7 +10676,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW
| WINED3D_SHADER_CONST_FFP_PROJ;
@ -288,7 +288,7 @@ index e48560c0b5..2361a81bd7 100644
{
if (entry->vs.modelview_matrix_location[i] != -1)
{
@@ -10853,6 +10947,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
@@ -10591,6 +10685,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
}
}
@ -298,7 +298,7 @@ index e48560c0b5..2361a81bd7 100644
for (i = 0; i < WINED3D_MAX_TEXTURES; ++i)
{
if (entry->vs.texture_matrix_location[i] != -1)
@@ -11390,7 +11487,17 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
@@ -11128,7 +11225,17 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
fragment_pipe->get_caps(device->adapter, &fragment_caps);
priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL;
priv->legacy_lighting = device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING;
@ -317,7 +317,7 @@ index e48560c0b5..2361a81bd7 100644
device->vertex_priv = vertex_priv;
device->fragment_priv = fragment_priv;
device->shader_priv = priv;
@@ -11423,6 +11530,14 @@ static void shader_glsl_free(struct wined3d_device *device, struct wined3d_conte
@@ -11161,6 +11268,14 @@ static void shader_glsl_free(struct wined3d_device *device, struct wined3d_conte
string_buffer_free(&priv->shader_buffer);
priv->fragment_pipe->free_private(device, context);
priv->vertex_pipe->vp_free(device, context);
@ -332,7 +332,7 @@ index e48560c0b5..2361a81bd7 100644
if (priv->ubo_vs_c != -1)
{
@@ -11842,7 +11957,11 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter,
@@ -11580,7 +11695,11 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter,
caps->ffp_generic_attributes = TRUE;
caps->max_active_lights = WINED3D_MAX_ACTIVE_LIGHTS;
caps->max_vertex_blend_matrices = MAX_VERTEX_BLENDS;
@ -345,7 +345,7 @@ index e48560c0b5..2361a81bd7 100644
caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN
| WINED3DVTXPCAPS_MATERIALSOURCE7
| WINED3DVTXPCAPS_VERTEXFOG
@@ -12042,7 +12161,8 @@ static void glsl_vertex_pipe_pixel_shader(struct wined3d_context *context,
@@ -11780,7 +11899,8 @@ static void glsl_vertex_pipe_pixel_shader(struct wined3d_context *context,
static void glsl_vertex_pipe_world(struct wined3d_context *context,
const struct wined3d_state *state, DWORD state_id)
{
@ -356,10 +356,10 @@ index e48560c0b5..2361a81bd7 100644
static void glsl_vertex_pipe_vertexblend(struct wined3d_context *context,
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index f7ba936588..7cc0d362b7 100644
index a84417d..b840e62 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -6334,6 +6334,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
@@ -6519,6 +6519,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
settings->flatshading = FALSE;
settings->swizzle_map = si->swizzle_map;
@ -368,7 +368,7 @@ index f7ba936588..7cc0d362b7 100644
int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb_entry *entry)
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index cd8bb5e423..d37f3ce860 100644
index cd8bb5e..d37f3ce 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -119,6 +119,15 @@ static BOOL declaration_element_valid_ffp(const struct wined3d_vertex_element *e
@ -388,10 +388,10 @@ index cd8bb5e423..d37f3ce860 100644
switch(element->format)
{
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6237558678..57065e95cc 100644
index 2035c0c..4122db5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -264,6 +264,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
@@ -267,6 +267,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
}
/* Device caps */
@ -399,7 +399,7 @@ index 6237558678..57065e95cc 100644
#define WINED3D_MAX_STREAMS 16
#define WINED3D_MAX_TEXTURES 8
#define WINED3D_MAX_FRAGMENT_SAMPLERS 16
@@ -2874,7 +2875,8 @@ struct wined3d_ffp_vs_settings
@@ -2958,7 +2959,8 @@ struct wined3d_ffp_vs_settings
DWORD ortho_fog : 1;
DWORD flatshading : 1;
DWORD swizzle_map : 16; /* MAX_ATTRIBS, 16 */
@ -409,7 +409,7 @@ index 6237558678..57065e95cc 100644
DWORD texgen[WINED3D_MAX_TEXTURES];
};
@@ -4751,6 +4753,13 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs)
@@ -4875,6 +4877,13 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs)
assert(cs->thread_id != GetCurrentThreadId());
}
@ -420,9 +420,9 @@ index 6237558678..57065e95cc 100644
+ && (context->stream_info.use_map & (1 << WINED3D_FFP_BLENDINDICES));
+}
+
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
#define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"
static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,
enum wined3d_material_color_source source)
{
--
2.20.1
1.9.1

24
patches/xaudio2-revert/0008-xaudio2_7-Fix-build.patch Normal file
View File

@ -0,0 +1,24 @@
From 76ff2b8644ec3e3b7c17ff3bc058dbdfc11a2ea0 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 17 May 2019 08:16:47 +1000
Subject: [PATCH] xaudio2_7: Fix build
---
dlls/xaudio2_7/xaudio_dll.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index 8fc2364..3dc0d6c 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -30,6 +30,7 @@
#include "xapofx.h"
+#include "wine/asm.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(xaudio2);
--
1.9.1