Mercurial > hg > truffle

diff src/os/windows/vm/jvm_windows.h @ 3429:5def270bc147
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
--- a/src/os/windows/vm/jvm_windows.h	Thu Apr 21 22:07:32 2011 -0700
+++ b/src/os/windows/vm/jvm_windows.h	Fri Apr 15 09:34:43 2011 -0400
@@ -30,10 +30,33 @@
  * JNI conversion, which should be sorted out later.
  */
 
+// JDK7 requires VS2010
+#if _MSC_VER >= 1600
+// JDK7 minimum platform requirement: Windows XP
+#if _WIN32_WINNT < 0x0501
+#undef _WIN32_WINNT
+#define _WIN32_WINNT  0x0501
+#endif
+#endif
+
 #include <windows.h>
-// #include <windef.h>
-// #include <winbase.h>
 
+#if _MSC_VER <= 1200
+// Psapi.h doesn't come with Visual Studio 6; it can be downloaded as Platform
+// SDK from Microsoft.  Here are the definitions copied from Psapi.h
+typedef struct _MODULEINFO {
+    LPVOID lpBaseOfDll;
+    DWORD SizeOfImage;
+    LPVOID EntryPoint;
+} MODULEINFO, *LPMODULEINFO;
+
+#else
+#include <Psapi.h>
+#endif
+
+
+
+#include <Tlhelp32.h>
 
 // #include "jni.h"
author	zgu
date	Fri, 15 Apr 2011 09:34:43 -0400
parents	f95d63e2154a
children	11c26bfcf8c7