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 7003ba44892d39ec0f409c793b97a0c5f4ae72d0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-01-31 11:08:09 +11:00
parent 46fc7a5a0d
commit 4839b31cec
5 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/crypt32-old_libgnutls/0001-crypt32-Fix-compile-error-on-older-gnutls.patch
View File

@ -1,26 +1,22 @@
From 778d6ea39b0c49f5000efd401f1ab05ec64c7abc Mon Sep 17 00:00:00 2001
From 2a88e8c6a5dc0d9b530664eda478088e7511c9e2 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 30 Jan 2019 10:20:49 +1100
Subject: [PATCH] crypt32: Fix compile error on older gnutls
Date: Thu, 31 Jan 2019 10:43:03 +1100
Subject: [PATCH] crypt32: Fix compile error on older gnutls.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/crypt32/pfx.c | 6 ++++++
1 file changed, 6 insertions(+)
dlls/crypt32/pfx.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c
index d824410..c4fb34d 100644
index cde2f19..46bf356 100644
--- a/dlls/crypt32/pfx.c
+++ b/dlls/crypt32/pfx.c
@@ -38,6 +38,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt);
#ifdef SONAME_LIBGNUTLS
WINE_DECLARE_DEBUG_CHANNEL(winediag);
@@ -45,6 +45,8 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password,
gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len,
gnutls_x509_crl_t * crl, unsigned int flags);
+/* Not present in gnutls version < 3.0 */
+int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password,
+ gnutls_x509_privkey_t *key, gnutls_x509_crt_t **chain, unsigned int *chain_len,
+ gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len,
+ gnutls_x509_crl_t * crl, unsigned int flags);
+int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t, unsigned int*);
+
static void *libgnutls_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f

40
patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch
View File

@ -1,20 +1,20 @@
From fe51309d6a518b11b1d9db5e42abfb6d31cae9eb Mon Sep 17 00:00:00 2001
From 3754ff36e69f3d6266ded912de0babfea68cbfed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 6 Jun 2017 23:42:56 +0200
Subject: [PATCH] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++-
dlls/ntoskrnl.exe/tests/driver.c | 37 ++++++++++++++--
include/ddk/wdm.h | 76 ++++++++++++++++++++++++++++++--
include/winnt.h | 2 +
dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++-
dlls/ntoskrnl.exe/tests/driver.c | 37 +++++++++++++++++--
include/ddk/wdm.h | 76 ++++++++++++++++++++++++++++++++++++++--
include/winnt.h | 2 ++
4 files changed, 127 insertions(+), 7 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 952fa5ec..2e08a50e 100644
index d3c2ea6..7d1fcdb 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2181,7 +2181,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
@@ -2153,7 +2153,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
ULONG Tag,
USHORT Depth)
{
@ -41,7 +41,7 @@ index 952fa5ec..2e08a50e 100644
/***********************************************************************
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index e361d345..2260816c 100644
index 215e090..70020e0 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -22,6 +22,9 @@
@ -54,7 +54,7 @@ index e361d345..2260816c 100644
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
@@ -528,6 +531,33 @@ static void test_version(void)
@@ -526,6 +529,33 @@ static void test_version(void)
ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber);
}
@ -88,7 +88,7 @@ index e361d345..2260816c 100644
static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@@ -558,6 +588,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
@@ -556,6 +586,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
test_load_driver();
test_sync();
test_version();
@ -96,7 +96,7 @@ index e361d345..2260816c 100644
/* print process report */
if (test_input->winetest_debug)
@@ -609,7 +640,7 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG
@@ -607,7 +638,7 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG
static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp)
{
@ -105,7 +105,7 @@ index e361d345..2260816c 100644
IoCompleteRequest(irp, IO_NO_INCREMENT);
return STATUS_SUCCESS;
}
@@ -634,14 +665,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
@@ -632,14 +663,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
break;
}
@ -123,7 +123,7 @@ index e361d345..2260816c 100644
return STATUS_SUCCESS;
}
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index a53c7a26..ca83129f 100644
index 03af14d..a4114e6 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -153,20 +153,18 @@ typedef struct _KWAIT_BLOCK {
@ -146,9 +146,9 @@ index a53c7a26..ca83129f 100644
typedef struct _ZONE_HEADER *PZONE_HEADER;
+typedef struct _LOOKASIDE_LIST_EX *PLOOKASIDE_LIST_EX;
typedef struct _FAST_MUTEX
{
@@ -191,6 +189,11 @@ typedef struct _VPB {
#define FM_LOCK_BIT 0x1
@@ -193,6 +191,11 @@ typedef struct _VPB {
WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)];
} VPB, *PVPB;
@ -160,7 +160,7 @@ index a53c7a26..ca83129f 100644
typedef enum _POOL_TYPE {
NonPagedPool,
PagedPool,
@@ -1230,6 +1233,71 @@ typedef struct _KLOCK_QUEUE_HANDLE {
@@ -1232,6 +1235,71 @@ typedef struct _KLOCK_QUEUE_HANDLE {
KIRQL OldIrql;
} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
@ -232,7 +232,7 @@ index a53c7a26..ca83129f 100644
typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2);
typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION;
@@ -1382,8 +1450,10 @@ PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T);
@@ -1384,8 +1452,10 @@ PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T);
PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T);
PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);
PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG);
@ -244,7 +244,7 @@ index a53c7a26..ca83129f 100644
PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK);
LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);
diff --git a/include/winnt.h b/include/winnt.h
index c08ee9a4..a156efc4 100644
index 75dfcd8..1b840bd 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -757,6 +757,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
@ -257,5 +257,5 @@ index c08ee9a4..a156efc4 100644
#ifdef __GNUC__
# define CONTAINING_RECORD(address, type, field) ({ \
--
2.20.1
1.9.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "78a8445a2a4a6f225386a8a9781e961d2c5517a4"
echo "7003ba44892d39ec0f409c793b97a0c5f4ae72d0"
}
# Show version information

15
patches/wineboot-DriveSerial/0001-wineboot-Assign-a-drive-serial-number-during-prefix-.patch
View File

@ -1,14 +1,15 @@
From 43f7ab85737327c3f13ace230f8eba0cf0414441 Mon Sep 17 00:00:00 2001
From 3a10fc7a8048fcab8e9e08b2d4fb3f7cad6ce0d0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 25 May 2015 06:07:50 +0200
Subject: wineboot: Assign a drive serial number during prefix creation/update.
Subject: [PATCH] wineboot: Assign a drive serial number during prefix
creation/update.
---
programs/wineboot/wineboot.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 4d70ea9..dbabfe4 100644
index 32e4225..6ce8b5c 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -81,6 +81,7 @@
@ -19,8 +20,8 @@ index 4d70ea9..dbabfe4 100644
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(wineboot);
@@ -165,6 +166,36 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value )
return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (strlenW(value) + 1) * sizeof(WCHAR) );
@@ -265,6 +266,36 @@ static void get_namestring( WCHAR *buf )
for (i = strlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;
}
+/* set a serial number for the disk containing windows */
@ -56,7 +57,7 @@ index 4d70ea9..dbabfe4 100644
/* create the volatile hardware registry keys */
static void create_hardware_registry_keys(void)
{
@@ -1233,6 +1264,7 @@ int main( int argc, char *argv[] )
@@ -1342,6 +1373,7 @@ int main( int argc, char *argv[] )
ResetEvent( event ); /* in case this is a restart */
@ -65,5 +66,5 @@ index 4d70ea9..dbabfe4 100644
create_dynamic_registry_keys();
create_environment_registry_keys();
--
2.4.0
1.9.1

62
patches/wined3d-WINED3D_RS_COLORWRITEENABLE/0001-wined3d-Implement-all-8-d3d11-color-write-masks.patch
View File

@ -1,26 +1,26 @@
From 870c465ab6580a54d4fe4494bdaf572cf0351f7c Mon Sep 17 00:00:00 2001
From bc38b0c46dc7827dcc30afc93d1ad2458a95ebc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 20 Jul 2017 13:50:07 +0200
Subject: [PATCH] wined3d: Implement all 8 d3d11 color write masks.
---
dlls/d3d11/device.c | 29 ++++++++---------
dlls/d3d11/device.c | 29 ++++++++++-----------
dlls/d3d11/state.c | 4 ---
dlls/wined3d/context.c | 10 +++---
dlls/wined3d/device.c | 6 ++--
dlls/wined3d/state.c | 57 ++++++++++++++++------------------
dlls/wined3d/stateblock.c | 11 ++++---
dlls/wined3d/surface.c | 7 ++---
dlls/wined3d/utils.c | 6 +++-
dlls/wined3d/context.c | 10 +++-----
dlls/wined3d/device.c | 6 ++---
dlls/wined3d/state.c | 57 +++++++++++++++++++-----------------------
dlls/wined3d/stateblock.c | 11 +++++---
dlls/wined3d/surface.c | 7 +++---
dlls/wined3d/utils.c | 6 ++++-
dlls/wined3d/wined3d_private.h | 1 +
include/wine/wined3d.h | 14 ++++++++-
include/wine/wined3d.h | 14 ++++++++++-
10 files changed, 74 insertions(+), 71 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 7ad3d9b5..080c7829 100644
index 8f12098..c225563 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -702,6 +702,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
@@ -2081,6 +2081,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f};
struct d3d_blend_state *blend_state_impl;
const D3D11_BLEND_DESC *desc;
@ -28,7 +28,7 @@ index 7ad3d9b5..080c7829 100644
TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n",
iface, blend_state, debug_float4(blend_factor), sample_mask);
@@ -716,14 +717,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
@@ -2095,14 +2096,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
wined3d_device_set_blend_state(device->wined3d_device, NULL,
(const struct wined3d_color *)blend_factor);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE);
@ -48,7 +48,7 @@ index 7ad3d9b5..080c7829 100644
wined3d_mutex_unlock();
return;
}
@@ -745,14 +743,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
@@ -2124,14 +2122,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha);
}
@ -71,7 +71,7 @@ index 7ad3d9b5..080c7829 100644
}
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index 6de35029..20517498 100644
index 6de3502..2051749 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -347,10 +347,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
@ -86,7 +86,7 @@ index 6de35029..20517498 100644
/* glEnableIndexedEXT(GL_BLEND, ...) */
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 4096673d..c326f3d5 100644
index 2653925..fd43a81 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2769,7 +2769,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine
@ -111,7 +111,7 @@ index 4096673d..c326f3d5 100644
context->last_was_rhw = TRUE;
context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */
@@ -4867,7 +4865,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
@@ -4876,7 +4874,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL)
continue;
@ -121,7 +121,7 @@ index 4096673d..c326f3d5 100644
wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding);
wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dee99dcd..c7563566 100644
index 3b6db26..d679f38 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -392,10 +392,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@ -138,10 +138,10 @@ index dee99dcd..c7563566 100644
checkGLcall("glClearColor");
clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 8708aa09..8cb9a7b5 100644
index d25ee97..7b219d4 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1554,9 +1554,6 @@ static void state_debug_monitor(struct wined3d_context *context, const struct wi
@@ -1564,9 +1564,6 @@ static void state_debug_monitor(struct wined3d_context *context, const struct wi
static void state_colorwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
DWORD mask0 = state->render_states[WINED3D_RS_COLORWRITEENABLE];
@ -151,7 +151,7 @@ index 8708aa09..8cb9a7b5 100644
const struct wined3d_gl_info *gl_info = context->gl_info;
TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n",
@@ -1570,13 +1567,7 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined
@@ -1580,13 +1577,7 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined
mask0 & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
checkGLcall("glColorMask(...)");
@ -166,7 +166,7 @@ index 8708aa09..8cb9a7b5 100644
}
static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DWORD mask)
@@ -1589,24 +1580,20 @@ static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DW
@@ -1599,24 +1590,20 @@ static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DW
checkGLcall("glColorMaski");
}
@ -201,7 +201,7 @@ index 8708aa09..8cb9a7b5 100644
}
static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
@@ -4661,18 +4648,26 @@ const struct StateEntryTemplate misc_state_template[] =
@@ -4671,18 +4658,26 @@ const struct StateEntryTemplate misc_state_template[] =
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEMASK), { STATE_RENDER(WINED3D_RS_MULTISAMPLEMASK), state_multisampmask }, WINED3D_GL_EXT_NONE },
{ STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE },
@ -236,7 +236,7 @@ index 8708aa09..8cb9a7b5 100644
{ STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE },
/* Samplers */
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 1c8e6ade..d697ed50 100644
index 8117652..59efd12 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -44,6 +44,10 @@ static const DWORD pixel_states_render[] =
@ -284,9 +284,9 @@ index 1c8e6ade..d697ed50 100644
+ rs[WINED3D_RS_COLORWRITE(i)] = 0x0000000f;
}
static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info)
static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHEST_TEXTURE_STATE + 1])
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0ee2f826..9022f421 100644
index 19b6d0b..1483855 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -160,6 +160,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3
@ -311,7 +311,7 @@ index 0ee2f826..9022f421 100644
gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST);
context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE));
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index dd70d3fc..bea118ac 100644
index dd70d3f..bea118a 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4752,7 +4752,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state)
@ -338,10 +338,10 @@ index dd70d3fc..bea118ac 100644
D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS);
D3DSTATE_TO_STR(WINED3D_RS_WRAP8);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1e3ec28d..c98b5717 100644
index 7f0ee7f..a69b6ca 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -272,6 +272,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
@@ -273,6 +273,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup
#define MAX_UNORDERED_ACCESS_VIEWS 8
#define MAX_TGSM_REGISTERS 8192
#define MAX_VERTEX_BLENDS 4
@ -350,10 +350,10 @@ index 1e3ec28d..c98b5717 100644
struct min_lookup
{
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 06f4f76e..5197e71f 100644
index 167a749..5ff9d35 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -402,8 +402,20 @@ enum wined3d_render_state
@@ -404,8 +404,20 @@ enum wined3d_render_state
WINED3D_RS_SRCBLENDALPHA = 207,
WINED3D_RS_DESTBLENDALPHA = 208,
WINED3D_RS_BLENDOPALPHA = 209,
@ -376,5 +376,5 @@ index 06f4f76e..5197e71f 100644
enum wined3d_blend
{
--
2.20.1
1.9.1