From 5db9d0a105c0011879460b73a20d10c2957a5ec8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 12 Dec 2014 04:35:46 +0100 Subject: [PATCH] Add missing files. --- .../0001-include-Add-mferror.h-header.patch | 115 ++++++++++++++++++ ...t-stubs-for-MFStartup-and-MFShutdown.patch | 67 ++++++++++ 2 files changed, 182 insertions(+) create mode 100644 patches/mfplat-Stubs/0001-include-Add-mferror.h-header.patch create mode 100644 patches/mfplat-Stubs/0002-mfplat-Implement-stubs-for-MFStartup-and-MFShutdown.patch diff --git a/patches/mfplat-Stubs/0001-include-Add-mferror.h-header.patch b/patches/mfplat-Stubs/0001-include-Add-mferror.h-header.patch new file mode 100644 index 00000000..f48b33ab --- /dev/null +++ b/patches/mfplat-Stubs/0001-include-Add-mferror.h-header.patch @@ -0,0 +1,115 @@ +From 76e1bf51109fcade8d12a828c501f86d42ba1c5f Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Fri, 12 Dec 2014 00:56:28 +0100 +Subject: include: Add mferror.h header. + +--- + include/Makefile.in | 1 + + include/mferror.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + create mode 100644 include/mferror.h + +diff --git a/include/Makefile.in b/include/Makefile.in +index 3cf9ba6..ef65df5 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -397,6 +397,7 @@ SRCDIR_INCLUDES = \ + mciavi.h \ + mcx.h \ + mediaerr.h \ ++ mferror.h \ + midles.h \ + minmax.h \ + mmddk.h \ +diff --git a/include/mferror.h b/include/mferror.h +new file mode 100644 +index 0000000..42c472f +--- /dev/null ++++ b/include/mferror.h +@@ -0,0 +1,82 @@ ++/* ++ * Copyright (C) 2014 Sebastian Lackner ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA ++ */ ++ ++#ifndef __WINE_MFERROR_H ++#define __WINE_MFERROR_H ++ ++#define MF_E_PLATFORM_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b0) ++#define MF_E_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d36b1) ++#define MF_E_INVALIDREQUEST _HRESULT_TYPEDEF_(0xc00d36b2) ++#define MF_E_INVALIDSTREAMNUMBER _HRESULT_TYPEDEF_(0xc00d36b3) ++#define MF_E_INVALIDMEDIATYPE _HRESULT_TYPEDEF_(0xc00d36b4) ++#define MF_E_NOTACCEPTING _HRESULT_TYPEDEF_(0xc00d36b5) ++#define MF_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b6) ++#define MF_E_UNSUPPORTED_REPRESENTATION _HRESULT_TYPEDEF_(0xc00d36b7) ++#define MF_E_NO_MORE_TYPES _HRESULT_TYPEDEF_(0xc00d36b9) ++#define MF_E_UNSUPPORTED_SERVICE _HRESULT_TYPEDEF_(0xc00d36ba) ++#define MF_E_UNEXPECTED _HRESULT_TYPEDEF_(0xc00d36bb) ++#define MF_E_INVALIDNAME _HRESULT_TYPEDEF_(0xc00d36bc) ++#define MF_E_INVALIDTYPE _HRESULT_TYPEDEF_(0xc00d36bd) ++#define MF_E_INVALID_FILE_FORMAT _HRESULT_TYPEDEF_(0xc00d36be) ++#define MF_E_INVALIDINDEX _HRESULT_TYPEDEF_(0xc00d36bf) ++#define MF_E_INVALID_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c0) ++#define MF_E_UNSUPPORTED_SCHEME _HRESULT_TYPEDEF_(0xc00d36c3) ++#define MF_E_UNSUPPORTED_BYTESTREAM_TYPE _HRESULT_TYPEDEF_(0xc00d36c4) ++#define MF_E_UNSUPPORTED_TIME_FORMAT _HRESULT_TYPEDEF_(0xc00d36c5) ++#define MF_E_NO_SAMPLE_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c8) ++#define MF_E_NO_SAMPLE_DURATION _HRESULT_TYPEDEF_(0xc00d36c9) ++#define MF_E_INVALID_STREAM_DATA _HRESULT_TYPEDEF_(0xc00d36cb) ++#define MF_E_RT_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d36cf) ++#define MF_E_UNSUPPORTED_RATE _HRESULT_TYPEDEF_(0xc00d36d0) ++#define MF_E_THINNING_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d1) ++#define MF_E_REVERSE_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d2) ++#define MF_E_UNSUPPORTED_RATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36d3) ++#define MF_E_RATE_CHANGE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d36d4) ++#define MF_E_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d36d5) ++#define MF_E_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d36d6) ++#define MF_E_NO_CLOCK _HRESULT_TYPEDEF_(0xc00d36d7) ++#define MF_S_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0x000d36d8) ++#define MF_E_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0xc00d36d9) ++#define MF_E_MULTIPLE_SUBSCRIBERS _HRESULT_TYPEDEF_(0xc00d36da) ++#define MF_E_TIMER_ORPHANED _HRESULT_TYPEDEF_(0xc00d36db) ++#define MF_E_STATE_TRANSITION_PENDING _HRESULT_TYPEDEF_(0xc00d36dc) ++#define MF_E_UNSUPPORTED_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36dd) ++#define MF_E_UNRECOVERABLE_ERROR_OCCURRED _HRESULT_TYPEDEF_(0xc00d36de) ++#define MF_E_SAMPLE_HAS_TOO_MANY_BUFFERS _HRESULT_TYPEDEF_(0xc00d36df) ++#define MF_E_SAMPLE_NOT_WRITABLE _HRESULT_TYPEDEF_(0xc00d36e0) ++#define MF_E_INVALID_KEY _HRESULT_TYPEDEF_(0xc00d36e2) ++#define MF_E_BAD_STARTUP_VERSION _HRESULT_TYPEDEF_(0xc00d36e3) ++#define MF_E_UNSUPPORTED_CAPTION _HRESULT_TYPEDEF_(0xc00d36e4) ++#define MF_E_INVALID_POSITION _HRESULT_TYPEDEF_(0xc00d36e5) ++#define MF_E_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d36e6) ++#define MF_E_PROPERTY_TYPE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d36e7) ++ ++#define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) ++#define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211) ++#define MF_E_TOPO_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d5212) ++#define MF_E_TOPO_CANNOT_CONNECT _HRESULT_TYPEDEF_(0xc00d5213) ++#define MF_E_TOPO_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d5214) ++#define MF_E_TOPO_INVALID_TIME_ATTRIBUTES _HRESULT_TYPEDEF_(0xc00d5215) ++#define MF_E_TOPO_LOOPS_IN_TOPOLOGY _HRESULT_TYPEDEF_(0xC00d5216) ++#define MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5217) ++#define MF_E_TOPO_MISSING_STREAM_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5218) ++#define MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED _HRESULT_TYPEDEF_(0xc00d5219) ++#define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) ++#define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) ++ ++#endif /* __WINE_MFERROR_H */ +\ No newline at end of file +-- +2.1.3 + diff --git a/patches/mfplat-Stubs/0002-mfplat-Implement-stubs-for-MFStartup-and-MFShutdown.patch b/patches/mfplat-Stubs/0002-mfplat-Implement-stubs-for-MFStartup-and-MFShutdown.patch new file mode 100644 index 00000000..d9c4e03c --- /dev/null +++ b/patches/mfplat-Stubs/0002-mfplat-Implement-stubs-for-MFStartup-and-MFShutdown.patch @@ -0,0 +1,67 @@ +From 1070c32921c59adc3c410f8e5bfaea49d7426630 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Fri, 12 Dec 2014 00:56:54 +0100 +Subject: mfplat: Implement stubs for MFStartup and MFShutdown. + +--- + dlls/mfplat/main.c | 23 +++++++++++++++++++++++ + dlls/mfplat/mfplat.spec | 4 ++-- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c +index a72f634..d86df7d 100644 +--- a/dlls/mfplat/main.c ++++ b/dlls/mfplat/main.c +@@ -22,6 +22,11 @@ + + #include "windef.h" + #include "winbase.h" ++#include "mferror.h" ++ ++#include "wine/debug.h" ++ ++WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) + { +@@ -36,3 +41,21 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) + + return TRUE; + } ++ ++/*********************************************************************** ++ * MFStartup (mfplat.@) ++ */ ++HRESULT WINAPI MFStartup(ULONG version, DWORD flags) ++{ ++ FIXME("(%u, %u): stub\n", version, flags); ++ return MF_E_BAD_STARTUP_VERSION; ++} ++ ++/*********************************************************************** ++ * MFShutdown (mfplat.@) ++ */ ++HRESULT WINAPI MFShutdown(void) ++{ ++ FIXME("(): stub\n"); ++ return S_OK; ++} +\ No newline at end of file +diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec +index 98a7147..7100dfd 100644 +--- a/dlls/mfplat/mfplat.spec ++++ b/dlls/mfplat/mfplat.spec +@@ -131,8 +131,8 @@ + @ stub MFSerializeMediaTypeToStream + @ stub MFSerializePresentationDescriptor + @ stub MFSetSockaddrAny +-@ stub MFShutdown +-@ stub MFStartup ++@ stdcall MFShutdown() ++@ stdcall MFStartup(long long) + @ stub MFStreamDescriptorProtectMediaType + @ stub MFTEnum + @ stub MFTEnumEx +-- +2.1.3 +