зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1852806 - Remove macros for older Windows SDK from ipc/. r=handyman,mccr8,ipc-reviewers
Depends on D188024 Differential Revision: https://phabricator.services.mozilla.com/D188025
This commit is contained in:
Родитель
53a80005eb
Коммит
0a7dc6a618
|
@ -4,10 +4,6 @@
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
// found in the LICENSE file.
|
// found in the LICENSE file.
|
||||||
|
|
||||||
// We need extended process and thread attribute support
|
|
||||||
#undef _WIN32_WINNT
|
|
||||||
#define _WIN32_WINNT 0x0600
|
|
||||||
|
|
||||||
#include "base/process_util.h"
|
#include "base/process_util.h"
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# include "nsPrintfCString.h"
|
# include "nsPrintfCString.h"
|
||||||
#endif // defined(MOZILLA_INTERNAL_API)
|
#endif // defined(MOZILLA_INTERNAL_API)
|
||||||
|
|
||||||
#if NTDDI_VERSION < NTDDI_WINBLUE || defined(__MINGW32__)
|
#if defined(__MINGW32__)
|
||||||
|
|
||||||
// Declarations from Windows SDK specific to Windows 8.1
|
// Declarations from Windows SDK specific to Windows 8.1
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ HRESULT WINAPI RoGetAgileReference(AgileReferenceOptions options, REFIID riid,
|
||||||
IUnknown* pUnk,
|
IUnknown* pUnk,
|
||||||
IAgileReference** ppAgileReference);
|
IAgileReference** ppAgileReference);
|
||||||
|
|
||||||
#endif // NTDDI_VERSION < NTDDI_WINBLUE
|
#endif // defined(__MINGW32__)
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace mscom {
|
namespace mscom {
|
||||||
|
|
|
@ -9,12 +9,6 @@
|
||||||
|
|
||||||
#include <objbase.h>
|
#include <objbase.h>
|
||||||
|
|
||||||
#if (NTDDI_VERSION < NTDDI_WIN8)
|
|
||||||
// Win8+ API that we use very carefully
|
|
||||||
DECLARE_HANDLE(CO_MTA_USAGE_COOKIE);
|
|
||||||
HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE* pCookie);
|
|
||||||
#endif // (NTDDI_VERSION < NTDDI_WIN8)
|
|
||||||
|
|
||||||
// A set of wrapped COM functions, so that we can dynamically link to the
|
// A set of wrapped COM functions, so that we can dynamically link to the
|
||||||
// functions in combase.dll on win8+. This prevents ole32.dll and many other
|
// functions in combase.dll on win8+. This prevents ole32.dll and many other
|
||||||
// DLLs loading, which are not required when we have win32k locked down.
|
// DLLs loading, which are not required when we have win32k locked down.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче