fix linkage inconsistency on windows

Change-Id: I677a5fe8dc5c91b96fe299b06a5f2dc767120a1d

3 files changed, 39 insertions, 38 deletions

diff --git a/registry/inc/registry/refltype.hxx b/registry/inc/registry/refltype.hxx
index b1267e4097e7..6ca113996407 100644
--- a/registry/inc/registry/refltype.hxx
+++ b/registry/inc/registry/refltype.hxx
@@ -81,7 +81,7 @@ struct RTUik
     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
 
 #endif
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index 75e0c91f766d..69882d7594bf 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -49,7 +49,7 @@ extern "C" {
                      reg_closeKey. If the function fails, phNewKey is NULL.
     @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,
                                          RegKeyHandle* phNewKey);
 
@@ -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).
     @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,
                                              RegKeyHandle** pphSubKeys,
                                              sal_uInt32* pnSubKeys);
@@ -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).
     @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);
 
 
@@ -107,7 +107,7 @@ RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys,
                     be deleted.
     @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);
 
 
@@ -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  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.
@@ -140,7 +140,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyN
     @param  valueSize specifies the size of pData in bytes
     @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,
                                            RegValueType valueType,
                                            RegValue pData,
@@ -156,7 +156,7 @@ RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
     @param  len specifies the len of pValueList.
     @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,
                                                       sal_Int32* pValueList,
                                                       sal_uInt32 len);
@@ -171,7 +171,7 @@ RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
     @param  len specifies the len of pValueList.
     @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,
                                                           sal_Char** pValueList,
                                                           sal_uInt32 len);
@@ -186,7 +186,7 @@ RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
     @param  len specifies the len of pValueList.
     @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,
                                                             sal_Unicode** pValueList,
                                                             sal_uInt32 len);
@@ -203,7 +203,7 @@ RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
     @param  pValueSize returns the size of the value in bytes
     @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,
                                                RegValueType* pValueType,
                                                sal_uInt32* pValueSize);
@@ -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.
     @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,
                                            RegValue pData);
 
@@ -233,7 +233,7 @@ RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
     @param  pLen returns the length of the value list.
     @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,
                                                       sal_Int32** pValueList,
                                                       sal_uInt32* pLen);
@@ -248,7 +248,7 @@ RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
     @param  pLen returns the length of the value list.
     @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,
                                                        sal_Char*** pValueList,
                                                        sal_uInt32* pLen);
@@ -263,7 +263,7 @@ RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
     @param  pLen returns the length of the value list.
     @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,
                                                          sal_Unicode*** pValueList,
                                                          sal_uInt32* pLen);
@@ -276,7 +276,7 @@ RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
     @param  len specifies the length of the value list.
     @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,
                                                   sal_uInt32 len);
 
@@ -290,7 +290,7 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
     @param  pKeyType returns the type of the key.
     @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,
                                              RegKeyType* pKeyType);
 
@@ -304,7 +304,7 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
     @param firstLinkOnly ignored
     @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,
                                                    sal_Bool firstLinkOnly,
                                                       rtl_uString** pResolvedName);
@@ -321,7 +321,7 @@ RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
                         registry information.
     @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* regFileName);
 
@@ -338,7 +338,7 @@ RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
                         registry information.
     @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* regFileName);
 
@@ -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.
     @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* regFileName,
                                            sal_Bool bWarnings,
@@ -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.
     @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);
 
 
@@ -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.
     @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);
 
 
@@ -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.
     @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.
@@ -399,7 +399,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
     @param  hReg identifies a currently open registry.
     @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.
@@ -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.
     @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,
                                                RegAccessMode accessMode);
 
@@ -419,7 +419,7 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
     @param  hRegistry identifies a currently open registry which should be closed.
     @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.
@@ -429,7 +429,7 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry);
                          name is NULL the registry itselfs will be destroyed.
     @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);
 
 
@@ -440,7 +440,7 @@ RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
     @param  hKey identifies a currently open key which content will be reported.
     @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
 }
diff --git a/registry/inc/registry/writer.h b/registry/inc/registry/writer.h
index 0adaa1aa918b..5b271bd75d99 100644
--- a/registry/inc/registry/writer.h
+++ b/registry/inc/registry/writer.h
@@ -29,6 +29,7 @@
 #ifndef INCLUDED_registry_writer_h
 #define INCLUDED_registry_writer_h
 
+#include "registry/regdllapi.h"
 #include "registry/types.h"
 #include "registry/version.h"
 
@@ -70,7 +71,7 @@ extern "C" {
 
    @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,
     rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
     rtl_uString const * typeName, sal_uInt16 superTypeCount,
@@ -85,7 +86,7 @@ void * SAL_CALL typereg_writer_create(
 
    @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.
@@ -102,7 +103,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
 
    @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)
         SAL_THROW_EXTERN_C();
 
@@ -132,7 +133,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
 
    @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,
     rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
     rtl_uString const * typeName, RTValueType valueType,
@@ -163,7 +164,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData(
 
    @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,
     RTMethodMode flags, rtl_uString const * name,
     rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
@@ -192,7 +193,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData(
 
    @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,
     RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
     SAL_THROW_EXTERN_C();
@@ -215,7 +216,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
 
    @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,
     rtl_uString const * typeName)
     SAL_THROW_EXTERN_C();
@@ -241,7 +242,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
 
    @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,
     RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
     SAL_THROW_EXTERN_C();
@@ -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
    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();
 
 #ifdef __cplusplus