diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-07-16 23:32:31 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-17 09:12:47 +0200 |
commit | 0ee0ca3036629b69bf20b448d74991fd133f08ac (patch) | |
tree | 6e3b0a2115db55ab94db203f162319d86cf13346 /external/pdfium/windows7.patch.1 | |
parent | 5a6671e8d8dc65f2bbb0880f19fd8c8c8e426b6d (diff) |
external: update pdfium to 3849
Change-Id: I616f57bd9de72b078500a290bf9ff89c71773f26
Reviewed-on: https://gerrit.libreoffice.org/75736
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external/pdfium/windows7.patch.1')
-rw-r--r-- | external/pdfium/windows7.patch.1 | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/external/pdfium/windows7.patch.1 b/external/pdfium/windows7.patch.1 index 00603c0570cb..d33f273ff4ca 100644 --- a/external/pdfium/windows7.patch.1 +++ b/external/pdfium/windows7.patch.1 @@ -1,34 +1,34 @@ diff --git a/third_party/base/win/win_util.cc b/third_party/base/win/win_util.cc -index 9c90b9d62..356eca74d 100644 +index ae2dba84d..7a3718848 100644 --- a/third_party/base/win/win_util.cc +++ b/third_party/base/win/win_util.cc @@ -12,28 +12,7 @@ namespace base { - namespace win {
-
- bool IsUser32AndGdi32Available() {
-- static auto is_user32_and_gdi32_available = []() {
-- // If win32k syscalls aren't disabled, then user32 and gdi32 are available.
--
-- typedef decltype(
-- GetProcessMitigationPolicy)* GetProcessMitigationPolicyType;
-- GetProcessMitigationPolicyType get_process_mitigation_policy_func =
-- reinterpret_cast<GetProcessMitigationPolicyType>(GetProcAddress(
-- GetModuleHandle(L"kernel32.dll"), "GetProcessMitigationPolicy"));
--
-- if (!get_process_mitigation_policy_func)
-- return true;
--
-- PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY policy = {};
-- if (get_process_mitigation_policy_func(GetCurrentProcess(),
-- ProcessSystemCallDisablePolicy,
-- &policy, sizeof(policy))) {
-- return policy.DisallowWin32kSystemCalls == 0;
-- }
--
-- return true;
-- }();
-- return is_user32_and_gdi32_available;
-+ return true;
- }
-
- } // namespace win
+ namespace win { + + bool IsUser32AndGdi32Available() { +- static auto is_user32_and_gdi32_available = []() { +- // If win32k syscalls aren't disabled, then user32 and gdi32 are available. +- +- typedef decltype( +- GetProcessMitigationPolicy)* GetProcessMitigationPolicyType; +- GetProcessMitigationPolicyType get_process_mitigation_policy_func = +- reinterpret_cast<GetProcessMitigationPolicyType>(GetProcAddress( +- GetModuleHandle(L"kernel32.dll"), "GetProcessMitigationPolicy")); +- +- if (!get_process_mitigation_policy_func) +- return true; +- +- PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY policy = {}; +- if (get_process_mitigation_policy_func(GetCurrentProcess(), +- ProcessSystemCallDisablePolicy, +- &policy, sizeof(policy))) { +- return policy.DisallowWin32kSystemCalls == 0; +- } +- +- return true; +- }(); +- return is_user32_and_gdi32_available; ++ return true; + } + + } // namespace win |