From f168899ce1d6f6a0b551a0d8dedaad4a16257713 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 23 Jan 2021 11:32:31 +1100 Subject: [PATCH] Rebase against 2d4dd4252b0cf6526b3cc8194cce642b16eb12f6. --- ...r-Implement-decoder-MFT-on-gstreamer.patch | 28 +++++++++---------- ...2-tests-Add-tests-for-NtQuerySection.patch | 4 +-- patches/patchinstall.sh | 2 +- ...nt-set-DDSCAPS_FLIP-for-gdi-renderer.patch | 18 ++++++------ staging/upstream-commit | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/patches/mfplat-streaming-support/0041-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch b/patches/mfplat-streaming-support/0041-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch index c5ecee7c..49af5d3c 100644 --- a/patches/mfplat-streaming-support/0041-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch +++ b/patches/mfplat-streaming-support/0041-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch @@ -1,4 +1,4 @@ -From f84c2f0717e5c90f837262e88dad4b1fdcbc64d2 Mon Sep 17 00:00:00 2001 +From 389c087267b8d9d3892c68b52ffa965df38730db Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Mon, 16 Mar 2020 12:09:39 -0500 Subject: [PATCH] winegstreamer: Implement decoder MFT on gstreamer. @@ -28,7 +28,7 @@ index 4f6b428f067..81c670c17e4 100644 pin.c \ qualitycontrol.c \ diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c -index 51aaefa911d..261a5b9f4ce 100644 +index b9effe73a5b..4afefe91aa8 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -51,6 +51,8 @@ static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) @@ -40,7 +40,7 @@ index 51aaefa911d..261a5b9f4ce 100644 pthread_mutex_lock(&cbdata->lock); cbdata->finished = 1; -@@ -404,3 +406,66 @@ void mf_src_no_more_pads_wrapper(GstElement *element, gpointer user) +@@ -363,3 +365,66 @@ void mf_src_no_more_pads_wrapper(GstElement *element, gpointer user) call_cb(&cbdata); } @@ -108,10 +108,10 @@ index 51aaefa911d..261a5b9f4ce 100644 + return cbdata.u.new_sample_data.ret; +} diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h -index a48999bbf71..6659aedefa5 100644 +index 0e262c12db8..98dff43ba9b 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h -@@ -53,6 +53,12 @@ enum CB_TYPE { +@@ -50,6 +50,12 @@ enum CB_TYPE { MF_SRC_STREAM_REMOVED, MF_SRC_NO_MORE_PADS, MEDIA_SOURCE_MAX, @@ -124,7 +124,7 @@ index a48999bbf71..6659aedefa5 100644 }; struct cb_data { -@@ -137,6 +143,17 @@ struct cb_data { +@@ -120,6 +126,17 @@ struct cb_data { GstQuery *query; gboolean ret; } query_sink_data; @@ -142,15 +142,15 @@ index a48999bbf71..6659aedefa5 100644 } u; int finished; -@@ -148,6 +165,7 @@ struct cb_data { +@@ -131,6 +148,7 @@ struct cb_data { void mark_wine_thread(void) DECLSPEC_HIDDEN; void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; +void perform_cb_mf_decode(struct cb_data *data) DECLSPEC_HIDDEN; - GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -@@ -172,5 +190,10 @@ GstBusSyncReply mf_src_bus_watch_wrapper(GstBus *bus, GstMessage *message, gpoin + gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; +@@ -152,5 +170,10 @@ GstBusSyncReply mf_src_bus_watch_wrapper(GstBus *bus, GstMessage *message, gpoin void mf_src_stream_added_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void mf_src_stream_removed_wrapper(GstElement *element, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void mf_src_no_more_pads_wrapper(GstElement *element, gpointer user) DECLSPEC_HIDDEN; @@ -162,10 +162,10 @@ index a48999bbf71..6659aedefa5 100644 #endif diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h -index dcf76554b6d..019cce5fad5 100644 +index 7000cb48a52..8494b34be98 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h -@@ -75,6 +75,7 @@ BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +@@ -77,6 +77,7 @@ BOOL init_gstreamer(void) DECLSPEC_HIDDEN; void start_dispatch_thread(void) DECLSPEC_HIDDEN; @@ -173,7 +173,7 @@ index dcf76554b6d..019cce5fad5 100644 extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; -@@ -85,6 +86,12 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; +@@ -87,6 +88,12 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; GstBuffer *gst_buffer_from_mf_sample(IMFSample *in) DECLSPEC_HIDDEN; @@ -1513,7 +1513,7 @@ index 00000000000..7055ffa54fc + } +} diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c -index bf3486d2be8..b604f6df066 100644 +index 72fd31eb052..77859cb277f 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -410,6 +410,16 @@ static const GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x0 @@ -1615,7 +1615,7 @@ index bf3486d2be8..b604f6df066 100644 /* audio-specific-config is stored here */ }; diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl -index 47c10a09cf0..fe8649c690c 100644 +index 1b203815330..05365e5e298 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -73,3 +73,15 @@ coclass WINEAudioConverter { } diff --git a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch index ff1ad3c2..5922cb18 100644 --- a/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch +++ b/patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch @@ -169,8 +169,8 @@ index 46b019c5817..b0c3db0fb76 100644 + ok(info.image.MaximumStackSize == nt->OptionalHeader.SizeOfStackReserve, "expected %#lx, got %#lx\n", (SIZE_T)nt->OptionalHeader.SizeOfStackReserve, info.image.MaximumStackSize); + ok(info.image.CommittedStackSize == nt->OptionalHeader.SizeOfStackCommit, "expected %#lx, got %#lx\n", (SIZE_T)nt->OptionalHeader.SizeOfStackCommit, info.image.CommittedStackSize); + ok(info.image.SubSystemType == nt->OptionalHeader.Subsystem, "expected %#x, got %#x\n", nt->OptionalHeader.Subsystem, info.image.SubSystemType); -+ ok(info.image.SubsystemVersionLow == nt->OptionalHeader.MinorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MinorSubsystemVersion, info.image.SubsystemVersionLow); -+ ok(info.image.SubsystemVersionHigh == nt->OptionalHeader.MajorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MajorSubsystemVersion, info.image.SubsystemVersionHigh); ++ ok(info.image.MinorSubsystemVersion == nt->OptionalHeader.MinorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MinorSubsystemVersion, info.image.MinorSubsystemVersion); ++ ok(info.image.MajorSubsystemVersion == nt->OptionalHeader.MajorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MajorSubsystemVersion, info.image.MajorSubsystemVersion); + ok(info.image.ImageCharacteristics == nt->FileHeader.Characteristics, "expected %#x, got %#x\n", nt->FileHeader.Characteristics, info.image.ImageCharacteristics); + ok(info.image.DllCharacteristics == nt->OptionalHeader.DllCharacteristics, "expected %#x, got %#x\n", nt->OptionalHeader.DllCharacteristics, info.image.DllCharacteristics); + ok(info.image.Machine == nt->FileHeader.Machine, "expected %#x, got %#x\n", nt->FileHeader.Machine, info.image.Machine); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 30b17325..902126a5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "158a9e738421cd16f2e8296f11baa724c64c8ca7" + echo "2d4dd4252b0cf6526b3cc8194cce642b16eb12f6" } # Show version information diff --git a/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch b/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch index 45c5131b..c3c510bf 100644 --- a/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch +++ b/patches/wined3d-unset-flip-gdi/0001-wined3d-Dont-set-DDSCAPS_FLIP-for-gdi-renderer.patch @@ -1,4 +1,4 @@ -From 1c2d05ef5e6417c26641f82c2d7ad43632ee237f Mon Sep 17 00:00:00 2001 +From ce957e22bf43363a4e1d713f243bc062649013f0 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 28 Jun 2019 14:27:10 +1000 Subject: [PATCH] wined3d: Dont set DDSCAPS_FLIP for gdi renderer @@ -11,10 +11,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47419 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c -index 991997af849..200edf9960c 100644 +index d06cbbbab0d..74766f710ae 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c -@@ -4399,6 +4399,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s +@@ -4310,6 +4310,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &adapter->gl_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER @@ -23,11 +23,11 @@ index 991997af849..200edf9960c 100644 | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c -index c3a1832e353..b02d1c84690 100644 +index 9a226edc65a..e76fc840f67 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c -@@ -298,6 +298,7 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s - BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; +@@ -564,6 +564,7 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FLIP @@ -35,10 +35,10 @@ index c3a1832e353..b02d1c84690 100644 | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index 4cae64a20e6..6a26fc2a0ae 100644 +index 167220a2299..9e27a76b95c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -2194,8 +2194,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in +@@ -2409,8 +2409,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->ddraw_caps.ssb_color_key_caps = ckey_caps; caps->ddraw_caps.ssb_fx_caps = fx_caps; @@ -49,5 +49,5 @@ index 4cae64a20e6..6a26fc2a0ae 100644 | WINEDDSCAPS_PRIMARYSURFACE | WINEDDSCAPS_TEXTURE -- -2.17.1 +2.29.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index c8b7b249..a7e0f282 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -158a9e738421cd16f2e8296f11baa724c64c8ca7 +2d4dd4252b0cf6526b3cc8194cce642b16eb12f6