Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkasper93 <kasper93@gmail.com>2013-10-19 15:48:03 +0400
committerUnderground78 <underground78@users.sourceforge.net>2013-10-19 20:43:12 +0400
commitf9e125a4edec9ccd92ef6ed9bec2dfbf65fe3bb2 (patch)
tree01283db87e54955a8f215dc7c4b2c7807f538640 /src
parentb45537000fa6ce6e61a411a0550d65e3f5faa8fb (diff)
Cosmetics: Use the IID_PPV_ARGS macro when possible (2/2).
Diffstat (limited to 'src')
-rw-r--r--src/DSUtil/DSUtil.cpp6
-rw-r--r--src/DSUtil/NullRenderers.cpp2
-rw-r--r--src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp4
-rw-r--r--src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp16
-rw-r--r--src/filters/renderer/VideoRenderers/SyncRenderer.cpp18
-rw-r--r--src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp2
-rw-r--r--src/mpc-hc/FGManagerBDA.cpp12
-rw-r--r--src/mpc-hc/FakeFilterMapper2.cpp4
-rw-r--r--src/mpc-hc/MainFrm.cpp20
-rw-r--r--src/mpc-hc/PlayerCaptureDialog.cpp4
10 files changed, 44 insertions, 44 deletions
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp
index 10223f827..82ff2a654 100644
--- a/src/DSUtil/DSUtil.cpp
+++ b/src/DSUtil/DSUtil.cpp
@@ -1240,7 +1240,7 @@ HRESULT LoadExternalObject(LPCTSTR path, REFCLSID clsid, REFIID iid, void** ppv)
if (p && FAILED(hr = p(clsid, iid, ppv))) {
CComPtr<IClassFactory> pCF;
- if (SUCCEEDED(hr = p(clsid, __uuidof(IClassFactory), (void**)&pCF))) {
+ if (SUCCEEDED(hr = p(clsid, IID_PPV_ARGS(&pCF)))) {
hr = pCF->CreateInstance(nullptr, iid, ppv);
}
}
@@ -1266,7 +1266,7 @@ HRESULT LoadExternalObject(LPCTSTR path, REFCLSID clsid, REFIID iid, void** ppv)
HRESULT LoadExternalFilter(LPCTSTR path, REFCLSID clsid, IBaseFilter** ppBF)
{
- return LoadExternalObject(path, clsid, __uuidof(IBaseFilter), (void**)ppBF);
+ return LoadExternalObject(path, clsid, IID_PPV_ARGS(ppBF));
}
HRESULT LoadExternalPropertyPage(IPersist* pP, REFCLSID clsid, IPropertyPage** ppPP)
@@ -1282,7 +1282,7 @@ HRESULT LoadExternalPropertyPage(IPersist* pP, REFCLSID clsid, IPropertyPage** p
while (pos) {
ExternalObject& eo = s_extObjs.GetNext(pos);
if (eo.clsid == clsid2) {
- return LoadExternalObject(eo.path, clsid, __uuidof(IPropertyPage), (void**)ppPP);
+ return LoadExternalObject(eo.path, clsid, IID_PPV_ARGS(ppPP));
}
}
diff --git a/src/DSUtil/NullRenderers.cpp b/src/DSUtil/NullRenderers.cpp
index 4a6af677b..f2efc4705 100644
--- a/src/DSUtil/NullRenderers.cpp
+++ b/src/DSUtil/NullRenderers.cpp
@@ -308,7 +308,7 @@ HRESULT CNullUVideoRenderer::DoRenderSample(IMediaSample* pSample)
CComQIPtr<IMFGetService> pService = pSample;
if (pService != nullptr) {
CComPtr<IDirect3DSurface9> pSurface;
- if (SUCCEEDED(pService->GetService(MR_BUFFER_SERVICE, __uuidof(IDirect3DSurface9), (void**)&pSurface))) {
+ if (SUCCEEDED(pService->GetService(MR_BUFFER_SERVICE, IID_PPV_ARGS(&pSurface)))) {
// TODO : render surface...
}
}
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp
index a7725204b..344923586 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp
@@ -735,7 +735,7 @@ HRESULT CMpcAudioRenderer::InitCoopLevel()
IVideoWindow* pVideoWindow = nullptr;
HWND hWnd = nullptr;
- hr = m_pGraph->QueryInterface(__uuidof(IVideoWindow), (void**) &pVideoWindow);
+ hr = m_pGraph->QueryInterface(IID_PPV_ARGS(&pVideoWindow));
if (SUCCEEDED(hr)) {
pVideoWindow->get_Owner((OAHWND*)&hWnd);
SAFE_RELEASE(pVideoWindow);
@@ -1274,7 +1274,7 @@ HRESULT CMpcAudioRenderer::InitAudioClient(WAVEFORMATEX* pWaveFormatEx, IAudioCl
// calculate the new period
if (SUCCEEDED(hr)) {
- hr = pAudioClient->GetService(__uuidof(IAudioRenderClient), (void**)(ppRenderClient));
+ hr = pAudioClient->GetService(IID_PPV_ARGS(ppRenderClient));
}
if (FAILED(hr)) {
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
index d3000a530..d6d1c0edb 100644
--- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
@@ -149,7 +149,7 @@ CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRES
CComPtr<IDirectXVideoDecoderService> pDecoderService;
HANDLE hDevice;
if (SUCCEEDED(m_pD3DManager->OpenDeviceHandle(&hDevice)) &&
- SUCCEEDED(m_pD3DManager->GetVideoService(hDevice, __uuidof(IDirectXVideoDecoderService), (void**)&pDecoderService))) {
+ SUCCEEDED(m_pD3DManager->GetVideoService(hDevice, IID_PPV_ARGS(&pDecoderService)))) {
TRACE_EVR("EVR: DXVA2 : device handle = 0x%08x", hDevice);
HookDirectXVideoDecoderService(pDecoderService);
@@ -327,7 +327,7 @@ STDMETHODIMP CEVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer)
hr = pMFGS->GetService(MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&pMFVR));
if (SUCCEEDED(hr)) {
- hr = QueryInterface(__uuidof(IMFVideoPresenter), (void**)&pVP);
+ hr = QueryInterface(IID_PPV_ARGS(&pVP));
}
if (SUCCEEDED(hr)) {
hr = pMFVR->InitializeRenderer(nullptr, pVP);
@@ -708,7 +708,7 @@ HRESULT CEVRAllocatorPresenter::IsMediaTypeSupported(IMFMediaType* pMixerType)
return hr;
}
-HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** pType)
+HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** ppType)
{
HRESULT hr;
AM_MEDIA_TYPE* pAMMedia = nullptr;
@@ -809,7 +809,7 @@ HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerTyp
}
pMixerType->FreeRepresentation(FORMAT_MFVideoFormat, (void*)pAMMedia);
- m_pMediaType->QueryInterface(__uuidof(IMFMediaType), (void**) pType);
+ m_pMediaType->QueryInterface(IID_PPV_ARGS(ppType));
return hr;
}
@@ -1177,7 +1177,7 @@ STDMETHODIMP CEVRAllocatorPresenter::GetCurrentMediaType(__deref_out IMFVideoMe
CHECK_HR(MF_E_NOT_INITIALIZED);
}
- CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType));
+ CHECK_HR(m_pMediaType->QueryInterface(IID_PPV_ARGS(ppMediaType)));
return hr;
}
@@ -1190,13 +1190,13 @@ STDMETHODIMP CEVRAllocatorPresenter::InitServicePointers(/* [in] */ __in IMFTop
TRACE_EVR("EVR: CEVRAllocatorPresenter::InitServicePointers\n");
hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_MIXER_SERVICE,
- __uuidof(IMFTransform), (void**)&m_pMixer, &dwObjects);
+ IID_PPV_ARGS(&m_pMixer), &dwObjects);
hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE,
- __uuidof(IMediaEventSink), (void**)&m_pSink, &dwObjects);
+ IID_PPV_ARGS(&m_pSink), &dwObjects);
hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE,
- __uuidof(IMFClock), (void**)&m_pClock, &dwObjects);
+ IID_PPV_ARGS(&m_pClock), &dwObjects);
StartWorkerThreads();
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index f2f90995d..9da695b4c 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -2487,7 +2487,7 @@ CSyncAP::CSyncAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error)
CComPtr<IDirectXVideoDecoderService> pDecoderService;
HANDLE hDevice;
if (SUCCEEDED(m_pD3DManager->OpenDeviceHandle(&hDevice)) &&
- SUCCEEDED(m_pD3DManager->GetVideoService(hDevice, __uuidof(IDirectXVideoDecoderService), (void**)&pDecoderService))) {
+ SUCCEEDED(m_pD3DManager->GetVideoService(hDevice, IID_PPV_ARGS(&pDecoderService)))) {
HookDirectXVideoDecoderService(pDecoderService);
m_pD3DManager->CloseDeviceHandle(hDevice);
}
@@ -2638,7 +2638,7 @@ STDMETHODIMP CSyncAP::CreateRenderer(IUnknown** ppRenderer)
hr = pMFGS->GetService(MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&pMFVR));
if (SUCCEEDED(hr)) {
- hr = QueryInterface(__uuidof(IMFVideoPresenter), (void**)&pVP);
+ hr = QueryInterface(IID_PPV_ARGS(&pVP));
}
if (SUCCEEDED(hr)) {
hr = pMFVR->InitializeRenderer(nullptr, pVP);
@@ -2959,7 +2959,7 @@ HRESULT CSyncAP::IsMediaTypeSupported(IMFMediaType* pMixerType)
return hr;
}
-HRESULT CSyncAP::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** pType)
+HRESULT CSyncAP::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** ppType)
{
HRESULT hr;
AM_MEDIA_TYPE* pAMMedia = nullptr;
@@ -3020,7 +3020,7 @@ HRESULT CSyncAP::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType
}
pMixerType->FreeRepresentation(FORMAT_MFVideoFormat, (void*)pAMMedia);
- m_pMediaType->QueryInterface(__uuidof(IMFMediaType), (void**) pType);
+ m_pMediaType->QueryInterface(IID_PPV_ARGS(ppType));
return hr;
}
@@ -3235,7 +3235,7 @@ STDMETHODIMP CSyncAP::GetCurrentMediaType(__deref_out IMFVideoMediaType** ppMed
CHECK_HR(MF_E_NOT_INITIALIZED);
}
- CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType));
+ CHECK_HR(m_pMediaType->QueryInterface(IID_PPV_ARGS(ppMediaType)));
return hr;
}
@@ -3244,9 +3244,9 @@ STDMETHODIMP CSyncAP::InitServicePointers(__in IMFTopologyServiceLookup* pLookup
{
HRESULT hr;
DWORD dwObjects = 1;
- hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_MIXER_SERVICE, __uuidof(IMFTransform), (void**)&m_pMixer, &dwObjects);
- hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE, __uuidof(IMediaEventSink), (void**)&m_pSink, &dwObjects);
- hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE, __uuidof(IMFClock), (void**)&m_pClock, &dwObjects);
+ hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_pMixer), &dwObjects);
+ hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_pSink), &dwObjects);
+ hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_pClock), &dwObjects);
StartWorkerThreads();
return S_OK;
}
@@ -3950,7 +3950,7 @@ HRESULT CSyncAP::BeginStreaming()
CComPtr<IBaseFilter> pEVR;
FILTER_INFO filterInfo;
ZeroMemory(&filterInfo, sizeof(filterInfo));
- m_pOuterEVR->QueryInterface(__uuidof(IBaseFilter), (void**)&pEVR);
+ m_pOuterEVR->QueryInterface(IID_PPV_ARGS(&pEVR));
pEVR->QueryFilterInfo(&filterInfo); // This addref's the pGraph member
BeginEnumFilters(filterInfo.pGraph, pEF, pBF);
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
index 0d0c6a75a..0dba763ce 100644
--- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
@@ -346,7 +346,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::PresentImage(DWORD_PTR dwUserID, VMR9Prese
CComPtr<IPin> pPin;
CMediaType mt;
- if (SUCCEEDED(m_pIVMRSurfAllocNotify->QueryInterface(__uuidof(IBaseFilter), (void**)&pVMR9)) &&
+ if (SUCCEEDED(m_pIVMRSurfAllocNotify->QueryInterface(IID_PPV_ARGS(&pVMR9))) &&
SUCCEEDED(pVMR9->FindPin(L"VMR Input0", &pPin)) &&
SUCCEEDED(pPin->ConnectionMediaType(&mt))) {
ExtractAvgTimePerFrame(&mt, m_rtTimePerFrame);
diff --git a/src/mpc-hc/FGManagerBDA.cpp b/src/mpc-hc/FGManagerBDA.cpp
index 59e1ebb71..67d0a7964 100644
--- a/src/mpc-hc/FGManagerBDA.cpp
+++ b/src/mpc-hc/FGManagerBDA.cpp
@@ -1137,15 +1137,15 @@ HRESULT CFGManagerBDA::SwitchStream(DVB_STREAM_TYPE nOldType, DVB_STREAM_TYPE nN
}
CComPtr<IPinConnection> pOldOutDynamic;
- pOldOut->QueryInterface(__uuidof(IPinConnection), (void**) &pOldOutDynamic);
+ pOldOut->QueryInterface(IID_PPV_ARGS(&pOldOutDynamic));
CComPtr<IPinConnection> pInPinDynamic;
- pInPin->QueryInterface(__uuidof(IPinConnection), (void**) &pInPinDynamic);
+ pInPin->QueryInterface(IID_PPV_ARGS(&pInPinDynamic));
CComPtr<IPinFlowControl> pOldOutControl;
if ((GetState() != State_Stopped) && pInPinDynamic && pOldOutDynamic) { // Try dynamic switch
- pOldOut->QueryInterface(__uuidof(IPinFlowControl), (void**) &pOldOutControl);
+ pOldOut->QueryInterface(IID_PPV_ARGS(&pOldOutControl));
pOldOutControl->Block(AM_PIN_FLOW_CONTROL_BLOCK, nullptr);
CComPtr<IGraphConfig> pGraph;
- QueryInterface(__uuidof(IGraphConfig), (void**) &pGraph);
+ QueryInterface(IID_PPV_ARGS(&pGraph));
hr = pGraph->Reconnect(pNewOut, pInPin, nullptr, nullptr, nullptr, AM_GRAPH_CONFIG_RECONNECT_DIRECTCONNECT);
pOldOutControl->Block(0, nullptr);
} else { // Dynamic pins not supported
@@ -1246,7 +1246,7 @@ HRESULT CFGManagerBDA::ChangeState(FILTER_STATE nRequested)
OAFilterState nState = nRequested + 1;
CComPtr<IMediaControl> pMC;
- QueryInterface(__uuidof(IMediaControl), (void**) &pMC);
+ QueryInterface(IID_PPV_ARGS(&pMC));
pMC->GetState(500, &nState);
if (nState != nRequested) {
switch (nRequested) {
@@ -1277,7 +1277,7 @@ FILTER_STATE CFGManagerBDA::GetState()
{
CComPtr<IMediaControl> pMC;
OAFilterState nState;
- QueryInterface(__uuidof(IMediaControl), (void**) &pMC);
+ QueryInterface(IID_PPV_ARGS(&pMC));
pMC->GetState(500, &nState);
return (FILTER_STATE) nState;
diff --git a/src/mpc-hc/FakeFilterMapper2.cpp b/src/mpc-hc/FakeFilterMapper2.cpp
index c20a5a92e..3dfebd3e8 100644
--- a/src/mpc-hc/FakeFilterMapper2.cpp
+++ b/src/mpc-hc/FakeFilterMapper2.cpp
@@ -268,7 +268,7 @@ HRESULT WINAPI Mine_CoCreateInstance(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter,
CComPtr<IUnknown> pUnk = (IUnknown*)(INonDelegatingUnknown*)pMK;
CComPtr<IUnknown> pInner;
- if (SUCCEEDED(Real_CoCreateInstance(rclsid, pUnk, dwClsContext, __uuidof(IUnknown), (void**)&pInner))) {
+ if (SUCCEEDED(Real_CoCreateInstance(rclsid, pUnk, dwClsContext, IID_PPV_ARGS(&pInner)))) {
pMK->SetInner(pInner);
return pUnk->QueryInterface(riid, ppv);
}
@@ -571,7 +571,7 @@ CFilterMapper2::CFilterMapper2(bool fRefCounted, bool fAllowUnreg, LPUNKNOWN pUn
HRESULT hr = Real_CoCreateInstance(
CLSID_FilterMapper2, (IUnknown*)(INonDelegatingUnknown*)this, CLSCTX_ALL,
- __uuidof(IUnknown), (void**)&m_pFM2);
+ IID_PPV_ARGS(&m_pFM2));
if (FAILED(hr) || !m_pFM2) {
ASSERT(0);
return;
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
index 2d39e7011..63d332402 100644
--- a/src/mpc-hc/MainFrm.cpp
+++ b/src/mpc-hc/MainFrm.cpp
@@ -11932,12 +11932,12 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD)
m_pCAP2 = nullptr;
m_pCAP = nullptr;
- m_pGB->FindInterface(__uuidof(ISubPicAllocatorPresenter), (void**)&m_pCAP, TRUE);
- m_pGB->FindInterface(__uuidof(ISubPicAllocatorPresenter2), (void**)&m_pCAP2, TRUE);
- m_pGB->FindInterface(__uuidof(IVMRWindowlessControl9), (void**)&m_pVMRWC, FALSE); // might have IVMRMixerBitmap9, but not IVMRWindowlessControl9
- m_pGB->FindInterface(__uuidof(IVMRMixerControl9), (void**)&m_pVMRMC, TRUE);
- m_pGB->FindInterface(__uuidof(IVMRMixerBitmap9), (void**)&pVMB, TRUE);
- m_pGB->FindInterface(__uuidof(IMFVideoMixerBitmap), (void**)&pMFVMB, TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pCAP), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pCAP2), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pVMRWC), FALSE); // might have IVMRMixerBitmap9, but not IVMRWindowlessControl9
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pVMRMC), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&pVMB), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&pMFVMB), TRUE);
pMVTO = m_pCAP;
if (s.fShowOSD || s.fShowDebugInfo) { // Force OSD on when the debug switch is used
@@ -11953,8 +11953,8 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD)
SetupVMR9ColorControl();
// === EVR !
- m_pGB->FindInterface(__uuidof(IMFVideoDisplayControl), (void**)&m_pMFVDC, TRUE);
- m_pGB->FindInterface(__uuidof(IMFVideoProcessor), (void**)&m_pMFVP, TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pMFVDC), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pMFVP), TRUE);
if (m_pMFVDC) {
m_pMFVDC->SetVideoWindow(m_pVideoWnd->m_hWnd);
}
@@ -14448,8 +14448,8 @@ bool CMainFrame::BuildGraphVideoAudio(int fVPreview, bool fVCapture, int fAPrevi
m_pCAP = nullptr;
m_pCAP2 = nullptr;
m_pGB->Render(pVidPrevPin);
- m_pGB->FindInterface(__uuidof(ISubPicAllocatorPresenter), (void**)&m_pCAP, TRUE);
- m_pGB->FindInterface(__uuidof(ISubPicAllocatorPresenter2), (void**)&m_pCAP2, TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pCAP), TRUE);
+ m_pGB->FindInterface(IID_PPV_ARGS(&m_pCAP2), TRUE);
}
if (fVidCap) {
diff --git a/src/mpc-hc/PlayerCaptureDialog.cpp b/src/mpc-hc/PlayerCaptureDialog.cpp
index 8e0bfed75..d22b15da7 100644
--- a/src/mpc-hc/PlayerCaptureDialog.cpp
+++ b/src/mpc-hc/PlayerCaptureDialog.cpp
@@ -109,7 +109,7 @@ static void LoadDefaultCodec(CAtlArray<Codec>& codecs, CComboBox& box, const GUI
if (DisplayName == c.DisplayName) {
box.SetCurSel(i);
if (!c.pBF) {
- c.pMoniker->BindToObject(nullptr, nullptr, __uuidof(IBaseFilter), (void**)&c.pBF);
+ c.pMoniker->BindToObject(nullptr, nullptr, IID_PPV_ARGS(&c.pBF));
}
break;
}
@@ -489,7 +489,7 @@ static int ShowPPage(CAtlArray<Codec>& codecs, const CComboBox& box, HWND hWnd =
Codec& c = codecs[iSel];
if (!c.pBF) {
- c.pMoniker->BindToObject(nullptr, nullptr, __uuidof(IBaseFilter), (void**)&c.pBF);
+ c.pMoniker->BindToObject(nullptr, nullptr, IID_PPV_ARGS(&c.pBF));
}
if (CComQIPtr<ISpecifyPropertyPages> pSPP = c.pBF) {