equal
deleted
inserted
replaced
81 char **__initenv; |
81 char **__initenv; |
82 |
82 |
83 int WINAPI |
83 int WINAPI |
84 WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow) |
84 WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow) |
85 { |
85 { |
86 int margc; |
86 int margc, appclassc; |
87 char** margv; |
87 char** margv; |
88 const jboolean const_javaw = JNI_TRUE; |
88 const jboolean const_javaw = JNI_TRUE; |
89 |
89 |
90 __initenv = _environ; |
90 __initenv = _environ; |
91 |
91 |
92 #else /* JAVAW */ |
92 #else /* JAVAW */ |
93 int |
93 int |
94 main(int argc, char **argv) |
94 main(int argc, char **argv) |
95 { |
95 { |
96 int margc; |
96 int margc, appclassc; |
97 char** margv; |
97 char** margv; |
98 const jboolean const_javaw = JNI_FALSE; |
98 const jboolean const_javaw = JNI_FALSE; |
99 #endif /* JAVAW */ |
99 #endif /* JAVAW */ |
100 |
100 |
101 JLI_InitArgProcessing(!HAS_JAVA_ARGS, const_disable_argfile); |
101 JLI_InitArgProcessing(!HAS_JAVA_ARGS, const_disable_argfile); |
146 // add the NULL pointer at argv[argc] |
146 // add the NULL pointer at argv[argc] |
147 JLI_List_add(args, NULL); |
147 JLI_List_add(args, NULL); |
148 margv = args->elements; |
148 margv = args->elements; |
149 } |
149 } |
150 #endif /* WIN32 */ |
150 #endif /* WIN32 */ |
|
151 if (const_appclasspath[0] == NULL) { |
|
152 appclassc = 0; |
|
153 } else { |
|
154 appclassc = sizeof(const_appclasspath) / sizeof(char *); |
|
155 } |
151 return JLI_Launch(margc, margv, |
156 return JLI_Launch(margc, margv, |
152 sizeof(const_jargs) / sizeof(char *), const_jargs, |
157 sizeof(const_jargs) / sizeof(char *), const_jargs, |
153 sizeof(const_appclasspath) / sizeof(char *), const_appclasspath, |
158 appclassc, const_appclasspath, |
154 VERSION_STRING, |
159 VERSION_STRING, |
155 DOT_VERSION, |
160 DOT_VERSION, |
156 (const_progname != NULL) ? const_progname : *margv, |
161 (const_progname != NULL) ? const_progname : *margv, |
157 (const_launcher != NULL) ? const_launcher : *margv, |
162 (const_launcher != NULL) ? const_launcher : *margv, |
158 HAS_JAVA_ARGS, |
163 HAS_JAVA_ARGS, |