Mercurial > hg > openjdk > jdk7 > jdk
changeset 4304:67992a58bfba
7032593: DLL_LOADING: Upgrade solution to 7016985 to reflect JDK7 solution
Reviewed-by: mchung, asaha
author | ksrini |
---|---|
date | Tue, 05 Apr 2011 16:19:37 -0700 |
parents | 0efa64f13302 |
children | 7181441faf72 |
files | src/windows/bin/java_md.c |
diffstat | 1 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/bin/java_md.c Tue Apr 05 14:49:03 2011 +0100 +++ b/src/windows/bin/java_md.c Tue Apr 05 16:19:37 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1212,22 +1212,11 @@ return findBootClass(env, classname); } -typedef BOOL (WINAPI *pfn_SetDllDirectory)(LPCTSTR); - void InitLauncher(boolean javaw) { INITCOMMONCONTROLSEX icx; - // Launcher links with kernel32 - HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll")); - pfn_SetDllDirectory fn = (pfn_SetDllDirectory) GetProcAddress(hKernel32, - "SetDllDirectory"); - if (fn != NULL) { - // Exclude CWD from Dll search path - fn(""); - } - /* * Required for javaw mode MessageBox output as well as for * HotSpot -XX:+ShowMessageBoxOnError in java mode, an empty