wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

mscoree-CorValidateImage: Replace check for __x86_64__ with _WIN64.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-07-17 04:17:57 +02:00
parent 76d8009160
commit 8f245e2d60
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
View File

@ -1,14 +1,14 @@
From 8a95b2a4647c5a92cc2f91b3baaaf2b9756176b1 Mon Sep 17 00:00:00 2001
From 9a13889280aaedf1219b4f41000fd02f343a4a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 2 Apr 2015 02:38:29 +0200
Subject: mscoree: Implement _CorValidateImage.
Subject: mscoree: Implement _CorValidateImage. (v2)
---
dlls/mscoree/mscoree_main.c | 74 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 72 insertions(+), 2 deletions(-)
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 8b46fd5..3644a18 100644
index 8b46fd5..327fcb9 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -21,11 +21,14 @@
@ -49,7 +49,7 @@ index 8b46fd5..3644a18 100644
+ if (!cliheader || size < sizeof(*cliheader))
+ return STATUS_INVALID_IMAGE_FORMAT;
+
+#ifdef __x86_64__
+#ifdef _WIN64
+ if (cliheader->Flags & COMIMAGE_FLAGS_32BITREQUIRED)
+ return STATUS_INVALID_IMAGE_FORMAT;
+
@ -105,5 +105,5 @@ index 8b46fd5..3644a18 100644
HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength)
--
2.3.5
2.4.5

2
patches/patchinstall.sh
View File

@ -3125,7 +3125,7 @@ fi
if test "$enable_mscoree_CorValidateImage" -eq 1; then
patch_apply mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
(
echo '+ { "Michael Müller", "mscoree: Implement _CorValidateImage.", 1 },';
echo '+ { "Michael Müller", "mscoree: Implement _CorValidateImage.", 2 },';
) >> "$patchlist"
fi