From 860ab9d7ce5e22d0e49b6b397b245dda437fd186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Tue, 4 Sep 2012 12:53:59 +0200
Subject: [PATCH] Java: Fixed some issues with the previous NT patch.
---
src/modules/Java/ntdl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/modules/Java/ntdl.c b/src/modules/Java/ntdl.c
index f7ce1d8b5a..b1b7931ca7 100644
--- a/src/modules/Java/ntdl.c
+++ b/src/modules/Java/ntdl.c
@@ -23,7 +23,7 @@ static HINSTANCE jvmdll = NULL;
static int open_nt_dll(void)
{
- LPCTSTR libname=_T("jvm");
+ LPTSTR libname=_T("jvm");
LPCTSTR keyname=_T("SOFTWARE\\JavaSoft\\Java Runtime Environment");
HKEY key;
TCHAR buffer[2*MAX_PATH+32];
@@ -88,14 +88,14 @@ static int open_nt_dll(void)
* SetDllDirectory() with it.
*/
kernel = GetModuleHandle("kernel32");
- getdlldir = (void *)GetModuleHandle(kernel, "GetDllDirectoryA");
- setdlldir = (void *)GetModuleHandle(kernel, "SetDllDirectoryA");
+ getdlldir = (void *)GetProcAddress(kernel, "GetDllDirectoryA");
+ setdlldir = (void *)GetProcAddress(kernel, "SetDllDirectoryA");
if (setdlldir) {
int cnt = 0;
for(l = len; l--;) {
- if (jvmdll[l] == '\\') {
+ if (libname[l] == '\\') {
/* Go up two directory levels. */
if (++cnt == 2) break;
}
--
GitLab