From bcf7bb0f8524838f590e3d042d60c14933286b2e Mon Sep 17 00:00:00 2001 From: clay_shooter Date: Sat, 26 Feb 2005 21:32:27 +0000 Subject: [PATCH] merged R-1_9 release tag against the root-B-1_9 --- .cvsignore | 11 + README.TXT | 28 - WhatsNew.html | 114 -- build.xml | 267 ++++ com/jacob/activeX/ActiveXComponent.java | 88 -- com/jacob/com/Dispatch.java | 589 -------- com/jacob/com/DispatchEvents.java | 75 -- com/jacob/com/JacobObject.java | 52 - com/jacob/com/ROT.java | 92 -- com/jacob/com/Variant.java | 372 ----- EventCallbacks.htm => docs/EventCallbacks.htm | 146 +- docs/HowToBuild.txt | 69 + .../JacobComLifetime.html | 102 +- .../JacobThreading.html | 820 +++++------ docs/WhatsNew.html | 344 +++++ docs/todo.txt | 3 + jacob.dll | Bin 94208 -> 0 bytes jacob.jar | Bin 17173 -> 0 bytes jni/.cvsignore | 4 + jni/Dispatch.cpp | 20 +- jni/DispatchEvents.cpp | 14 +- jni/DispatchEvents.h | 4 +- jni/EventProxy.cpp | 84 +- jni/EventProxy.h | 11 +- jni/SafeArray.cpp | 17 +- jni/Variant.cpp | 48 +- jni/Variant.h | 13 + jni/jacob.dll | Bin 94208 -> 0 bytes jni/jacob.exp | Bin 36752 -> 0 bytes jni/jacob.lib | Bin 61978 -> 0 bytes jni/makefile | 51 - jni/util.h | 3 +- makefile | 18 - .../jacob/samples}/ado/ADO_README.txt | 176 +-- .../{ => com/jacob/samples}/ado/Command.java | 2 +- .../jacob/samples}/ado/CommandTypeEnum.java | 2 +- .../jacob/samples}/ado/Connection.java | 2 +- .../{ => com/jacob/samples}/ado/Field.java | 2 +- .../{ => com/jacob/samples}/ado/Fields.java | 2 +- .../jacob/samples}/ado/Recordset.java | 2 +- .../{ => com/jacob/samples}/ado/ms/README.txt | 0 .../jacob/samples}/ado/ms/testms.java.txt | 0 samples/{ => com/jacob/samples}/ado/test.java | 2 +- .../jacob/samples}/applet/AppTest.html | 16 +- .../jacob/samples}/applet/AppTest.java | 4 +- .../jacob/samples}/servlet/JacobScript.java | 6 +- .../jacob/samples}/servlet/readme.txt | 88 +- .../{ => com/jacob/samples}/test/Access.java | 2 +- .../jacob/samples}/test/DispatchTest.java | 80 +- .../{ => com/jacob/samples}/test/IETest.java | 9 +- .../jacob/samples}/test/MathProj/Math.cls | 0 .../jacob/samples}/test/MathProj/MathTest.dll | Bin .../jacob/samples}/test/MathProj/MathTest.exp | Bin .../jacob/samples}/test/MathProj/MathTest.lib | Bin .../jacob/samples}/test/MathProj/MathTest.vbp | 0 .../jacob/samples}/test/MathProj/MathTest.vbw | 0 .../jacob/samples}/test/MathProj/README | 0 .../{ => com/jacob/samples}/test/Outlook.java | 12 +- .../jacob/samples}/test/ScriptTest.bat | 0 .../jacob/samples}/test/ScriptTest.java | 104 +- .../jacob/samples}/test/ScriptTest2.java | 196 +-- .../samples/test/ScriptTest2ActiveX.java | 96 ++ .../jacob/samples}/test/ScriptTest3.java | 136 +- .../samples/test/ScriptTest3ActiveX.java | 66 + .../jacob/samples/test/ScriptTestActiveX.java | 46 + .../samples/test/ScriptTestErrEvents.java | 19 + .../samples}/test/atl/MultiFace/Face.cpp | 134 +- .../jacob/samples}/test/atl/MultiFace/Face.h | 126 +- .../samples}/test/atl/MultiFace/Face.rgs | 0 .../samples}/test/atl/MultiFace/MultiFace.aps | Bin .../samples}/test/atl/MultiFace/MultiFace.cpp | 144 +- .../samples}/test/atl/MultiFace/MultiFace.def | 0 .../samples}/test/atl/MultiFace/MultiFace.dsp | 0 .../samples}/test/atl/MultiFace/MultiFace.dsw | 0 .../samples}/test/atl/MultiFace/MultiFace.h | 1142 ++++++++-------- .../samples}/test/atl/MultiFace/MultiFace.idl | 0 .../samples}/test/atl/MultiFace/MultiFace.ncb | Bin .../samples}/test/atl/MultiFace/MultiFace.opt | Bin .../samples}/test/atl/MultiFace/MultiFace.plg | 0 .../samples}/test/atl/MultiFace/MultiFace.rc | 0 .../samples}/test/atl/MultiFace/MultiFace.tlb | Bin .../samples}/test/atl/MultiFace/MultiFace_i.c | 0 .../samples}/test/atl/MultiFace/MultiFace_p.c | 0 .../test/atl/MultiFace/MultiFaceps.def | 0 .../test/atl/MultiFace/MultiFaceps.mk | 0 .../samples}/test/atl/MultiFace/StdAfx.cpp | 24 +- .../samples}/test/atl/MultiFace/StdAfx.h | 54 +- .../samples}/test/atl/MultiFace/dlldata.c | 0 .../samples}/test/atl/MultiFace/resource.h | 36 +- .../samples}/test/atl/MultiFaceTest.java | 2 +- .../jacob/samples}/test/atl/readme.txt | 28 +- samples/{ => com/jacob/samples}/test/foo.foo | Bin samples/{ => com/jacob/samples}/test/foo.ser | Bin .../jacob/samples}/test/jacobtest.xls | Bin .../{ => com/jacob/samples}/test/math.java | 76 +- .../jacob/samples}/test/sa_dispatch.java | 82 +- .../{ => com/jacob/samples}/test/sa_test.java | 116 +- .../jacob/samples}/test/safearray.java | 122 +- .../{ => com/jacob/samples}/test/sample2.mdb | Bin .../{ => com/jacob/samples}/test/speed.java | 36 +- .../{ => com/jacob/samples}/test/test.java | 551 ++++---- .../jacob/samples}/test/varSerTest.java | 99 +- .../jacob/samples}/test/variant_test.java | 46 +- src/com/jacob/activeX/.cvsignore | 2 + src/com/jacob/activeX/ActiveXComponent.java | 493 +++++++ src/com/jacob/com/.cvsignore | 2 + {com => src/com}/jacob/com/ComException.java | 0 .../com}/jacob/com/ComFailException.java | 0 {com => src/com}/jacob/com/ComThread.java | 13 + src/com/jacob/com/Dispatch.java | 1200 +++++++++++++++++ src/com/jacob/com/DispatchEvents.java | 139 ++ {com => src/com}/jacob/com/DispatchProxy.java | 29 +- {com => src/com}/jacob/com/EnumVariant.java | 50 +- src/com/jacob/com/JacobObject.java | 139 ++ {com => src/com}/jacob/com/MainSTA.java | 0 src/com/jacob/com/ROT.java | 214 +++ {com => src/com}/jacob/com/STA.java | 0 {com => src/com}/jacob/com/SafeArray.java | 166 ++- src/com/jacob/com/Variant.java | 721 ++++++++++ src/com/jacob/com/VariantViaEvent.java | 14 + .../com}/jacob/com/WrongThreadException.java | 0 todo.txt | 1 - unittest/com/jacob/com/JacobObjectTest.java | 18 + unittest/com/jacob/com/ROT2Test.java | 122 ++ unittest/com/jacob/com/ROT3Test.java | 131 ++ unittest/com/jacob/com/ROTTest.java | 73 + .../com/jacob/com/SafeArrayReleaseTest.java | 105 ++ unittest/readme.txt | 1 + vstudio/jacob/jacob.dsp | 184 ++- vstudio/jacob/jacob.ncb | Bin 132096 -> 189440 bytes vstudio/jacob/jacob.opt | Bin 53760 -> 48640 bytes vstudio/jacob/jacob.plg | 38 +- 132 files changed, 7134 insertions(+), 4068 deletions(-) create mode 100644 .cvsignore delete mode 100644 README.TXT delete mode 100644 WhatsNew.html create mode 100644 build.xml delete mode 100644 com/jacob/activeX/ActiveXComponent.java delete mode 100644 com/jacob/com/Dispatch.java delete mode 100644 com/jacob/com/DispatchEvents.java delete mode 100644 com/jacob/com/JacobObject.java delete mode 100644 com/jacob/com/ROT.java delete mode 100644 com/jacob/com/Variant.java rename EventCallbacks.htm => docs/EventCallbacks.htm (71%) create mode 100644 docs/HowToBuild.txt rename JacobComLifetime.html => docs/JacobComLifetime.html (98%) rename JacobThreading.html => docs/JacobThreading.html (97%) create mode 100644 docs/WhatsNew.html create mode 100644 docs/todo.txt delete mode 100644 jacob.dll delete mode 100644 jacob.jar create mode 100644 jni/.cvsignore delete mode 100644 jni/jacob.dll delete mode 100644 jni/jacob.exp delete mode 100644 jni/jacob.lib delete mode 100644 jni/makefile delete mode 100644 makefile rename samples/{ => com/jacob/samples}/ado/ADO_README.txt (97%) rename samples/{ => com/jacob/samples}/ado/Command.java (98%) rename samples/{ => com/jacob/samples}/ado/CommandTypeEnum.java (92%) rename samples/{ => com/jacob/samples}/ado/Connection.java (99%) rename samples/{ => com/jacob/samples}/ado/Field.java (98%) rename samples/{ => com/jacob/samples}/ado/Fields.java (97%) rename samples/{ => com/jacob/samples}/ado/Recordset.java (99%) rename samples/{ => com/jacob/samples}/ado/ms/README.txt (100%) rename samples/{ => com/jacob/samples}/ado/ms/testms.java.txt (100%) rename samples/{ => com/jacob/samples}/ado/test.java (98%) rename samples/{ => com/jacob/samples}/applet/AppTest.html (95%) rename samples/{ => com/jacob/samples}/applet/AppTest.java (93%) rename samples/{ => com/jacob/samples}/servlet/JacobScript.java (94%) rename samples/{ => com/jacob/samples}/servlet/readme.txt (96%) rename samples/{ => com/jacob/samples}/test/Access.java (98%) rename samples/{ => com/jacob/samples}/test/DispatchTest.java (71%) rename samples/{ => com/jacob/samples}/test/IETest.java (93%) rename samples/{ => com/jacob/samples}/test/MathProj/Math.cls (100%) rename samples/{ => com/jacob/samples}/test/MathProj/MathTest.dll (100%) rename samples/{ => com/jacob/samples}/test/MathProj/MathTest.exp (100%) rename samples/{ => com/jacob/samples}/test/MathProj/MathTest.lib (100%) rename samples/{ => com/jacob/samples}/test/MathProj/MathTest.vbp (100%) rename samples/{ => com/jacob/samples}/test/MathProj/MathTest.vbw (100%) rename samples/{ => com/jacob/samples}/test/MathProj/README (100%) rename samples/{ => com/jacob/samples}/test/Outlook.java (78%) rename samples/{ => com/jacob/samples}/test/ScriptTest.bat (100%) rename samples/{ => com/jacob/samples}/test/ScriptTest.java (78%) rename samples/{ => com/jacob/samples}/test/ScriptTest2.java (94%) create mode 100644 samples/com/jacob/samples/test/ScriptTest2ActiveX.java rename samples/{ => com/jacob/samples}/test/ScriptTest3.java (91%) create mode 100644 samples/com/jacob/samples/test/ScriptTest3ActiveX.java create mode 100644 samples/com/jacob/samples/test/ScriptTestActiveX.java create mode 100644 samples/com/jacob/samples/test/ScriptTestErrEvents.java rename samples/{ => com/jacob/samples}/test/atl/MultiFace/Face.cpp (94%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/Face.h (96%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/Face.rgs (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.aps (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.cpp (96%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.def (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.dsp (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.dsw (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.h (96%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.idl (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.ncb (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.opt (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.plg (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.rc (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace.tlb (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace_i.c (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFace_p.c (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFaceps.def (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/MultiFaceps.mk (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/StdAfx.cpp (96%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/StdAfx.h (97%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/dlldata.c (100%) rename samples/{ => com/jacob/samples}/test/atl/MultiFace/resource.h (96%) rename samples/{ => com/jacob/samples}/test/atl/MultiFaceTest.java (96%) rename samples/{ => com/jacob/samples}/test/atl/readme.txt (96%) rename samples/{ => com/jacob/samples}/test/foo.foo (100%) rename samples/{ => com/jacob/samples}/test/foo.ser (100%) rename samples/{ => com/jacob/samples}/test/jacobtest.xls (100%) rename samples/{ => com/jacob/samples}/test/math.java (94%) rename samples/{ => com/jacob/samples}/test/sa_dispatch.java (94%) rename samples/{ => com/jacob/samples}/test/sa_test.java (95%) rename samples/{ => com/jacob/samples}/test/safearray.java (81%) rename samples/{ => com/jacob/samples}/test/sample2.mdb (100%) rename samples/{ => com/jacob/samples}/test/speed.java (81%) rename samples/{ => com/jacob/samples}/test/test.java (95%) rename samples/{ => com/jacob/samples}/test/varSerTest.java (91%) rename samples/{ => com/jacob/samples}/test/variant_test.java (92%) create mode 100644 src/com/jacob/activeX/.cvsignore create mode 100644 src/com/jacob/activeX/ActiveXComponent.java create mode 100644 src/com/jacob/com/.cvsignore rename {com => src/com}/jacob/com/ComException.java (100%) rename {com => src/com}/jacob/com/ComFailException.java (100%) rename {com => src/com}/jacob/com/ComThread.java (91%) create mode 100644 src/com/jacob/com/Dispatch.java create mode 100644 src/com/jacob/com/DispatchEvents.java rename {com => src/com}/jacob/com/DispatchProxy.java (79%) rename {com => src/com}/jacob/com/EnumVariant.java (75%) create mode 100644 src/com/jacob/com/JacobObject.java rename {com => src/com}/jacob/com/MainSTA.java (100%) create mode 100644 src/com/jacob/com/ROT.java rename {com => src/com}/jacob/com/STA.java (100%) rename {com => src/com}/jacob/com/SafeArray.java (77%) create mode 100644 src/com/jacob/com/Variant.java create mode 100644 src/com/jacob/com/VariantViaEvent.java rename {com => src/com}/jacob/com/WrongThreadException.java (100%) delete mode 100644 todo.txt create mode 100644 unittest/com/jacob/com/JacobObjectTest.java create mode 100644 unittest/com/jacob/com/ROT2Test.java create mode 100644 unittest/com/jacob/com/ROT3Test.java create mode 100644 unittest/com/jacob/com/ROTTest.java create mode 100644 unittest/com/jacob/com/SafeArrayReleaseTest.java create mode 100644 unittest/readme.txt diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..dd03ddf --- /dev/null +++ b/.cvsignore @@ -0,0 +1,11 @@ +jacob.dll +jacob.jar +jacobdll.jar +*.zip +RELEASE.txt +.project +.classpath +compilation_tools.properties +version.properties +release + diff --git a/README.TXT b/README.TXT deleted file mode 100644 index dbfa0ff..0000000 --- a/README.TXT +++ /dev/null @@ -1,28 +0,0 @@ -For documentation see: http://users.rcn.com/danadler/jacob/ - -The java code is in com\jacob\*. - -The C++ code is in .\jni. - -To build, run: - -nmake -f makefile - -That will first compile the JAVA files and build the JAR file, and -then compile the C++ code and build the DLL. - -Building the jni: - -The following are hardcoded into the makefile, so you may have to -change it. I developed this with the C++ compiler and ATL version -that ship with VC++ 6.0, so I'm not sure if different versions will -work. - -I have compiled this against JDK 1.1.6 and 1.2.2 as well as Microsoft -SDK for Java 3.2 as the JDK setting. - -DEST_DIR is a destination directory into which to copy the final DLL. - -JDK = d:\j2sdk1.4.2_06 -DEST_DIR = d:\jacob -MSDEVDIR = d:\apps\\"Microsoft Visual Studio"\VC98 diff --git a/WhatsNew.html b/WhatsNew.html deleted file mode 100644 index 85c6bb3..0000000 --- a/WhatsNew.html +++ /dev/null @@ -1,114 +0,0 @@ -

What's New in JACOB 1.8

- - -
  • -

    What's New in JACOB 1.7

    - -

    Related Links

    -