Skip to content

Added Java 7 Support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prunn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added Java 7 Support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7686ba
Added Java 7 Support
prunn Aug 12, 2013
9e7c108
working tested launcher editor
prunn Aug 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 48 additions & 10 deletions cpp/editor_launcher/rfdynhud_editor_launcher/Source/jvm_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma comment(lib, "advapi32")

#include "jvm_connection.hpp"
#include <Windows.h>
#include <winreg.h>
Expand All @@ -8,6 +10,7 @@

static const char* LOG_FOLDER = getLogFolder();
static const char* LOG_FILENAME = getLogFilename();
int JAVA_VERSION = 0;

int findLastSeparator( const char* filename )
{
Expand Down Expand Up @@ -142,21 +145,28 @@ void logg2( const char* message )
}

char* readJavaHomeFromRegistry()
{
{//int& version
char* buffer = (char*)malloc( MAX_PATH );
HKEY keyHandle;
DWORD size1;
DWORD Type;

if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7", 0, KEY_QUERY_VALUE, &keyHandle ) == ERROR_SUCCESS )
{
size1 = MAX_PATH - 1;
RegQueryValueEx( keyHandle, "JavaHome", NULL, &Type, (LPBYTE)buffer, &size1);
RegCloseKey( keyHandle );
JAVA_VERSION = 7;
return ( buffer );
}
if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.6", 0, KEY_QUERY_VALUE, &keyHandle ) == ERROR_SUCCESS )
{
size1 = MAX_PATH - 1;
RegQueryValueEx( keyHandle, "JavaHome", NULL, &Type, (LPBYTE)buffer, &size1);
RegCloseKey( keyHandle );

JAVA_VERSION = 6;
return ( buffer );
}

free( buffer );

logg( "WARNING: Registry key for 32 bit Java 6 Runtime Environment not found." );
Expand All @@ -167,8 +177,10 @@ char* readJavaHomeFromRegistry()
char* guessJavaHome()
{
char* buffer = (char*)malloc( MAX_PATH );
char* buffer7 = (char*)malloc( MAX_PATH );

DWORD len = GetEnvironmentVariable( "ProgramFiles", buffer, MAX_PATH );
DWORD len7 = GetEnvironmentVariable( "ProgramFiles", buffer, MAX_PATH );

char* buff = buffer + len;
memcpy( buff, "\\Java\\jre6", 11 );
Expand All @@ -177,17 +189,31 @@ char* guessJavaHome()
char* result = (char*)malloc( len );
memcpy( result, buffer, len );
free( buffer );

char* buff7 = buffer7 + len7;
memcpy( buff7, "\\Java\\jre7", 11 );
len7 += 11;

if ( checkDirectoryExists( result, false ) != 1 )
char* result7 = (char*)malloc( len7 );
memcpy( result7, buffer7, len7 );
free( buffer7 );

if ( checkDirectoryExists( result, false ) != 1 && checkDirectoryExists( result7, false ) != 1)
{
free( result );
free( result7 );

logg( "WARNING: Couldn't find 32 bit Java 6 Runtime Environment in the default folder." );
logg( "WARNING: Couldn't find 32 bit Java 6 or Java 7 Runtime Environment in the default folder." );

return ( NULL );
}

return ( result );
if ( checkDirectoryExists( result7, false ) != 1)
{
JAVA_VERSION = 7;
return ( result7 );
}
JAVA_VERSION = 6;
return ( result );
}

char* getJavaHome()
Expand Down Expand Up @@ -228,13 +254,25 @@ bool createNewJavaVM( const char* PLUGIN_PATH, JavaVM** jvm, JNIEnv** env )

logg( fileBuffer );

getFullPath( JAVA_HOME, "bin\\msvcr71.dll", fileBuffer );
logg( " Loading msvcr71.dll..." );
if(JAVA_VERSION == 7)
{
getFullPath( JAVA_HOME, "bin\\msvcr100.dll", fileBuffer );
logg( " Loading msvcr100.dll...");
}
else
{
getFullPath( JAVA_HOME, "bin\\msvcr71.dll", fileBuffer );
logg( " Loading msvcr71.dll...");
}

HMODULE msvcdll = LoadLibrary( fileBuffer );

if ( msvcdll == NULL )
{
logg( "ERROR: Failed to load msvcr71.dll." );
if(JAVA_VERSION == 7)
logg( " ERROR: Failed to load msvcr100.dll." );
else
logg( " ERROR: Failed to load msvcr71.dll." );
return ( false );
}

Expand Down
64 changes: 49 additions & 15 deletions cpp/plugin/common/Source/jvm_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,30 @@
#include "util.h"
#include "logging.h"

int JAVA_VERSION = 0;
char* readJavaHomeFromRegistry()
{
{//int& version
char* buffer = (char*)malloc( MAX_PATH );
HKEY keyHandle;
DWORD size1;
DWORD Type;

if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7", 0, KEY_QUERY_VALUE, &keyHandle ) == ERROR_SUCCESS )
{
size1 = MAX_PATH - 1;
RegQueryValueEx( keyHandle, "JavaHome", NULL, &Type, (LPBYTE)buffer, &size1);
RegCloseKey( keyHandle );
JAVA_VERSION = 7;
return ( buffer );
}
if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.6", 0, KEY_QUERY_VALUE, &keyHandle ) == ERROR_SUCCESS )
{
size1 = MAX_PATH - 1;
RegQueryValueEx( keyHandle, "JavaHome", NULL, &Type, (LPBYTE)buffer, &size1);
RegCloseKey( keyHandle );

JAVA_VERSION = 6;
return ( buffer );
}

free( buffer );

logg( "WARNING: Registry key for 32 bit Java 6 Runtime Environment not found." );
Expand All @@ -33,8 +41,10 @@ char* readJavaHomeFromRegistry()
char* guessJavaHome()
{
char* buffer = (char*)malloc( MAX_PATH );
char* buffer7 = (char*)malloc( MAX_PATH );

DWORD len = GetEnvironmentVariable( "ProgramFiles", buffer, MAX_PATH );
DWORD len7 = GetEnvironmentVariable( "ProgramFiles", buffer, MAX_PATH );

char* buff = buffer + len;
memcpy( buff, "\\Java\\jre6", 11 );
Expand All @@ -43,36 +53,50 @@ char* guessJavaHome()
char* result = (char*)malloc( len );
memcpy( result, buffer, len );
free( buffer );

char* buff7 = buffer7 + len7;
memcpy( buff7, "\\Java\\jre7", 11 );
len7 += 11;

char* result7 = (char*)malloc( len7 );
memcpy( result7, buffer7, len7 );
free( buffer7 );

if ( checkDirectoryExists( result, false ) != 1 )
if ( checkDirectoryExists( result, false ) != 1 && checkDirectoryExists( result7, false ) != 1)
{
free( result );
free( result7 );

logg( "WARNING: Couldn't find 32 bit Java 6 Runtime Environment in the default folder." );
logg( "WARNING: Couldn't find 32 bit Java 6 or Java 7 Runtime Environment in the default folder." );

return ( NULL );
}

return ( result );
if ( checkDirectoryExists( result7, false ) != 1)
{
JAVA_VERSION = 7;
return ( result7 );
}
JAVA_VERSION = 6;
return ( result );
}

char* getJavaHome()
{
char* result;

result = readJavaHomeFromRegistry();
if ( result != NULL )
logg( "JAVA_VERSION :" + JAVA_VERSION );
if ( result != NULL )
return ( result );

result = guessJavaHome();
if ( result != NULL )
return ( result );
// TODO: Read the path from a user defined file.

return ( NULL );
}

//static const int& JAVA_VERSION;
static const char* JAVA_HOME = getJavaHome();

jboolean isCopy = false;
Expand Down Expand Up @@ -109,14 +133,24 @@ bool createNewJavaVM( const char* PLUGIN_PATH, JavaVM** jvm, JNIEnv** env )
memcpy( fileBuffer + 24 + strlen( JAVA_HOME ), "\".", 3 );

logg( fileBuffer );

getFullPath( JAVA_HOME, "bin\\msvcr71.dll", fileBuffer );
logg( " Loading msvcr71.dll...", false );
if(JAVA_VERSION == 7)
{
getFullPath( JAVA_HOME, "bin\\msvcr100.dll", fileBuffer );
logg( " Loading msvcr100.dll...", false );
}
else
{
getFullPath( JAVA_HOME, "bin\\msvcr71.dll", fileBuffer );
logg( " Loading msvcr71.dll...", false );
}
HMODULE msvcdll = LoadLibrary( fileBuffer );

if ( msvcdll == NULL )
{
logg( " ERROR: Failed to load msvcr71.dll." );
if(JAVA_VERSION == 7)
logg( " ERROR: Failed to load msvcr100.dll." );
else
logg( " ERROR: Failed to load msvcr71.dll." );
return ( false );
}
else
Expand Down