From 1f2ce1661f16aee2caeb8d87304ea93da81f67b4 Mon Sep 17 00:00:00 2001 From: jihye kim Date: Mon, 16 Sep 2013 17:02:40 +0900 Subject: [PATCH] fixed the bug - change finding java path routine at 64bit windows (add Wow6432Node) Change-Id: I4ff061df05059a6b260d1862b3311da0e201de26 Signed-off-by: jihye kim --- package/changelog | 5 +++++ package/pkginfo.manifest | 2 +- util/oslib-win32.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/changelog b/package/changelog index ff94f66bcf..a0492c1e1d 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,8 @@ +* 1.5.94 +- fixed the bug +- change finding java path routine at 64bit windows (add Wow6432Node) +== jihye kim 2013-09-16 + * 1.5.93 - rebase QEMU onto 1.6. == Kitae Kim 2013-09-13 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 6c01d30c02..68d7273a6a 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.5.93 +Version: 1.5.94 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/util/oslib-win32.c b/util/oslib-win32.c index f70ee3c885..c942154642 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -73,7 +73,7 @@ bool get_java_path(char** java_path) DWORD dwBufLen = JAVA_MAX_COMMAND_LENGTH; RegOpenKeyEx(HKEY_LOCAL_MACHINE, - "SOFTWARE\\JavaSoft\\Java Runtime Environment", + "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment", 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | MY_KEY_WOW64_64KEY, &hKey); -- 2.34.1