From ac2c2ffdb8c8e9c7428d2ea134dc9b0c4d2355cb Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 31 May 2017 07:06:29 +0200 Subject: [PATCH] Rebase against 06eceb3af2d56f158dab2db5a7bc768cc2b1c391. --- ...-rtcore-ntuser-window-l1-1-0-Add-dll.patch | 18 +-- ...in-rtcore-ntuser-draw-l1-1-0-Add-dll.patch | 18 +-- ...d-stub-for-SetThreadIdealProcessorEx.patch | 2 +- ...rnel32-Add-a-bunch-of-kernel32-stubs.patch | 22 ++-- ...-Add-stub-for-MFCreateSourceResolver.patch | 122 ------------------ patches/patchinstall.sh | 46 +------ .../wined3d-CSMT_Main/9999-IfDefined.patch | 4 +- ...s-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch | 51 ++++---- ...support-for-D3D11_QUERY_PIPELINE_STA.patch | 39 +++--- ...ak-free_so_statistics_queries-on-dev.patch | 24 ---- ...t-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch | 55 ++++---- ...rect-index-to-shader_glsl_ffp_vertex.patch | 53 -------- .../definition | 1 - ...1.drv-Fix-compilation-without-XFixes.patch | 41 ------ staging/VERSION | 2 +- 15 files changed, 105 insertions(+), 393 deletions(-) delete mode 100644 patches/mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch delete mode 100644 patches/wined3d-QUERY_Stubs/0003-wined3d-Don-t-leak-free_so_statistics_queries-on-dev.patch delete mode 100644 patches/wined3d-glsl_ffp_vertex_lighting/0001-wined3d-Pass-correct-index-to-shader_glsl_ffp_vertex.patch delete mode 100644 patches/wined3d-glsl_ffp_vertex_lighting/definition delete mode 100644 patches/winex11-XFixes/0001-winex11.drv-Fix-compilation-without-XFixes.patch diff --git a/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch index cd6ad284..cda87ec3 100644 --- a/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 3d0de5feeb0cf5863dd355e0e6f271de1665124c Mon Sep 17 00:00:00 2001 +From 0e6a0ebdbdbf269d9520479d67fe601a606147cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:05:14 +0100 Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll @@ -13,27 +13,27 @@ Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index e1dc9f2..82b112b 100644 +index f4e5b466269..b7f1bcb6b19 100644 --- a/configure.ac +++ b/configure.ac -@@ -2800,6 +2800,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) +@@ -2857,6 +2857,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in new file mode 100644 -index 0000000..9641c2a +index 00000000000..9641c2a6dd1 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-window-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec new file mode 100644 -index 0000000..b7575c6 +index 00000000000..b7575c6fa75 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec @@ -0,0 +1,81 @@ @@ -119,10 +119,10 @@ index 0000000..b7575c6 +@ stdcall WaitMessage() user32.WaitMessage +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/tools/make_specfiles b/tools/make_specfiles -index 0fd0420..89b311e 100755 +index cf2563b8e79..27b0cead5b6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -302,6 +302,7 @@ my @dll_groups = +@@ -315,6 +315,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", @@ -131,5 +131,5 @@ index 0fd0420..89b311e 100755 "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- -2.9.0 +2.12.2 diff --git a/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch index e8fa4b21..38df9384 100644 --- a/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 3aa4751bd2cd9918733772e4a5a6c418bebfe560 Mon Sep 17 00:00:00 2001 +From d1fc786a0fe69d811970d4edd1403e1383b9d5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:08:48 +0100 Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll. @@ -13,36 +13,36 @@ Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 97dfa5e..cd145dd 100644 +index 2e2bcd12af6..d6a4e04dd8d 100644 --- a/configure.ac +++ b/configure.ac -@@ -2799,6 +2799,7 @@ WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) +@@ -2856,6 +2856,7 @@ WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-draw-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) + WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 -index 0000000..956f2f3 +index 00000000000..956f2f3c9d8 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-draw-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec new file mode 100644 -index 0000000..59900a9 +index 00000000000..59900a93eb5 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow diff --git a/tools/make_specfiles b/tools/make_specfiles -index a37666c..937a92f 100755 +index 2748a12d038..b9959cc51f1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -301,6 +301,7 @@ my @dll_groups = +@@ -314,6 +314,7 @@ my @dll_groups = "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", @@ -51,5 +51,5 @@ index a37666c..937a92f 100755 "api-ms-win-rtcore-ntuser-window-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", -- -2.9.0 +2.12.2 diff --git a/patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch b/patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch index 4fad670a..8fa4a88f 100644 --- a/patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch +++ b/patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch @@ -46,7 +46,7 @@ index ac2c3687789..499fbe24d09 100644 /*********************************************************************** - * SetThreadIdealProcessorEx (KERNEL32.@) - */ --BOOL SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) +-BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) -{ - FIXME("(%p %p %p): stub\n", thread, ideal, previous); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch b/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch index d86672eb..5ad86ffe 100644 --- a/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch +++ b/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch @@ -1,4 +1,4 @@ -From fae902ce5da0baa0675d7a99b36ccb706e20b27c Mon Sep 17 00:00:00 2001 +From 49002900cbaa41ab5ba077778966a14ea7c251ee Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 16 Jun 2016 18:56:21 +0800 Subject: kernel32: Add a bunch of kernel32 stubs. @@ -18,7 +18,7 @@ fails to start if any of these APIs is missing. 9 files changed, 214 insertions(+), 19 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec -index 77414bc367..6a41d51fd3 100644 +index 77414bc367c..6a41d51fd39 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -2,7 +2,7 @@ @@ -31,7 +31,7 @@ index 77414bc367..6a41d51fd3 100644 @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec -index e7e2c02b30..9d321af724 100644 +index 149678995cc..04329650096 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -2,7 +2,7 @@ @@ -44,11 +44,11 @@ index e7e2c02b30..9d321af724 100644 @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec -index 968b960a6a..0e30f18e52 100644 +index 7bfbe72106e..4607da257ba 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -2,7 +2,7 @@ - @ stub CreateProcessAsUserW + @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread -@ stub CreateRemoteThreadEx @@ -57,7 +57,7 @@ index 968b960a6a..0e30f18e52 100644 @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index 5ef7cb8172..4dcc40ea5d 100644 +index 1a11af579f4..87583cd8f78 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -319,7 +319,7 @@ @@ -163,7 +163,7 @@ index 5ef7cb8172..4dcc40ea5d 100644 @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister @ stdcall -i386 -private UTUnRegister(long) krnl386.exe16.UTUnRegister diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c -index ee995f55af..391184af01 100644 +index d3d46b7dc89..b0ed3c5fca3 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2454,3 +2454,148 @@ BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRW @@ -316,7 +316,7 @@ index ee995f55af..391184af01 100644 + return FALSE; +} diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c -index de466185e9..c8dd94bbea 100644 +index a30428fb277..2e26a9438c0 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -113,6 +113,18 @@ HANDLE WINAPI CreateRemoteThread( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE @@ -339,7 +339,7 @@ index de466185e9..c8dd94bbea 100644 * OpenThread [KERNEL32.@] Retrieves a handle to a thread from its thread id */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec -index 689d58739e..8f5ac6c7ec 100644 +index bb80f212936..36eee6f9925 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -212,7 +212,7 @@ @@ -352,7 +352,7 @@ index 689d58739e..8f5ac6c7ec 100644 @ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW @ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW diff --git a/include/winbase.h b/include/winbase.h -index 67c29b51c5..2306b4fc0c 100644 +index 67c29b51c55..2306b4fc0c3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1682,6 +1682,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM @@ -402,7 +402,7 @@ index 67c29b51c5..2306b4fc0c 100644 WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR); #define EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages) diff --git a/include/winnt.h b/include/winnt.h -index 450499c129..5bd1b1b4a8 100644 +index 450499c1299..5bd1b1b4a83 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6016,9 +6016,29 @@ typedef VOID (CALLBACK *PTP_TIMER_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_TIME diff --git a/patches/mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch b/patches/mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch deleted file mode 100644 index 94b89295..00000000 --- a/patches/mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 8fbcec200516b16f2d151368c74115ece0cca0ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 26 Mar 2016 14:31:03 +0100 -Subject: mfplat: Add stub for MFCreateSourceResolver. - ---- - dlls/mf/mf.spec | 2 +- - dlls/mfplat/main.c | 11 +++++++++++ - dlls/mfplat/mfplat.spec | 2 +- - include/mfidl.idl | 40 ++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 53 insertions(+), 2 deletions(-) - -diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec -index 546a697887..f70538e132 100644 ---- a/dlls/mf/mf.spec -+++ b/dlls/mf/mf.spec -@@ -57,7 +57,7 @@ - @ stub MFCreateSequencerSource - @ stub MFCreateSequencerSourceRemoteStream - @ stub MFCreateSimpleTypeHandler --@ stub MFCreateSourceResolver -+@ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver - @ stub MFCreateStandardQualityManager - @ stub MFCreateTopoLoader - @ stub MFCreateTopology -diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c -index 1fd4a279bd..c522aff470 100644 ---- a/dlls/mfplat/main.c -+++ b/dlls/mfplat/main.c -@@ -30,6 +30,7 @@ - #include "initguid.h" - #include "mfapi.h" - #include "mferror.h" -+#include "mfidl.h" - - #include "wine/debug.h" - #include "wine/unicode.h" -@@ -914,3 +915,13 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) - *attributes = &object->IMFAttributes_iface; - return S_OK; - } -+ -+/*********************************************************************** -+ * MFCreateSourceResolver (mfplat.@) -+ */ -+HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **source_resolver) -+{ -+ FIXME("(%p): stub\n", source_resolver); -+ -+ return E_NOTIMPL; -+} -diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec -index d96eb517c1..2d737fb545 100644 ---- a/dlls/mfplat/mfplat.spec -+++ b/dlls/mfplat/mfplat.spec -@@ -58,7 +58,7 @@ - @ stub MFCreateSample - @ stub MFCreateSocket - @ stub MFCreateSocketListener --@ stub MFCreateSourceResolver -+@ stdcall MFCreateSourceResolver(ptr) - @ stub MFCreateStreamDescriptor - @ stub MFCreateSystemTimeSource - @ stub MFCreateSystemUnderlyingClock -diff --git a/include/mfidl.idl b/include/mfidl.idl -index 3431260cf0..a99b02e376 100644 ---- a/include/mfidl.idl -+++ b/include/mfidl.idl -@@ -48,6 +48,13 @@ typedef struct _MFCLOCK_PROPERTIES - DWORD dwClockJitter; - } MFCLOCK_PROPERTIES; - -+typedef enum MF_OBJECT_TYPE -+{ -+ MF_OBJECT_MEDIASOURCE, -+ MF_OBJECT_BYTESTREAM, -+ MF_OBJECT_INVALID -+} MF_OBJECT_TYPE; -+ - [ - object, - uuid(2eb1e945-18b8-4139-9b1a-d5d584818530), -@@ -124,3 +131,36 @@ interface IMFMediaSession : IMFMediaEventGenerator - HRESULT GetSessionCapabilities([out] DWORD *caps); - HRESULT GetFullTopology([in] DWORD flags, [in] TOPOID id, [out] IMFTopology **topology); - } -+ -+[ -+ object, -+ uuid(fbe5a32d-a497-4b61-bb85-97b1a848a6e3), -+] -+interface IMFSourceResolver : IUnknown -+{ -+ [local] HRESULT CreateObjectFromURL([in] const WCHAR *url, [in] DWORD flags, [in] IPropertyStore *props, -+ [out] MF_OBJECT_TYPE *type, [out] IUnknown **object); -+ [local] HRESULT CreateObjectFromByteStream([in] IMFByteStream *stream, [in] const WCHAR *url, -+ [in] DWORD flags, [in] IPropertyStore *props, -+ [out] MF_OBJECT_TYPE *type, [out] IUnknown **object); -+ [local] HRESULT BeginCreateObjectFromURL([in] const WCHAR *url, [in] DWORD flags, -+ [in] IPropertyStore *props, [out] IUnknown **cancel_cookie, -+ [in] IMFAsyncCallback *callback, [in] IUnknown *unk_state); -+ [call_as(BeginCreateObjectFromURL)] HRESULT RemoteBeginCreateObjectFromURL([in, string] const WCHAR *url, -+ [in] DWORD flags, [in] IPropertyStore *props, [in] IMFRemoteAsyncCallback *callback); -+ [local] HRESULT EndCreateObjectFromURL([in] IMFAsyncResult *result, [out] MF_OBJECT_TYPE *type, -+ [out] IUnknown **object); -+ [call_as(EndCreateObjectFromURL)] HRESULT RemoteEndCreateObjectFromURL([in] IUnknown *result, -+ [out] MF_OBJECT_TYPE *type, [out] IUnknown **object); -+ [local] HRESULT BeginCreateObjectFromByteStream([in] IMFByteStream *stream, [in] const WCHAR *url, -+ [in] DWORD flags, [in] IPropertyStore *props, [out] IUnknown **cancel_cookie, -+ [in] IMFAsyncCallback *callback, [in] IUnknown *unk_state); -+ [call_as(BeginCreateObjectFromByteStream)] HRESULT RemoteBeginCreateObjectFromByteStream( -+ [in] IMFByteStream *stream, [in, unique] const WCHAR *url, [in] DWORD flags, -+ [in, unique] IPropertyStore *props, [in] IMFRemoteAsyncCallback *callback); -+ [local] HRESULT EndCreateObjectFromByteStream([in] IMFAsyncResult *result, [out] MF_OBJECT_TYPE *type, -+ [out] IUnknown **object); -+ [call_as(EndCreateObjectFromByteStream)] HRESULT RemoteEndCreateObjectFromByteStream([in] IUnknown *result, -+ [out] MF_OBJECT_TYPE *type, [out] IUnknown **object); -+ [local] HRESULT CancelObjectCreation([in] IUnknown *cancel_cookie); -+} --- -2.12.2 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 925f5704..cdf91b79 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7d2ce5cbe7c84dd193e982d4cfe882265867f998" + echo "06eceb3af2d56f158dab2db5a7bc768cc2b1c391" } # Show version information version() { - echo "Wine Staging 2.9" + echo "Wine Staging 2.10 (unreleased)" echo "Copyright (C) 2014-2017 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" @@ -435,7 +435,6 @@ patch_enable_all () enable_wined3d_WINED3DFMT_R32G32_UINT="$1" enable_wined3d_buffer_create="$1" enable_wined3d_check_format_support="$1" - enable_wined3d_glsl_ffp_vertex_lighting="$1" enable_wined3d_wined3d_guess_gl_vendor="$1" enable_winedbg_Process_Arguments="$1" enable_winedevice_Fix_Relocation="$1" @@ -452,7 +451,6 @@ patch_enable_all () enable_winex11_Window_Groups="$1" enable_winex11_Window_Style="$1" enable_winex11_XEMBED="$1" - enable_winex11_XFixes="$1" enable_winex11__NET_ACTIVE_WINDOW="$1" enable_winex11_wglShareLists="$1" enable_winhlp32_Flex_Workaround="$1" @@ -1546,9 +1544,6 @@ patch_enable () wined3d-check_format_support) enable_wined3d_check_format_support="$2" ;; - wined3d-glsl_ffp_vertex_lighting) - enable_wined3d_glsl_ffp_vertex_lighting="$2" - ;; wined3d-wined3d_guess_gl_vendor) enable_wined3d_wined3d_guess_gl_vendor="$2" ;; @@ -1597,9 +1592,6 @@ patch_enable () winex11-XEMBED) enable_winex11_XEMBED="$2" ;; - winex11-XFixes) - enable_winex11_XFixes="$2" - ;; winex11-_NET_ACTIVE_WINDOW) enable_winex11__NET_ACTIVE_WINDOW="$2" ;; @@ -5098,19 +5090,16 @@ fi # | * [#39367] Return stub interface from mf.MFCreateMediaSession # | # | Modified files: -# | * dlls/mf/Makefile.in, dlls/mf/main.c, dlls/mf/mf.spec, dlls/mf/mf_private.h, dlls/mf/session.c, dlls/mfplat/main.c, -# | dlls/mfplat/mfplat.spec, include/mfidl.idl, include/rpcndr.h +# | * dlls/mf/Makefile.in, dlls/mf/main.c, dlls/mf/mf.spec, dlls/mf/mf_private.h, dlls/mf/session.c, include/rpcndr.h # | if test "$enable_mfplat_MFTRegister" -eq 1; then patch_apply mfplat-MFTRegister/0006-mf-Add-stub-for-MFCreateMediaSession.patch patch_apply mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch patch_apply mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch - patch_apply mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch ( printf '%s\n' '+ { "Michael Müller", "mf: Add stub for MFCreateMediaSession.", 1 },'; printf '%s\n' '+ { "Michael Müller", "include/rpcndr.h: Fix definition of EXTERN_GUID.", 1 },'; printf '%s\n' '+ { "Michael Müller", "mf: Implement IMFMediaSession stub interface.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "mfplat: Add stub for MFCreateSourceResolver.", 1 },'; ) >> "$patchlist" fi @@ -8851,13 +8840,11 @@ fi if test "$enable_wined3d_QUERY_Stubs" -eq 1; then patch_apply wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch patch_apply wined3d-QUERY_Stubs/0002-d3d11-Add-dummy-support-for-D3D11_QUERY_PIPELINE_STA.patch - patch_apply wined3d-QUERY_Stubs/0003-wined3d-Don-t-leak-free_so_statistics_queries-on-dev.patch patch_apply wined3d-QUERY_Stubs/0004-wined3d-Implement-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch patch_apply wined3d-QUERY_Stubs/0005-d3d11-tests-Add-basic-test-for-D3D11_QUERY_PIPELINE_.patch ( printf '%s\n' '+ { "Michael Müller", "wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW.", 1 },'; printf '%s\n' '+ { "Michael Müller", "d3d11: Add dummy support for D3D11_QUERY_PIPELINE_STATISTICS query.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "wined3d: Don'\''t leak free_so_statistics_queries on device destruction.", 1 },'; printf '%s\n' '+ { "Michael Müller", "wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS.", 1 },'; printf '%s\n' '+ { "Michael Müller", "d3d11/tests: Add basic test for D3D11_QUERY_PIPELINE_STATISTICS.", 1 },'; ) >> "$patchlist" @@ -8980,21 +8967,6 @@ if test "$enable_wined3d_check_format_support" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-glsl_ffp_vertex_lighting -# | -# | This patchset fixes the following Wine bugs: -# | * [#43053] Pass correct index to shader_glsl_ffp_vertex_lighting_footer -# | -# | Modified files: -# | * dlls/wined3d/glsl_shader.c -# | -if test "$enable_wined3d_glsl_ffp_vertex_lighting" -eq 1; then - patch_apply wined3d-glsl_ffp_vertex_lighting/0001-wined3d-Pass-correct-index-to-shader_glsl_ffp_vertex.patch - ( - printf '%s\n' '+ { "Józef Kucia", "wined3d: Pass correct index to shader_glsl_ffp_vertex_lighting_footer.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-wined3d_guess_gl_vendor # | # | This patchset fixes the following Wine bugs: @@ -9293,18 +9265,6 @@ if test "$enable_winex11_XEMBED" -eq 1; then ) >> "$patchlist" fi -# Patchset winex11-XFixes -# | -# | Modified files: -# | * dlls/winex11.drv/clipboard.c -# | -if test "$enable_winex11_XFixes" -eq 1; then - patch_apply winex11-XFixes/0001-winex11.drv-Fix-compilation-without-XFixes.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "winex11.drv: Fix compilation without XFixes.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winex11-wglShareLists # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index e0489bfe..2459bd4f 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -9,7 +9,7 @@ Based on patches by: diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c -@@ -1265,6 +1265,9 @@ HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +@@ -1267,6 +1267,9 @@ HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) { UINT offset, size; @@ -19,7 +19,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c HRESULT hr; BYTE *ptr; -@@ -1279,7 +1282,14 @@ HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +@@ -1281,7 +1284,14 @@ HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, size = buffer->resource.size; } diff --git a/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch b/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch index d68c39d2..3f72a030 100644 --- a/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch +++ b/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch @@ -1,14 +1,14 @@ -From 3354f6b38cd1b3a18a4c81ec430d0557f3503290 Mon Sep 17 00:00:00 2001 +From e673885709da5bb4d6e13bb9c005ef590768e198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 16 Apr 2016 18:18:54 +0200 Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW. --- - dlls/d3d10core/tests/device.c | 4 +- - dlls/d3d11/tests/d3d11.c | 4 +- - dlls/wined3d/query.c | 96 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 100 insertions(+), 4 deletions(-) + dlls/d3d10core/tests/device.c | 4 +- + dlls/d3d11/tests/d3d11.c | 4 +- + dlls/wined3d/query.c | 100 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 364a2abfe7f..c08004723cc 100644 @@ -26,7 +26,7 @@ index 364a2abfe7f..c08004723cc 100644 ULONG refcount, expected_refcount; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index 431db44e1cc..18d2a2fd4d1 100644 +index b160977caec..a56bcd91f70 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4600,8 +4600,8 @@ static void test_create_query(void) @@ -41,25 +41,10 @@ index 431db44e1cc..18d2a2fd4d1 100644 {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c -index 28db6be239b..53745f959e6 100644 +index 55871130ce0..3c7a3ae4f8a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c -@@ -309,6 +309,14 @@ static void wined3d_query_destroy_object(void *object) - context_free_so_statistics_query(pq); - HeapFree(GetProcessHeap(), 0, pq); - } -+ else if (query->type == WINED3D_QUERY_TYPE_SO_STATISTICS) -+ { -+ HeapFree(GetProcessHeap(), 0, query); -+ } -+ else if (query->type == WINED3D_QUERY_TYPE_SO_OVERFLOW) -+ { -+ HeapFree(GetProcessHeap(), 0, query); -+ } - else - { - ERR("Query %p has invalid type %#x.\n", query, query->type); -@@ -773,6 +781,34 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D +@@ -729,6 +729,34 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D return poll; } @@ -91,17 +76,23 @@ index 28db6be239b..53745f959e6 100644 + return FALSE; +} + - static const struct wined3d_query_ops event_query_ops = + static void wined3d_event_query_ops_destroy(struct wined3d_query *query) { - wined3d_event_query_ops_poll, -@@ -979,6 +1015,60 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); +@@ -981,6 +1009,72 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, return WINED3D_OK; } ++static void wined3d_statistics_query_ops_destroy(struct wined3d_query *query) ++{ ++ HeapFree(GetProcessHeap(), 0, query); ++} ++ +static const struct wined3d_query_ops statistics_query_ops = +{ + wined3d_statistics_query_ops_poll, + wined3d_statistics_query_ops_issue, ++ wined3d_statistics_query_ops_destroy, +}; + +static HRESULT wined3d_statistics_query_create(struct wined3d_device *device, @@ -125,10 +116,16 @@ index 28db6be239b..53745f959e6 100644 + return WINED3D_OK; +} + ++static void wined3d_overflow_query_ops_destroy(struct wined3d_query *query) ++{ ++ HeapFree(GetProcessHeap(), 0, query); ++} ++ +static const struct wined3d_query_ops overflow_query_ops = +{ + wined3d_overflow_query_ops_poll, + wined3d_overflow_query_ops_issue, ++ wined3d_overflow_query_ops_destroy, +}; + +static HRESULT wined3d_overflow_query_create(struct wined3d_device *device, @@ -155,7 +152,7 @@ index 28db6be239b..53745f959e6 100644 HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { -@@ -1006,6 +1096,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q +@@ -1008,6 +1102,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: return wined3d_so_statistics_query_create(device, type, parent, parent_ops, query); diff --git a/patches/wined3d-QUERY_Stubs/0002-d3d11-Add-dummy-support-for-D3D11_QUERY_PIPELINE_STA.patch b/patches/wined3d-QUERY_Stubs/0002-d3d11-Add-dummy-support-for-D3D11_QUERY_PIPELINE_STA.patch index 4c3ef77b..1c982c68 100644 --- a/patches/wined3d-QUERY_Stubs/0002-d3d11-Add-dummy-support-for-D3D11_QUERY_PIPELINE_STA.patch +++ b/patches/wined3d-QUERY_Stubs/0002-d3d11-Add-dummy-support-for-D3D11_QUERY_PIPELINE_STA.patch @@ -1,4 +1,4 @@ -From 47db3c24a1b6504146154b31fc285a54578dc3ad Mon Sep 17 00:00:00 2001 +From 6313efefb1d2dc0adaaae123cee74678e0709fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 22 Jan 2017 01:51:51 +0100 Subject: d3d11: Add dummy support for D3D11_QUERY_PIPELINE_STATISTICS query. @@ -6,9 +6,9 @@ Subject: d3d11: Add dummy support for D3D11_QUERY_PIPELINE_STATISTICS query. --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- - dlls/wined3d/query.c | 48 +++++++++++++++++++++++++++++++++++++++++++ - include/wine/wined3d.h | 15 ++++++++++++++ - 4 files changed, 65 insertions(+), 2 deletions(-) + dlls/wined3d/query.c | 50 +++++++++++++++++++++++++++++++++++++++++++ + include/wine/wined3d.h | 15 +++++++++++++ + 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c08004723cc..9958feb1c25 100644 @@ -24,7 +24,7 @@ index c08004723cc..9958feb1c25 100644 {D3D10_QUERY_SO_STATISTICS, FALSE, FALSE}, {D3D10_QUERY_SO_OVERFLOW_PREDICATE, TRUE, FALSE}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index 18d2a2fd4d1..91620723f46 100644 +index a56bcd91f70..9c4b0392014 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4598,7 +4598,7 @@ static void test_create_query(void) @@ -37,21 +37,10 @@ index 18d2a2fd4d1..91620723f46 100644 {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE}, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c -index 53745f959e6..db747362ab5 100644 +index 3c7a3ae4f8a..1da1b3ea7ae 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c -@@ -317,6 +317,10 @@ static void wined3d_query_destroy_object(void *object) - { - HeapFree(GetProcessHeap(), 0, query); - } -+ else if (query->type == WINED3D_QUERY_TYPE_PIPELINE_STATISTICS) -+ { -+ HeapFree(GetProcessHeap(), 0, query); -+ } - else - { - ERR("Query %p has invalid type %#x.\n", query, query->type); -@@ -809,6 +813,20 @@ static BOOL wined3d_overflow_query_ops_issue(struct wined3d_query *query, DWORD +@@ -757,6 +757,20 @@ static BOOL wined3d_overflow_query_ops_issue(struct wined3d_query *query, DWORD return FALSE; } @@ -69,17 +58,23 @@ index 53745f959e6..db747362ab5 100644 + return FALSE; +} + - static const struct wined3d_query_ops event_query_ops = + static void wined3d_event_query_ops_destroy(struct wined3d_query *query) { - wined3d_event_query_ops_poll, -@@ -1069,6 +1087,33 @@ static HRESULT wined3d_overflow_query_create(struct wined3d_device *device, + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); +@@ -1075,6 +1089,39 @@ static HRESULT wined3d_overflow_query_create(struct wined3d_device *device, return WINED3D_OK; } ++static void wined3d_pipeline_query_ops_destroy(struct wined3d_query *query) ++{ ++ HeapFree(GetProcessHeap(), 0, query); ++} ++ +static const struct wined3d_query_ops pipeline_query_ops = +{ + wined3d_pipeline_query_ops_poll, + wined3d_pipeline_query_ops_issue, ++ wined3d_pipeline_query_ops_destroy, +}; + +static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device, @@ -106,7 +101,7 @@ index 53745f959e6..db747362ab5 100644 HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { -@@ -1102,6 +1147,9 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q +@@ -1108,6 +1155,9 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q case WINED3D_QUERY_TYPE_SO_OVERFLOW: return wined3d_overflow_query_create(device, type, parent, parent_ops, query); diff --git a/patches/wined3d-QUERY_Stubs/0003-wined3d-Don-t-leak-free_so_statistics_queries-on-dev.patch b/patches/wined3d-QUERY_Stubs/0003-wined3d-Don-t-leak-free_so_statistics_queries-on-dev.patch deleted file mode 100644 index 11c4c496..00000000 --- a/patches/wined3d-QUERY_Stubs/0003-wined3d-Don-t-leak-free_so_statistics_queries-on-dev.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d9ca35b4d4489e101caa4950d086413a3a08a0e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 28 May 2017 03:59:24 +0200 -Subject: wined3d: Don't leak free_so_statistics_queries on device destruction. - ---- - dlls/wined3d/context.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c -index bdcdf007a42..8d674c1cf88 100644 ---- a/dlls/wined3d/context.c -+++ b/dlls/wined3d/context.c -@@ -1343,6 +1343,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) - checkGLcall("context cleanup"); - } - -+ HeapFree(GetProcessHeap(), 0, context->free_so_statistics_queries); - HeapFree(GetProcessHeap(), 0, context->free_timestamp_queries); - HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); - HeapFree(GetProcessHeap(), 0, context->free_event_queries); --- -2.12.2 - diff --git a/patches/wined3d-QUERY_Stubs/0004-wined3d-Implement-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch b/patches/wined3d-QUERY_Stubs/0004-wined3d-Implement-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch index 4d1077b7..894f2537 100644 --- a/patches/wined3d-QUERY_Stubs/0004-wined3d-Implement-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch +++ b/patches/wined3d-QUERY_Stubs/0004-wined3d-Implement-WINED3D_QUERY_TYPE_PIPELINE_STATIS.patch @@ -1,4 +1,4 @@ -From f38e263c61ba7273b01fa0f9e82680e08f089d35 Mon Sep 17 00:00:00 2001 +From a36cd6cf41376b8dae38c289d353da26ecf53ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 28 May 2017 04:49:57 +0200 Subject: wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS. @@ -6,16 +6,16 @@ Subject: wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS. --- dlls/wined3d/context.c | 58 ++++++++++++ dlls/wined3d/directx.c | 1 + - dlls/wined3d/query.c | 196 +++++++++++++++++++++++++++++++++++++++-- + dlls/wined3d/query.c | 197 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 39 ++++++++ - 5 files changed, 286 insertions(+), 9 deletions(-) + 5 files changed, 287 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c -index 8d674c1cf88..68c173344b0 100644 +index 8ab0e10d815..b03287f5029 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c -@@ -940,6 +940,43 @@ void context_free_so_statistics_query(struct wined3d_so_statistics_query *query) +@@ -933,6 +933,43 @@ void context_free_so_statistics_query(struct wined3d_so_statistics_query *query) context->free_so_statistics_queries[context->free_so_statistics_query_count++] = query->u; } @@ -59,7 +59,7 @@ index 8d674c1cf88..68c173344b0 100644 typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); static void context_enum_fbo_entries(const struct wined3d_device *device, -@@ -1232,6 +1269,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) +@@ -1225,6 +1262,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_so_statistics_query *so_statistics_query; @@ -67,7 +67,7 @@ index 8d674c1cf88..68c173344b0 100644 struct wined3d_timestamp_query *timestamp_query; struct wined3d_occlusion_query *occlusion_query; struct wined3d_event_query *event_query; -@@ -1256,6 +1294,14 @@ static void context_destroy_gl_resources(struct wined3d_context *context) +@@ -1249,6 +1287,14 @@ static void context_destroy_gl_resources(struct wined3d_context *context) so_statistics_query->context = NULL; } @@ -82,7 +82,7 @@ index 8d674c1cf88..68c173344b0 100644 LIST_FOR_EACH_ENTRY(timestamp_query, &context->timestamp_queries, struct wined3d_timestamp_query, entry) { if (context->valid) -@@ -1312,6 +1358,15 @@ static void context_destroy_gl_resources(struct wined3d_context *context) +@@ -1305,6 +1351,15 @@ static void context_destroy_gl_resources(struct wined3d_context *context) } } @@ -98,7 +98,7 @@ index 8d674c1cf88..68c173344b0 100644 if (gl_info->supported[ARB_TIMER_QUERY]) GL_EXTCALL(glDeleteQueries(context->free_timestamp_query_count, context->free_timestamp_queries)); -@@ -1344,6 +1399,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) +@@ -1337,6 +1392,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) } HeapFree(GetProcessHeap(), 0, context->free_so_statistics_queries); @@ -106,7 +106,7 @@ index 8d674c1cf88..68c173344b0 100644 HeapFree(GetProcessHeap(), 0, context->free_timestamp_queries); HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries); -@@ -1812,6 +1868,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, +@@ -1801,6 +1857,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, list_init(&ret->so_statistics_queries); @@ -116,7 +116,7 @@ index 8d674c1cf88..68c173344b0 100644 list_init(&ret->fbo_destroy_list); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index 7a7fbe0578a..ee43cfac449 100644 +index e6cefbd2cf2..ec53192b76f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -144,6 +144,7 @@ static const struct wined3d_extension_map gl_extension_map[] = @@ -128,7 +128,7 @@ index 7a7fbe0578a..ee43cfac449 100644 {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c -index db747362ab5..bbeab020c27 100644 +index 1da1b3ea7ae..3bac4e1d28f 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -61,6 +61,11 @@ static struct wined3d_so_statistics_query *wined3d_so_statistics_query_from_quer @@ -143,17 +143,7 @@ index db747362ab5..bbeab020c27 100644 BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; -@@ -319,6 +324,9 @@ static void wined3d_query_destroy_object(void *object) - } - else if (query->type == WINED3D_QUERY_TYPE_PIPELINE_STATISTICS) - { -+ struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); -+ if (pq->context) -+ context_free_pipeline_statistics_query(pq); - HeapFree(GetProcessHeap(), 0, query); - } - else -@@ -815,16 +823,179 @@ static BOOL wined3d_overflow_query_ops_issue(struct wined3d_query *query, DWORD +@@ -759,16 +764,179 @@ static BOOL wined3d_overflow_query_ops_issue(struct wined3d_query *query, DWORD static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) { @@ -335,8 +325,19 @@ index db747362ab5..bbeab020c27 100644 + return poll; } - static const struct wined3d_query_ops event_query_ops = -@@ -1097,19 +1268,26 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device, + static void wined3d_event_query_ops_destroy(struct wined3d_query *query) +@@ -1091,6 +1259,10 @@ static HRESULT wined3d_overflow_query_create(struct wined3d_device *device, + + static void wined3d_pipeline_query_ops_destroy(struct wined3d_query *query) + { ++ struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); ++ ++ if (pq->context) ++ context_free_pipeline_statistics_query(pq); + HeapFree(GetProcessHeap(), 0, query); + } + +@@ -1105,19 +1277,26 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { @@ -370,7 +371,7 @@ index db747362ab5..bbeab020c27 100644 return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h -index fc4c1bb11f8..80fc6809238 100644 +index 3806869fd42..8b25220cd4b 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -78,6 +78,7 @@ enum wined3d_gl_extension @@ -382,7 +383,7 @@ index fc4c1bb11f8..80fc6809238 100644 ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 183c856e07c..315e89d098b 100644 +index 18109850157..1025c98f180 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1721,6 +1721,40 @@ void context_alloc_so_statistics_query(struct wined3d_context *context, diff --git a/patches/wined3d-glsl_ffp_vertex_lighting/0001-wined3d-Pass-correct-index-to-shader_glsl_ffp_vertex.patch b/patches/wined3d-glsl_ffp_vertex_lighting/0001-wined3d-Pass-correct-index-to-shader_glsl_ffp_vertex.patch deleted file mode 100644 index 5e80c16e..00000000 --- a/patches/wined3d-glsl_ffp_vertex_lighting/0001-wined3d-Pass-correct-index-to-shader_glsl_ffp_vertex.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4047696eda07c8fe788d717eb6cdfdd04a7ad2d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B3zef=20Kucia?= -Date: Sat, 27 May 2017 03:17:22 +0200 -Subject: wined3d: Pass correct index to - shader_glsl_ffp_vertex_lighting_footer. - ---- - dlls/wined3d/glsl_shader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index f53b755a131..7304b2bdcc0 100644 ---- a/dlls/wined3d/glsl_shader.c -+++ b/dlls/wined3d/glsl_shader.c -@@ -8272,7 +8272,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer - continue; - } - shader_addline(buffer, "dir = normalize(dir);\n"); -- shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); -+ shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); - shader_addline(buffer, "}\n"); - } - -@@ -8313,7 +8313,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer - shader_addline(buffer, "}\n"); - continue; - } -- shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); -+ shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); - shader_addline(buffer, "}\n"); - } - -@@ -8324,7 +8324,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer - continue; - shader_addline(buffer, "att = 1.0;\n"); - shader_addline(buffer, "dir = normalize(ffp_light[%u].direction.xyz);\n", idx); -- shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); -+ shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); - } - - for (i = 0; i < settings->parallel_point_light_count; ++i, ++idx) -@@ -8334,7 +8334,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer - continue; - shader_addline(buffer, "att = 1.0;\n"); - shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", idx); -- shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); -+ shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); - } - - shader_addline(buffer, "ffp_varying_diffuse.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n", --- -2.12.2 - diff --git a/patches/wined3d-glsl_ffp_vertex_lighting/definition b/patches/wined3d-glsl_ffp_vertex_lighting/definition deleted file mode 100644 index 3cb71e89..00000000 --- a/patches/wined3d-glsl_ffp_vertex_lighting/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [43053] Pass correct index to shader_glsl_ffp_vertex_lighting_footer diff --git a/patches/winex11-XFixes/0001-winex11.drv-Fix-compilation-without-XFixes.patch b/patches/winex11-XFixes/0001-winex11.drv-Fix-compilation-without-XFixes.patch deleted file mode 100644 index 8f258de0..00000000 --- a/patches/winex11-XFixes/0001-winex11.drv-Fix-compilation-without-XFixes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d4dc0e7e0c45cce29e4b6e968184eb6c946b825e Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Thu, 25 May 2017 01:50:05 +0200 -Subject: winex11.drv: Fix compilation without XFixes. - ---- - dlls/winex11.drv/clipboard.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c -index 3da40811794..8e6e05b8288 100644 ---- a/dlls/winex11.drv/clipboard.c -+++ b/dlls/winex11.drv/clipboard.c -@@ -1954,21 +1954,21 @@ static BOOL wait_clipboard_mutex(void) - - - /************************************************************************** -- * handle_selection_notify_event -+ * selection_notify_event - * - * Called when x11 clipboard content changes - */ -+#ifdef SONAME_LIBXFIXES - static BOOL selection_notify_event( HWND hwnd, XEvent *event ) - { --#ifdef SONAME_LIBXFIXES - XFixesSelectionNotifyEvent *req = (XFixesSelectionNotifyEvent*)event; - - if (!is_clipboard_owner) return FALSE; - if (req->owner == selection_window) return FALSE; - request_selection_contents( req->display, TRUE ); - return FALSE; --#endif - } -+#endif - - /************************************************************************** - * xfixes_init --- -2.12.2 - diff --git a/staging/VERSION b/staging/VERSION index 26633b90..718d504c 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.9 +Wine Staging 2.10 (unreleased)