[Title] add java path for windows

[Type] bug fix
[Module] emulator (qemu)
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index e6a673797f9bc939709e4db7c725ea4fe9993e81..2896c5824bb06bca7361d7841437c350a2d9e023 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.3.19
+Version: 1.3.20
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c
index fd8deb8f0531d5c023c5a1733faf0b4ffbe72f78..ef47d1903372f3df93dc30f4a8cbc037892f9c4d 100644 (file)
--- a/tizen/src/skin/maruskin_client.c
+++ b/tizen/src/skin/maruskin_client.c
@@ -258,6 +258,20 @@ int start_simple_client(char* msg) {
 
     INFO("run simple client\n");
 
+#ifdef CONFIG_WIN32
+    // find java path in 64bit windows
+    JAVA_EXEFILE_PATH = malloc(JAVA_MAX_COMMAND_LENGTH);
+       memset(JAVA_EXEFILE_PATH, 0, JAVA_MAX_COMMAND_LENGTH);
+    if (is_wow64()) {
+        INFO("This process is running under WOW64.\n");
+        if (!get_java_path(&JAVA_EXEFILE_PATH)) {
+             strcpy(JAVA_EXEFILE_PATH, "java");
+           }
+    } else {
+        strcpy(JAVA_EXEFILE_PATH, "java");
+    }
+#endif
+
     int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
         strlen(JAVA_SIMPLEMODE_OPTION) + strlen(msg) + 7;
     if (len > JAVA_MAX_COMMAND_LENGTH) {
@@ -268,6 +282,10 @@ int start_simple_client(char* msg) {
     INFO("command for swt : %s\n", cmd);
 
 #ifdef CONFIG_WIN32
+    // for 64bit windows
+    free(JAVA_EXEFILE_PATH);
+    JAVA_EXEFILE_PATH=0;
+
     ret = WinExec(cmd, SW_SHOW);
 #else
     ret = system(cmd);