wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against dfeded6460ce067fe1c0540306c2964a170bed2a.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-10-12 09:22:48 +11:00
parent 5e9626af6c
commit c7f16e15e7
12 changed files with 58 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/dinput-SetActionMap-genre/definition
View File

@ -1,2 +1,3 @@
Fixes: [47326] dinput: Allow mapping of controls based of genre type.
Depends: dinput-joy-mappings
Disabled: True

1
patches/dinput-axis-recalc/definition
View File

@ -1 +1,2 @@
Fixes: [41317] dinput: Recalculated Axis after deadzone change.
Disabled: True

1
patches/dinput-joy-mappings/definition
View File

@ -1 +1,2 @@
Fixes: [34108] dinput: Improve support for user Joystick configuration.
Disabled: True

1
patches/dinput-reconnect-joystick/definition
View File

@ -1 +1,2 @@
Fixes: [34297] dinput: Allow reconnecting to disconnected joysticks
Disabled: True

2
patches/dinput-remap-joystick/definition
View File

@ -1,2 +1,2 @@
Fixes: [35815] dinput: Allow remapping of joystick buttons.
Disabled: True

32
patches/eventfd_synchronization/0015-server-Create-eventfd-file-descriptors-for-event-obj.patch
View File

@ -1,4 +1,4 @@
From dfa487b0d7d7895f6f47f4ae9c81faf951080b56 Mon Sep 17 00:00:00 2001
From bc78e23a57da5470ed44b72b2d4112583ea236d1 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Fri, 8 Jun 2018 21:01:24 -0500
Subject: [PATCH] server: Create eventfd file descriptors for event objects.
@ -9,8 +9,8 @@ This lets system processes shut down.
---
server/esync.c | 8 ++++++++
server/esync.h | 1 +
server/event.c | 30 ++++++++++++++++++++++++++++--
3 files changed, 37 insertions(+), 2 deletions(-)
server/event.c | 29 +++++++++++++++++++++++++++--
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/server/esync.c b/server/esync.c
index 2b9307267f9..975e5d2ddd6 100644
@ -41,18 +41,10 @@ index 1e12560ddd6..fcbfd0989bb 100644
void esync_wake_up( struct object *obj );
+void esync_clear( int fd );
diff --git a/server/event.c b/server/event.c
index 4168fef90d1..346c55805c8 100644
index c727bfdd1ba..f1a88e3d23f 100644
--- a/server/event.c
+++ b/server/event.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <unistd.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -34,6 +35,7 @@
@@ -35,6 +35,7 @@
#include "thread.h"
#include "request.h"
#include "security.h"
@ -60,7 +52,7 @@ index 4168fef90d1..346c55805c8 100644
static const WCHAR event_name[] = {'E','v','e','n','t'};
@@ -55,13 +57,16 @@ struct event
@@ -56,13 +57,16 @@ struct event
struct list kernel_object; /* list of kernel object pointers */
int manual_reset; /* is it a manual reset event? */
int signaled; /* event has been signaled */
@ -77,7 +69,7 @@ index 4168fef90d1..346c55805c8 100644
static const struct object_ops event_ops =
{
@@ -71,7 +76,7 @@ static const struct object_ops event_ops =
@@ -72,7 +76,7 @@ static const struct object_ops event_ops =
add_queue, /* add_queue */
remove_queue, /* remove_queue */
event_signaled, /* signaled */
@ -86,7 +78,7 @@ index 4168fef90d1..346c55805c8 100644
event_satisfied, /* satisfied */
event_signal, /* signal */
no_get_fd, /* get_fd */
@@ -85,7 +90,7 @@ static const struct object_ops event_ops =
@@ -86,7 +90,7 @@ static const struct object_ops event_ops =
no_open_file, /* open_file */
event_get_kernel_obj_list, /* get_kernel_obj_list */
no_close_handle, /* close_handle */
@ -95,7 +87,7 @@ index 4168fef90d1..346c55805c8 100644
};
@@ -151,6 +156,9 @@ struct event *create_event( struct object *root, const struct unicode_str *name,
@@ -152,6 +156,9 @@ struct event *create_event( struct object *root, const struct unicode_str *name,
list_init( &event->kernel_object );
event->manual_reset = manual_reset;
event->signaled = initial_state;
@ -105,7 +97,7 @@ index 4168fef90d1..346c55805c8 100644
}
}
return event;
@@ -179,6 +187,9 @@ void set_event( struct event *event )
@@ -180,6 +187,9 @@ void set_event( struct event *event )
void reset_event( struct event *event )
{
event->signaled = 0;
@ -115,7 +107,7 @@ index 4168fef90d1..346c55805c8 100644
}
static void event_dump( struct object *obj, int verbose )
@@ -196,6 +207,13 @@ static int event_signaled( struct object *obj, struct wait_queue_entry *entry )
@@ -197,6 +207,13 @@ static int event_signaled( struct object *obj, struct wait_queue_entry *entry )
return event->signaled;
}
@ -129,7 +121,7 @@ index 4168fef90d1..346c55805c8 100644
static void event_satisfied( struct object *obj, struct wait_queue_entry *entry )
{
struct event *event = (struct event *)obj;
@@ -224,6 +242,14 @@ static struct list *event_get_kernel_obj_list( struct object *obj )
@@ -225,6 +242,14 @@ static struct list *event_get_kernel_obj_list( struct object *obj )
return &event->kernel_object;
}

46
patches/nvapi-Stub_DLL/0019-wined3d-Make-depth-bounds-test-into-a-proper-state.patch
View File

@ -1,4 +1,4 @@
From 673e8c2b688451f8bfa7fc1c45ba2f7c8be19614 Mon Sep 17 00:00:00 2001
From e54feda95d0e88080d118d2079c62f091dffe3e3 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 22 May 2021 17:38:50 -0500
Subject: [PATCH] wined3d: Make depth bounds test into a proper state.
@ -12,10 +12,10 @@ Subject: [PATCH] wined3d: Make depth bounds test into a proper state.
5 files changed, 98 insertions(+), 31 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 13c0fce5bb1..fb3e7db991f 100644
index 1b4ed519260..33a8519a613 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -135,6 +135,7 @@ enum wined3d_cs_op
@@ -145,6 +145,7 @@ enum wined3d_cs_op
WINED3D_CS_OP_SET_RENDER_STATE,
WINED3D_CS_OP_SET_TEXTURE_STATE,
WINED3D_CS_OP_SET_SAMPLER_STATE,
@ -23,7 +23,7 @@ index 13c0fce5bb1..fb3e7db991f 100644
WINED3D_CS_OP_SET_TRANSFORM,
WINED3D_CS_OP_SET_CLIP_PLANE,
WINED3D_CS_OP_SET_COLOR_KEY,
@@ -385,6 +386,12 @@ struct wined3d_cs_set_sampler_state
@@ -395,6 +396,12 @@ struct wined3d_cs_set_sampler_state
DWORD value;
};
@ -36,7 +36,7 @@ index 13c0fce5bb1..fb3e7db991f 100644
struct wined3d_cs_set_transform
{
enum wined3d_cs_op opcode;
@@ -609,6 +616,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
@@ -619,6 +626,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER_STATE);
@ -44,7 +44,7 @@ index 13c0fce5bb1..fb3e7db991f 100644
WINED3D_TO_STR(WINED3D_CS_OP_SET_TRANSFORM);
WINED3D_TO_STR(WINED3D_CS_OP_SET_CLIP_PLANE);
WINED3D_TO_STR(WINED3D_CS_OP_SET_COLOR_KEY);
@@ -1923,6 +1931,28 @@ void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context
@@ -1939,6 +1947,28 @@ void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context
wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
}
@ -73,7 +73,7 @@ index 13c0fce5bb1..fb3e7db991f 100644
static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data)
{
const struct wined3d_cs_set_transform *op = data;
@@ -2917,6 +2947,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
@@ -2963,6 +2993,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
/* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state,
/* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state,
/* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state,
@ -82,11 +82,11 @@ index 13c0fce5bb1..fb3e7db991f 100644
/* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane,
/* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d2147447ee0..cc100b02bac 100644
index 436c4dfe854..b0c7579b4ed 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1891,6 +1891,14 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
wined3d_rasterizer_state_decref(prev);
@@ -1923,6 +1923,14 @@ out:
wined3d_mutex_unlock();
}
+static void wined3d_device_context_set_depth_bounds(struct wined3d_device_context *context,
@ -100,7 +100,7 @@ index d2147447ee0..cc100b02bac 100644
void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
const struct wined3d_viewport *viewports)
{
@@ -3546,7 +3554,8 @@ static void wined3d_device_set_texture(struct wined3d_device *device,
@@ -3612,7 +3620,8 @@ static void wined3d_device_set_texture(struct wined3d_device *device,
void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
struct wined3d_stateblock *stateblock)
{
@ -110,7 +110,7 @@ index d2147447ee0..cc100b02bac 100644
const struct wined3d_stateblock_state *state = &stateblock->stateblock_state;
const struct wined3d_saved_states *changed = &stateblock->changed;
const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT;
@@ -3652,7 +3661,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3718,7 +3727,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_COLORWRITEENABLE1:
case WINED3D_RS_COLORWRITEENABLE2:
case WINED3D_RS_COLORWRITEENABLE3:
@ -119,7 +119,7 @@ index d2147447ee0..cc100b02bac 100644
break;
case WINED3D_RS_BACK_STENCILFAIL:
@@ -3671,7 +3680,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3737,7 +3746,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_ZENABLE:
case WINED3D_RS_ZFUNC:
case WINED3D_RS_ZWRITEENABLE:
@ -128,7 +128,7 @@ index d2147447ee0..cc100b02bac 100644
break;
case WINED3D_RS_FILLMODE:
@@ -3680,9 +3689,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3746,9 +3755,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
case WINED3D_RS_DEPTHBIAS:
case WINED3D_RS_SCISSORTESTENABLE:
case WINED3D_RS_ANTIALIASEDLINEENABLE:
@ -145,7 +145,7 @@ index d2147447ee0..cc100b02bac 100644
default:
wined3d_device_set_render_state(device, idx, state->rs[idx]);
break;
@@ -3871,6 +3886,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
@@ -3937,6 +3952,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
}
}
@ -245,10 +245,10 @@ index 8316269afcf..6cd4ff30458 100644
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE },
{ STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE },
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 4019dd4d812..9b58c217a0c 100644
index 47718c9f710..39d39396a6e 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -5321,6 +5321,8 @@ const char *debug_d3dstate(DWORD state)
@@ -5323,6 +5323,8 @@ const char *debug_d3dstate(DWORD state)
return "STATE_DEPTH_STENCIL";
if (STATE_IS_STENCIL_REF(state))
return "STATE_STENCIL_REF";
@ -258,10 +258,10 @@ index 4019dd4d812..9b58c217a0c 100644
return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a2048fc6ea6..17ad7869d1b 100644
index 56c90ba6606..e7ee1c1478a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1838,7 +1838,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state
@@ -1854,7 +1854,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state
#define STATE_STENCIL_REF (STATE_DEPTH_STENCIL + 1)
#define STATE_IS_STENCIL_REF(a) ((a) == STATE_STENCIL_REF)
@ -273,7 +273,7 @@ index a2048fc6ea6..17ad7869d1b 100644
#define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET)
#define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER)
@@ -3670,6 +3673,13 @@ struct wined3d_light_state
@@ -3703,6 +3706,13 @@ struct wined3d_light_state
const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS];
};
@ -287,7 +287,7 @@ index a2048fc6ea6..17ad7869d1b 100644
#define WINED3D_STATE_NO_REF 0x00000001
#define WINED3D_STATE_INIT_DEFAULT 0x00000002
@@ -3724,8 +3734,11 @@ struct wined3d_state
@@ -3757,8 +3767,11 @@ struct wined3d_state
struct wined3d_blend_state *blend_state;
struct wined3d_color blend_factor;
unsigned int sample_mask;
@ -299,7 +299,7 @@ index a2048fc6ea6..17ad7869d1b 100644
struct wined3d_rasterizer_state *rasterizer_state;
};
@@ -4806,6 +4819,8 @@ void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *c
@@ -4878,6 +4891,8 @@ void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *c
void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context,
enum wined3d_shader_type type, unsigned int start_idx, unsigned int count,
const struct wined3d_constant_buffer_state *buffers) DECLSPEC_HIDDEN;
@ -309,5 +309,5 @@ index a2048fc6ea6..17ad7869d1b 100644
struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context,
--
2.30.2
2.33.0

10
patches/nvapi-Stub_DLL/0021-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
View File

@ -1,4 +1,4 @@
From ede7d81998194cecad240bd3df4cd902c01a0bde Mon Sep 17 00:00:00 2001
From c7cbd42a6085d03a94ee4ac9b77834b3725bf033 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 22 May 2021 18:11:07 -0500
Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest().
@ -117,11 +117,11 @@ index c8b66ac2fa3..b8b4750203a 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cc100b02bac..962112074a4 100644
index b0c7579b4ed..8c61c530812 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1891,7 +1891,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
wined3d_rasterizer_state_decref(prev);
@@ -1923,7 +1923,7 @@ out:
wined3d_mutex_unlock();
}
-static void wined3d_device_context_set_depth_bounds(struct wined3d_device_context *context,
@ -155,5 +155,5 @@ index 7be893b8f21..689fc55fdfe 100644
struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref);
HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context,
--
2.30.2
2.33.0

97
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "7554bd4b41a1429517eb86fd20dbe813cdd0550a"
echo "dfeded6460ce067fe1c0540306c2964a170bed2a"
}
# Show version information
@ -109,11 +109,6 @@ patch_enable_all ()
enable_ddraw_IDirect3DTexture2_Load="$1"
enable_ddraw_Silence_FIXMEs="$1"
enable_ddraw_version_check="$1"
enable_dinput_SetActionMap_genre="$1"
enable_dinput_axis_recalc="$1"
enable_dinput_joy_mappings="$1"
enable_dinput_reconnect_joystick="$1"
enable_dinput_remap_joystick="$1"
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dwrite_FontFallback="$1"
@ -364,21 +359,6 @@ patch_enable ()
ddraw-version-check)
enable_ddraw_version_check="$2"
;;
dinput-SetActionMap-genre)
enable_dinput_SetActionMap_genre="$2"
;;
dinput-axis-recalc)
enable_dinput_axis_recalc="$2"
;;
dinput-joy-mappings)
enable_dinput_joy_mappings="$2"
;;
dinput-reconnect-joystick)
enable_dinput_reconnect_joystick="$2"
;;
dinput-remap-joystick)
enable_dinput_remap_joystick="$2"
;;
dsound-EAX)
enable_dsound_EAX="$2"
;;
@ -1407,13 +1387,6 @@ if test "$enable_dsound_EAX" -eq 1; then
enable_dsound_Fast_Mixer=1
fi
if test "$enable_dinput_SetActionMap_genre" -eq 1; then
if test "$enable_dinput_joy_mappings" -gt 1; then
abort "Patchset dinput-joy-mappings disabled, but dinput-SetActionMap-genre depends on that."
fi
enable_dinput_joy_mappings=1
fi
if test "$enable_ddraw_version_check" -eq 1; then
if test "$enable_ddraw_Device_Caps" -gt 1; then
abort "Patchset ddraw-Device_Caps disabled, but ddraw-version-check depends on that."
@ -1783,74 +1756,6 @@ if test "$enable_ddraw_version_check" -eq 1; then
patch_apply ddraw-version-check/0001-ddraw-Return-correct-devices-based-off-requested-Dir.patch
fi
# Patchset dinput-joy-mappings
# |
# | This patchset fixes the following Wine bugs:
# | * [#34108] dinput: Improve support for user Joystick configuration.
# |
# | Modified files:
# | * dlls/dinput/ansi.c, dlls/dinput/config.c, dlls/dinput/device.c, dlls/dinput/device_private.h, dlls/dinput/dinput_main.c,
# | dlls/dinput/joystick.c, dlls/dinput8/tests/device.c
# |
if test "$enable_dinput_joy_mappings" -eq 1; then
patch_apply dinput-joy-mappings/0001-dinput-Load-users-Joystick-mappings.patch
patch_apply dinput-joy-mappings/0002-dinput-Allow-empty-Joystick-mappings.patch
patch_apply dinput-joy-mappings/0003-dinput-Support-username-in-Config-dialog.patch
patch_apply dinput-joy-mappings/0004-dinput-Dont-allow-Fixed-actions-to-be-changed.patch
fi
# Patchset dinput-SetActionMap-genre
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * dinput-joy-mappings
# |
# | This patchset fixes the following Wine bugs:
# | * [#47326] dinput: Allow mapping of controls based of genre type.
# |
# | Modified files:
# | * dlls/dinput/device.c
# |
if test "$enable_dinput_SetActionMap_genre" -eq 1; then
patch_apply dinput-SetActionMap-genre/0001-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch
fi
# Patchset dinput-axis-recalc
# |
# | This patchset fixes the following Wine bugs:
# | * [#41317] dinput: Recalculated Axis after deadzone change.
# |
# | Modified files:
# | * dlls/dinput/joystick.c
# |
if test "$enable_dinput_axis_recalc" -eq 1; then
patch_apply dinput-axis-recalc/0001-dinput-Recalculated-Axis-after-deadzone-change.patch
fi
# Patchset dinput-reconnect-joystick
# |
# | This patchset fixes the following Wine bugs:
# | * [#34297] dinput: Allow reconnecting to disconnected joysticks
# |
# | Modified files:
# | * dlls/dinput/joystick_linuxinput.c
# |
if test "$enable_dinput_reconnect_joystick" -eq 1; then
patch_apply dinput-reconnect-joystick/0001-dinput-Allow-reconnecting-to-disconnected-joysticks.patch
fi
# Patchset dinput-remap-joystick
# |
# | This patchset fixes the following Wine bugs:
# | * [#35815] dinput: Allow remapping of joystick buttons.
# |
# | Modified files:
# | * dlls/dinput/joystick.c, dlls/dinput/joystick_linux.c, dlls/dinput/joystick_linuxinput.c, dlls/dinput/joystick_osx.c,
# | dlls/dinput/joystick_private.h
# |
if test "$enable_dinput_remap_joystick" -eq 1; then
patch_apply dinput-remap-joystick/0001-dinput-Allow-remapping-of-joystick-buttons.patch
fi
# Patchset dsound-Fast_Mixer
# |
# | This patchset fixes the following Wine bugs:

12
patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
View File

@ -1,4 +1,4 @@
From c2482d111b828a7613e50db405d7071b54507ff8 Mon Sep 17 00:00:00 2001
From ffbf14456d085e1c74edc93a92b14aadb97d6972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 8 Jun 2017 23:41:02 +0200
Subject: [PATCH] dxgkrnl.sys: Add stub driver.
@ -14,17 +14,17 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
create mode 100644 dlls/dxgkrnl.sys/main.c
diff --git a/configure.ac b/configure.ac
index 29ff8923ec8..7a27ac4a11d 100644
index 37be28f13e7..f499ec92715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3256,6 +3256,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
WINE_CONFIG_MAKEFILE(dlls/dxerr9)
@@ -3133,6 +3133,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn)
WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
+WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
WINE_CONFIG_MAKEFILE(dlls/dxguid)
WINE_CONFIG_MAKEFILE(dlls/dxtrans)
WINE_CONFIG_MAKEFILE(dlls/dxva2)
WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
new file mode 100644
index 00000000000..50390fbbb1e
@ -115,5 +115,5 @@ index 00000000000..c5639c237c8
+ return STATUS_SUCCESS;
+}
--
2.30.2
2.33.0

10
patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
View File

@ -1,4 +1,4 @@
From 1c65bd50c4e154444a025a2ebd135c16eb4f18c1 Mon Sep 17 00:00:00 2001
From 5e9c65ebccf3910bdd15fe7f9302c16a054c3006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 8 Jun 2017 23:42:32 +0200
Subject: [PATCH] dxgmms1.sys: Add stub driver.
@ -14,17 +14,17 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
create mode 100644 dlls/dxgmms1.sys/main.c
diff --git a/configure.ac b/configure.ac
index 7a27ac4a11d..c446446d4a2 100644
index f499ec92715..c8845e5b696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3257,6 +3257,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
@@ -3134,6 +3134,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
WINE_CONFIG_MAKEFILE(dlls/dxgi)
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
+WINE_CONFIG_MAKEFILE(dlls/dxgmms1.sys)
WINE_CONFIG_MAKEFILE(dlls/dxguid)
WINE_CONFIG_MAKEFILE(dlls/dxtrans)
WINE_CONFIG_MAKEFILE(dlls/dxva2)
WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
new file mode 100644
index 00000000000..3ecc3ee5a3e
@ -91,5 +91,5 @@ index 00000000000..686493d3296
+ return STATUS_SUCCESS;
+}
--
2.30.2
2.33.0

2
staging/upstream-commit
View File

@ -1 +1 @@
7554bd4b41a1429517eb86fd20dbe813cdd0550a
dfeded6460ce067fe1c0540306c2964a170bed2a