ole32: get_moniker_for_progid_display_name should fallback to using…

ole32: get_moniker_for_progid_display_name should fallback to using IClassFactory to get IParseDisplayName if getting it directly fails.

ole32: get_moniker_for_progid_display_name should fallback to using…
9645f9d1 · Rob Shearman · Alexandre Julliard · ebac63e1 · 9645f9d1
Commit 9645f9d1 authored Jan 06, 2008 by Rob Shearman Committed by Alexandre Julliard Jan 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

moniker.c dlls/ole32/moniker.c +15 -0

No files found.
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -1086,6 +1086,21 @@ static HRESULT get_moniker_for_progid_display_name(LPBC pbc,
        IParseDisplayName *pdn;
        hr = IMoniker_BindToObject(class_moniker, pbc, NULL,
                                   &IID_IParseDisplayName, (void **)&pdn);
+        /* fallback to using IClassFactory to get IParseDisplayName -
+         * adsldp.dll depends on this */
+        if (FAILED(hr))
+        {
+            IClassFactory *pcf;
+            hr = IMoniker_BindToObject(class_moniker, pbc, NULL,
+                                       &IID_IClassFactory, (void **)&pcf);
+            if (SUCCEEDED(hr))
+            {
+                hr = IClassFactory_CreateInstance(pcf, NULL,
+                                                  &IID_IParseDisplayName,
+                                                  (void **)&pdn);
+                IClassFactory_Release(pcf);
+            }
+        }
        IMoniker_Release(class_moniker);
        if (SUCCEEDED(hr))
        {