Kaydet (Commit) 9f683161 authored tarafından David Tardon's avatar David Tardon

fix linkage inconsistency on windows

Change-Id: I677a5fe8dc5c91b96fe299b06a5f2dc767120a1d
üst 953d9ab4
...@@ -81,7 +81,7 @@ struct RTUik ...@@ -81,7 +81,7 @@ struct RTUik
sal_uInt32 m_Data5; sal_uInt32 m_Data5;
}; };
/// specifies the calling onvention for type reader/wrter api /// specifies the calling convention for type reader/writer api
#define TYPEREG_CALLTYPE SAL_CALL #define TYPEREG_CALLTYPE SAL_CALL
#endif #endif
......
...@@ -49,7 +49,7 @@ extern "C" { ...@@ -49,7 +49,7 @@ extern "C" {
reg_closeKey. If the function fails, phNewKey is NULL. reg_closeKey. If the function fails, phNewKey is NULL.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegKeyHandle* phNewKey); RegKeyHandle* phNewKey);
...@@ -82,7 +82,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, ...@@ -82,7 +82,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
@param pnSubKeys specifies the length of the array (the number of open subkeys). @param pnSubKeys specifies the length of the array (the number of open subkeys).
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegKeyHandle** pphSubKeys, RegKeyHandle** pphSubKeys,
sal_uInt32* pnSubKeys); sal_uInt32* pnSubKeys);
...@@ -95,7 +95,7 @@ RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey, ...@@ -95,7 +95,7 @@ RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
@param nSubKeys specifies the length of the array (the number of subkeys to closed). @param nSubKeys specifies the length of the array (the number of subkeys to closed).
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys,
sal_uInt32 nSubKeys); sal_uInt32 nSubKeys);
...@@ -107,7 +107,7 @@ RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys, ...@@ -107,7 +107,7 @@ RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys,
be deleted. be deleted.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
rtl_uString* keyName); rtl_uString* keyName);
...@@ -125,7 +125,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey); ...@@ -125,7 +125,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
@param hKey identifies a currently open key which name will be returned. @param hKey identifies a currently open key which name will be returned.
@param pKeyName contains the keyname if succeeds else an empty string. @param pKeyName contains the keyname if succeeds else an empty string.
*/ */
RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName); REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
/** This function sets a value of a key. /** This function sets a value of a key.
...@@ -140,7 +140,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyN ...@@ -140,7 +140,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyN
@param valueSize specifies the size of pData in bytes @param valueSize specifies the size of pData in bytes
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegValueType valueType, RegValueType valueType,
RegValue pData, RegValue pData,
...@@ -156,7 +156,7 @@ RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey, ...@@ -156,7 +156,7 @@ RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
@param len specifies the len of pValueList. @param len specifies the len of pValueList.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Int32* pValueList, sal_Int32* pValueList,
sal_uInt32 len); sal_uInt32 len);
...@@ -171,7 +171,7 @@ RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey, ...@@ -171,7 +171,7 @@ RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
@param len specifies the len of pValueList. @param len specifies the len of pValueList.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Char** pValueList, sal_Char** pValueList,
sal_uInt32 len); sal_uInt32 len);
...@@ -186,7 +186,7 @@ RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey, ...@@ -186,7 +186,7 @@ RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
@param len specifies the len of pValueList. @param len specifies the len of pValueList.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Unicode** pValueList, sal_Unicode** pValueList,
sal_uInt32 len); sal_uInt32 len);
...@@ -203,7 +203,7 @@ RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey, ...@@ -203,7 +203,7 @@ RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
@param pValueSize returns the size of the value in bytes @param pValueSize returns the size of the value in bytes
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegValueType* pValueType, RegValueType* pValueType,
sal_uInt32* pValueSize); sal_uInt32* pValueSize);
...@@ -219,7 +219,7 @@ RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey, ...@@ -219,7 +219,7 @@ RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
@param pData points to an allocated memory block receiving the data of the value. @param pData points to an allocated memory block receiving the data of the value.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegValue pData); RegValue pData);
...@@ -233,7 +233,7 @@ RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey, ...@@ -233,7 +233,7 @@ RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
@param pLen returns the length of the value list. @param pLen returns the length of the value list.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Int32** pValueList, sal_Int32** pValueList,
sal_uInt32* pLen); sal_uInt32* pLen);
...@@ -248,7 +248,7 @@ RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey, ...@@ -248,7 +248,7 @@ RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
@param pLen returns the length of the value list. @param pLen returns the length of the value list.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Char*** pValueList, sal_Char*** pValueList,
sal_uInt32* pLen); sal_uInt32* pLen);
...@@ -263,7 +263,7 @@ RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey, ...@@ -263,7 +263,7 @@ RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
@param pLen returns the length of the value list. @param pLen returns the length of the value list.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Unicode*** pValueList, sal_Unicode*** pValueList,
sal_uInt32* pLen); sal_uInt32* pLen);
...@@ -276,7 +276,7 @@ RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey, ...@@ -276,7 +276,7 @@ RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
@param len specifies the length of the value list. @param len specifies the length of the value list.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
RegValue pValueList, RegValue pValueList,
sal_uInt32 len); sal_uInt32 len);
...@@ -290,7 +290,7 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, ...@@ -290,7 +290,7 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
@param pKeyType returns the type of the key. @param pKeyType returns the type of the key.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
RegKeyType* pKeyType); RegKeyType* pKeyType);
...@@ -304,7 +304,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey, ...@@ -304,7 +304,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
@param firstLinkOnly ignored @param firstLinkOnly ignored
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
sal_Bool firstLinkOnly, sal_Bool firstLinkOnly,
rtl_uString** pResolvedName); rtl_uString** pResolvedName);
...@@ -321,7 +321,7 @@ RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey, ...@@ -321,7 +321,7 @@ RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
registry information. registry information.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
rtl_uString* regFileName); rtl_uString* regFileName);
...@@ -338,7 +338,7 @@ RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, ...@@ -338,7 +338,7 @@ RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
registry information. registry information.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
rtl_uString* regFileName); rtl_uString* regFileName);
...@@ -358,7 +358,7 @@ RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, ...@@ -358,7 +358,7 @@ RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
@param bReport if TRUE the function reports warnings on stdout if a key already exists. @param bReport if TRUE the function reports warnings on stdout if a key already exists.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
rtl_uString* keyName, rtl_uString* keyName,
rtl_uString* regFileName, rtl_uString* regFileName,
sal_Bool bWarnings, sal_Bool bWarnings,
...@@ -371,7 +371,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, ...@@ -371,7 +371,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
@param phRegistry points to a handle of the new registry if the function succeeds otherwise NULL. @param phRegistry points to a handle of the new registry if the function succeeds otherwise NULL.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
RegHandle* phRegistry); RegHandle* phRegistry);
...@@ -381,7 +381,7 @@ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, ...@@ -381,7 +381,7 @@ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
@param phRootKey points to a handle of the open root key if the function succeeds otherwise NULL. @param phRootKey points to a handle of the open root key if the function succeeds otherwise NULL.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
RegKeyHandle* phRootKey); RegKeyHandle* phRootKey);
...@@ -391,7 +391,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, ...@@ -391,7 +391,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
@param pName returns the name of the registry if the function succeeds otherwise an empty string. @param pName returns the name of the registry if the function succeeds otherwise an empty string.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName); REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
/** This function returns the access mode of the registry. /** This function returns the access mode of the registry.
...@@ -399,7 +399,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) ...@@ -399,7 +399,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
@param hReg identifies a currently open registry. @param hReg identifies a currently open registry.
@return TRUE if accessmode is read only else FALSE. @return TRUE if accessmode is read only else FALSE.
*/ */
sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg); REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
/** This function opens a registry with the specified name. /** This function opens a registry with the specified name.
...@@ -409,7 +409,7 @@ sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg); ...@@ -409,7 +409,7 @@ sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
@param accessMode specifies the accessmode of the registry, REG_READONLY or REG_READWRITE. @param accessMode specifies the accessmode of the registry, REG_READONLY or REG_READWRITE.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
RegHandle* phRegistry, RegHandle* phRegistry,
RegAccessMode accessMode); RegAccessMode accessMode);
...@@ -419,7 +419,7 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, ...@@ -419,7 +419,7 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
@param hRegistry identifies a currently open registry which should be closed. @param hRegistry identifies a currently open registry which should be closed.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry); REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry);
/** This function destroys a registry. /** This function destroys a registry.
...@@ -429,7 +429,7 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry); ...@@ -429,7 +429,7 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry);
name is NULL the registry itselfs will be destroyed. name is NULL the registry itselfs will be destroyed.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
rtl_uString* registryName); rtl_uString* registryName);
...@@ -440,7 +440,7 @@ RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, ...@@ -440,7 +440,7 @@ RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
@param hKey identifies a currently open key which content will be reported. @param hKey identifies a currently open key which content will be reported.
@return REG_NO_ERROR if succeeds else an error code. @return REG_NO_ERROR if succeeds else an error code.
*/ */
RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey); REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#ifndef INCLUDED_registry_writer_h #ifndef INCLUDED_registry_writer_h
#define INCLUDED_registry_writer_h #define INCLUDED_registry_writer_h
#include "registry/regdllapi.h"
#include "registry/types.h" #include "registry/types.h"
#include "registry/version.h" #include "registry/version.h"
...@@ -70,7 +71,7 @@ extern "C" { ...@@ -70,7 +71,7 @@ extern "C" {
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
void * SAL_CALL typereg_writer_create( REG_DLLPUBLIC void * SAL_CALL typereg_writer_create(
typereg_Version version, rtl_uString const * documentation, typereg_Version version, rtl_uString const * documentation,
rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
rtl_uString const * typeName, sal_uInt16 superTypeCount, rtl_uString const * typeName, sal_uInt16 superTypeCount,
...@@ -85,7 +86,7 @@ void * SAL_CALL typereg_writer_create( ...@@ -85,7 +86,7 @@ void * SAL_CALL typereg_writer_create(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); REG_DLLPUBLIC void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
/** /**
Sets the type name of a super type of a type writer. Sets the type name of a super type of a type writer.
...@@ -102,7 +103,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); ...@@ -102,7 +103,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setSuperTypeName( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
void * handle, sal_uInt16 index, rtl_uString const * typeName) void * handle, sal_uInt16 index, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -132,7 +133,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName( ...@@ -132,7 +133,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setFieldData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setFieldData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
rtl_uString const * typeName, RTValueType valueType, rtl_uString const * typeName, RTValueType valueType,
...@@ -163,7 +164,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData( ...@@ -163,7 +164,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTMethodMode flags, rtl_uString const * name, RTMethodMode flags, rtl_uString const * name,
rtl_uString const * returnTypeName, sal_uInt16 parameterCount, rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
...@@ -192,7 +193,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData( ...@@ -192,7 +193,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodParameterData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -215,7 +216,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData( ...@@ -215,7 +216,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
rtl_uString const * typeName) rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -241,7 +242,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( ...@@ -241,7 +242,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setReferenceData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setReferenceData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -258,7 +259,7 @@ sal_Bool SAL_CALL typereg_writer_setReferenceData( ...@@ -258,7 +259,7 @@ sal_Bool SAL_CALL typereg_writer_setReferenceData(
the given type writer; if an out-of-memory condition occurs, null is returned the given type writer; if an out-of-memory condition occurs, null is returned
and <code>size</code> is not modified and <code>size</code> is not modified
*/ */
void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size) REG_DLLPUBLIC void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -1154,7 +1154,7 @@ typereg_Version TypeRegistryEntry::getVersion() const { ...@@ -1154,7 +1154,7 @@ typereg_Version TypeRegistryEntry::getVersion() const {
extern "C" { extern "C" {
sal_Bool typereg_reader_create( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_create(
void const * buffer, sal_uInt32 length, sal_Bool copy, void const * buffer, sal_uInt32 length, sal_Bool copy,
typereg_Version maxVersion, void ** result) typereg_Version maxVersion, void ** result)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1192,7 +1192,7 @@ static TypeReaderImpl TYPEREG_CALLTYPE createEntry(const sal_uInt8* buffer, sal_ ...@@ -1192,7 +1192,7 @@ static TypeReaderImpl TYPEREG_CALLTYPE createEntry(const sal_uInt8* buffer, sal_
return handle; return handle;
} }
void typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1200,7 +1200,7 @@ void typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C() ...@@ -1200,7 +1200,7 @@ void typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C()
pEntry->m_refCount++; pEntry->m_refCount++;
} }
void typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1211,7 +1211,7 @@ void typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C() ...@@ -1211,7 +1211,7 @@ void typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C()
} }
} }
typereg_Version typereg_reader_getVersion(void * handle) SAL_THROW_EXTERN_C() { REG_DLLPUBLIC typereg_Version TYPEREG_CALLTYPE typereg_reader_getVersion(void * handle) SAL_THROW_EXTERN_C() {
return handle == 0 return handle == 0
? TYPEREG_VERSION_0 ? TYPEREG_VERSION_0
: static_cast< TypeRegistryEntry * >(handle)->getVersion(); : static_cast< TypeRegistryEntry * >(handle)->getVersion();
...@@ -1235,7 +1235,7 @@ static sal_uInt16 TYPEREG_CALLTYPE getMajorVersion(TypeReaderImpl hEntry) ...@@ -1235,7 +1235,7 @@ static sal_uInt16 TYPEREG_CALLTYPE getMajorVersion(TypeReaderImpl hEntry)
return pEntry->readUINT16(OFFSET_MAJOR_VERSION); return pEntry->readUINT16(OFFSET_MAJOR_VERSION);
} }
RTTypeClass typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC RTTypeClass TYPEREG_CALLTYPE typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1245,14 +1245,14 @@ RTTypeClass typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C() ...@@ -1245,14 +1245,14 @@ RTTypeClass typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C()
(pEntry->readUINT16(OFFSET_TYPE_CLASS) & ~RT_TYPE_PUBLISHED); (pEntry->readUINT16(OFFSET_TYPE_CLASS) & ~RT_TYPE_PUBLISHED);
} }
sal_Bool typereg_reader_isPublished(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_isPublished(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry * entry = static_cast< TypeRegistryEntry * >(hEntry); TypeRegistryEntry * entry = static_cast< TypeRegistryEntry * >(hEntry);
return entry != 0 return entry != 0
&& (entry->readUINT16(OFFSET_TYPE_CLASS) & RT_TYPE_PUBLISHED) != 0; && (entry->readUINT16(OFFSET_TYPE_CLASS) & RT_TYPE_PUBLISHED) != 0;
} }
void typereg_reader_getTypeName(void * hEntry, rtl_uString** pTypeName) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getTypeName(void * hEntry, rtl_uString** pTypeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1302,7 +1302,7 @@ static void TYPEREG_CALLTYPE getUik(TypeReaderImpl hEntry, RTUik* uik) ...@@ -1302,7 +1302,7 @@ static void TYPEREG_CALLTYPE getUik(TypeReaderImpl hEntry, RTUik* uik)
} }
} }
void typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1319,7 +1319,7 @@ void typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku) ...@@ -1319,7 +1319,7 @@ void typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku)
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
void typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1337,7 +1337,7 @@ void typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName) ...@@ -1337,7 +1337,7 @@ void typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName)
} }
sal_uInt16 typereg_reader_getFieldCount(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getFieldCount(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1351,7 +1351,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getFieldCount(TypeReaderImpl hEntry) ...@@ -1351,7 +1351,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getFieldCount(TypeReaderImpl hEntry)
return typereg_reader_getFieldCount(hEntry); return typereg_reader_getFieldCount(hEntry);
} }
void typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1367,7 +1367,7 @@ void typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uI ...@@ -1367,7 +1367,7 @@ void typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uI
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
void typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1384,7 +1384,7 @@ void typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sa ...@@ -1384,7 +1384,7 @@ void typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sa
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RTFieldAccess typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index) REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1394,7 +1394,7 @@ RTFieldAccess typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index) ...@@ -1394,7 +1394,7 @@ RTFieldAccess typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index)
return pEntry->m_pFields->getFieldAccess(index); return pEntry->m_pFields->getFieldAccess(index);
} }
sal_Bool typereg_reader_getFieldValue( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_getFieldValue(
void * hEntry, sal_uInt16 index, RTValueType * type, void * hEntry, sal_uInt16 index, RTValueType * type,
RTConstValueUnion * value) RTConstValueUnion * value)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1421,7 +1421,7 @@ static RTValueType TYPEREG_CALLTYPE getFieldConstValue(TypeReaderImpl hEntry, sa ...@@ -1421,7 +1421,7 @@ static RTValueType TYPEREG_CALLTYPE getFieldConstValue(TypeReaderImpl hEntry, sa
return t; return t;
} }
void typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1438,7 +1438,7 @@ void typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sa ...@@ -1438,7 +1438,7 @@ void typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sa
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
void typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1456,7 +1456,7 @@ void typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName ...@@ -1456,7 +1456,7 @@ void typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName
} }
sal_uInt16 typereg_reader_getMethodCount(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodCount(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1470,7 +1470,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodCount(TypeReaderImpl hEntry) ...@@ -1470,7 +1470,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodCount(TypeReaderImpl hEntry)
return typereg_reader_getMethodCount(hEntry); return typereg_reader_getMethodCount(hEntry);
} }
void typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1487,7 +1487,7 @@ void typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_ ...@@ -1487,7 +1487,7 @@ void typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
sal_uInt16 typereg_reader_getMethodParameterCount( REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodParameterCount(
void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1502,7 +1502,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodParamCount(TypeReaderImpl hEntry, sa ...@@ -1502,7 +1502,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodParamCount(TypeReaderImpl hEntry, sa
return typereg_reader_getMethodParameterCount(hEntry, index); return typereg_reader_getMethodParameterCount(hEntry, index);
} }
void typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMethodParamType, sal_uInt16 index, sal_uInt16 paramIndex) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMethodParamType, sal_uInt16 index, sal_uInt16 paramIndex)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1519,7 +1519,7 @@ void typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMet ...@@ -1519,7 +1519,7 @@ void typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMet
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
void typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodParamName, sal_uInt16 index, sal_uInt16 paramIndex) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodParamName, sal_uInt16 index, sal_uInt16 paramIndex)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1536,7 +1536,7 @@ void typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodP ...@@ -1536,7 +1536,7 @@ void typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodP
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RTParamMode typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 index, sal_uInt16 paramIndex) REG_DLLPUBLIC RTParamMode TYPEREG_CALLTYPE typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 index, sal_uInt16 paramIndex)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1546,7 +1546,7 @@ RTParamMode typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 ind ...@@ -1546,7 +1546,7 @@ RTParamMode typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 ind
return pEntry->m_pMethods->getMethodParamMode(index, paramIndex); return pEntry->m_pMethods->getMethodParamMode(index, paramIndex);
} }
sal_uInt16 typereg_reader_getMethodExceptionCount( REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodExceptionCount(
void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1561,7 +1561,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodExcCount(TypeReaderImpl hEntry, sal_ ...@@ -1561,7 +1561,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodExcCount(TypeReaderImpl hEntry, sal_
return typereg_reader_getMethodExceptionCount(hEntry, index); return typereg_reader_getMethodExceptionCount(hEntry, index);
} }
void typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMethodExcpType, sal_uInt16 index, sal_uInt16 excIndex) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMethodExcpType, sal_uInt16 index, sal_uInt16 excIndex)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1578,7 +1578,7 @@ void typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMet ...@@ -1578,7 +1578,7 @@ void typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMet
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
void typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethodReturnType, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethodReturnType, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1595,7 +1595,7 @@ void typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethod ...@@ -1595,7 +1595,7 @@ void typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethod
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RTMethodMode typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index) REG_DLLPUBLIC RTMethodMode TYPEREG_CALLTYPE typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1605,7 +1605,7 @@ RTMethodMode typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index) ...@@ -1605,7 +1605,7 @@ RTMethodMode typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index)
return pEntry->m_pMethods->getMethodMode(index); return pEntry->m_pMethods->getMethodMode(index);
} }
void typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodDoku, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodDoku, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1622,7 +1622,7 @@ void typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodD ...@@ -1622,7 +1622,7 @@ void typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodD
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
sal_uInt16 typereg_reader_getReferenceCount(void * hEntry) SAL_THROW_EXTERN_C() REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getReferenceCount(void * hEntry) SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1636,7 +1636,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getReferenceCount(TypeReaderImpl hEntry) ...@@ -1636,7 +1636,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getReferenceCount(TypeReaderImpl hEntry)
return typereg_reader_getReferenceCount(hEntry); return typereg_reader_getReferenceCount(hEntry);
} }
void typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReferenceName, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReferenceName, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1653,7 +1653,7 @@ void typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReference ...@@ -1653,7 +1653,7 @@ void typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReference
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RTReferenceType typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index) REG_DLLPUBLIC RTReferenceType TYPEREG_CALLTYPE typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1663,7 +1663,7 @@ RTReferenceType typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index) ...@@ -1663,7 +1663,7 @@ RTReferenceType typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index)
return pEntry->m_pReferences->getReferenceType(index); return pEntry->m_pReferences->getReferenceType(index);
} }
void typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pReferenceDoku, sal_uInt16 index) REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pReferenceDoku, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1680,7 +1680,7 @@ void typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pRefe ...@@ -1680,7 +1680,7 @@ void typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pRefe
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RTFieldAccess typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index) REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1690,7 +1690,7 @@ RTFieldAccess typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index) ...@@ -1690,7 +1690,7 @@ RTFieldAccess typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index)
return pEntry->m_pReferences->getReferenceAccess(index); return pEntry->m_pReferences->getReferenceAccess(index);
} }
sal_uInt16 typereg_reader_getSuperTypeCount(void * hEntry) REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getSuperTypeCount(void * hEntry)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
...@@ -1700,7 +1700,7 @@ sal_uInt16 typereg_reader_getSuperTypeCount(void * hEntry) ...@@ -1700,7 +1700,7 @@ sal_uInt16 typereg_reader_getSuperTypeCount(void * hEntry)
return pEntry->m_nSuperTypes; return pEntry->m_nSuperTypes;
} }
void typereg_reader_getSuperTypeName( REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName(
void * hEntry, rtl_uString ** pSuperTypeName, sal_uInt16 index) void * hEntry, rtl_uString ** pSuperTypeName, sal_uInt16 index)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
...@@ -1719,7 +1719,7 @@ void typereg_reader_getSuperTypeName( ...@@ -1719,7 +1719,7 @@ void typereg_reader_getSuperTypeName(
RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
} }
RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void) REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void)
{ {
static RegistryTypeReader_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; static RegistryTypeReader_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
if (!aApi.acquire) if (!aApi.acquire)
......
...@@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil ...@@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil
static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName); static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setFieldData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setFieldData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
rtl_uString const * typeName, RTValueType valueType, rtl_uString const * typeName, RTValueType valueType,
...@@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry, ...@@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry,
constValue); constValue);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTMethodMode flags, rtl_uString const * name, RTMethodMode flags, rtl_uString const * name,
rtl_uString const * returnTypeName, sal_uInt16 parameterCount, rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
...@@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry, ...@@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry,
hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount); hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodParameterData(
void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry, ...@@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry,
hEntry, index, paramIndex, mode, name, type); hEntry, index, paramIndex, mode, name, type);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodExceptionTypeName(
void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
rtl_uString const * typeName) rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry, ...@@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry,
typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type); typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type);
} }
REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size) REG_DLLPUBLIC void const * TYPEREG_CALLTYPE typereg_writer_getBlob(void * handle, sal_uInt32 * size)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeWriter * writer = static_cast< TypeWriter * >(handle); TypeWriter * writer = static_cast< TypeWriter * >(handle);
...@@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry) ...@@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry)
return size; return size;
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setReferenceData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry, ...@@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry,
typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name); typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name);
} }
REG_DLLPUBLIC void * typereg_writer_create( REG_DLLPUBLIC void * TYPEREG_CALLTYPE typereg_writer_create(
typereg_Version version, rtl_uString const * documentation, typereg_Version version, rtl_uString const * documentation,
rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
rtl_uString const * typeName, sal_uInt16 superTypeCount, rtl_uString const * typeName, sal_uInt16 superTypeCount,
...@@ -1424,11 +1424,11 @@ REG_DLLPUBLIC void * typereg_writer_create( ...@@ -1424,11 +1424,11 @@ REG_DLLPUBLIC void * typereg_writer_create(
} }
} }
REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() {
delete static_cast< TypeWriter * >(handle); delete static_cast< TypeWriter * >(handle);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setSuperTypeName(
void * handle, sal_uInt16 index, rtl_uString const * typeName) void * handle, sal_uInt16 index, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
...@@ -1457,7 +1457,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry( ...@@ -1457,7 +1457,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
return t; return t;
} }
RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void) REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void)
{ {
static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0}; static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0};
if (!aApi.acquire) if (!aApi.acquire)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment