Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
dlls/qedit/mediadet.c | 70 +++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c
index 0b64e18..4f84deb 100644
--- a/dlls/qedit/mediadet.c
+++ b/dlls/qedit/mediadet.c
@@ -70,6 +70,40 @@ static void MD_cleanup(MediaDetImpl *This)
This->cur_stream = 0;
}
+/* From quartz, 2008/04/07 */
+static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var)
+{
+ IPropertyBag *pPropBagCat = NULL;
+ HRESULT hr;
+
+ VariantInit(var);
+ V_VT(var) = VT_BSTR;
+
+ hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag,
+ (LPVOID *) &pPropBagCat);
+
+ if (SUCCEEDED(hr))
+ hr = IPropertyBag_Read(pPropBagCat, L"CLSID", var, NULL);
+
+ if (SUCCEEDED(hr))
+ {
+ hr = CLSIDFromString(V_BSTR(var), clsid);
+ VariantClear(var);
+ V_VT(var) = VT_BSTR;
+ }
+
+ if (SUCCEEDED(hr))
+ hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", var, NULL);
+
+ if (SUCCEEDED(hr))
+ TRACE("Moniker = %s - %s\n", debugstr_guid(clsid), debugstr_w(V_BSTR(var)));
+
+ if (pPropBagCat)
+ IPropertyBag_Release(pPropBagCat);
+
+ return hr;
+}
+
/* MediaDet inner IUnknown */
static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
{
@@ -372,40 +406,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal)
return S_OK;
}
-/* From quartz, 2008/04/07 */
-static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar)
-{
- IPropertyBag *pPropBagCat = NULL;
- HRESULT hr;
-
- VariantInit(pvar);
- V_VT(pvar) = VT_BSTR;
-
- hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag,
- (LPVOID *) &pPropBagCat);
-
- if (SUCCEEDED(hr))
- hr = IPropertyBag_Read(pPropBagCat, L"CLSID", pvar, NULL);
-
- if (SUCCEEDED(hr))
- {
- hr = CLSIDFromString(V_BSTR(pvar), pclsid);
- VariantClear(pvar);
- V_VT(pvar) = VT_BSTR;
- }
-
- if (SUCCEEDED(hr))
- hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", pvar, NULL);
-
- if (SUCCEEDED(hr))
- TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar)));
-
- if (pPropBagCat)
- IPropertyBag_Release(pPropBagCat);
-
- return hr;
-}
-
static HRESULT GetSplitter(MediaDetImpl *This)
{
IFileSourceFilter *file;
@@ -458,7 +458,7 @@ static HRESULT GetSplitter(MediaDetImpl *This)
hr = E_NOINTERFACE;
while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK)
{
- hr = GetFilterInfo(mon, &clsid, &var);
+ hr = get_filter_info(mon, &clsid, &var);
IMoniker_Release(mon);
if (FAILED(hr))
continue;
--
2.21.0