MWS_SRX644: migrate branch mws_srx644 -> HEAD

3 files changed, 61 insertions, 7 deletions

diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 0a72ae39b3ec..60bca742c6e6 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -1,5 +1,33 @@
 UDK_3.1 {
     global:
+        # jvmaccess/javainfo.hxx:
+        __1cJjvmaccessIJavaInfoNInitException2t6M_v_; # jvmaccess::JavaInfo::InitException::InitException()
+        __1cJjvmaccessIJavaInfoNInitException2t6Mrk2_v_; # jvmaccess::JavaInfo::InitException::InitException(InitException const &)
+        __1cJjvmaccessIJavaInfoNInitException2T6M_v_; # jvmaccess::JavaInfo::InitException::~InitException()
+        __1cJjvmaccessIJavaInfoNInitException2G6Mrk2_r2_; # jvmaccess::JavaInfo::InitException&jvmaccess::JavaInfo::InitException::operator=(InitException const &)
+        __1cJjvmaccessbS__RTTI__1nJjvmaccessIJavaInfoNInitException__; # RTTI for jvmaccess::JavaInfo::InitException
+        __1cJjvmaccessIJavaInfo2t6MrknDrtlIOUString__v_; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &)
+        __1cJjvmaccessIJavaInfo2t5B6MrknDrtlIOUString__v_; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &) #Nvariant 1
+        __1cJjvmaccessIJavaInfo2t6MrknDrtlIOUString_i_v_; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &, int)
+        __1cJjvmaccessIJavaInfo2t5B6MrknDrtlIOUString_i_v_; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &, int) #Nvariant 1
+        __1cJjvmaccessIJavaInfo2t6Mrk1_v_; # jvmaccess::JavaInfo::JavaInfo(JavaInfo const &)
+        __1cJjvmaccessIJavaInfo2t5B6Mrk1_v_; # jvmaccess::JavaInfo::JavaInfo(JavaInfo const &) #Nvariant 1
+        __1cJjvmaccessIJavaInfo2T6M_v_; # jvmaccess::JavaInfo::~JavaInfo()
+        __1cJjvmaccessIJavaInfo2T5B6M_v_; # jvmaccess::JavaInfo::~JavaInfo() #Nvariant 1
+        __1cJjvmaccessIJavaInfo2G6Mrk1_r1_; # jvmaccess::JavaInfo::operator =(jvmaccess::JavaInfo const &)
+        __1cJjvmaccessIJavaInfoNcreateAllInfo6FpnE_STLGvector4n0B_n0CJallocator4n0B______v_; # jvmaccess::JavaInfo::createAllInfo(srd::vector< JavaInfo > *)
+        __1cJjvmaccessIJavaInfoOcreateBestInfo6Fb_1_; # jvmaccess::JavaInfo::createBestInfo(bool)
+        __1cJjvmaccessIJavaInfoGisSame6kMrk1_b_; # jvmaccess::JavaInfo::isSame(JavaInfo const &) const
+        __1cJjvmaccessIJavaInfoHisEqual6kMrk1_b_; # jvmaccess::JavaInfo::isEqual(JavaInfo const &) const
+        __1cJjvmaccessIJavaInfoPcompareVersions6kMrk1_i_; # jvmaccess::JavaInfo::compareVersions(JavaInfo const &) const
+        __1cJjvmaccessIJavaInfoKgetVersion6kM_rknDrtlIOUString__; # jvmaccess::JavaInfo::getVersion() const
+        __1cJjvmaccessIJavaInfoXgetInstallationLocation6kM_rknDrtlIOUString__; # jvmaccess::JavaInfo::getInstallationLocation() const
+        __1cJjvmaccessIJavaInfoHgetType6kM_rknDrtlIOUString__; # jvmaccess::JavaInfo::getType() const
+        __1cJjvmaccessIJavaInfoVgetRuntimeLibLocation6kM_rknDrtlIOUString__; # jvmaccess::JavaInfo::getRuntimeLibLocation() const
+        __1cJjvmaccessIJavaInfoVsupportsAccessibility6kM_b_; # jvmaccess::JavaInfo::supportsAccessibility() const
+        __1cJjvmaccessIJavaInfoPgetLibLocations6kM_rknDrtlIOUString__; # jvmaccess::JavaInfo::getLibLocations() const
+        __1cJjvmaccessIJavaInfoOgetJarFilePath6kMrknDrtlIOUString__3_; # jvmaccess::JavaInfo::getJarFilePath(rtl::OUString const &) const
+
         # jvmaccess/virtualmachine.hxx:
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6Mrk3_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
@@ -7,10 +35,10 @@ UDK_3.1 {
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2G6Mrk3_r3_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
         __1cJjvmaccesscO__RTTI__1nJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException
         __1cJjvmaccessOVirtualMachineLAttachGuard2t6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
-        __1cJjvmaccessOVirtualMachineLAttachGuard2t5B6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard #Nvariant 1(rtl::Reference< VirtualMachine > const &)
+        __1cJjvmaccessOVirtualMachineLAttachGuard2t5B6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) #Nvariant 1
         __1cJjvmaccessOVirtualMachineLAttachGuard2T6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
-        __1cJjvmaccessOVirtualMachineLAttachGuard2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard #Nvariant 1()
-        __1cJjvmaccessOVirtualMachine2t6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, jint, bool, JNIEnv *)
+        __1cJjvmaccessOVirtualMachineLAttachGuard2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() #Nvariant 1
+        __1cJjvmaccessOVirtualMachine2t6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
 
     local:
         *;
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 6e454b7beffa..d3db57d74a9b 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: sb $ $Date: 2002-12-06 11:35:37 $
+#   last change: $Author: hr $ $Date: 2003-03-26 12:41:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -79,7 +79,10 @@ SHL1TARGET = $(TARGET)$(COMID)
 
 SHL1IMPLIB = i$(TARGET)
 SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
+SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
+.IF "$(OS)" == "WNT"
+SHL1STDLIBS += advapi32.lib
+.ENDIF # WNT
 
 .IF "$(COMNAME)" == "msci"
 SHL1VERSIONMAP = msvc_win32_intel.map
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 9898e43b58d2..1bf5194b96ad 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,5 +1,28 @@
 UDK_3.1 {
     global:
+        # jvmaccess/javainfo.hxx:
+        ??0InitException@JavaInfo@jvmaccess@@QAE@XZ; # jvmaccess::JavaInfo::InitException::InitException()
+        ??0InitException@JavaInfo@jvmaccess@@QAE@ABV012@@Z; # jvmaccess::JavaInfo::InitException::InitException(InitException const &)
+        ??1InitException@JavaInfo@jvmaccess@@UAE@XZ; # jvmaccess::JavaInfo::InitException::~InitException()
+        ??4InitException@JavaInfo@jvmaccess@@QAEAAV012@ABV012@@Z; # jvmaccess::JavaInfo::InitException::operator=(InitException const &)
+        ??0JavaInfo@jvmaccess@@QAE@ABVOUString@rtl@@@Z; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &)
+        ??0JavaInfo@jvmaccess@@QAE@ABVOUString@rtl@@H@Z; # jvmaccess::JavaInfo::JavaInfo(rtl::OUString const &, int)
+        ??0JavaInfo@jvmaccess@@QAE@ABV01@@Z; # jvmaccess::JavaInfo::JavaInfo(JavaInfo const &)
+        ??1JavaInfo@jvmaccess@@QAE@XZ; # jvmaccess::JavaInfo::~JavaInfo()
+        ??4JavaInfo@jvmaccess@@QAEAAV01@ABV01@@Z; # jvmaccess::JavaInfo::operator =(JavaInfo const &)
+        ?createAllInfo@JavaInfo@jvmaccess@@SAXPAV?$vector@VJavaInfo@jvmaccess@@V?$allocator@VJavaInfo@jvmaccess@@@_STL@@@_STL@@@Z; # jvmaccess::JavaInfo::createAllInfo(std::vector< JavaInfo > *)
+        ?createBestInfo@JavaInfo@jvmaccess@@SA?AV12@_N@Z; # jvmaccess::JavaInfo::createBestInfo(bool)
+        ?isSame@JavaInfo@jvmaccess@@QBE_NABV12@@Z; # jvmaccess::JavaInfo::isSame(JavaInfo const &) const
+        ?isEqual@JavaInfo@jvmaccess@@QBE_NABV12@@Z; # jvmaccess::JavaInfo::isEqual(JavaInfo const &) const
+        ?compareVersions@JavaInfo@jvmaccess@@QBEHABV12@@Z; # jvmaccess::JavaInfo::compareVersions(JavaInfo const &) const
+        ?getVersion@JavaInfo@jvmaccess@@QBEABVOUString@rtl@@XZ; # jvmaccess::JavaInfo::getVersion() const
+        ?getInstallationLocation@JavaInfo@jvmaccess@@QBEABVOUString@rtl@@XZ; # jvmaccess::JavaInfo::getInstallationLocation() const
+        ?getType@JavaInfo@jvmaccess@@QBEABVOUString@rtl@@XZ; # jvmaccess::JavaInfo::getType() const
+        ?getRuntimeLibLocation@JavaInfo@jvmaccess@@QBEABVOUString@rtl@@XZ; # jvmaccess::JavaInfo::getRuntimeLibLocation() const
+        ?supportsAccessibility@JavaInfo@jvmaccess@@QBE_NXZ; # jvmaccess::JavaInfo::supportsAccessibility() const
+        ?getLibLocations@JavaInfo@jvmaccess@@QBEABVOUString@rtl@@XZ; # jvmaccess::JavaInfo::getLibLocations() const
+        ?getJarFilePath@JavaInfo@jvmaccess@@QBE?AVOUString@rtl@@ABV34@@Z; # jvmaccess::JavaInfo::getJarFilePath(rtl::OUString const &) const
+
         # jvmaccess/virtualmachine.hxx:
         ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
         ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
@@ -7,7 +30,7 @@ UDK_3.1 {
         ??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAEAAV0123@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
         ??0AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
         ??1AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
-        ??0VirtualMachine@jvmaccess@@QAE@PAUJavaVM_@@J_NPAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, jint, bool, JNIEnv *)
+    ??0VirtualMachine@jvmaccess@@QAE@PAUJavaVM_@@H_NPAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
 
     local:
         *;