Drop windows7.patch.1 from pdfium
Change-Id: Idb458e3e65bc22d148cc68e496aa0dda32fec2a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178079 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
parent
143e89dbf8
commit
7dd9d6525a
2 changed files with 0 additions and 36 deletions
2
external/pdfium/UnpackedTarball_pdfium.mk
vendored
2
external/pdfium/UnpackedTarball_pdfium.mk
vendored
|
@ -10,8 +10,6 @@
|
|||
pdfium_patches :=
|
||||
# Fixes build on our baseline.
|
||||
pdfium_patches += build.patch.1
|
||||
# Avoids Windows 8 build dependency.
|
||||
pdfium_patches += windows7.patch.1
|
||||
pdfium_patches += c++20-comparison.patch
|
||||
|
||||
pdfium_patches += constexpr-template.patch
|
||||
|
|
34
external/pdfium/windows7.patch.1
vendored
34
external/pdfium/windows7.patch.1
vendored
|
@ -1,34 +0,0 @@
|
|||
diff --git a/core/fxcrt/win/win_util.cc b/core/fxcrt/win/win_util.cc
|
||||
index 43e9151d1..76657ac0a 100644
|
||||
--- a/core/fxcrt/win/win_util.cc
|
||||
+++ b/core/fxcrt/win/win_util.cc
|
||||
@@ -10,28 +10,7 @@
|
||||
namespace pdfium {
|
||||
|
||||
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 pdfium
|
Loading…
Reference in a new issue