Signed-off-by: Jactry Zeng jzeng@codeweavers.com --- configure | 2 ++ configure.ac | 1 + dlls/mfmediaengine/Makefile.in | 7 ++++++ dlls/mfmediaengine/main.c | 36 +++++++++++++++++++++++++++ dlls/mfmediaengine/mfmediaengine.spec | 3 +++ 5 files changed, 49 insertions(+) create mode 100644 dlls/mfmediaengine/Makefile.in create mode 100644 dlls/mfmediaengine/main.c create mode 100644 dlls/mfmediaengine/mfmediaengine.spec
diff --git a/configure b/configure index c06bc4f079..82c3611b40 100755 --- a/configure +++ b/configure @@ -1385,6 +1385,7 @@ enable_mciwave enable_mf enable_mf3216 enable_mferror +enable_mfmediaengine enable_mfplat enable_mfplay enable_mfreadwrite @@ -20378,6 +20379,7 @@ wine_fn_config_makefile dlls/mf enable_mf wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mferror enable_mferror +wine_fn_config_makefile dlls/mfmediaengine enable_mfmediaengine wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfplay enable_mfplay diff --git a/configure.ac b/configure.ac index e58a924239..ef41e94df6 100644 --- a/configure.ac +++ b/configure.ac @@ -3358,6 +3358,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf) WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mferror) +WINE_CONFIG_MAKEFILE(dlls/mfmediaengine) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfplay) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in new file mode 100644 index 0000000000..1654130574 --- /dev/null +++ b/dlls/mfmediaengine/Makefile.in @@ -0,0 +1,7 @@ +MODULE = mfmediaengine.dll +IMPORTLIB = mfmediaengine + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c new file mode 100644 index 0000000000..81aaf77e2c --- /dev/null +++ b/dlls/mfmediaengine/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/mfmediaengine/mfmediaengine.spec b/dlls/mfmediaengine/mfmediaengine.spec new file mode 100644 index 0000000000..a7e7cb9036 --- /dev/null +++ b/dlls/mfmediaengine/mfmediaengine.spec @@ -0,0 +1,3 @@ +@ stub DllCanUnloadNow +@ stub DllGetActivationFactory +@ stub DllGetClassObject
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55924
Your paranoid android.
=== debian10 (32 bit report) ===
mfplat: mfplat.c:3860: Test failed: D3D12CreateDevice failed: 0x80004005. Unhandled exception: page fault on execute access to 0x11002400 in 32-bit code (0x11002400).
Report errors: mfplat:mfplat crashed (c0000005)
=== debian10 (32 bit Chinese:China report) ===
mfplat: mfplat.c:3860: Test failed: D3D12CreateDevice failed: 0x80004005. Unhandled exception: page fault on execute access to 0x11002400 in 32-bit code (0x11002400).
Report errors: mfplat:mfplat crashed (c0000005)
=== debian10 (32 bit WoW report) ===
mfplat: mfplat.c:3860: Test failed: D3D12CreateDevice failed: 0x80004005. Unhandled exception: page fault on execute access to 0x11002400 in 32-bit code (0x11002400).
Report errors: mfplat:mfplat crashed (c0000005)
=== debian10 (64 bit WoW report) ===
mfplat: mfplat.c:3860: Test failed: D3D12CreateDevice failed: 0x80004005. Unhandled exception: page fault on execute access to 0x11002400 in 32-bit code (0x11002400).
Report errors: mfplat:mfplat crashed (c0000005)
-
Jactry Zeng -
Marvin