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

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

4 files changed, 1220 insertions, 0 deletions

diff --git a/registry/test/makefile.mk b/registry/test/makefile.mk
new file mode 100644
index 000000000..f6d99120f
--- /dev/null
+++ b/registry/test/makefile.mk
@@ -0,0 +1,81 @@
+#
+# 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 .
+#
+
+PRJ=..
+
+PRJNAME=registry
+TARGET=regtest
+
+USE_LDUMP2=TRUE
+
+ENABLE_EXCEPTIONS := TRUE
+
+# --- Settings -----------------------------------------------------
+.INCLUDE :  settings.mk
+
+
+# ------------------------------------------------------------------
+CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
+
+CXXFILES= \
+               testregcpp.cxx	\
+               testmerge.cxx		
+
+
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+
+LIB1OBJFILES= \
+                $(SLO)$/testregcpp.obj	\
+                $(SLO)$/testmerge.obj
+
+
+SHL1TARGET= rgt$(DLLPOSTFIX)
+SHL1IMPLIB= rgt
+SHL1STDLIBS=	\
+                $(SALLIB) \
+                $(SALHELPERLIB)	\
+                $(REGLIB) \
+                $(STDLIBCPP)
+
+SHL1LIBS=	$(LIB1TARGET)
+SHL1DEPN=	$(LIB1TARGET)
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=	$(SHL1TARGET)
+             
+DEF1DEPN	=$(MISC)$/rgt$(DLLPOSTFIX).flt $(SLOFILES)
+DEFLIB1NAME =$(TARGET)
+DEF1DES 	=Registry Runtime - TestDll
+
+# --- Targets ------------------------------------------------------
+
+#all: \
+#	ALLTAR	
+
+.INCLUDE :  target.mk
+
+# --- SO2-Filter-Datei ---
+
+
+$(MISC)$/rgt$(DLLPOSTFIX).flt:
+    @echo ------------------------------
+    @echo Making: $@
+    @echo WEP>$@
+    @echo LIBMAIN>>$@
+    @echo LibMain>>$@
+
+
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
new file mode 100644
index 000000000..9d4562d9e
--- /dev/null
+++ b/registry/test/regdiagnose.h
@@ -0,0 +1,38 @@
+/* -*- 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_REGISTRY_TEST_REGDIAGNOSE_H
+#define INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H
+
+#include <osl/diagnose.h>
+
+#define REG_ENSURE(c, m)   _REG_ENSURE(c, __FILE__, __LINE__, m)
+
+#define _REG_ENSURE(c, f, l, m) \
+    do \
+    {  \
+        if (!(c) && ::osl_assertFailedLine(f, l, m)) \
+           ::osl_breakDebug(); \
+    } while (0)
+
+
+#endif // INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
new file mode 100644
index 000000000..d16100c5c
--- /dev/null
+++ b/registry/test/testmerge.cxx
@@ -0,0 +1,405 @@
+/* -*- 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 <iostream>
+#include <stdio.h>
+#include <string.h>
+
+#include "registry/registry.hxx"
+#include "registry/reflread.hxx"
+#include "registry/reflwrit.hxx"
+#include "regdiagnose.h"
+#include <rtl/alloc.h>
+#include <rtl/ustring.hxx>
+
+
+sal_Int32 lValue1   = 123456789;
+sal_Int32 lValue2   = 54321;
+sal_Int32 lValue3   = 111333111;
+sal_Int32 lValue4   = 333111333;
+char* sValue        = (char*)"string Value";
+OUString wValue("unicode Value");
+
+
+void test_generateMerge1()
+{
+    Registry *myRegistry = new Registry();
+
+    RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9;
+
+    REG_ENSURE(!myRegistry->create(OUString("merge1.rdb")), "testGenerateMerge1 error 1");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge1 error 2");
+
+    REG_ENSURE(!rootKey.createKey(OUString("MergeKey1"), key1), "testGenerateMerge1 error 3");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey1"), key2), "testGenerateMerge1 error 4");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), key3), "testGenerateMerge1 error 5");
+    REG_ENSURE(!key3.setValue(OUString(), RegValueType::LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 5a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey2"), key4), "testGenerateMerge1 error 6");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), key5), "testGenerateMerge1 error 7");
+    REG_ENSURE(!key5.setValue(OUString(), RegValueType::STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 7a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey3"), key6), "testGenerateMerge1 error 8");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 9");
+    REG_ENSURE(!key7.setValue(OUString(), RegValueType::UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 9a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey4"), key8), "testGenerateMerge1 error 10");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), key9), "testGenerateMerge1 error 11");
+    REG_ENSURE(!key9.setValue(OUString(), RegValueType::BINARY, (void*)"abcdefghijklmnopqrstuvwxyz", 27), "testGenerateMerge1 error 11a");
+
+
+    REG_ENSURE(!key1.closeKey() &&
+                !key2.closeKey() &&
+                !key3.closeKey() &&
+                !key4.closeKey() &&
+                !key5.closeKey() &&
+                !key6.closeKey() &&
+                !key7.closeKey() &&
+                !key8.closeKey() &&
+                !key9.closeKey(), "testGenerateMerge1 error 12");
+
+    REG_ENSURE(!rootKey.createKey(OUString("MergeKey1u2"), key1), "testGenerateMerge1 error 13");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey11"), key2), "testGenerateMerge1 error 14");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), key3), "testGenerateMerge1 error 15");
+    REG_ENSURE(!key3.setValue(OUString(), RegValueType::LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 15a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey12"), key4), "testGenerateMerge1 error 16");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), key5), "testGenerateMerge1 error 17");
+    REG_ENSURE(!key5.setValue(OUString(), RegValueType::STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 17a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey13"), key6), "testGenerateMerge1 error 18");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 19");
+    REG_ENSURE(!key7.setValue(OUString(), RegValueType::UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 19a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge1 error 20");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge1 error 21");
+    REG_ENSURE(!key9.setValue(OUString(), RegValueType::LONG, &lValue3, sizeof(sal_Int32)), "testGenerateMerge1 error 21a");
+
+    REG_ENSURE(!rootKey.closeKey() &&
+                !key1.closeKey() &&
+                !key2.closeKey() &&
+                !key3.closeKey() &&
+                !key4.closeKey() &&
+                !key5.closeKey() &&
+                !key6.closeKey() &&
+                !key7.closeKey() &&
+                !key8.closeKey() &&
+                !key9.closeKey(), "testGenerateMerge1 error 22");
+
+
+    delete myRegistry;
+
+    std::cout << "test_generateMerge1() Ok!\n";
+    return;
+}
+
+void test_generateMerge2()
+{
+    Registry *myRegistry = new Registry();
+
+    RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9;
+
+    REG_ENSURE(!myRegistry->create(OUString("merge2.rdb")), "testGenerateMerge2 error 1");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge2 error 2");
+
+    REG_ENSURE(!rootKey.createKey(OUString("MergeKey2"), key1), "testGenerateMerge2 error 3");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey1"), key2), "testGenerateMerge2 error 4");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 5");
+    REG_ENSURE(!key3.setValue(OUString(), RegValueType::BINARY, (void*)"1234567890", 11), "testGenerateMerge1 error 5a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey2"), key4), "testGenerateMerge2 error 6");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), key5), "testGenerateMerge2 error 7");
+    REG_ENSURE(!key5.setValue(OUString(), RegValueType::UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 7a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey3"), key6), "testGenerateMerge2 error 8");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), key7), "testGenerateMerge2 error 9");
+    REG_ENSURE(!key7.setValue(OUString(), RegValueType::STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 9a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey4"), key8), "testGenerateMerge2 error 10");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), key9), "testGenerateMerge2 error 11");
+    REG_ENSURE(!key9.setValue(OUString(), RegValueType::LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 11a");
+
+    REG_ENSURE(!key1.closeKey() &&
+                !key2.closeKey() &&
+                !key3.closeKey() &&
+                !key4.closeKey() &&
+                !key5.closeKey() &&
+                !key6.closeKey() &&
+                !key7.closeKey() &&
+                !key8.closeKey() &&
+                !key9.closeKey(), "testGenerateMerge2 error 12");
+
+    REG_ENSURE(!rootKey.createKey(OUString("MergeKey1u2"), key1), "testGenerateMerge2 error 13");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey21"), key2), "testGenerateMerge2 error 14");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 15");
+    REG_ENSURE(!key3.setValue(OUString(), RegValueType::BINARY, (void*)"a1b2c3d4e5f6g7h8i9", 19), "testGenerateMerge1 error 15a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey22"), key4), "testGenerateMerge2 error 16");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), key5), "testGenerateMerge2 error 17");
+    REG_ENSURE(!key5.setValue(OUString(), RegValueType::LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 17a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey23"), key6), "testGenerateMerge2 error 18");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), key7), "testGenerateMerge2 error 19");
+    REG_ENSURE(!key7.setValue(OUString(), RegValueType::STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 19a");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge2 error 20");
+    REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge2 error 21");
+    REG_ENSURE(!key9.setValue(OUString(), RegValueType::LONG, &lValue4, sizeof(sal_Int32)), "testGenerateMerge1 error 21a");
+
+    REG_ENSURE(!rootKey.closeKey() &&
+                !key1.closeKey() &&
+                !key2.closeKey() &&
+                !key3.closeKey() &&
+                !key4.closeKey() &&
+                !key5.closeKey() &&
+                !key6.closeKey() &&
+                !key7.closeKey() &&
+                !key8.closeKey() &&
+                !key9.closeKey(), "testGenerateMerge2 error 22");
+
+
+    delete myRegistry;
+
+    std::cout << "test_generateMerge2() Ok!\n";
+    return;
+}
+
+void test_merge()
+{
+    Registry *myRegistry = new Registry();
+
+    RegistryKey rootKey, key1, mkey1, key2, mkey2, key1u2, mkey1u2;
+
+    REG_ENSURE(!myRegistry->create(OUString("mergetest.rdb")), "testMerge error 1");
+    REG_ENSURE(myRegistry->getName() == "mergetest.rdb", "testMerge error 1.a)");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "testMerge error 2");
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString("/stardiv/IchbineinMergeKey"),
+                OUString("merge1.rdb")), "testMerge error 3");
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("/stardiv/IchbineinMergeKey"),
+                OUString("merge2.rdb")), "testMerge error 4");
+
+
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 5");
+
+    REG_ENSURE(!key1.openKey("MergeKey1", mkey1), "testMerge error 6");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 7");
+
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey1", mkey1), "testMerge error 8");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 9");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey1/KeyWithLongValue", mkey1), "testMerge error 10");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 11");
+
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey2", mkey1), "testMerge error 12");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 13");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey2/KeyWithStringValue", mkey1), "testMerge error 14");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 15");
+
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey3", mkey1), "testMerge error 16");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 17");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue", mkey1), "testMerge error 18");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 19");
+
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey4", mkey1), "testMerge error 20");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 21");
+    REG_ENSURE(!key1.openKey("/MergeKey1/MK1SubKey4/KeyWithBinaryValue", mkey1), "testMerge error 22");
+    REG_ENSURE(!mkey1.closeKey(), "testMerge error 23");
+
+    REG_ENSURE(!key1.closeKey(), "testMerge error 24");
+
+
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key2), "testMerge error 25");
+
+    REG_ENSURE(!key2.openKey("MergeKey2", mkey2), "testMerge error 26");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 27");
+
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey1", mkey2), "testMerge error 28");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 29");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey1/KeyWithBinaryValue", mkey2), "testMerge error 30");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 31");
+
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey2", mkey2), "testMerge error 31");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 33");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue", mkey2), "testMerge error 34");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 35");
+
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey3", mkey2), "testMerge error 36");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 37");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey3/KeyWithStringValue", mkey2), "testMerge error 38");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 39");
+
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey4", mkey2), "testMerge error 40");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 41");
+    REG_ENSURE(!key2.openKey("/MergeKey2/MK2SubKey4/KeyWithLongValue", mkey2), "testMerge error 42");
+    REG_ENSURE(!mkey2.closeKey(), "testMerge error 43");
+
+    REG_ENSURE(!key2.closeKey(), "testMerge error 44");
+
+
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1u2), "testMerge error 40");
+
+    REG_ENSURE(!key1u2.openKey("MergeKey1u2", mkey1u2), "testMerge error 41");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 42");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey11", mkey1u2), "testMerge error 43");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 44");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey11/KeyWithLongValue", mkey1u2), "testMerge error 45");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 46");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey12", mkey1u2), "testMerge error 47");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 48");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey12/KeyWithStringValue", mkey1u2), "testMerge error 49");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 50");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey13", mkey1u2), "testMerge error 51");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 52");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue", mkey1u2), "testMerge error 53");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 54");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey21", mkey1u2), "testMerge error 55");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 56");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue", mkey1u2), "testMerge error 57");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 58");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey22", mkey1u2), "testMerge error 59");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 60");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey22/KeyWithLongValue", mkey1u2), "testMerge error 61");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 62");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey23", mkey1u2), "testMerge error 63");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 64");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK2SubKey23/KeyWithStringValue", mkey1u2), "testMerge error 65");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 66");
+
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK12SubKey1u2", mkey1u2), "testMerge error 67");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 68");
+    REG_ENSURE(!key1u2.openKey("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue", mkey1u2), "testMerge error 69");
+    REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 70");
+
+    REG_ENSURE(!key1u2.closeKey(), "testMerge error 71");
+
+
+    RegValueType    valueType;
+    sal_uInt32          valueSize;
+    sal_Int32           int32Value;
+    sal_uInt8           *Value;
+
+    REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 72");
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 73");
+    REG_ENSURE(valueType == RegValueType::LONG && valueSize == sizeof(sal_Int32), "testMerge error 74");
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 74.a)");
+    REG_ENSURE(int32Value == lValue1, "testMerge error 74.b)");
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 75");
+    REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 76");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)");
+    REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 76.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77");
+    REG_ENSURE(valueType == RegValueType::UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 78");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 78.a)");
+    REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 78.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 79");
+    REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 27, "testMerge error 80");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)");
+    REG_ENSURE(strcmp((const char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81");
+    REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 11, "testMerge error 82");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)");
+    REG_ENSURE(strcmp((const char*)Value, "1234567890") == 0, "testMerge error 82.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83");
+    REG_ENSURE(valueType == RegValueType::UNICODE&& valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 84");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 84.a)");
+    REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 84.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 85");
+    REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 86");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)");
+    REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 86.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87");
+    REG_ENSURE(valueType == RegValueType::LONG && valueSize == sizeof(sal_Int32), "testMerge error 88");
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 88.a)");
+    REG_ENSURE(int32Value == lValue1, "testMerge error 88.b)");
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 89");
+    REG_ENSURE(valueType == RegValueType::LONG && valueSize == sizeof(sal_Int32), "testMerge error 90");
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 90.a)");
+    REG_ENSURE(int32Value == lValue2, "testMerge error 90.b)");
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 91");
+    REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 92");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)");
+    REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 92.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93");
+    REG_ENSURE(valueType == RegValueType::UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 94");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 94.a)");
+    REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 94.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 95");
+    REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 19, "testMerge error 96");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)");
+    REG_ENSURE(strcmp((const char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97");
+    REG_ENSURE(valueType == RegValueType::LONG && valueSize == sizeof(sal_Int32), "testMerge error 98");
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 98.a)");
+    REG_ENSURE(int32Value == lValue2, "testMerge error 98.b)");
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 99");
+    REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 100");
+    Value = new sal_uInt8[valueSize];
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)");
+    REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 100.b)");
+    delete [] Value;
+
+    REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101");
+    REG_ENSURE(valueType == RegValueType::LONG && valueSize == sizeof(sal_Int32), "testMerge error 102");
+    REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 102.a)");
+    REG_ENSURE(int32Value == lValue4, "testMerge error 102.b)");
+
+
+    REG_ENSURE(!key1.closeKey(), "testMerge error 24");
+
+
+    REG_ENSURE(!rootKey.closeKey(), "testMerge error 10");
+
+    REG_ENSURE(!myRegistry->destroy( OUString("merge1.rdb") ), "test_registry_CppApi error 11");
+    REG_ENSURE(!myRegistry->destroy( OUString("merge2.rdb") ), "test_registry_CppApi error 12");
+    REG_ENSURE(!myRegistry->destroy( OUString() ), "test_registry_CppApi error 13");
+
+    delete myRegistry;
+
+    std::cout << "test_merge() Ok!\n";
+    return;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
new file mode 100644
index 000000000..6d545359b
--- /dev/null
+++ b/registry/test/testregcpp.cxx
@@ -0,0 +1,696 @@
+/* -*- 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 <iostream>
+#include <stdio.h>
+#include <string.h>
+
+#include "registry/registry.hxx"
+#include "registry/reflread.hxx"
+#include "registry/reflwrit.hxx"
+#include "regdiagnose.h"
+#include <rtl/alloc.h>
+#include <rtl/ustring.hxx>
+
+
+void test_coreReflection()
+{
+    Registry *myRegistry = new Registry();
+
+    RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8;
+
+    REG_ENSURE(!myRegistry->create(OUString("ucrtest.rdb")), "testCoreReflection error 1");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "testCoreReflection error 2");
+
+    REG_ENSURE(!rootKey.createKey(OUString("UCR"), key1), "testCoreReflection error 3");
+    REG_ENSURE(!key1.createKey(OUString("ModuleA"), key2), "testCoreReflection error 4");
+    REG_ENSURE(!key2.createKey(OUString("StructA"), key3), "testCoreReflection error 5");
+    REG_ENSURE(!key2.createKey(OUString("EnumA"), key4), "testCoreReflection error 6");
+    REG_ENSURE(!key2.createKey(OUString("XInterfaceA"), key5), "testCoreReflection error 7");
+    REG_ENSURE(!key2.createKey(OUString("ExceptionA"), key6), "testCoreReflection error 8");
+    REG_ENSURE(!key2.createKey(OUString("ServiceA"), key7), "testCoreReflection error 8a");
+    REG_ENSURE(!key2.createKey(OUString("ConstantsA"), key8), "testCoreReflection error 8b");
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_MODULE,
+                                  OUString("ModuleA"),
+                                  OUString(), 11, 0, 0);
+
+        RTConstValue aConst;
+
+        writer.setDoku(OUString("Hello I am a module"));
+        writer.setFileName(OUString("DummyFile"));
+
+        aConst.m_type = RT_TYPE_BOOL;
+        aConst.m_value.aBool = sal_True;
+        writer.setFieldData(0, OUString("aConstBool"),
+                            OUString("boolean"),
+                            OUString("I am a boolean"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_BYTE;
+        aConst.m_value.aByte = 127;
+        writer.setFieldData(1, OUString("aConstByte"),
+                            OUString("byte"),
+                            OUString("I am a byte"),
+                            OUString("DummyFile"),  RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_INT16;
+        aConst.m_value.aShort = -10;
+        writer.setFieldData(2, OUString("aConstShort"),
+                            OUString("short"),
+                            OUString("I am a short"),
+                            OUString("DummyFile"),  RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_UINT16;
+        aConst.m_value.aUShort = 10;
+        writer.setFieldData(3, OUString("aConstUShort"),
+                            OUString("unsigned short"),
+                            OUString("I am an unsigned short"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_INT32;
+        aConst.m_value.aLong = -100000;
+        writer.setFieldData(4, OUString("aConstLong"),
+                            OUString("long"),
+                            OUString("I am a long"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_UINT32;
+        aConst.m_value.aULong = 100000;
+        writer.setFieldData(5, OUString("aConstULong"),
+                            OUString("unsigned long"),
+                            OUString("I am an unsigned long"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_INT64;
+        aConst.m_value.aHyper = -100000000;
+        writer.setFieldData(6, OUString("aConstHyper"),
+                            OUString("hyper"),
+                            OUString("I am an hyper"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_UINT64;
+        aConst.m_value.aUHyper = 100000000;
+        writer.setFieldData(7, OUString("aConstULong"),
+                            OUString("unsigned long"),
+                            OUString("I am an unsigned long"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_FLOAT;
+        aConst.m_value.aFloat = -2e-10f;
+        writer.setFieldData(8, OUString("aConstFloat"),
+                            OUString("float"),
+                            OUString("I am a float"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_DOUBLE;
+        aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString("aConstDouble"),
+                                                              OUString("double"),
+                                                              OUString("I am a double"),
+                                                              OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_STRING;
+        OUString tmpStr("this is a unicode string");
+        aConst.m_value.aString = tmpStr.getStr();
+
+        writer.setFieldData(10, OUString("aConstString"),
+                            OUString("string"),
+                            OUString("I am a string"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key2.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9");
+
+        sal_uInt8* readBlop = (sal_uInt8*)std::malloc(aBlopSize);
+        REG_ENSURE(!key2.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9a");
+
+        RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
+
+        if (reader.isValid())
+        {
+            REG_ENSURE(reader.getTypeName() == "ModuleA", "testCoreReflection error 9a2");
+
+            RTConstValue aReadConst = reader.getFieldConstValue(4);
+            REG_ENSURE( aReadConst.m_type == RT_TYPE_INT32, "testCoreReflection error 9a3");
+            REG_ENSURE( aReadConst.m_value.aLong == -100000, "testCoreReflection error 9a4");
+
+            aReadConst = reader.getFieldConstValue(6);
+            REG_ENSURE( aReadConst.m_type == RT_TYPE_INT64, "testCoreReflection error 9a5");
+            REG_ENSURE( aReadConst.m_value.aHyper == -100000000, "testCoreReflection error 9a6");
+
+            aReadConst = reader.getFieldConstValue(10);
+            OString aConstStr = OUStringToOString(aConst.m_value.aString, RTL_TEXTENCODING_ASCII_US);
+            REG_ENSURE(aConstStr.equals("this is a unicode string"), "testCoreReflection error 9b");
+        }
+
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_STRUCT,
+                                  OUString("ModuleA/StructA"),
+                                  OUString(), 3, 0, 0);
+
+        writer.setDoku(OUString("Hello I am a structure"));
+        writer.setFileName(OUString("DummyFile"));
+
+        writer.setFieldData(0, OUString("asal_uInt32"),
+                            OUString("unsigned long"),
+                            OUString(), OUString(), RTFieldAccess::READWRITE);
+        writer.setFieldData(1, OUString("aXInterface"),
+                            OUString("stardiv/uno/XInterface"),
+                            OUString(), OUString(), RTFieldAccess::READWRITE);
+        writer.setFieldData(2, OUString("aSequence"),
+                            OUString("[]ModuleA/EnumA"),
+                            OUString(), OUString(), RTFieldAccess::READWRITE);
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key3.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9a");
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_ENUM,
+                                  OUString("ModuleA/EnumA"),
+                                  OUString(), 2, 0, 0);
+
+        RTConstValue aConst;
+
+        aConst.m_type = RT_TYPE_UINT32;
+        aConst.m_value.aULong = 10;
+
+        writer.setDoku(OUString("Hello I am an enum"));
+        writer.setFileName(OUString("DummyFile"));
+
+        writer.setFieldData(0, OUString("ENUM_VAL_1"),
+                            OUString(), OUString("I am an enum value"),
+                            OUString(), RTFieldAccess::CONST, aConst);
+
+        aConst.m_value.aULong = 10;
+        writer.setFieldData(1, OUString("ENUM_VAL_2"),
+                            OUString(), OUString(), OUString(), RTFieldAccess::CONST, aConst);
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key4.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9b");
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_INTERFACE,
+                                  OUString("ModuleA/XInterfaceA"),
+                                  OUString("stardiv/uno/XInterface"),
+                                  4, 1, 0);
+        RTConstValue aConst;
+
+        RTUik aUik = {1,2,3,4,5};
+
+        writer.setUik(aUik);
+        writer.setDoku(OUString("Hello I am an interface"));
+        writer.setFileName(OUString("DummyFile"));
+
+        writer.setFieldData(0, OUString("aString"),
+                            OUString("string"), OUString(), OUString(), RTFieldAccess::READWRITE);
+        writer.setFieldData(1, OUString("aStruct"),
+                            OUString("ModuleA/StructA"),
+                            OUString(), OUString(), RTFieldAccess::READONLY);
+        writer.setFieldData(2, OUString("aEnum"),
+                            OUString("ModuleA/EnumA"), OUString(), OUString(), RTFieldAccess::BOUND);
+        aConst.m_type = RT_TYPE_UINT16;
+        aConst.m_value.aUShort = 12;
+        writer.setFieldData(3, OUString("aConstUShort"),
+                            OUString("unsigned short"), OUString(),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+
+        writer.setMethodData(0, OUString("methodA"),
+                             OUString("double"), RTMethodMode::TWOWAY, 2, 1,
+                             OUString("Hello I am the methodA"));
+        writer.setParamData(0, 0, OUString("ModuleA/StructA"),
+                            OUString("aStruct"), RT_PARAM_IN);
+        writer.setParamData(0, 1, OUString("unsigned short"),
+                            OUString("aShort"), RT_PARAM_INOUT);
+        writer.setExcData(0, 0, OUString("ModuleA/ExceptionA"));
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key5.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9c");
+
+        sal_uInt8* readBlop = (sal_uInt8*)std::malloc(aBlopSize);
+        REG_ENSURE(!key5.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9c1");
+
+        RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
+
+        if (reader.isValid())
+        {
+            REG_ENSURE(reader.getTypeName() == "ModuleA/XInterfaceA", "testCoreReflection error 9c2");
+
+            RTUik retUik;
+            reader.getUik(retUik);
+            REG_ENSURE(retUik.m_Data1 = 1, "testCoreReflection error 9c3");
+            REG_ENSURE(retUik.m_Data2 = 2, "testCoreReflection error 9c4");
+            REG_ENSURE(retUik.m_Data3 = 3, "testCoreReflection error 9c5");
+            REG_ENSURE(retUik.m_Data4 = 4, "testCoreReflection error 9c6");
+            REG_ENSURE(retUik.m_Data5 = 5, "testCoreReflection error 9c7");
+        }
+
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_EXCEPTION,
+                                  OUString("ModuleA/ExceptionA"),
+                                  OUString(), 1, 0, 0);
+
+        writer.setDoku(OUString("Hello I am an exception"));
+
+        writer.setFieldData(0, OUString("aSource"),
+                            OUString("stardiv/uno/XInterface"),
+                            OUString("I am an interface member"),
+                            OUString(), RTFieldAccess::READWRITE);
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key6.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9d");
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_SERVICE,
+                                  OUString("ModuleA/ServiceA"),
+                                  OUString(), 1, 0, 4);
+
+        writer.setDoku(OUString("Hello I am a service"));
+        writer.setFileName(OUString("DummyFile"));
+
+        writer.setFieldData(0, OUString("aProperty"),
+                            OUString("stardiv/uno/XInterface"),
+                            OUString("I am a property"),
+                            OUString(), RTFieldAccess::READWRITE);
+
+        writer.setReferenceData(0, OUString("ModuleA/XInterfaceA"), RTReferenceType::SUPPORTS,
+                                OUString("Hello I am a reference to a supported interface"),
+                                RTFieldAccess::OPTIONAL);
+        writer.setReferenceData(1, OUString("ModuleA/XInterfaceA"), RTReferenceType::OBSERVES,
+                                OUString("Hello I am a reference to an observed interface"));
+        writer.setReferenceData(2, OUString("ModuleA/ServiceB"), RTReferenceType::EXPORTS,
+                                OUString("Hello I am a reference to an exported service"));
+        writer.setReferenceData(3, OUString("ModuleA/ServiceB"), RTReferenceType::NEEDS,
+                                OUString("Hello I am a reference to a needed service"));
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key7.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9e");
+        sal_uInt8* readBlop = (sal_uInt8*)std::malloc(aBlopSize);
+        REG_ENSURE(!key7.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9e2");
+
+        RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
+
+        if (reader.isValid())
+        {
+            REG_ENSURE(reader.getTypeName() == "ModuleA/ServiceA", "testCoreReflection error 9e3");
+
+            sal_uInt32 referenceCount = reader.getReferenceCount();
+            REG_ENSURE( referenceCount == 4, "testCoreReflection error 9e4");
+
+            OUString refName = reader.getReferenceName(0);
+            REG_ENSURE(refName == "ModuleA/XInterfaceA", "testCoreReflection error 9e5");
+        }
+    }
+
+    {
+        RegistryTypeWriter writer(RT_TYPE_CONSTANTS,
+                                  OUString("ModuleA/ConstansA"),
+                                  OUString(), 3, 0, 0);
+
+        RTConstValue aConst;
+
+        writer.setDoku(OUString("Hello I am a constants group"));
+        writer.setFileName(OUString("DummyFile"));
+
+        aConst.m_type = RT_TYPE_BOOL;
+        aConst.m_value.aBool = sal_True;
+        writer.setFieldData(0, OUString("ConstantsA_aConstBool"),
+                            OUString("boolean"),
+                            OUString("I am a boolean"),
+                            OUString("DummyFile"), RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_BYTE;
+        aConst.m_value.aByte = 127;
+        writer.setFieldData(1, OUString("ConstantsA_aConstByte"),
+                            OUString("byte"),
+                            OUString("I am a byte"),
+                            OUString("DummyFile"),  RTFieldAccess::CONST, aConst);
+        aConst.m_type = RT_TYPE_INT16;
+        aConst.m_value.aShort = -10;
+        writer.setFieldData(2, OUString("ConstantsA_aConstShort"),
+                            OUString("short"),
+                            OUString("I am a short"),
+                            OUString("DummyFile"),  RTFieldAccess::CONST, aConst);
+
+        const sal_uInt8* pBlop = writer.getBlop();
+        sal_uInt32      aBlopSize = writer.getBlopSize();
+
+        REG_ENSURE(!key8.setValue(OUString(), RegValueType::BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9f");
+    }
+
+//  REG_ENSURE(!myRegistry->destroy(NULL), "testCoreReflection error 10");
+    delete myRegistry;
+
+    std::cout << "test_coreReflection() Ok!\n";
+}
+
+void test_registry_CppApi()
+{
+    Registry *myRegistry = new Registry();
+
+    RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8, key9;
+
+    REG_ENSURE(!myRegistry->create(OUString("test.rdb")), "test_registry_CppApi error 1");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 2");
+
+    REG_ENSURE(!rootKey.createKey(OUString("myFirstKey"), key1), "test_registry_CppApi error 3");
+    REG_ENSURE(!rootKey.createKey(OUString("mySecondKey"), key2), "test_registry_CppApi error 4");
+    REG_ENSURE(!key1.createKey(OUString("X"), key3), "test_registry_CppApi error 5");
+    REG_ENSURE(!key1.createKey(OUString("mySecondSubKey"), key4), "test_registry_CppApi error 6");
+    REG_ENSURE(!rootKey.createKey(OUString("myThirdKey"), key5), "test_registry_CppApi error 6a");
+
+    REG_ENSURE(!key5.createKey(OUString("1"), key4), "test_registry_CppApi error 6b");
+    REG_ENSURE(!key4.createKey(OUString("2"), key3), "test_registry_CppApi error 6c");
+    REG_ENSURE(!key5.openKey("1", key4), "test_registry_CppApi error 6d");
+    REG_ENSURE(!rootKey.openKey("/myThirdKey/1", key4), "test_registry_CppApi error 6e");
+    REG_ENSURE(key4.getName() == "/myThirdKey/1", "test_registry_CppApi error 6f");
+
+    REG_ENSURE(!rootKey.createKey(OUString("myFourthKey"), key6), "test_registry_CppApi error 7");
+    REG_ENSURE(!rootKey.createKey(OUString("myFifthKey"), key6), "test_registry_CppApi error 7a");
+    REG_ENSURE(!rootKey.createKey(OUString("mySixthKey"), key6), "test_registry_CppApi error 7b");
+
+    // Link Test
+
+
+    REG_ENSURE(!rootKey.createKey(OUString("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");
+    REG_ENSURE(!key6.createLink(OUString("myFirstLink"), OUString("/myFourthKey/X")), "test_registry_CppApi error 7d");
+    REG_ENSURE(!key6.createKey(OUString("mySixthSubKey"), key7), "test_registry_CppApi error 7e");
+
+    OUString linkTarget;
+    REG_ENSURE(!key6.getLinkTarget(OUString("myFirstLink"), linkTarget), "test_registry_CppApi error 7f");
+    REG_ENSURE(linkTarget == "/myFourthKey/X", "test_registry_CppApi error 7g");
+
+    RegistryKeyNames* pSubKeyNames = new RegistryKeyNames();
+    sal_uInt32           nSubKeys=0;
+
+    REG_ENSURE(!rootKey.getKeyNames(OUString("mySixthKey"), *pSubKeyNames), "test_registry_CppApi error 7h)");
+    REG_ENSURE(pSubKeyNames->getLength() == 2, "test_registry_CppApi error 7i)");
+
+    for (sal_uInt32 i=0; i < pSubKeyNames->getLength(); i++)
+    {
+        if ( pSubKeyNames->getElement(i) == "/mySixthKey/myFirstLink" )
+        {
+            RegKeyType keyType;
+            REG_ENSURE(!rootKey.getKeyType(pSubKeyNames->getElement(i), &keyType), "test_registry_CppApi error 7j");
+            REG_ENSURE(keyType == RG_LINKTYPE, "test_registry_CppApi error 7k");
+        }
+    }
+
+    REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7k1");
+    delete pSubKeyNames;
+
+    REG_ENSURE(!rootKey.openKey("/mySixthKey/myFirstLink", key6), "test_registry_CppApi error 7l");
+//    REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m");
+
+    REG_ENSURE(!rootKey.openKey("myFifthKey", key6), "test_registry_CppApi error 7m1");
+    REG_ENSURE(!key6.createLink(OUString("mySecondLink"),
+                                 OUString("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2");
+
+    REG_ENSURE(!rootKey.openKey("/myFifthKey/mySecondLink", key6), "test_registry_CppApi error 7m3");
+//    REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m4");
+
+    REG_ENSURE(!rootKey.createKey(OUString("/myFifthKey/mySecondLink/myFirstLinkSubKey"), key7), "test_registry_CppApi error 7m5");
+    REG_ENSURE(key7.getName() == "/myFourthKey/X/myFirstLinkSubKey", "test_registry_CppApi error 7m6");
+
+    REG_ENSURE(!key7.createLink(OUString("myThirdLink"), OUString("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m7");
+    REG_ENSURE(!rootKey.openKey("/myFourthKey/X/myFirstLinkSubKey/myThirdLink", key7), "test_registry_CppApi error 7m8");
+//    REG_ENSURE(!key7.openKey("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink", key6), "test_registry_CppApi error 7m9");
+//    REG_ENSURE(key7.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m10");
+    REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7m11");
+
+    REG_ENSURE(!rootKey.deleteLink(OUString("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m12");
+
+    REG_ENSURE(!rootKey.createLink(OUString("/myFifthKey/mySecondLink"),
+                                    OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")),
+                                    "test_registry_CppApi error 7m13");
+
+//    REG_ENSURE(rootKey.openKey("/myFourthKey/X/myFirstLinkSubKey/myThirdLink", key7) == REG_DETECT_RECURSION,
+//                "test_registry_CppApi error 7m14");
+
+//    REG_ENSURE(key7.closeKey() == REG_INVALID_KEY, "test_registry_CppApi error 7m11");
+
+    RegistryKeyNames subKeyNames;
+    nSubKeys=0;
+
+    REG_ENSURE(!rootKey.getKeyNames(OUString("mySixthKey"), subKeyNames), "test_registry_CppApi error 7n");
+
+    nSubKeys = subKeyNames.getLength();
+    REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7n1");
+    REG_ENSURE(subKeyNames.getElement(0) == "/mySixthKey/myFirstLink", "test_registry_CppApi error 7p1)");
+    REG_ENSURE(subKeyNames.getElement(1) =="/mySixthKey/mySixthSubKey", "test_registry_CppApi error 7p2");
+
+
+    RegistryKeyArray subKeys;
+    nSubKeys=0;
+
+    REG_ENSURE(!rootKey.openSubKeys(OUString("myFirstKey"), subKeys), "test_registry_CppApi error 7o");
+
+    nSubKeys = subKeys.getLength();
+    REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7o1");
+    REG_ENSURE(subKeys.getElement(0).getName() == "/myFirstKey/mySecondSubKey", "test_registry_CppApi error 7p1)");
+    REG_ENSURE(subKeys.getElement(1).getName() == "/myFirstKey/X", "test_registry_CppApi error 7p2");
+
+    REG_ENSURE(!rootKey.closeSubKeys(subKeys), "test_registry_CppApi error 7q)");
+
+
+    REG_ENSURE(!rootKey.createKey(OUString("/TEST"), key8), "test_registry_CppApi error 8");
+    REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child1"), key8), "test_registry_CppApi error 8a");
+    REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child2"), key8), "test_registry_CppApi error 8a1");
+    REG_ENSURE(!rootKey.openKey("/TEST", key9), "test_registry_CppApi error 8b");
+    REG_ENSURE(!key8.closeKey() && !key9.closeKey(),  "test_registry_CppApi error 8b1");
+    REG_ENSURE(!rootKey.openKey("/TEST", key8), "test_registry_CppApi error 8b");
+    REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8c");
+    REG_ENSURE(!rootKey.openKey("TEST", key8), "test_registry_CppApi error 8c");
+    REG_ENSURE(!key8.closeKey(),  "test_registry_CppApi error 8d");
+
+
+    char* Value=(char*)"My first value";
+    REG_ENSURE(!rootKey.setValue(OUString("mySecondKey"), RegValueType::STRING, Value, 18), "test_registry_CppApi error 9");
+
+    RegValueType    valueType;
+    sal_uInt32          valueSize;
+    char*           readValue;
+    REG_ENSURE(!rootKey.getValueInfo(OUString("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a");
+
+    readValue = (char*)std::malloc(valueSize);
+    REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10");
+
+    REG_ENSURE(valueType == RegValueType::STRING, "test_registry_CppApi error 11");
+    REG_ENSURE(valueSize == 18, "test_registry_CppApi error 12");
+    REG_ENSURE(strcmp(readValue, Value) == 0, "test_registry_CppApi error 13");
+    std::free(readValue);
+
+    const char* pList[3];
+    const char* n1= "Hello";
+    const char* n2= "now I";
+    const char* n3= "come";
+
+    pList[0]=n1;
+    pList[1]=n2;
+    pList[2]=n3;
+
+    REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (char**)pList, 3), "test_registry_CppApi error 13a");
+
+    RegistryValueList<char*> valueList;
+    REG_ENSURE(!rootKey.getStringListValue(OUString("myFourthKey"), valueList), "test_registry_CppApi error 13b");
+
+    REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c");
+    REG_ENSURE(strcmp(n2, valueList.getElement(1)) == 0, "test_registry_CppApi error 13d");
+    REG_ENSURE(strcmp(n3, valueList.getElement(2)) == 0, "test_registry_CppApi error 13e");
+
+    REG_ENSURE(!rootKey.getValueInfo(OUString("myFourthKey"), &valueType, &valueSize), "test_registry_CppApi error 13e1");
+    REG_ENSURE(valueType == RegValueType::STRINGLIST, "test_registry_CppApi error 13e2");
+    REG_ENSURE(valueSize == 3, "test_registry_CppApi error 13e3");
+
+    sal_Int32 pLong[3];
+    pLong[0] = 123;
+    pLong[1] = 456;
+    pLong[2] = 789;
+
+    REG_ENSURE(!rootKey.setLongListValue(OUString("myFifthKey"), pLong, 3), "test_registry_CppApi error 13f");
+
+    RegistryValueList<sal_Int32> longList;
+    REG_ENSURE(!rootKey.getLongListValue(OUString("myFifthKey"), longList), "test_registry_CppApi error 13g");
+
+    REG_ENSURE(pLong[0] == longList.getElement(0), "test_registry_CppApi error 13h");
+    REG_ENSURE(pLong[1] == longList.getElement(1), "test_registry_CppApi error 13i");
+    REG_ENSURE(pLong[2] == longList.getElement(2), "test_registry_CppApi error 13j");
+
+
+    OUString sWTestValue("My first unicode value");
+    const sal_Unicode* wTestValue= sWTestValue.getStr();
+    REG_ENSURE(!rootKey.setValue(OUString("mySixthKey"), RegValueType::UNICODE, (void*)wTestValue,
+                (rtl_ustr_getLength(wTestValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 13j1");
+
+    REG_ENSURE(!rootKey.getValueInfo(OUString("mySixthKey"), &valueType, &valueSize), "test_registry_CppApi error 13j2");
+    sal_Unicode* pTmpValue = (sal_Unicode*)std::malloc(valueSize);
+    REG_ENSURE(!rootKey.getValue(OUString("mySixthKey"), pTmpValue), "test_registry_CppApi error 13j3");
+    REG_ENSURE(rtl_ustr_getLength(wTestValue) == rtl_ustr_getLength(pTmpValue), "test_registry_CppApi error 13j4");
+    REG_ENSURE(rtl_ustr_compare(wTestValue, pTmpValue) == 0, "test_registry_CppApi error 13j4");
+
+    const sal_Unicode* pUnicode[3];
+    OUString w1("Hello");
+    OUString w2("now I");
+    OUString w3("come as unicode");
+
+    pUnicode[0]=w1.getStr();
+    pUnicode[1]=w2.getStr();
+    pUnicode[2]=w3.getStr();
+
+    REG_ENSURE(!rootKey.setUnicodeListValue(OUString("mySixthKey"), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k");
+
+    RegistryValueList<sal_Unicode*> unicodeList;
+    REG_ENSURE(!rootKey.getUnicodeListValue(OUString("mySixthKey"), unicodeList), "test_registry_CppApi error 13l");
+
+    REG_ENSURE(rtl_ustr_compare(w1, unicodeList.getElement(0)) == 0, "test_registry_CppApi error 13m");
+    REG_ENSURE(rtl_ustr_compare(w2, unicodeList.getElement(1)) == 0, "test_registry_CppApi error 13n");
+    REG_ENSURE(rtl_ustr_compare(w3, unicodeList.getElement(2)) == 0, "test_registry_CppApi error 13o");
+
+    REG_ENSURE(!key6.closeKey(),  "test_registry_CppApi error 14");
+
+    REG_ENSURE(!key1.closeKey() &&
+               !key3.closeKey() &&
+               !key4.closeKey(),  "test_registry_CppApi error 14");
+
+    REG_ENSURE(!rootKey.deleteKey(OUString("myFirstKey")), "test_registry_CppApi error 15");
+
+    REG_ENSURE(!key2.closeKey(), "test_registry_CppApi error 16");
+    REG_ENSURE(!rootKey.openKey("mySecondKey", key2), "test_registry_CppApi error 17");
+
+    REG_ENSURE(!key5.closeKey(), "test_registry_CppApi error 18");
+
+    REG_ENSURE(!rootKey.deleteKey(OUString("myThirdKey")), "test_registry_CppApi error 19");
+
+    REG_ENSURE(rootKey.openKey("myThirdKey", key5), "test_registry_CppApi error 20");
+
+    REG_ENSURE(!key2.closeKey() &&
+                !rootKey.closeKey(),  "test_registry_CppApi error 21");
+
+    REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 22");
+
+    // Test loadkey
+    RegistryKey rootKey2, key21, key22, key23, key24 , key25;
+
+    REG_ENSURE(!myRegistry->create(OUString("test2.rdb")), "test_registry_CppApi error 23");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey2), "test_registry_CppApi error 24");
+
+    REG_ENSURE(!rootKey2.createKey(OUString("reg2FirstKey"), key21), "test_registry_CppApi error 25");
+    REG_ENSURE(!rootKey2.createKey(OUString("reg2SecondKey"), key22), "test_registry_CppApi error 26");
+    REG_ENSURE(!key21.createKey(OUString("reg2FirstSubKey"), key23), "test_registry_CppApi error 27");
+    REG_ENSURE(!key21.createKey(OUString("reg2SecondSubKey"), key24), "test_registry_CppApi error 28");
+    REG_ENSURE(!rootKey2.createKey(OUString("reg2ThirdKey"), key25), "test_registry_CppApi error 29");
+
+    sal_uInt32 nValue= 123456789;
+    REG_ENSURE(!key23.setValue(OUString(), RegValueType::LONG, &nValue, sizeof(sal_uInt32)), "test_registry_CppApi error 30");
+
+    REG_ENSURE(!key21.closeKey() &&
+               !key22.closeKey() &&
+               !key23.closeKey() &&
+               !key24.closeKey() &&
+               !key25.closeKey() &&
+               !rootKey2.closeKey(), "test_registry_CppApi error 31");
+
+    REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 32");
+
+    REG_ENSURE(!myRegistry->open(OUString("test.rdb"), RegAccessMode::READWRITE), "test_registry_CppApi error 33");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 34");
+
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString("allFromTest2"),
+                    OUString("test2.rdb")), "test_registry_CppApi error 35");
+    REG_ENSURE(!myRegistry->saveKey(rootKey, OUString("allFromTest2"),
+                    OUString("test3.rdb")), "test_registry_CppApi error 36");
+
+    REG_ENSURE(!rootKey.createKey(OUString("allFromTest3"), key1), "test_registry_CppApi error 37");
+    REG_ENSURE(!key1.createKey(OUString("myFirstKey2"), key2), "test_registry_CppApi error 38");
+    REG_ENSURE(!key1.createKey(OUString("mySecondKey2"), key3), "test_registry_CppApi error 39");
+
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("allFromTest3"),
+                    OUString("test3.rdb")), "test_registry_CppApi error 40");
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("allFromTest3"),
+                    OUString("ucrtest.rdb"), sal_True), "test_registry_CppApi error 40.a)");
+
+//     REG_ENSURE(myRegistry->mergeKey(rootKey, OUString("allFromTest3"), OUString("ucrtest.rdb"), sal_True)
+//                  == REG_NO_ERROR/*REG_MERGE_CONFLICT*/, "test_registry_CppApi error 40.b)");
+
+    REG_ENSURE(!key1.closeKey() &&
+                !key2.closeKey(), "test_registry_CppApi error 41");
+
+    const sal_Unicode* wValue= OUString("My first unicode value").getStr();
+    REG_ENSURE(!key3.setValue(OUString(), RegValueType::UNICODE, (void*)wValue,
+                (rtl_ustr_getLength(wValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 42");
+
+    REG_ENSURE(!key3.closeKey(), "test_registry_CppApi error 43");
+
+    REG_ENSURE(!rootKey.openKey("/allFromTest3/reg2FirstKey/reg2FirstSubKey", key1),
+                "test_registry_CppApi error 43.a)");
+    REG_ENSURE(!rootKey.deleteKey(OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), "test_registry_CppApi error 44");
+    REG_ENSURE(key1.getValueInfo(OUString(), &valueType, &valueSize) == REG_INVALID_KEY,
+                "test_registry_CppApi error 44.a)");
+    REG_ENSURE(!key1.closeKey(), "test_registry_CppApi error 44.b)");
+
+    REG_ENSURE(!rootKey.closeKey(), "test_registry_CppApi error 45");
+
+    REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 46");
+
+    REG_ENSURE(!myRegistry->open(OUString("test.rdb"), RegAccessMode::READWRITE), "test_registry_CppApi error 47");
+
+    REG_ENSURE(!myRegistry->destroy(OUString("test2.rdb")), "test_registry_CppApi error 48");
+//  REG_ENSURE(!myRegistry->destroy("test3.rdb"), "test_registry_CppApi error 49");
+
+    Registry *myRegistry2 = new Registry(*myRegistry);
+
+    REG_ENSURE(myRegistry->destroy(OUString()), "test_registry_CppApi error 50");
+
+    delete(myRegistry2);
+
+    REG_ENSURE(!myRegistry->create(OUString("destroytest.rdb")), "test_registry_CppApi error 51");
+    REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 52");
+    REG_ENSURE(!myRegistry->open(OUString("destroytest.rdb"), RegAccessMode::READONLY), "test_registry_CppApi error 53");
+    REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 54");
+
+    REG_ENSURE(myRegistry->mergeKey(rootKey, OUString("allFromTest3"),
+                    OUString("test3.rdb")), "test_registry_CppApi error 55");
+    REG_ENSURE(!myRegistry->destroy(OUString("test3.rdb")), "test_registry_CppApi error 56");
+
+    REG_ENSURE(!rootKey.closeKey(), "test_registry_CppApi error 57");
+    REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 58");
+    REG_ENSURE(!myRegistry->open(OUString("destroytest.rdb"), RegAccessMode::READWRITE), "test_registry_CppApi error 59");
+    REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 60");
+
+    REG_ENSURE(!myRegistry->open(OUString("test.rdb"), RegAccessMode::READWRITE), "test_registry_CppApi error 61");
+    REG_ENSURE(!myRegistry->destroy(OUString("ucrtest.rdb")), "test_registry_CppApi error 62");
+    REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 63");
+    delete(myRegistry);
+
+    std::cout << "test_registry_CppApi() Ok!\n";
+
+    return;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */