From 8f245e2d607ed662c4ebdf0731c353939c9f926f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 17 Jul 2015 04:17:57 +0200
Subject: [PATCH] mscoree-CorValidateImage: Replace check for __x86_64__ with
 _WIN64.

---
 .../0001-mscoree-Implement-_CorValidateImage.patch     | 10 +++++-----
 patches/patchinstall.sh                                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch b/patches/mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
index 67324a84..c1c71db7 100644
--- a/patches/mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
+++ b/patches/mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
@@ -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
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 92aa8ba0..154bf4e7 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -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