archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve COM ctor exception code for failing ProgIDs (GH-17673)

Browse source 
The `$module_name` of `com::__construct()` can be a ProgID, ClassID or
moniker.  We first try `CLSIDFromString()`, and if that fails, we go
ahead and try to treat the `$module_name` as a moniker.  If that also
fails, we throw an exception with the result of `MkParseDisplayName()`
what would just be `MK_E_SYNTAX` if given a ProgID.  This result is
highly confusing for the common case where a ProgID is given, which is
not registered (e.g. due to a typo).  In this case, we use the original
`HRESULT` (`CO_E_CLASSSTRING`) instead.
This commit is contained in:
Christoph M. Becker 2025-02-14 17:44:43 +01:00 • committed by GitHub
parent fe9c9049ef
commit 252b52ac5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/com_dotnet/com_com.c
View file

@ -38,7 +38,7 @@ PHP_METHOD(com, __construct)
OLECHAR *moniker;
CLSID clsid;
CLSCTX ctx = CLSCTX_SERVER;
HRESULT res = E_FAIL;
HRESULT res = E_FAIL, res2;
ITypeLib *TL = NULL;
COSERVERINFO info;
COAUTHIDENTITY authid = {0};
@ -142,7 +142,7 @@ PHP_METHOD(com, __construct)
}
}
if (FAILED(CLSIDFromString(moniker, &clsid))) {
if (FAILED(res2 = CLSIDFromString(moniker, &clsid))) {
/* try to use it as a moniker */
IBindCtx *pBindCtx = NULL;
IMoniker *pMoniker = NULL;
@ -182,6 +182,9 @@ PHP_METHOD(com, __construct)
if (pBindCtx) {
IBindCtx_Release(pBindCtx);
}
if (FAILED(res) && res2 == CO_E_CLASSSTRING && !wcspbrk(moniker, L"\\:")) {
res = res2;
}
} else if (server_name) {
MULTI_QI qi;