From f1e08a23facb2d718276b3fbf59b0df2b54fceb9 Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Tue, 27 May 2008 10:06:20 +0000 Subject: Changed implementation of ArgumentIsString to work with wide-character null-terminated strings on Windows. Changed Windows dynamic linker to use LoadLibraryW which is the only variant available on Windows CE. Changed GetProcAddress to explicitly named GetProcAddressA; this is implicitly the only variant available on Windows XP. Tested by compiling gluegen-rt.dll for both Windows XP and Windows CE. Also brought dynlink-unix-CustomJavaCode.java in line with modifications that were apparently hand made to the UnixDynamicLinkerImpl and MacOSXDynamicLinkerImpl classes. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@79 a78bb65f-1512-4460-ba86-f6dc96a7bf27 --- .../com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java') diff --git a/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java b/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java index c1d2fa0..553c2f2 100755 --- a/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java +++ b/src/java/com/sun/gluegen/runtime/WindowsDynamicLinkerImpl.java @@ -1,4 +1,4 @@ -/* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Mon Jul 31 16:26:59 PDT 2006 ----! */ +/* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Tue May 27 02:37:55 PDT 2008 ----! */ package com.sun.gluegen.runtime; @@ -14,20 +14,20 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker /** Interface to C language function:
DWORD GetLastError(void); */ private static native int GetLastError(); - /** Interface to C language function:
PROC GetProcAddress(HANDLE hModule, LPCSTR lpProcName); */ - private static native long GetProcAddress(long hModule, java.lang.String lpProcName); + /** Interface to C language function:
PROC GetProcAddressA(HANDLE hModule, LPCSTR lpProcName); */ + private static native long GetProcAddressA(long hModule, java.lang.String lpProcName); - /** Interface to C language function:
HANDLE LoadLibraryA(LPCSTR lpLibFileName); */ - private static native long LoadLibraryA(java.lang.String lpLibFileName); + /** Interface to C language function:
HANDLE LoadLibraryW(LPCWSTR lpLibFileName); */ + private static native long LoadLibraryW(java.lang.String lpLibFileName); // --- Begin CustomJavaCode .cfg declarations public long openLibrary(String libraryName) { - return LoadLibraryA(libraryName); + return LoadLibraryW(libraryName); } public long lookupSymbol(long libraryHandle, String symbolName) { - return GetProcAddress(libraryHandle, symbolName); + return GetProcAddressA(libraryHandle, symbolName); } public void closeLibrary(long libraryHandle) { -- cgit v1.2.3