Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1275283. Use MFBT_API for importing/exporting in DLL blocklist. r=glandium

Browse Source
This commit is contained in:
Jeff Muizelaar 2016-05-24 17:57:57 -04:00
parent dad637eb4a
commit f2757bc5b8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozglue/build/WindowsDllBlocklist.cpp
View File

@ -29,6 +29,7 @@
#include "mozilla/UniquePtr.h"
#include "mozilla/WindowsVersion.h"
#include "nsWindowsHelpers.h"
#include "WindowsDllBlocklist.h"
using namespace mozilla;
@ -742,7 +743,7 @@ WindowsDllInterceptor NtDllIntercept;
} // namespace
NS_EXPORT void
MFBT_API void
DllBlocklist_Initialize()
{
#if defined(_MSC_VER) && _MSC_VER < 1900 && defined(_M_X64)
@ -781,7 +782,7 @@ DllBlocklist_Initialize()
}
}
NS_EXPORT void
MFBT_API void
DllBlocklist_SetInXPCOMLoadOnMainThread(bool inXPCOMLoadOnMainThread)
{
if (inXPCOMLoadOnMainThread) {
@ -792,7 +793,7 @@ DllBlocklist_SetInXPCOMLoadOnMainThread(bool inXPCOMLoadOnMainThread)
}
}
NS_EXPORT void
MFBT_API void
DllBlocklist_WriteNotes(HANDLE file)
{
DWORD nBytes;

8
mozglue/build/WindowsDllBlocklist.h
View File

@ -10,13 +10,13 @@
#include <windows.h>
#include "mozilla/GuardObjects.h"
#include "nscore.h"
#include "mozilla/Attributes.h"
#define HAS_DLL_BLOCKLIST
NS_IMPORT void DllBlocklist_Initialize();
NS_IMPORT void DllBlocklist_SetInXPCOMLoadOnMainThread(bool inXPCOMLoadOnMainThread);
NS_IMPORT void DllBlocklist_WriteNotes(HANDLE file);
MFBT_API void DllBlocklist_Initialize();
MFBT_API void DllBlocklist_SetInXPCOMLoadOnMainThread(bool inXPCOMLoadOnMainThread);
MFBT_API void DllBlocklist_WriteNotes(HANDLE file);
class MOZ_RAII AutoSetXPCOMLoadOnMainThread
{