diff --git a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch index a633605b..6be179c8 100644 --- a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From 2aeb3a9e57142c3f4ff86cb81b206bdbc146552d Mon Sep 17 00:00:00 2001 +From c8f9b712a946fac79af1290d14c1d31d0a8f0c10 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:54:26 +0100 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. @@ -7,17 +7,16 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. dlls/d2d1/bitmap.c | 2 +- dlls/d2d1/brush.c | 8 ++++---- dlls/d2d1/dc_render_target.c | 2 +- - dlls/d2d1/device.c | 2 +- dlls/d2d1/geometry.c | 6 +++--- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/state_block.c | 2 +- - 7 files changed, 12 insertions(+), 12 deletions(-) + 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c -index c0aef3c..8a4b517 100644 +index 39e81192f77..52810211701 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c -@@ -626,5 +626,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +@@ -623,5 +623,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) if (!iface) return NULL; assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl); @@ -25,10 +24,10 @@ index c0aef3c..8a4b517 100644 + return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface); } diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c -index 9c73ae1..a748669 100644 +index 21abf1456ab..1030884c2b7 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c -@@ -256,7 +256,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, +@@ -253,7 +253,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) { @@ -37,7 +36,7 @@ index 9c73ae1..a748669 100644 } static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface, -@@ -399,7 +399,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F * +@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F * static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface) { @@ -46,7 +45,7 @@ index 9c73ae1..a748669 100644 } static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface, -@@ -586,7 +586,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, +@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface) { @@ -55,7 +54,7 @@ index 9c73ae1..a748669 100644 } static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface, -@@ -818,7 +818,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, +@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface) { @@ -65,10 +64,10 @@ index 9c73ae1..a748669 100644 static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface, diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c -index b095008..6030826 100644 +index 310c5412967..9d9168dc8ee 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c -@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface) { @@ -77,24 +76,11 @@ index b095008..6030826 100644 } static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) -diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c -index 45b2258..bf32c23 100644 ---- a/dlls/d2d1/device.c -+++ b/dlls/d2d1/device.c -@@ -207,7 +207,7 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic - - static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) - { -- return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); -+ return CONTAINING_RECORD((ID2D1DeviceContext*)iface, struct d2d_device_context, ID2D1DeviceContext_iface); - } - - static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c -index 421ba2b..f8db51c 100644 +index 91ce32c28e7..da4a1f2d3ee 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c -@@ -2987,7 +2987,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = +@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface) { @@ -103,7 +89,7 @@ index 421ba2b..f8db51c 100644 } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out) -@@ -3503,7 +3503,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory +@@ -3498,7 +3498,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface) { @@ -112,7 +98,7 @@ index 421ba2b..f8db51c 100644 } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface, -@@ -3838,7 +3838,7 @@ fail: +@@ -3833,7 +3833,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface) { @@ -122,10 +108,10 @@ index 421ba2b..f8db51c 100644 static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c -index d0b9695..429561e 100644 +index 625f101eaa7..f3626c42cee 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c -@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface) { @@ -135,10 +121,10 @@ index d0b9695..429561e 100644 static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c -index b15384e..4e7e34b 100644 +index e3175146a64..b66752983e6 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c -@@ -190,5 +190,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat +@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat if (!iface) return NULL; assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl); @@ -146,5 +132,5 @@ index b15384e..4e7e34b 100644 + return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } -- -1.9.1 +2.20.1 diff --git a/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch b/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch index 166e1379..aebf34ba 100644 --- a/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch +++ b/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch @@ -1,22 +1,22 @@ -From 07c70b0b20919d9908b408322d65c62ad459f09e Mon Sep 17 00:00:00 2001 +From 4984f8e6033facccfa7b27b4b0f83e6615abc972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 19 Jan 2017 16:56:56 +0100 Subject: [PATCH] d3d11: Initial implementation for deferred contexts. --- - dlls/d3d11/device.c | 1071 +++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 1040 insertions(+), 31 deletions(-) + dlls/d3d11/device.c | 1072 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 1041 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index ebe8c03..791b959 100644 +index fbc875c6fee..74ae6f8f333 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c -@@ -19,12 +19,181 @@ +@@ -17,11 +17,181 @@ + * + */ - #include "config.h" - #include "wine/port.h" +#include "wine/list.h" - ++ #define NONAMELESSUNION #include "d3d11_private.h" @@ -193,7 +193,7 @@ index ebe8c03..791b959 100644 /* ID3D11DeviceContext - deferred context */ struct d3d11_deferred_context { -@@ -32,9 +201,531 @@ struct d3d11_deferred_context +@@ -29,9 +199,531 @@ struct d3d11_deferred_context ID3D11Device *device; LONG refcount; @@ -725,7 +725,7 @@ index ebe8c03..791b959 100644 static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = -@@ -1221,7 +1912,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D +@@ -1226,7 +1918,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface, ID3D11CommandList *command_list, BOOL restore_state) { @@ -747,7 +747,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface, -@@ -2855,6 +3559,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex +@@ -2938,6 +3643,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex if (!refcount) { @@ -755,7 +755,7 @@ index ebe8c03..791b959 100644 wined3d_private_store_cleanup(&context->private_store); ID3D11Device_Release(context->device); HeapFree(GetProcessHeap(), 0, context); -@@ -2906,43 +3611,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface( +@@ -2989,43 +3695,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { @@ -848,7 +848,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface, -@@ -2955,53 +3703,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i +@@ -3038,53 +3787,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { @@ -1027,7 +1027,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface, -@@ -3030,7 +3894,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon +@@ -3113,7 +3978,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, D3D11_PRIMITIVE_TOPOLOGY topology) { @@ -1045,7 +1045,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface, -@@ -3090,8 +3963,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De +@@ -3173,8 +4047,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views, ID3D11DepthStencilView *depth_stencil_view) { @@ -1075,7 +1075,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews( -@@ -3111,15 +4004,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde +@@ -3194,15 +4088,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { @@ -1122,7 +1122,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, -@@ -3161,13 +4083,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi +@@ -3244,13 +4167,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface, ID3D11RasterizerState *rasterizer_state) { @@ -1159,7 +1159,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface, -@@ -3282,8 +4225,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11 +@@ -3365,8 +4309,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11 static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { @@ -1179,7 +1179,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface, -@@ -3296,36 +4249,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC +@@ -3379,36 +4333,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { @@ -1247,7 +1247,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface, -@@ -3626,7 +4605,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11 +@@ -3709,7 +4689,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11 static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface) { @@ -1264,7 +1264,7 @@ index ebe8c03..791b959 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface) -@@ -3651,9 +4638,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic +@@ -3734,9 +4722,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface, BOOL restore, ID3D11CommandList **command_list) { @@ -1296,7 +1296,7 @@ index ebe8c03..791b959 100644 } static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl = -@@ -4268,6 +5275,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device +@@ -4351,6 +5359,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device object->device = iface; object->refcount = 1; @@ -1306,5 +1306,5 @@ index ebe8c03..791b959 100644 wined3d_private_store_init(&object->private_store); -- -1.9.1 +2.20.1 diff --git a/patches/ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch b/patches/ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch index 561afc12..fc485308 100644 --- a/patches/ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch +++ b/patches/ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch @@ -1,4 +1,4 @@ -From 9c098c43e76a736bc84c0f29ca6845eccfee8aa0 Mon Sep 17 00:00:00 2001 +From 690b0a49ae9e8ee3935e7c4e19bcd6c637ce28d8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 26 Nov 2014 10:46:09 +0100 Subject: [PATCH] ntdll: Move code to update user shared data into a separate @@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Move code to update user shared data into a separate 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 292b0f6a9..5f679f509 100644 +index fb01a26590d..b7dfdc44e19 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1528,3 +1528,6 @@ +@@ -1552,3 +1552,6 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) @@ -21,7 +21,7 @@ index 292b0f6a9..5f679f509 100644 +# User shared data +@ cdecl __wine_user_shared_data() diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index fb53bb9a2..febfcdd84 100644 +index c1d6012b4da..b6ede0d18cf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -245,7 +245,6 @@ void thread_init(void) @@ -33,7 +33,7 @@ index fb53bb9a2..febfcdd84 100644 struct ntdll_thread_data *thread_data; @@ -333,7 +332,23 @@ void thread_init(void) - + init_directories(); init_user_process_params( info_size ); - /* initialize time values in user_shared_data */ diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ae0852b2..9dcabea4 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "95be042be3f116db38eb4a255c2667a6b46fcc1e" + echo "436fb03a87ae6dcbbbe149e401942b7eb8369f51" } # Show version information @@ -7347,20 +7347,25 @@ fi # | dlls/xaudio2_6/Makefile.in, dlls/xaudio2_7/Makefile.in, dlls/xaudio2_7/compat.c, dlls/xaudio2_7/tests/xaudio2.c, # | dlls/xaudio2_7/x3daudio.c, dlls/xaudio2_7/xapo.c, dlls/xaudio2_7/xapofx.c, dlls/xaudio2_7/xaudio_allocator.c, # | dlls/xaudio2_7/xaudio_classes.idl, dlls/xaudio2_7/xaudio_dll.c, dlls/xaudio2_7/xaudio_private.h, -# | dlls/xaudio2_8/Makefile.in, dlls/xaudio2_9/Makefile.in, include/config.h.in, include/xapo.idl, include/xaudio2.idl +# | dlls/xaudio2_8/Makefile.in, dlls/xaudio2_8/xaudio2_8.spec, dlls/xaudio2_9/Makefile.in, dlls/xaudio2_9/xaudio2_9.spec, +# | include/config.h.in, include/xapo.idl, include/xaudio2.idl # | if test "$enable_xaudio2_revert" -eq 1; then - patch_apply xaudio2-revert/0001-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch - patch_apply xaudio2-revert/0002-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch - patch_apply xaudio2-revert/0003-Revert-xaudio2-Fix-32-bit-build.patch - patch_apply xaudio2-revert/0004-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch - patch_apply xaudio2-revert/0005-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch - patch_apply xaudio2-revert/0006-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch - patch_apply xaudio2-revert/0007-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch - patch_apply xaudio2-revert/0008-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch - patch_apply xaudio2-revert/0009-Revert-xaudio2-Rewrite-to-use-FAudio.patch - patch_apply xaudio2-revert/0010-xaudio2_7-Fix-build.patch + patch_apply xaudio2-revert/0001-Revert-xaudio2-Export-functions-by-ordinal.patch + patch_apply xaudio2-revert/0002-Revert-xaudio2-Add-TRACE-functions-to-CreateAudioRev.patch + patch_apply xaudio2-revert/0003-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch + patch_apply xaudio2-revert/0004-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch + patch_apply xaudio2-revert/0005-Revert-xaudio2-Fix-32-bit-build.patch + patch_apply xaudio2-revert/0006-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch + patch_apply xaudio2-revert/0007-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch + patch_apply xaudio2-revert/0008-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch + patch_apply xaudio2-revert/0009-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch + patch_apply xaudio2-revert/0010-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch + patch_apply xaudio2-revert/0011-Revert-xaudio2-Rewrite-to-use-FAudio.patch + patch_apply xaudio2-revert/0012-xaudio2_7-Fix-build.patch ( + printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Export functions by ordinal.\".", 1 },'; + printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Add TRACE functions to CreateAudioReverb/CreateAudioVolumeMeter.\".", 1 },'; printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Fix some TRACE calls erroneously marked as stubs.\".", 1 },'; printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Use new features from FAudio 19.06 (but keep compatibility for <=19.05).\".", 1 },'; printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"xaudio2: Fix 32-bit build.\".", 1 },'; diff --git a/patches/xaudio2-revert/0001-Revert-xaudio2-Export-functions-by-ordinal.patch b/patches/xaudio2-revert/0001-Revert-xaudio2-Export-functions-by-ordinal.patch new file mode 100644 index 00000000..26915375 --- /dev/null +++ b/patches/xaudio2-revert/0001-Revert-xaudio2-Export-functions-by-ordinal.patch @@ -0,0 +1,48 @@ +From 6070be771682c1c1e621acfa9e25ab4ae0db0e75 Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Wed, 3 Jul 2019 09:19:14 +1000 +Subject: [PATCH 1/2] Revert "xaudio2: Export functions by ordinal." + +This reverts commit 92a5299b1d0a0775e1158f334c0348a3ffe8f063. +--- + dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ + dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec +index 78bf05bdb6..0b9f23866b 100644 +--- a/dlls/xaudio2_8/xaudio2_8.spec ++++ b/dlls/xaudio2_8/xaudio2_8.spec +@@ -1,6 +1,6 @@ +-1 stdcall -ordinal XAudio2Create(ptr long long) +-2 stdcall -ordinal CreateAudioReverb(ptr) +-3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +-4 cdecl -ordinal CreateFX(ptr ptr ptr long) +-5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +-6 cdecl -ordinal X3DAudioInitialize(long float ptr) ++@ stdcall XAudio2Create(ptr long long) ++@ stdcall CreateAudioVolumeMeter(ptr) ++@ stdcall CreateAudioReverb(ptr) ++@ cdecl CreateFX(ptr ptr ptr long) ++@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) ++@ cdecl X3DAudioInitialize(long float ptr) +diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec +index 78bf05bdb6..0b9f23866b 100644 +--- a/dlls/xaudio2_9/xaudio2_9.spec ++++ b/dlls/xaudio2_9/xaudio2_9.spec +@@ -1,6 +1,6 @@ +-1 stdcall -ordinal XAudio2Create(ptr long long) +-2 stdcall -ordinal CreateAudioReverb(ptr) +-3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +-4 cdecl -ordinal CreateFX(ptr ptr ptr long) +-5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +-6 cdecl -ordinal X3DAudioInitialize(long float ptr) ++@ stdcall XAudio2Create(ptr long long) ++@ stdcall CreateAudioVolumeMeter(ptr) ++@ stdcall CreateAudioReverb(ptr) ++@ cdecl CreateFX(ptr ptr ptr long) ++@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) ++@ cdecl X3DAudioInitialize(long float ptr) +-- +2.20.1 + diff --git a/patches/xaudio2-revert/0002-Revert-xaudio2-Add-TRACE-functions-to-CreateAudioRev.patch b/patches/xaudio2-revert/0002-Revert-xaudio2-Add-TRACE-functions-to-CreateAudioRev.patch new file mode 100644 index 00000000..412105e6 --- /dev/null +++ b/patches/xaudio2-revert/0002-Revert-xaudio2-Add-TRACE-functions-to-CreateAudioRev.patch @@ -0,0 +1,36 @@ +From 1e3508c74fcb56b75574f9a2d4d723d94976a3d4 Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Wed, 3 Jul 2019 09:19:18 +1000 +Subject: [PATCH 2/2] Revert "xaudio2: Add TRACE functions to + CreateAudioReverb/CreateAudioVolumeMeter." + +This reverts commit 6103b8173b119fb8c80a107f0284a83399438066. +--- + dlls/xaudio2_7/xaudio_dll.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c +index a87e0124d3..da0b0aa606 100644 +--- a/dlls/xaudio2_7/xaudio_dll.c ++++ b/dlls/xaudio2_7/xaudio_dll.c +@@ -2075,8 +2075,6 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) + IClassFactory *cf; + HRESULT hr; + +- TRACE("%p\n", out); +- + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; +@@ -2093,8 +2091,6 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) + IClassFactory *cf; + HRESULT hr; + +- TRACE("%p\n", out); +- + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; +-- +2.20.1 + diff --git a/patches/xaudio2-revert/0001-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch b/patches/xaudio2-revert/0003-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch similarity index 100% rename from patches/xaudio2-revert/0001-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch rename to patches/xaudio2-revert/0003-Revert-xaudio2-Fix-some-TRACE-calls-erroneously-mark.patch diff --git a/patches/xaudio2-revert/0002-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch b/patches/xaudio2-revert/0004-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch similarity index 100% rename from patches/xaudio2-revert/0002-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch rename to patches/xaudio2-revert/0004-Revert-xaudio2-Use-new-features-from-FAudio-19.06-bu.patch diff --git a/patches/xaudio2-revert/0003-Revert-xaudio2-Fix-32-bit-build.patch b/patches/xaudio2-revert/0005-Revert-xaudio2-Fix-32-bit-build.patch similarity index 100% rename from patches/xaudio2-revert/0003-Revert-xaudio2-Fix-32-bit-build.patch rename to patches/xaudio2-revert/0005-Revert-xaudio2-Fix-32-bit-build.patch diff --git a/patches/xaudio2-revert/0004-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch b/patches/xaudio2-revert/0006-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch similarity index 100% rename from patches/xaudio2-revert/0004-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch rename to patches/xaudio2-revert/0006-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch diff --git a/patches/xaudio2-revert/0005-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch b/patches/xaudio2-revert/0007-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch similarity index 100% rename from patches/xaudio2-revert/0005-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch rename to patches/xaudio2-revert/0007-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch diff --git a/patches/xaudio2-revert/0006-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch b/patches/xaudio2-revert/0008-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch similarity index 100% rename from patches/xaudio2-revert/0006-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch rename to patches/xaudio2-revert/0008-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch diff --git a/patches/xaudio2-revert/0007-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch b/patches/xaudio2-revert/0009-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch similarity index 100% rename from patches/xaudio2-revert/0007-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch rename to patches/xaudio2-revert/0009-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch diff --git a/patches/xaudio2-revert/0008-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch b/patches/xaudio2-revert/0010-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch similarity index 100% rename from patches/xaudio2-revert/0008-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch rename to patches/xaudio2-revert/0010-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch diff --git a/patches/xaudio2-revert/0009-Revert-xaudio2-Rewrite-to-use-FAudio.patch b/patches/xaudio2-revert/0011-Revert-xaudio2-Rewrite-to-use-FAudio.patch similarity index 100% rename from patches/xaudio2-revert/0009-Revert-xaudio2-Rewrite-to-use-FAudio.patch rename to patches/xaudio2-revert/0011-Revert-xaudio2-Rewrite-to-use-FAudio.patch diff --git a/patches/xaudio2-revert/0010-xaudio2_7-Fix-build.patch b/patches/xaudio2-revert/0012-xaudio2_7-Fix-build.patch similarity index 100% rename from patches/xaudio2-revert/0010-xaudio2_7-Fix-build.patch rename to patches/xaudio2-revert/0012-xaudio2_7-Fix-build.patch