Changeset 264188 in webkit

Timestamp:

Jul 9, 2020 12:49:58 PM (4 years ago)

Author:

Fujii Hironori

Message:

[WinCairo][MediaFoundation] Use /DELAYLOAD for mf.dll
​https://bugs.webkit.org/show_bug.cgi?id=213330

Reviewed by Per Arne Vollan.

WinCairo failed to start up due to a missing dependency on some
versions of Windows in which Media Foundation is not available
such like Windows 10 N. Use delay load for Media Foundation. And,
check the availability.

• PlatformWinCairo.cmake: Link with delayimp.lib. Added /DELAYLOAD linker options.
• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:

(WebCore::MediaPlayerPrivateMediaFoundation::isAvailable): Check mf.dll is available.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWinCairo.cmake (modified) (2 diffs)
• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-09  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][MediaFoundation] Use /DELAYLOAD for mf.dll
+        https://bugs.webkit.org/show_bug.cgi?id=213330
+
+        Reviewed by Per Arne Vollan.
+
+        WinCairo failed to start up due to a missing dependency on some
+        versions of Windows in which Media Foundation is not available
+        such like Windows 10 N. Use delay load for Media Foundation. And,
+        check the availability.
+
+        * PlatformWinCairo.cmake: Link with delayimp.lib. Added /DELAYLOAD linker options.
+        * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+        (WebCore::MediaPlayerPrivateMediaFoundation::isAvailable): Check mf.dll is available.
+
 2020-07-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/PlatformWinCairo.cmake

@@ -44 +44 @@
     comctl32
     crypt32
+    delayimp
     dxva2
     evr
@@ -55 +56 @@
 )
 
+target_link_options(WebCore PUBLIC /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll)
+
 list(APPEND WebCoreTestSupport_LIBRARIES
     Cairo::Cairo

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp

@@ -108 +108 @@
 bool MediaPlayerPrivateMediaFoundation::isAvailable() 
 {
-    notImplemented();
-    return true;
+    static bool isMediaFoundationAvailable = LoadLibrary(L"mf.dll");
+    return isMediaFoundationAvailable;
 }