equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
1210 } |
1210 } |
1211 } |
1211 } |
1212 return findBootClass(env, classname); |
1212 return findBootClass(env, classname); |
1213 } |
1213 } |
1214 |
1214 |
1215 typedef BOOL (WINAPI *pfn_SetDllDirectory)(LPCTSTR); |
|
1216 |
|
1217 void |
1215 void |
1218 InitLauncher(boolean javaw) |
1216 InitLauncher(boolean javaw) |
1219 { |
1217 { |
1220 INITCOMMONCONTROLSEX icx; |
1218 INITCOMMONCONTROLSEX icx; |
1221 |
|
1222 // Launcher links with kernel32 |
|
1223 HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll")); |
|
1224 pfn_SetDllDirectory fn = (pfn_SetDllDirectory) GetProcAddress(hKernel32, |
|
1225 "SetDllDirectory"); |
|
1226 if (fn != NULL) { |
|
1227 // Exclude CWD from Dll search path |
|
1228 fn(""); |
|
1229 } |
|
1230 |
1219 |
1231 /* |
1220 /* |
1232 * Required for javaw mode MessageBox output as well as for |
1221 * Required for javaw mode MessageBox output as well as for |
1233 * HotSpot -XX:+ShowMessageBoxOnError in java mode, an empty |
1222 * HotSpot -XX:+ShowMessageBoxOnError in java mode, an empty |
1234 * flag field is sufficient to perform the basic UI initialization. |
1223 * flag field is sufficient to perform the basic UI initialization. |