From d9a3f235e27463901f5fcb3a7836ac5d2dbb2cd2 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Tue, 5 Apr 2011 16:19:37 -0700 Subject: [PATCH] 7032593: DLL_LOADING: Upgrade solution to 7016985 to reflect JDK7 solution Reviewed-by: mchung, asaha --- jdk/src/windows/bin/java_md.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/jdk/src/windows/bin/java_md.c b/jdk/src/windows/bin/java_md.c index 4353ec5a12f..dfa50ac8af8 100644 --- a/jdk/src/windows/bin/java_md.c +++ b/jdk/src/windows/bin/java_md.c @@ -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 @@ jclass FindBootStrapClass(JNIEnv *env, const char *classname) 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