wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1140797 - Make gmp-clearkey buildable outside of mozilla-central. r=edwin

Browse Source
This commit is contained in:
Chris Pearce 2015-03-09 08:27:05 +13:00
parent c704e830ef
commit 932fc485ea
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/gmp-clearkey/0.1/ClearKeySession.cpp
View File

@ -10,7 +10,6 @@
#include "gmp-api/gmp-decryption.h"
#include "mozilla/Endian.h"
#include "pk11pub.h"
using namespace mozilla;

1
media/gmp-clearkey/0.1/WMFAACDecoder.cpp
View File

@ -17,6 +17,7 @@
#include "WMFAACDecoder.h"
#include <algorithm>
#include <stdint.h>
#include <vector>
using std::vector;

1
media/gmp-clearkey/0.1/WMFH264Decoder.cpp
View File

@ -15,6 +15,7 @@
*/
#include "WMFH264Decoder.h"
#include <algorithm>
namespace wmf {

10
media/gmp-clearkey/0.1/WMFUtils.cpp
View File

@ -55,7 +55,7 @@ LinkMfplat()
static bool sInitOk = false;
if (!sInitDone) {
sInitDone = true;
auto handle = GetModuleHandle("mfplat.dll");
auto handle = GetModuleHandleA("mfplat.dll");
#define MFPLAT_FUNC(_func) \
if (!(_func = (decltype(_func))(GetProcAddress(handle, #_func)))) { \
return false; \
@ -74,9 +74,9 @@ EnsureLibs()
static bool sInitOk = false;
if (!sInitDone) {
sInitOk = LinkMfplat() &&
!!GetModuleHandle("msauddecmft.dll") &&
!!GetModuleHandle("msmpeg2adec.dll") &&
!!GetModuleHandle("msmpeg2vdec.dll");
!!GetModuleHandleA("msauddecmft.dll") &&
!!GetModuleHandleA("msmpeg2adec.dll") &&
!!GetModuleHandleA("msmpeg2vdec.dll");
sInitDone = true;
}
return sInitOk;
@ -183,7 +183,7 @@ CreateMFT(const CLSID& clsid,
const char* aDllName,
CComPtr<IMFTransform>& aOutMFT)
{
HMODULE module = ::GetModuleHandle(aDllName);
HMODULE module = ::GetModuleHandleA(aDllName);
if (!module) {
LOG("Failed to get %S\n", aDllName);
return E_FAIL;