[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - external/pdfium

[Vasily Melenchuk (via logerrit)]

 external/pdfium/windows7.patch.1 |   58 +++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

New commits:
commit ef405c9997f589426f0b4c078b46d7c1ee4497dd
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Mon Dec 21 20:41:19 2020 +0300
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Tue Dec 22 01:49:09 2020 +0300

    Fixed CR/LF in patch file for 3dbe66b7895a412ad7ad9aede4be383489d805de:
    
    Author: Miklos Vajna <vmiklos at collabora.com>
    Date:   Mon May 20 21:37:39 2019 +0200
    
        external: update pdfium to 3794
    
    Change-Id: Iceb88ed16fb51146157bddcd3bc03d9b413b7473

diff --git a/external/pdfium/windows7.patch.1 b/external/pdfium/windows7.patch.1
index f6dfdc62b014..d33f273ff4ca 100644
--- a/external/pdfium/windows7.patch.1
+++ b/external/pdfium/windows7.patch.1
@@ -3,32 +3,32 @@ 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