Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy

johannes · smalyshev · commit bb963a5f501c · 2012-05-28T17:39:39.000-07:00
diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c
@@ -42,7 +42,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)
 	}
 }
 
-PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
+PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 		int codepage TSRMLS_DC)
 {
 	php_com_dotnet_object *obj;
@@ -65,7 +65,7 @@ PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 	z->value.obj.handlers = &php_com_object_handlers;
 }
 
-PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
+PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
 		int codepage TSRMLS_DC)
 {
 	php_com_dotnet_object *obj;
@@ -92,7 +92,7 @@ PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
 
 /* this is a convenience function for fetching a particular
  * element from a (possibly multi-dimensional) safe array */
-PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
 {
 	UINT dims;
 	LONG lbound, ubound;
diff --git a/ext/com_dotnet/com_olechar.c b/ext/com_dotnet/com_olechar.c
@@ -30,7 +30,7 @@
 #include "php_com_dotnet_internal.h"
 
 
-PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring = NULL;
 	DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS;
@@ -65,7 +65,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int c
 	return olestring;
 }
 
-PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
 {
 	char *string;
 	uint length = 0;
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
@@ -268,7 +268,7 @@ static void istream_destructor(php_istream *stm TSRMLS_DC)
 }
 /* }}} */
 
-PHPAPI IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
+PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
 {
 	php_istream *stm = (php_istream*)CoTaskMemAlloc(sizeof(*stm));
 
diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c
@@ -35,7 +35,7 @@
  * b) a CLSID, major, minor e.g. "{00000200-0000-0010-8000-00AA006D2EA4},2,0"
  * c) a Type Library name e.g. "Microsoft OLE DB ActiveX Data Objects 1.0 Library"
  */
-PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
 {
 	ITypeLib *TL = NULL;
 	char *strtok_buf, *major, *minor;
@@ -153,7 +153,7 @@ PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_D
 }
 
 /* Given a type-library, merge it into the current engine state */
-PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
 {
 	int i, j, interfaces;
 	TYPEKIND pTKind;
@@ -228,7 +228,7 @@ void php_com_typelibrary_dtor(void *pDest)
 	ITypeLib_Release(*Lib);
 }
 
-PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
 	int codepage, int *cached TSRMLS_DC)
 {
 	ITypeLib **TLp;
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
@@ -98,7 +98,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
 	}
 }
 
-PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring;
 	php_com_dotnet_object *obj;
@@ -166,7 +166,7 @@ PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_D
 	}
 }
 
-PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring = NULL;
 	int ret = SUCCESS;
@@ -258,7 +258,7 @@ PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC
 }
 
 
-PHPAPI int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
 {
 	int ret = SUCCESS;
 	
diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c
@@ -578,7 +578,7 @@ static void disp_destructor(php_dispatchex *disp TSRMLS_DC)
 	CoTaskMemFree(disp);
 }
 
-PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
 	   HashTable *id_to_name TSRMLS_DC)
 {
 	php_dispatchex *disp = disp_constructor(val TSRMLS_CC);
@@ -617,7 +617,7 @@ PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
 	return (IDispatch*)disp;
 }
 
-PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
 {
 	php_dispatchex *disp = NULL;
 
diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h
@@ -28,6 +28,14 @@ extern zend_module_entry com_dotnet_module_entry;
 #include "TSRM.h"
 #endif
 
+#ifdef PHP_WIN32
+# define PHP_COM_DOTNET_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_COM_DOTNET_API __attribute__ ((visibility("default")))
+#else
+# define PHP_COM_DOTNET_API
+#endif
+
 PHP_MINIT_FUNCTION(com_dotnet);
 PHP_MSHUTDOWN_FUNCTION(com_dotnet);
 PHP_RINIT_FUNCTION(com_dotnet);
diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h
@@ -84,9 +84,9 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec
 int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS_DC);
 
 /* com_olechar.c */
-PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring,
+PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring,
 		uint *string_len, int codepage TSRMLS_DC);
-PHPAPI OLECHAR *php_com_string_to_olestring(char *string,
+PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string,
 		uint string_len, int codepage TSRMLS_DC);
 
 
@@ -112,8 +112,8 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, char *name, int namelen,
 
 /* com_wrapper.c */
 int php_com_wrapper_minit(INIT_FUNC_ARGS);
-PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
-PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);
 
 /* com_persist.c */
 int php_com_persist_minit(INIT_FUNC_ARGS);
@@ -147,10 +147,10 @@ PHP_FUNCTION(variant_get_type);
 PHP_FUNCTION(variant_set_type);
 PHP_FUNCTION(variant_cast);
 
-PHPAPI void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
-PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
-PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
-PHPAPI int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);
+PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);
 
 /* com_dotnet.c */
 PHP_FUNCTION(com_dotnet_create_instance);
@@ -159,17 +159,17 @@ void php_com_dotnet_mshutdown(TSRMLS_D);
 
 /* com_misc.c */
 void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC);
-PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
+PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 		int codepage TSRMLS_DC);
-PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
+PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
 		int codepage TSRMLS_DC);
-PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);
 
 /* com_typeinfo.c */
-PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
 		int codepage, int *cached TSRMLS_DC);
-PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
-PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
 		int codepage TSRMLS_DC);
 void php_com_typelibrary_dtor(void *pDest);
 ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink TSRMLS_DC);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-PHPAPI void php_com_wrap_dispatch(zval z, IDispatch disp,`
	`45`	`+PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval z, IDispatch disp,`
`46`	`46`	`int codepage TSRMLS_DC)`
`47`	`47`	`{`
`48`	`48`	`php_com_dotnet_object *obj;`
`@@ -65,7 +65,7 @@ PHPAPI void php_com_wrap_dispatch(zval z, IDispatch disp,`
`65`	`65`	`z->value.obj.handlers = &php_com_object_handlers;`
`66`	`66`	`}`
`67`	`67`
`68`		`-PHPAPI void php_com_wrap_variant(zval z, VARIANT v,`
	`68`	`+PHP_COM_DOTNET_API void php_com_wrap_variant(zval z, VARIANT v,`
`69`	`69`	`int codepage TSRMLS_DC)`
`70`	`70`	`{`
`71`	`71`	`php_com_dotnet_object *obj;`
`@@ -92,7 +92,7 @@ PHPAPI void php_com_wrap_variant(zval z, VARIANT v,`
`92`	`92`
`93`	`93`	`/* this is a convenience function for fetching a particular`
`94`	`94`	`* element from a (possibly multi-dimensional) safe array */`
`95`		`-PHPAPI int php_com_safearray_get_elem(VARIANT array, VARIANT dest, LONG dim1 TSRMLS_DC)`
	`95`	`+PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT array, VARIANT dest, LONG dim1 TSRMLS_DC)`
`96`	`96`	`{`
`97`	`97`	`UINT dims;`
`98`	`98`	`LONG lbound, ubound;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include "php_com_dotnet_internal.h"`
`31`	`31`
`32`	`32`
`33`		`-PHPAPI OLECHAR php_com_string_to_olestring(char string, uint string_len, int codepage TSRMLS_DC)`
	`33`	`+PHP_COM_DOTNET_API OLECHAR php_com_string_to_olestring(char string, uint string_len, int codepage TSRMLS_DC)`
`34`	`34`	`{`
`35`	`35`	`OLECHAR *olestring = NULL;`
`36`	`36`	`DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED \| MB_ERR_INVALID_CHARS;`
`@@ -65,7 +65,7 @@ PHPAPI OLECHAR php_com_string_to_olestring(char string, uint string_len, int c`
`65`	`65`	`return olestring;`
`66`	`66`	`}`
`67`	`67`
`68`		`-PHPAPI char php_com_olestring_to_string(OLECHAR olestring, uint *string_len, int codepage TSRMLS_DC)`
	`68`	`+PHP_COM_DOTNET_API char php_com_olestring_to_string(OLECHAR olestring, uint *string_len, int codepage TSRMLS_DC)`
`69`	`69`	`{`
`70`	`70`	`char *string;`
`71`	`71`	`uint length = 0;`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ static void istream_destructor(php_istream *stm TSRMLS_DC)`
`268`	`268`	`}`
`269`	`269`	`/* }}} */`
`270`	`270`
`271`		`-PHPAPI IStream php_com_wrapper_export_stream(php_stream stream TSRMLS_DC)`
	`271`	`+PHP_COM_DOTNET_API IStream php_com_wrapper_export_stream(php_stream stream TSRMLS_DC)`
`272`	`272`	`{`
`273`	`273`	`php_istream stm = (php_istream)CoTaskMemAlloc(sizeof(*stm));`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`* b) a CLSID, major, minor e.g. "{00000200-0000-0010-8000-00AA006D2EA4},2,0"`
`36`	`36`	`* c) a Type Library name e.g. "Microsoft OLE DB ActiveX Data Objects 1.0 Library"`
`37`	`37`	`*/`
`38`		`-PHPAPI ITypeLib php_com_load_typelib(char search_string, int codepage TSRMLS_DC)`
	`38`	`+PHP_COM_DOTNET_API ITypeLib php_com_load_typelib(char search_string, int codepage TSRMLS_DC)`
`39`	`39`	`{`
`40`	`40`	`ITypeLib *TL = NULL;`
`41`	`41`	`char strtok_buf, major, *minor;`
`@@ -153,7 +153,7 @@ PHPAPI ITypeLib php_com_load_typelib(char search_string, int codepage TSRMLS_D`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/* Given a type-library, merge it into the current engine state */`
`156`		`-PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)`
	`156`	`+PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)`
`157`	`157`	`{`
`158`	`158`	`int i, j, interfaces;`
`159`	`159`	`TYPEKIND pTKind;`
`@@ -228,7 +228,7 @@ void php_com_typelibrary_dtor(void *pDest)`
`228`	`228`	`ITypeLib_Release(*Lib);`
`229`	`229`	`}`
`230`	`230`
`231`		`-PHPAPI ITypeLib php_com_load_typelib_via_cache(char search_string,`
	`231`	`+PHP_COM_DOTNET_API ITypeLib php_com_load_typelib_via_cache(char search_string,`
`232`	`232`	`int codepage, int *cached TSRMLS_DC)`
`233`	`233`	`{`
`234`	`234`	`ITypeLib **TLp;`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static void safe_array_from_zval(VARIANT v, zval z, int codepage TSRMLS_DC)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-PHPAPI void php_com_variant_from_zval(VARIANT v, zval z, int codepage TSRMLS_DC)`
	`101`	`+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT v, zval z, int codepage TSRMLS_DC)`
`102`	`102`	`{`
`103`	`103`	`OLECHAR *olestring;`
`104`	`104`	`php_com_dotnet_object *obj;`
`@@ -166,7 +166,7 @@ PHPAPI void php_com_variant_from_zval(VARIANT v, zval z, int codepage TSRMLS_D`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`-PHPAPI int php_com_zval_from_variant(zval z, VARIANT v, int codepage TSRMLS_DC)`
	`169`	`+PHP_COM_DOTNET_API int php_com_zval_from_variant(zval z, VARIANT v, int codepage TSRMLS_DC)`
`170`	`170`	`{`
`171`	`171`	`OLECHAR *olestring = NULL;`
`172`	`172`	`int ret = SUCCESS;`
`@@ -258,7 +258,7 @@ PHPAPI int php_com_zval_from_variant(zval z, VARIANT v, int codepage TSRMLS_DC`
`258`	`258`	`}`
`259`	`259`
`260`	`260`
`261`		`-PHPAPI int php_com_copy_variant(VARIANT dstvar, VARIANT srcvar TSRMLS_DC)`
	`261`	`+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT dstvar, VARIANT srcvar TSRMLS_DC)`
`262`	`262`	`{`
`263`	`263`	`int ret = SUCCESS;`
`264`	`264`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ static void disp_destructor(php_dispatchex *disp TSRMLS_DC)`
`578`	`578`	`CoTaskMemFree(disp);`
`579`	`579`	`}`
`580`	`580`
`581`		`-PHPAPI IDispatch php_com_wrapper_export_as_sink(zval val, GUID *sinkid,`
	`581`	`+PHP_COM_DOTNET_API IDispatch php_com_wrapper_export_as_sink(zval val, GUID *sinkid,`
`582`	`582`	`HashTable *id_to_name TSRMLS_DC)`
`583`	`583`	`{`
`584`	`584`	`php_dispatchex *disp = disp_constructor(val TSRMLS_CC);`
`@@ -617,7 +617,7 @@ PHPAPI IDispatch php_com_wrapper_export_as_sink(zval val, GUID *sinkid,`
`617`	`617`	`return (IDispatch*)disp;`
`618`	`618`	`}`
`619`	`619`
`620`		`-PHPAPI IDispatch php_com_wrapper_export(zval val TSRMLS_DC)`
	`620`	`+PHP_COM_DOTNET_API IDispatch php_com_wrapper_export(zval val TSRMLS_DC)`
`621`	`621`	`{`
`622`	`622`	`php_dispatchex *disp = NULL;`
`623`	`623`