fixed the bug

- change finding java path routine at 64bit windows (add Wow6432Node)

Change-Id: I4ff061df05059a6b260d1862b3311da0e201de26
Signed-off-by: jihye kim <jihye1128.kim@samsung.com>

diff --git a/package/changelog b/package/changelog
index ff94f66bcf2741c2df5d88f17fecc52a856f7f54..a0492c1e1d40b4a88b5981c740f9ea63417aa34b 100644 (file)
--- 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 <jihye1128@samsung.com> 2013-09-16
+
 * 1.5.93
 - rebase QEMU onto 1.6.
 == Kitae Kim <kt920.kim@samsung.com> 2013-09-13

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6c01d30c02e0e0743d2ec85cc15d69d5b33fefd8..68d7273a6a0ea1aa0dac92f32adfb872bd0001a8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.5.93
+Version: 1.5.94
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index f70ee3c885f4527ed8b5c21a20cd034adca9b68b..c942154642788ab61befb1d0ac5825da65aca97d 100644 (file)
--- 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);