--- a/JavaVM.st Fri Feb 06 01:56:01 1998 +0000
+++ b/JavaVM.st Fri Feb 06 02:16:40 1998 +0000
@@ -3169,9 +3169,9 @@
_Runtime_loadFileInternalI:nativeContext
"1.1b3 change; load a sharedLib like 'loadFileInternal',
but return integer:
- -1 outOfMemory error
- 0 failed to load
- 1 loaded or already loaded (i.e. ok)"
+ -1 outOfMemory error
+ 0 failed to load
+ 1 loaded or already loaded (i.e. ok)"
|jLibName libName libHandle|
@@ -3179,34 +3179,38 @@
libName := Java as_ST_String:jLibName.
(SimulatedLibs includes:libName) ifTrue:[
- ('JAVA: builtIn libLoad simulated: ' , libName) printNL.
- ^ 1
+"/ ('JAVA: builtIn libLoad simulated: ' , libName) printNL.
+ ^ 1
].
(LoadedLibs notNil and:[LoadedLibs includesKey:libName]) ifTrue:[
- ('JAVA: already loaded: ' , libName) printNL.
- ^ 1
+"/ ('JAVA: already loaded: ' , libName) printNL.
+ ^ 1
].
libName asFilename exists ifFalse:[
- ('JAVA: no file to load: ' , libName) printNL.
- ^ 0
+ ('JAVA: no file to load: ' , libName) printNL.
+ ^ 0
+ ].
+
+ (self confirm:'permission to load native library: ' , libName , ' ?') ifFalse:[
+ ^ 0
].
libHandle := ObjectFileLoader loadLibrary:libName.
libHandle isNil ifTrue:[
- ('JAVA: failed to load: ' , libName) printNL.
- ^ 0
+ ('JAVA: failed to load: ' , libName) printNL.
+ ^ 0
].
LoadedLibs isNil ifTrue:[
- LoadedLibs := Dictionary new.
+ LoadedLibs := Dictionary new.
].
LoadedLibs at:libName put:libHandle.
^ 1
- "Modified: / 8.8.1997 / 12:05:07 / cg"
"Created: / 4.1.1998 / 19:10:54 / cg"
+ "Modified: / 6.2.1998 / 03:11:59 / cg"
!
_Runtime_totalMemory:nativeContext
@@ -3729,16 +3733,20 @@
libName := Java as_ST_String:jLibName.
(index := SimulatedNativeLibs indexOf:libName) ~~ 0 ifTrue:[
- ('JAVA: builtIn nativeLibLoad simulated: ' , libName) printNL.
+"/ ('JAVA: builtIn nativeLibLoad simulated: ' , libName) printNL.
nativeLoader instVarNamed:'handle' put:index.
^ self "/ void
].
(LoadedNativeLibs notNil
and:[LoadedNativeLibs includesKey:libName]) ifTrue:[
- ('JAVA: native library already loaded: ' , libName) printNL.
+"/ ('JAVA: native library already loaded: ' , libName) printNL.
nativeLoader instVarNamed:'handle' put:(LoadedNativeLibs at:libName).
^ self "/ void
].
+
+ (self confirm:'permission to load native library: ' , libName , ' ?') ifFalse:[
+ ^ self
+ ].
self halt.
libName asFilename exists ifFalse:[
@@ -3761,7 +3769,7 @@
^ self "/ void
"Created: / 27.1.1998 / 18:38:37 / cg"
- "Modified: / 28.1.1998 / 22:20:43 / cg"
+ "Modified: / 6.2.1998 / 03:12:17 / cg"
!
_ClassLoader_initIDs:nativeContext
@@ -7061,11 +7069,13 @@
jEv instVarNamed:'id' put:id.
^ Array with:jEv.
].
- ('JAVA: unhandled event:' , type) infoPrintCR.
+ EventTrace == true ifTrue:[
+ ('JAVA: unhandled event:' , type) infoPrintCR.
+ ].
^ nil.
"Created: / 6.1.1998 / 20:38:58 / cg"
- "Modified: / 6.2.1998 / 02:22:43 / cg"
+ "Modified: / 6.2.1998 / 03:07:00 / cg"
!
doWindowsEventThread
@@ -7115,7 +7125,9 @@
event := sensor nextEvent.
].
event isNil ifTrue:[
- '*** eventThread: nil event ignored' printCR.
+ EventTrace == true ifTrue:[
+ '*** eventThread: nil event ignored' printCR.
+ ].
^ self
].
@@ -7123,7 +7135,7 @@
]
"Created: / 6.1.1998 / 21:02:40 / cg"
- "Modified: / 5.2.1998 / 11:13:58 / cg"
+ "Modified: / 6.2.1998 / 03:08:12 / cg"
!
processEvent:event
@@ -7278,6 +7290,6 @@
!JavaVM class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.21 1998/02/06 01:55:03 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.22 1998/02/06 02:16:40 cg Exp $'
! !
JavaVM initialize!