diff options
author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-05-04 23:41:10 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-06 07:23:20 +0200 |
commit | 953d9ab43b38a5d181d64a4c87255a6182248897 (patch) | |
tree | c3b11c4e424bd07b88f3d3b270d064fb42ec2aab /registry/inc | |
parent | c2003c73d71001fcb66fb86a15cde82e60aa242a (diff) |
gbuild conversion: registry module
Change-Id: I I9dbd2a05602e7d415ca76850458129f68583c83f
Diffstat (limited to 'registry/inc')
-rw-r--r-- | registry/inc/makefile.mk | 39 | ||||
-rw-r--r-- | registry/inc/registry/reader.h | 69 | ||||
-rw-r--r-- | registry/inc/registry/reflread.hxx | 3 | ||||
-rw-r--r-- | registry/inc/registry/reflwrit.hxx | 3 | ||||
-rw-r--r-- | registry/inc/registry/regdllapi.h | 15 | ||||
-rw-r--r-- | registry/inc/registry/registry.h | 5 |
6 files changed, 57 insertions, 77 deletions
diff --git a/registry/inc/makefile.mk b/registry/inc/makefile.mk deleted file mode 100644 index 203cb8582424..000000000000 --- a/registry/inc/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=registry -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h index cdbd0bacd487..66aaca241ca6 100644 --- a/registry/inc/registry/reader.h +++ b/registry/inc/registry/reader.h @@ -29,6 +29,7 @@ #ifndef INCLUDED_registry_reader_h #define INCLUDED_registry_reader_h +#include "registry/regdllapi.h" #include "registry/types.h" #include "registry/version.h" @@ -68,7 +69,7 @@ extern "C" { @since UDK 3.2.0 */ -sal_Bool SAL_CALL typereg_reader_create( +REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_create( void const * buffer, sal_uInt32 length, sal_Bool copy, enum typereg_Version maxVersion, void ** result) SAL_THROW_EXTERN_C(); @@ -80,7 +81,7 @@ sal_Bool SAL_CALL typereg_reader_create( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C(); +REG_DLLPUBLIC void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C(); /** Decrements the reference count of a type reader. @@ -91,7 +92,7 @@ void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C(); @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C(); +REG_DLLPUBLIC void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C(); /** Returns the binary blob version of a type reader. @@ -104,7 +105,7 @@ void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C(); @since UDK 3.2.0 */ -enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle) +REG_DLLPUBLIC enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle) SAL_THROW_EXTERN_C(); /** @@ -118,7 +119,7 @@ enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getDocumentation( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getDocumentation( void * handle, rtl_uString ** result) SAL_THROW_EXTERN_C(); /** @@ -133,7 +134,7 @@ void SAL_CALL typereg_reader_getDocumentation( @since UDK 3.2.0 @deprecated */ -void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result) +REG_DLLPUBLIC void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result) SAL_THROW_EXTERN_C(); /** @@ -151,7 +152,7 @@ void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result) @since UDK 3.2.0 */ -enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle) +REG_DLLPUBLIC enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle) SAL_THROW_EXTERN_C(); /** @@ -164,7 +165,7 @@ enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle) @since UDK 3.2.0 */ -sal_Bool SAL_CALL typereg_reader_isPublished(void * handle) +REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_isPublished(void * handle) SAL_THROW_EXTERN_C(); /** @@ -178,7 +179,7 @@ sal_Bool SAL_CALL typereg_reader_isPublished(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result) +REG_DLLPUBLIC void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result) SAL_THROW_EXTERN_C(); /** @@ -191,7 +192,7 @@ void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result) @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle) +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle) SAL_THROW_EXTERN_C(); /** @@ -208,7 +209,7 @@ sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getSuperTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getSuperTypeName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -222,7 +223,7 @@ void SAL_CALL typereg_reader_getSuperTypeName( @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle) +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle) SAL_THROW_EXTERN_C(); /** @@ -238,7 +239,7 @@ sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getFieldDocumentation( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -256,7 +257,7 @@ void SAL_CALL typereg_reader_getFieldDocumentation( @since UDK 3.2.0 @deprecated */ -void SAL_CALL typereg_reader_getFieldFileName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldFileName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -271,7 +272,7 @@ void SAL_CALL typereg_reader_getFieldFileName( @since UDK 3.2.0 */ -RTFieldAccess SAL_CALL typereg_reader_getFieldFlags( +REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getFieldFlags( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -287,7 +288,7 @@ RTFieldAccess SAL_CALL typereg_reader_getFieldFlags( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getFieldName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -304,7 +305,7 @@ void SAL_CALL typereg_reader_getFieldName( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getFieldTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldTypeName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -326,7 +327,7 @@ void SAL_CALL typereg_reader_getFieldTypeName( @since UDK 3.2.0 */ -sal_Bool SAL_CALL typereg_reader_getFieldValue( +REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_getFieldValue( void * handle, sal_uInt16 index, enum RTValueType * type, union RTConstValueUnion * value) SAL_THROW_EXTERN_C(); @@ -341,7 +342,7 @@ sal_Bool SAL_CALL typereg_reader_getFieldValue( @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle) +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle) SAL_THROW_EXTERN_C(); /** @@ -357,7 +358,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodDocumentation( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -372,7 +373,7 @@ void SAL_CALL typereg_reader_getMethodDocumentation( @since UDK 3.2.0 */ -enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags( +REG_DLLPUBLIC enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -388,7 +389,7 @@ enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -405,7 +406,7 @@ void SAL_CALL typereg_reader_getMethodName( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodReturnTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodReturnTypeName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -420,7 +421,7 @@ void SAL_CALL typereg_reader_getMethodReturnTypeName( @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount( +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -439,7 +440,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount( @since UDK 3.2.0 */ -enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags( +REG_DLLPUBLIC enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags( void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex) SAL_THROW_EXTERN_C(); @@ -460,7 +461,7 @@ enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodParameterName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 parameterIndex) SAL_THROW_EXTERN_C(); @@ -482,7 +483,7 @@ void SAL_CALL typereg_reader_getMethodParameterName( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodParameterTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterTypeName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 parameterIndex) SAL_THROW_EXTERN_C(); @@ -498,7 +499,7 @@ void SAL_CALL typereg_reader_getMethodParameterTypeName( @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount( +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -518,7 +519,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getMethodExceptionTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodExceptionTypeName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) SAL_THROW_EXTERN_C(); @@ -533,7 +534,7 @@ void SAL_CALL typereg_reader_getMethodExceptionTypeName( @since UDK 3.2.0 */ -sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle) +REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle) SAL_THROW_EXTERN_C(); /** @@ -550,7 +551,7 @@ sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle) @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getReferenceDocumentation( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); @@ -566,7 +567,7 @@ void SAL_CALL typereg_reader_getReferenceDocumentation( @since UDK 3.2.0 */ -RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags( +REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -581,7 +582,7 @@ RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags( @since UDK 3.2.0 */ -enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort( +REG_DLLPUBLIC enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort( void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C(); /** @@ -598,7 +599,7 @@ enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort( @since UDK 3.2.0 */ -void SAL_CALL typereg_reader_getReferenceTypeName( +REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceTypeName( void * handle, rtl_uString ** result, sal_uInt16 index) SAL_THROW_EXTERN_C(); diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx index 37602566dfbf..95892e392ad9 100644 --- a/registry/inc/registry/reflread.hxx +++ b/registry/inc/registry/reflread.hxx @@ -29,6 +29,7 @@ #ifndef _REGISTRY_REFLREAD_HXX_ #define _REGISTRY_REFLREAD_HXX_ +#include <registry/regdllapi.h> #include <registry/refltype.hxx> #include <registry/regtype.h> #include <rtl/ustring.hxx> @@ -91,7 +92,7 @@ struct RegistryTypeReader_Api /** the API initialization function. */ -RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void); +REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void); #ifdef __cplusplus } diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx index 82e40118952a..e3325ac673d5 100644 --- a/registry/inc/registry/reflwrit.hxx +++ b/registry/inc/registry/reflwrit.hxx @@ -29,6 +29,7 @@ #ifndef _REGISTRY_REFLWRIT_HXX_ #define _REGISTRY_REFLWRIT_HXX_ +#include <registry/regdllapi.h> #include <registry/refltype.hxx> #include <registry/regtype.h> #include <rtl/ustring.hxx> @@ -70,7 +71,7 @@ struct RegistryTypeWriter_Api /** the API initialization function. */ -RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void); +REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void); #ifdef __cplusplus } diff --git a/registry/inc/registry/regdllapi.h b/registry/inc/registry/regdllapi.h new file mode 100644 index 000000000000..6587ee647d75 --- /dev/null +++ b/registry/inc/registry/regdllapi.h @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_REGDLLAPI_H +#define INCLUDED_REGDLLAPI_H + +#include "sal/types.h" + +#if defined(REG_DLLIMPLEMENTATION) +#define REG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif /* INCLUDED_REGDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h index c27da988c303..75e0c91f766d 100644 --- a/registry/inc/registry/registry.h +++ b/registry/inc/registry/registry.h @@ -32,6 +32,7 @@ #include <stddef.h> #include <rtl/ustring.h> #include <registry/regtype.h> +#include <registry/regdllapi.h> #ifdef __cplusplus extern "C" { @@ -63,7 +64,7 @@ RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, reg_closeKey. If the function fails, phNewKey is NULL. @return REG_NO_ERROR if succeeds else an error code. */ -RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, rtl_uString* keyName, RegKeyHandle* phOpenKey); @@ -116,7 +117,7 @@ RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey, The memory of the variable specifying the key will be freed. @return REG_NO_ERROR if succeeds else an error code. */ -RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey); +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey); /** This function returns the name of a key. |