Fix #55847: DOTNET .NET 4.0 GAC new location

ext/com_dotnet/com_dotnet.c

@@ -117,6 +117,44 @@ struct dotnet_runtime_stuff {
 	DISPID create_instance;
 };
 
+/* We link dynamically to mscoree.dll to avoid the hard dependency on .NET
+ * framework, which is only required if a dotnet instance is to be created.
+ */
+static HRESULT dotnet_bind_runtime(LPVOID FAR *ppv)
+{
+	HRESULT hr;
+	HMODULE mscoree;
+	typedef HRESULT (STDAPICALLTYPE *cbtr_t)(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);
+	cbtr_t CorBindToRuntime;
+	OLECHAR *oleversion;
+	char *version;
+
+	mscoree = LoadLibraryA("mscoree.dll");
+	if (mscoree == NULL) {
+		return S_FALSE;
+	}
+
+	CorBindToRuntime = (cbtr_t) GetProcAddress(mscoree, "CorBindToRuntime");
+	if (CorBindToRuntime == NULL) {
+		FreeLibrary(mscoree);
+		return S_FALSE;
+	}
+
+	version = INI_STR("com.dotnet_version");
+	if (version == NULL || *version == '\0') {
+		oleversion = NULL;
+	} else {
+		oleversion = php_com_string_to_olestring(version, strlen(version), COMG(code_page));
+	}
+
+	hr = CorBindToRuntime(oleversion, NULL, &CLSID_CorRuntimeHost, &IID_ICorRuntimeHost, ppv);
+
+	efree(oleversion);
+	FreeLibrary(mscoree);
+
+	return hr;
+}
+
 static HRESULT dotnet_init(char **p_where)
 {
 	HRESULT hr;
@@ -130,10 +168,8 @@ static HRESULT dotnet_init(char **p_where)
 	}
 	memset(stuff, 0, sizeof(*stuff));
 
-	where = "CoCreateInstance";
-	hr = CoCreateInstance(&CLSID_CorRuntimeHost, NULL, CLSCTX_ALL,
-			&IID_ICorRuntimeHost, (LPVOID*)&stuff->dotnet_host);
-
+	where = "dotnet_bind_runtime";
+	hr = dotnet_bind_runtime((LPVOID*)&stuff->dotnet_host);
 	if (FAILED(hr))
 		goto out;
 

ext/com_dotnet/com_extension.c

@@ -144,6 +144,7 @@ PHP_INI_BEGIN()
     STD_PHP_INI_ENTRY("com.autoregister_casesensitive",	"1", PHP_INI_ALL, OnAutoregisterCasesensitive, autoreg_case_sensitive, zend_com_dotnet_globals, com_dotnet_globals)
 	STD_PHP_INI_ENTRY("com.code_page", "", PHP_INI_ALL, OnUpdateLong, code_page, zend_com_dotnet_globals, com_dotnet_globals)
 	PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypeLibFileUpdate)
+	PHP_INI_ENTRY("com.dotnet_version", NULL, PHP_INI_SYSTEM, NULL)
 PHP_INI_END()
 /* }}} */
 

php.ini-development

@@ -1614,6 +1614,10 @@ zend.assertions = 1
 ; Default: system ANSI code page
 ;com.code_page=
 
+; The version of the .NET framework to use. The value of the setting are the first three parts
+; of the framework's version number, separated by dots, and prefixed with "v", e.g. "v4.0.30319".
+;com.dotnet_version=
+
 [mbstring]
 ; language for internal character representation.
 ; This affects mb_send_mail() and mbstring.detect_order.

php.ini-production

@@ -1618,6 +1618,10 @@ zend.assertions = -1
 ; Default: system ANSI code page
 ;com.code_page=
 
+; The version of the .NET framework to use. The value of the setting are the first three parts
+; of the framework's version number, separated by dots, and prefixed with "v", e.g. "v4.0.30319".
+;com.dotnet_version=
+
 [mbstring]
 ; language for internal character representation.
 ; This affects mb_send_mail() and mbstring.detect_order.