Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #63208: BSTR to PHP string conversion not binary safe

diff --cc ext/com_dotnet/com_olechar.c
Simple merge

diff --cc ext/com_dotnet/com_variant.c
Simple merge

diff --cc ext/com_dotnet/php_com_dotnet_internal.h
index 4974bb78e3ce4dc1d6d0880e169217714b589791,84811386994b8dfd3ecd04af4b0808f7861ce6e4..1d089a2ed6b1a52eeefea8d575cab5e2a63a7ada
--- 1/ext/com_dotnet/php_com_dotnet_internal.h
--- 2/ext/com_dotnet/php_com_dotnet_internal.h
+++ b/ext/com_dotnet/php_com_dotnet_internal.h
@@@ -82,8 -84,10 +82,10 @@@ int php_com_saproxy_create(zend_object 
  /* com_olechar.c */
  PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring,
                size_t *string_len, int codepage);
 -PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string,
 +PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(const char *string,
                size_t string_len, int codepage);
+ BSTR php_com_string_to_bstr(zend_string *string, int codepage);
+ zend_string *php_com_bstr_to_string(BSTR bstr, int codepage);
  
  
  /* com_com.c */