25df8adbc0
commit 4b56d82c7d converted the cli_uno
library from "Managed C++" to "C++/CLI", but forgot one detail:
The destructors on "ref" classes were mapped to Finalize() methods in
the old syntax, but the new one maps them to Dispose() methods, which
are only invoked on stack-allocated objects. Presumably this omission
results in leaking of native C++ UNO objects.
Reading the C++/CLI documentation i get the impression that:
1) the destructor should explicitly call the finalizer
2) the CLR will not call the finalizer itself iff the destructor is
invoked
http://msdn.microsoft.com/en-us/library/ms235315.aspx
http://msdn.microsoft.com/en-us/library/ke3a209d%28v=vs.110%29.aspx
Change-Id: I509d9b69a399c3d7d6597060ab9b7c78c5916e11
Reviewed-on: https://gerrit.libreoffice.org/11132
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
109 lines
3.7 KiB
C++
109 lines
3.7 KiB
C++
/* -*- 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_ENVIRONMENT_H
|
|
#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_ENVIRONMENT_H
|
|
|
|
#include "cli_base.h"
|
|
|
|
using namespace System;
|
|
using namespace System::Collections;
|
|
using namespace System::Runtime::Serialization;
|
|
|
|
namespace cli_uno
|
|
{
|
|
|
|
public ref class Cli_environment
|
|
{
|
|
static System::String^ sOidPart;
|
|
static Hashtable^ m_objects;
|
|
static System::Runtime::Serialization::ObjectIDGenerator^ m_IDGen;
|
|
inline static System::String^ createKey(System::String^ oid, System::Type^ t);
|
|
|
|
#if OSL_DEBUG_LEVEL >= 1
|
|
int _numRegisteredObjects;
|
|
#endif
|
|
|
|
static Cli_environment()
|
|
{
|
|
m_objects = Hashtable::Synchronized(gcnew Hashtable());
|
|
m_IDGen = gcnew System::Runtime::Serialization::ObjectIDGenerator();
|
|
System::Text::StringBuilder^ buffer = gcnew System::Text::StringBuilder(256);
|
|
Guid gd = Guid::NewGuid();
|
|
buffer->Append(";cli[0];");
|
|
buffer->Append(gd.ToString());
|
|
sOidPart = buffer->ToString();
|
|
}
|
|
|
|
public:
|
|
|
|
inline Cli_environment();
|
|
|
|
~Cli_environment();
|
|
!Cli_environment();
|
|
|
|
/**
|
|
Registers an UNO object as being mapped by this bridge. The resulting
|
|
cli object is represents all interfaces of the UNO object. Therefore the
|
|
object can be registered only with its OID; a type is not necessary.
|
|
*/
|
|
Object^ registerInterface(Object^ obj, System::String^ oid);
|
|
/**
|
|
Registers a CLI object as being mapped by this bridge. The resulting
|
|
object represents exactly one UNO interface.
|
|
*/
|
|
Object^ registerInterface(Object^ obj, System::String^ oid, System::Type^ type);
|
|
|
|
/**
|
|
By revoking an interface it is declared that the respective interface has
|
|
not been mapped. The proxy implementations call revoke interface in their
|
|
destructors.
|
|
*/
|
|
inline void revokeInterface(System::String^ oid);
|
|
|
|
void revokeInterface(System::String^ oid, System::Type^ type);
|
|
/**
|
|
* Retrieves an interface identified by its object id and type from this
|
|
* environment.
|
|
*
|
|
* @param oid object id of interface to be retrieved
|
|
* @param type the type description of the interface to be retrieved
|
|
* @see com.sun.star.uno.IEnvironment#getRegisteredInterface
|
|
*/
|
|
Object^ getRegisteredInterface(System::String^ oid, System::Type^ type);
|
|
|
|
/**
|
|
* Generates a worldwide unique object identifier (oid) for the given object. It is
|
|
* guaranteed, that subsequent calls to the method with the same object
|
|
* will give the same id.
|
|
* <p>
|
|
* @return the generated oid.
|
|
* @param object the object for which a Oid should be generated.
|
|
*/
|
|
static System::String^ getObjectIdentifier(Object^ obj);
|
|
|
|
};
|
|
|
|
} //namespace cli_uno
|
|
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|