From 5d672b283999dde84005c1da7fa71972549cc8de Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 5 Jun 2017 11:03:20 +0200 Subject: [PATCH] Rebase against 6c752aaf8da225365b2bdbbf3c43d41afd4d1344. --- ...rnel32-Add-a-bunch-of-kernel32-stubs.patch | 18 ++++----- ...ement-IMFMediaSession-stub-interface.patch | 38 ++++++++++++------- patches/patchinstall.sh | 5 ++- 3 files changed, 37 insertions(+), 24 deletions(-) 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 5ad86ffe..6e9b6567 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 49002900cbaa41ab5ba077778966a14ea7c251ee Mon Sep 17 00:00:00 2001 +From 46e49340da6151f517a23d77ab9eed45b9e6982c 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. @@ -352,12 +352,12 @@ index bb80f212936..36eee6f9925 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 67c29b51c55..2306b4fc0c3 100644 +index 1347f8cd1c3..8f9c5a1f649 100644 --- a/include/winbase.h +++ b/include/winbase.h -@@ -1682,6 +1682,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM - #define PROC_THREAD_ATTRIBUTE_ALL_APPLICATION_PACKAGES_POLICY (ProcThreadAttributeAllApplicationPackagesPolicy | PROC_THREAD_ATTRIBUTE_INPUT) - #define PROC_THREAD_ATTRIBUTE_WIN32K_FILTER (ProcThreadAttributeWin32kFilter | PROC_THREAD_ATTRIBUTE_INPUT) +@@ -1685,6 +1685,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM + #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) + #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef void *PUMS_CONTEXT; +typedef void *PUMS_COMPLETION_LIST; @@ -376,7 +376,7 @@ index 67c29b51c55..2306b4fc0c3 100644 WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); -@@ -1831,6 +1845,7 @@ WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECUR +@@ -1834,6 +1848,7 @@ WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECUR #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); @@ -384,7 +384,7 @@ index 67c29b51c55..2306b4fc0c3 100644 WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR); -@@ -1848,6 +1863,8 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); +@@ -1851,6 +1866,8 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); @@ -393,7 +393,7 @@ index 67c29b51c55..2306b4fc0c3 100644 WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer) -@@ -1906,6 +1923,7 @@ WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL); +@@ -1909,6 +1926,7 @@ WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL); WINBASEAPI BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL); #define EndUpdateResource WINELIB_NAME_AW(EndUpdateResource) WINBASEAPI void WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit); @@ -437,5 +437,5 @@ index 450499c1299..5bd1b1b4a83 100644 } #endif -- -2.12.2 +2.13.0 diff --git a/patches/mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch b/patches/mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch index 9ceff0cb..0576ada9 100644 --- a/patches/mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch +++ b/patches/mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch @@ -1,30 +1,30 @@ -From 5aba6883ef5c0566d489f04b912adbeccf2e2a57 Mon Sep 17 00:00:00 2001 +From 880ddd6aceac678a7059dea7b2673acd1a75bb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 26 Mar 2016 06:05:20 +0100 Subject: mf: Implement IMFMediaSession stub interface. --- - dlls/mf/Makefile.in | 3 +- + dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 5 +- dlls/mf/mf_private.h | 28 +++++++ dlls/mf/session.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 254 insertions(+), 3 deletions(-) + dlls/mf/topology.c | 1 - + 5 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 dlls/mf/mf_private.h create mode 100644 dlls/mf/session.c diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in -index d7fdb61..01e5fbf 100644 +index 6725d5bf14a..9c61d94c8aa 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in -@@ -1,4 +1,5 @@ - MODULE = mf.dll +@@ -3,4 +3,5 @@ IMPORTLIB = mf C_SRCS = \ -- main.c -+ main.c \ -+ session.c + main.c \ ++ session.c \ + topology.c diff --git a/dlls/mf/main.c b/dlls/mf/main.c -index 86f2774..702618f 100644 +index 86f27741c9e..702618ffba5 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -23,7 +23,8 @@ @@ -48,7 +48,7 @@ index 86f2774..702618f 100644 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h new file mode 100644 -index 0000000..36c05e7 +index 00000000000..36c05e7b050 --- /dev/null +++ b/dlls/mf/mf_private.h @@ -0,0 +1,28 @@ @@ -82,7 +82,7 @@ index 0000000..36c05e7 +#endif /* __WINE_MF_MF_PRIVATE_H */ diff --git a/dlls/mf/session.c b/dlls/mf/session.c new file mode 100644 -index 0000000..931e53a +index 00000000000..931e53af5bd --- /dev/null +++ b/dlls/mf/session.c @@ -0,0 +1,221 @@ @@ -307,6 +307,18 @@ index 0000000..931e53a + *iface = &This->IMFMediaSession_iface; + return S_OK; +} +diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c +index 924d3863c85..40df4948b38 100644 +--- a/dlls/mf/topology.c ++++ b/dlls/mf/topology.c +@@ -23,7 +23,6 @@ + + #include "windef.h" + #include "winbase.h" +-#include "initguid.h" + #include "mfidl.h" + + #include "wine/debug.h" -- -2.7.1 +2.13.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index cd235f37..0ee40383 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "1fbb661ed1745bdfdcd1287c730f63503ee3f13f" + echo "6c752aaf8da225365b2bdbbf3c43d41afd4d1344" } # Show version information @@ -5111,7 +5111,8 @@ 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, include/rpcndr.h +# | * dlls/mf/Makefile.in, dlls/mf/main.c, dlls/mf/mf.spec, dlls/mf/mf_private.h, dlls/mf/session.c, dlls/mf/topology.c, +# | include/rpcndr.h # | if test "$enable_mfplat_MFTRegister" -eq 1; then patch_apply mfplat-MFTRegister/0006-mf-Add-stub-for-MFCreateMediaSession.patch