-
-
Notifications
You must be signed in to change notification settings - Fork 66
/
proton-exp-9.0.patch
115 lines (107 loc) · 3.9 KB
/
proton-exp-9.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
diff -ruN proton-exp/dlls/ntdll/unix/virtual.c proton-exp-new/dlls/ntdll/unix/virtual.c
--- proton-exp/dlls/ntdll/unix/virtual.c 2024-04-14 14:01:48.709513621 +0000
+++ proton-exp-new/dlls/ntdll/unix/virtual.c 2024-04-14 14:02:04.503318324 +0000
@@ -456,41 +456,7 @@
static void kernel_writewatch_register_range( struct file_view *view, void *base, size_t size )
{
- struct uffdio_register uffdio_register;
- struct uffdio_writeprotect wp;
-
- if (!(view->protect & VPROT_WRITEWATCH) || !use_kernel_writewatch) return;
-
- madvise( base, size, MADV_NOHUGEPAGE );
- if (use_kernel_writewatch == 2)
- {
- kernel_writewatch_reset( base, size );
- return;
- }
-
- uffdio_register.range.start = (UINT_PTR)base;
- uffdio_register.range.len = size;
- uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
- if (ioctl( uffd_fd, UFFDIO_REGISTER, &uffdio_register ) == -1)
- {
- ERR( "ioctl( UFFDIO_REGISTER ) failed, %s.\n", strerror(errno) );
- return;
- }
-
- if (!(uffdio_register.ioctls & UFFDIO_WRITEPROTECT))
- {
- ERR( "uffdio_register.ioctls %s.\n", wine_dbgstr_longlong(uffdio_register.ioctls) );
- return;
- }
- wp.range.start = (UINT_PTR)base;
- wp.range.len = size;
- wp.mode = UFFDIO_WRITEPROTECT_MODE_WP;
-
- if (ioctl(uffd_fd, UFFDIO_WRITEPROTECT, &wp) == -1)
- {
- perror("ioctl(UFFDIO_WRITEPROTECT)");
- exit(-1);
- }
+ return;
}
static NTSTATUS kernel_soft_dirty_get_write_watches( void *base, SIZE_T size, void **addresses, ULONG_PTR *count, BOOL reset )
diff -ruN proton-exp/dlls/winegstreamer/Makefile.in proton-exp-new/dlls/winegstreamer/Makefile.in
--- proton-exp/dlls/winegstreamer/Makefile.in 2024-04-14 14:01:48.969510402 +0000
+++ proton-exp-new/dlls/winegstreamer/Makefile.in 2024-04-14 14:02:47.668786548 +0000
@@ -32,11 +32,4 @@
winegstreamer_classes.idl \
wm_reader.c \
wma_decoder.c \
- wmv_decoder.c \
- media-converter/audioconv.c \
- media-converter/audioconvbin.c \
- media-converter/fossilize.c \
- media-converter/lib.c \
- media-converter/murmur3.c \
- media-converter/protondemuxer.c \
- media-converter/videoconv.c
+ wmv_decoder.c
diff -ruN proton-exp/dlls/winegstreamer/unixlib.c proton-exp-new/dlls/winegstreamer/unixlib.c
--- proton-exp/dlls/winegstreamer/unixlib.c 2024-04-14 14:01:48.973510353 +0000
+++ proton-exp-new/dlls/winegstreamer/unixlib.c 2024-04-14 14:02:04.503318324 +0000
@@ -46,8 +46,6 @@
GST_DEBUG_CATEGORY(wine);
-extern bool media_converter_init(void);
-
GstGLDisplay *gl_display;
GstStreamType stream_type_from_caps(GstCaps *caps)
@@ -325,12 +323,5 @@
}
}
- if (!media_converter_init())
- {
- GST_ERROR("Failed to init media converter.");
- gst_object_unref(gl_display);
- return STATUS_UNSUCCESSFUL;
- }
-
return STATUS_SUCCESS;
}
diff -ruN proton-exp/dlls/winegstreamer/wg_source.c proton-exp-new/dlls/winegstreamer/wg_source.c
--- proton-exp/dlls/winegstreamer/wg_source.c 2024-04-14 14:01:48.973510353 +0000
+++ proton-exp-new/dlls/winegstreamer/wg_source.c 2024-04-14 14:02:04.503318324 +0000
@@ -82,23 +82,7 @@
GstCaps *caps;
gchar *str;
- if (!(caps = gst_type_find_helper_for_data_with_extension(NULL, data, size,
- extension ? extension + 1 : NULL, &probability)))
- {
- GST_ERROR("Failed to detect caps for url %s, data %p, size %u", url, data, size);
- return NULL;
- }
-
- str = gst_caps_to_string(caps);
- if (probability > GST_TYPE_FIND_POSSIBLE)
- GST_INFO("Detected caps %s with probability %u for url %s, data %p, size %u",
- str, probability, url, data, size);
- else
- GST_FIXME("Detected caps %s with probability %u for url %s, data %p, size %u",
- str, probability, url, data, size);
- g_free(str);
-
- return caps;
+ return NULL;
}
static GstPad *create_pad_with_caps(GstPadDirection direction, GstCaps *caps)