Mercurial > hg > truffle

comparison src/os/windows/vm/jvm_windows.h @ 3833:b1cbb0907b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7016797: Hotspot: securely/restrictive load dlls and new API for loading system dlls Summary: Created Windows Dll wrapped to handle jdk6 and jdk7 platform requirements, also provided more restictive Dll search orders for Windows system Dlls. Reviewed-by: acorn, dcubed, ohair, alanb
author zgu
date Fri, 15 Apr 2011 09:34:43 -0400
parents f95d63e2154a
children 11c26bfcf8c7
comparison
equal deleted inserted replaced
3821:8107273fd204 3833:b1cbb0907b36
28 /* 28 /*
29 * This file is currently collecting system-specific dregs for the 29 * This file is currently collecting system-specific dregs for the
30 * JNI conversion, which should be sorted out later. 30 * JNI conversion, which should be sorted out later.
31 */ 31 */
32 32
33 // JDK7 requires VS2010
34 #if _MSC_VER >= 1600
35 // JDK7 minimum platform requirement: Windows XP
36 #if _WIN32_WINNT < 0x0501
37 #undef _WIN32_WINNT
38 #define _WIN32_WINNT 0x0501
39 #endif
40 #endif
41
33 #include <windows.h> 42 #include <windows.h>
34 // #include <windef.h>
35 // #include <winbase.h>
36 43
44 #if _MSC_VER <= 1200
45 // Psapi.h doesn't come with Visual Studio 6; it can be downloaded as Platform
46 // SDK from Microsoft. Here are the definitions copied from Psapi.h
47 typedef struct _MODULEINFO {
48 LPVOID lpBaseOfDll;
49 DWORD SizeOfImage;
50 LPVOID EntryPoint;
51 } MODULEINFO, *LPMODULEINFO;
52
53 #else
54 #include <Psapi.h>
55 #endif
56
57
58
59 #include <Tlhelp32.h>
37 60
38 // #include "jni.h" 61 // #include "jni.h"
39 62
40 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} 63 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"}
41 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} 64 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"}