Commit 56d7abb4 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 16010: Fixing sandbox compile issues

parent 38c4a4a8

dom/media/gmp/rlz/GMPDeviceBinding.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ GetStackAfterCurrentFrame(uint8_t** aOutTop, uint8_t** aOutBottom) 
{

  // "Top" of the free space on the stack is directly after the memory

  // holding our return address.

  uint8_t* top = (uint8_t*)_AddressOfReturnAddress();

  uint8_t* top = (uint8_t*)__builtin_return_address(0);//_AddressOfReturnAddress();



  // Look down the stack until we find the guard page...

  MEMORY_BASIC_INFORMATION memInfo = {0};

js/xpconnect/src/XPCShellImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "mozilla/widget/AudioSession.h"

#include <windows.h>

#if defined(MOZ_SANDBOX)

#include "SandboxBroker.h"

#include "sandboxBroker.h"

#endif

#endif

security/sandbox/chromium-shim/base/win/sdkdecls.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ QueryThreadCycleTime( 
#define PROCESS_CREATION_MITIGATION_POLICY_WIN32K_SYSTEM_CALL_DISABLE_RESERVED            (0x00000003 << 28)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_MASK                   (0x00000003ui64 << 32)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_DEFER                  (0x00000000ui64 << 32)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_ALWAYS_ON              (0x00000001ui64 << 32)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_ALWAYS_ON              (0x00000001uLL << 32)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_ALWAYS_OFF             (0x00000002ui64 << 32)

#define PROCESS_CREATION_MITIGATION_POLICY_EXTENSION_POINT_DISABLE_RESERVED               (0x00000003ui64 << 32)

security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc

+4 −0
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ void PrepareForUTF8Output(const CHAR* src, 


// Instantiate versions we know callers will need.

template void PrepareForUTF8Output(const wchar_t*, size_t, std::string*);

#if !defined(__MINGW32__)

template void PrepareForUTF8Output(const char16*, size_t, std::string*);

#endif



template<typename STRING>

void PrepareForUTF16Or32Output(const char* src,
@@ -143,6 +145,8 @@ void PrepareForUTF16Or32Output(const char* src, 


// Instantiate versions we know callers will need.

template void PrepareForUTF16Or32Output(const char*, size_t, std::wstring*);

#if !defined(__MINGW32__)

template void PrepareForUTF16Or32Output(const char*, size_t, string16*);

#endif



}  // namespace base

security/sandbox/chromium/base/threading/platform_thread_win.cc

+2 −0
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ void SetNameInternal(PlatformThreadId thread_id, const char* name) { 
  info.dwThreadID = thread_id;

  info.dwFlags = 0;



#if 0

  __try {

    RaiseException(kVCThreadNameException, 0, sizeof(info)/sizeof(DWORD),

                   reinterpret_cast<DWORD_PTR*>(&info));

  } __except(EXCEPTION_CONTINUE_EXECUTION) {

  }

#endif

}



struct ThreadParams {