From b94d777562ad342074b7ff2d06bac9229046126a Mon Sep 17 00:00:00 2001 From: jihye kim Date: Mon, 20 Aug 2012 23:20:19 +0900 Subject: [PATCH] [Title] add java path for windows [Type] bug fix [Module] emulator (qemu) [Priority] major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- tizen/src/skin/maruskin_client.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c index fd8deb8..ef47d19 100644 --- 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); -- 2.7.4