Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 306 insertions, 0 deletions

diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
new file mode 100644
index 000000000..95915196b
--- /dev/null
+++ b/jvmaccess/source/classpath.cxx
@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <jvmaccess/classpath.hxx>
+
+#include <cassert>
+#include <vector>
+
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uri/UriReferenceFactory.hpp>
+#include <com/sun/star/uri/XVndSunStarExpandUrlReference.hpp>
+#include <com/sun/star/util/theMacroExpander.hpp>
+#include <cppuhelper/exc_hlp.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <o3tl/string_view.hxx>
+
+#include <jni.h>
+
+namespace com::sun::star::uno { class XComponentContext; }
+
+jobjectArray jvmaccess::ClassPath::translateToUrls(
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    JNIEnv * environment, std::u16string_view classPath)
+{
+    assert(context.is());
+    assert(environment != nullptr);
+    jclass classUrl(environment->FindClass("java/net/URL"));
+    if (classUrl == nullptr) {
+        return nullptr;
+    }
+    jmethodID ctorUrl(
+        environment->GetMethodID(classUrl, "<init>", "(Ljava/lang/String;)V"));
+    if (ctorUrl == nullptr) {
+        return nullptr;
+    }
+    ::std::vector< jobject > urls;
+    for (::sal_Int32 i = 0; i != -1;) {
+        OUString url(o3tl::getToken(classPath, 0, ' ', i));
+        if (!url.isEmpty()) {
+            css::uno::Reference< css::uri::XVndSunStarExpandUrlReference >
+                expUrl(
+                    css::uri::UriReferenceFactory::create(context)->parse(url),
+                    css::uno::UNO_QUERY);
+            if (expUrl.is()) {
+                css::uno::Reference< css::util::XMacroExpander > expander =
+                    css::util::theMacroExpander::get(context);
+                try {
+                    url = expUrl->expand( expander );
+                } catch (const css::lang::IllegalArgumentException & e) {
+                    css::uno::Any anyEx = cppu::getCaughtException();
+                    throw css::lang::WrappedTargetRuntimeException(
+                        "com.sun.star.lang.IllegalArgumentException: "
+                         + e.Message,
+                         nullptr, anyEx );
+                }
+            }
+            jvalue arg;
+            arg.l = environment->NewString(
+                reinterpret_cast< jchar const * >(url.getStr()),
+                static_cast< jsize >(url.getLength()));
+            if (arg.l == nullptr) {
+                return nullptr;
+            }
+            jobject o(environment->NewObjectA(classUrl, ctorUrl, &arg));
+            if (o == nullptr) {
+                return nullptr;
+            }
+            urls.push_back(o);
+        }
+    }
+    jobjectArray result = environment->NewObjectArray(
+        static_cast< jsize >(urls.size()), classUrl, nullptr);
+        // static_cast is ok, as each element of urls occupied at least one
+        // character of the OUString classPath
+    if (result == nullptr) {
+        return nullptr;
+    }
+    jsize idx = 0;
+    for (auto const& url : urls)
+    {
+        environment->SetObjectArrayElement(result, idx++, url);
+    }
+    return result;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx
new file mode 100644
index 000000000..08bfbcdcf
--- /dev/null
+++ b/jvmaccess/source/unovirtualmachine.cxx
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <jvmaccess/unovirtualmachine.hxx>
+
+#include <jvmaccess/virtualmachine.hxx>
+#include <sal/log.hxx>
+#include <utility>
+
+#include <jni.h>
+
+namespace jvmaccess {
+
+UnoVirtualMachine::CreationException::CreationException() {}
+
+UnoVirtualMachine::CreationException::CreationException(
+    CreationException const &)
+{}
+
+UnoVirtualMachine::CreationException &
+UnoVirtualMachine::CreationException::operator =(CreationException const &) {
+    return *this;
+}
+
+UnoVirtualMachine::UnoVirtualMachine(
+    rtl::Reference< jvmaccess::VirtualMachine > virtualMachine,
+    void * classLoader):
+    m_virtualMachine(std::move(virtualMachine)),
+    m_classLoader(nullptr)
+{
+    try {
+        m_classLoader =
+            jvmaccess::VirtualMachine::AttachGuard(m_virtualMachine).
+            getEnvironment()->NewGlobalRef(static_cast< jobject >(classLoader));
+    } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) {}
+    if (m_classLoader == nullptr) {
+        throw CreationException();
+    }
+}
+
+const rtl::Reference< jvmaccess::VirtualMachine >&
+UnoVirtualMachine::getVirtualMachine() const {
+    return m_virtualMachine;
+}
+
+UnoVirtualMachine::~UnoVirtualMachine() {
+    try {
+        jvmaccess::VirtualMachine::AttachGuard(m_virtualMachine).
+            getEnvironment()->DeleteGlobalRef(
+                static_cast< jobject >(m_classLoader));
+    } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) {
+        SAL_INFO(
+            "jvmaccess",
+            "ignored"
+                " jvmaccess::VirtualMachine::AttachGuard::CreationException");
+    }
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx
new file mode 100644
index 000000000..eb4b8069c
--- /dev/null
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <cassert>
+
+#include <jvmaccess/virtualmachine.hxx>
+#include <sal/log.hxx>
+#include <utility>
+
+using jvmaccess::VirtualMachine;
+
+VirtualMachine::AttachGuard::CreationException::CreationException()
+{}
+
+VirtualMachine::AttachGuard::CreationException::CreationException(
+    CreationException const &)
+{}
+
+VirtualMachine::AttachGuard::CreationException &
+VirtualMachine::AttachGuard::CreationException::operator =(
+    CreationException const &)
+{
+    return *this;
+}
+
+VirtualMachine::AttachGuard::AttachGuard(
+    rtl::Reference< VirtualMachine > xMachine):
+    m_xMachine(std::move(xMachine))
+{
+    assert(m_xMachine.is());
+    m_pEnvironment = m_xMachine->attachThread(&m_bDetach);
+    if (m_pEnvironment == nullptr)
+        throw CreationException();
+}
+
+VirtualMachine::AttachGuard::~AttachGuard()
+{
+    if (m_bDetach)
+        m_xMachine->detachThread();
+}
+
+VirtualMachine::VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy,
+                               JNIEnv const * pMainThreadEnv):
+    m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy)
+{
+    (void) pMainThreadEnv; // avoid warnings
+    assert(pVm != nullptr);
+    assert(nVersion >= JNI_VERSION_1_2);
+    assert(pMainThreadEnv);
+}
+
+VirtualMachine::~VirtualMachine()
+{
+    if (m_bDestroy)
+    {
+        // Do not destroy the VM.  Under Java 1.3, the AWT event loop thread is
+        // not a daemon thread and is never terminated, so that calling
+        // DestroyJavaVM (waiting for all non-daemon threads to terminate) hangs
+        // forever.
+/*
+        jint n = m_pVm->DestroyJavaVM();
+        SAL_WARN_IF(n != JNI_OK, "jvmaccess", "JNI: DestroyJavaVM failed");
+*/
+    }
+}
+
+JNIEnv * VirtualMachine::attachThread(bool * pAttached) const
+{
+    assert(pAttached != nullptr && "bad parameter");
+    JNIEnv * pEnv;
+    jint n = m_pVm->GetEnv(reinterpret_cast< void ** >(&pEnv), m_nVersion);
+    SAL_WARN_IF(
+        n != JNI_OK && n != JNI_EDETACHED, "jvmaccess", "JNI: GetEnv failed");
+    if (pEnv == nullptr)
+    {
+        if (m_pVm->AttachCurrentThread
+            (
+#ifndef ANDROID
+             reinterpret_cast< void ** >(&pEnv),
+#else
+             // The Android <jni.h> has AttachCurrentThread() taking a
+             // JNIEnv** and not void **
+             &pEnv,
+#endif
+             nullptr)
+            != JNI_OK)
+            return nullptr;
+        *pAttached = true;
+    }
+    else
+        *pAttached = false;
+    return pEnv;
+}
+
+void VirtualMachine::detachThread() const
+{
+    jint n = m_pVm->DetachCurrentThread();
+    SAL_WARN_IF(n != JNI_OK, "jvmaccess", "JNI: DetachCurrentThread failed");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */