Add NoData as valid return state for Statements with params

[mono.git] / mono / metadata / coree.c

diff --git a/mono/metadata/coree.c b/mono/metadata/coree.c
index 873df01f3df25106b497e805de82b9f3d34e3164..6c7ff4a1f27d3e9370c05d760f5fdebfc867b2ad 100644 (file)
--- a/mono/metadata/coree.c
+++ b/mono/metadata/coree.c
@@ -9,13 +9,7 @@
 
 #include <config.h>
 
-#ifdef PLATFORM_WIN32
-
-#if _WIN32_WINNT < 0x0501
-/* Required for ACTCTX. */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif /* _WIN32_WINNT < 0x0501 */
+#ifdef HOST_WIN32
 
 #include <string.h>
 #include <glib.h>
@@ -226,10 +220,12 @@ STDAPI _CorValidateImage(PVOID *ImageBase, LPCWSTR FileName)
 {
        IMAGE_DOS_HEADER* DosHeader;
        IMAGE_NT_HEADERS32* NtHeaders32;
-       IMAGE_NT_HEADERS64* NtHeaders64;
        IMAGE_DATA_DIRECTORY* CliHeaderDir;
+#ifdef _WIN64
+       IMAGE_NT_HEADERS64* NtHeaders64;
        MonoCLIHeader* CliHeader;
        DWORD SizeOfHeaders;
+#endif
        DWORD* Address;
        DWORD OldProtect;
 
@@ -410,7 +406,9 @@ HMODULE WINAPI MonoLoadImage(LPCWSTR FileName)
        HANDLE MapHandle;
        IMAGE_DOS_HEADER* DosHeader;
        IMAGE_NT_HEADERS32* NtHeaders32;
+#ifdef _WIN64
        IMAGE_NT_HEADERS64* NtHeaders64;
+#endif
        HMODULE ModuleHandle;
 
        FileHandle = CreateFile(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
@@ -458,7 +456,9 @@ InvalidImageFormat:
                goto UnmapView;
        }
 
+#ifdef _WIN64
 ValidImage:
+#endif
        UnmapViewOfFile(DosHeader);
        CloseHandle(MapHandle);
 
@@ -736,8 +736,8 @@ STDAPI MonoFixupExe(HMODULE ModuleHandle)
                                                return E_FAIL;
 
                                        BaseRelocSize -= RelocBlockSize;
-                                       RelocBlock = (USHORT*)((DWORD_PTR)BaseReloc + IMAGE_SIZEOF_BASE_RELOCATION);
-                                       RelocBlockSize -= IMAGE_SIZEOF_BASE_RELOCATION;
+                                       RelocBlock = (USHORT*)((DWORD_PTR)BaseReloc + sizeof(IMAGE_BASE_RELOCATION));
+                                       RelocBlockSize -= sizeof(IMAGE_BASE_RELOCATION);
                                        RelocBlockSize /= sizeof(USHORT);
 
                                        while (RelocBlockSize-- != 0)
@@ -923,4 +923,4 @@ mono_fixup_exe_image (MonoImage* image)
                MonoFixupExe ((HMODULE) image->raw_data);
 }
 
-#endif /* PLATFORM_WIN32 */
+#endif /* HOST_WIN32 */