diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp index a059e85..62785fa 100644 --- a/DirectXTex/DirectXTexMipmaps.cpp +++ b/DirectXTex/DirectXTexMipmaps.cpp @@ -178,7 +178,7 @@ HRESULT _ResizeSeparateColorAndAlpha( _In_ IWICImagingFactory* pWIC, _In_ IWICBi ScopedObject pixelFormatInfo; if ( SUCCEEDED(hr) ) { - hr = componentInfo->QueryInterface( __uuidof(IWICPixelFormatInfo), (void**)&pixelFormatInfo ); + hr = componentInfo->QueryInterface( IID_PPV_ARGS( &pixelFormatInfo ) ); } UINT bitsPerPixel = 0; @@ -474,7 +474,7 @@ static HRESULT _GenerateMipMapsUsingWIC( _In_ const Image& baseImage, _In_ DWORD return hr; ScopedObject pixelFormatInfo; - hr = componentInfo->QueryInterface( __uuidof(IWICPixelFormatInfo2), (void**)&pixelFormatInfo ); + hr = componentInfo->QueryInterface( IID_PPV_ARGS( &pixelFormatInfo ) ); if ( FAILED(hr) ) return hr; diff --git a/DirectXTex/DirectXTexResize.cpp b/DirectXTex/DirectXTexResize.cpp index 01627ef..beb457b 100644 --- a/DirectXTex/DirectXTexResize.cpp +++ b/DirectXTex/DirectXTexResize.cpp @@ -46,7 +46,7 @@ static HRESULT _PerformResizeUsingWIC( _In_ const Image& srcImage, _In_ DWORD fi return hr; ScopedObject pixelFormatInfo; - hr = componentInfo->QueryInterface( __uuidof(IWICPixelFormatInfo2), (void**)&pixelFormatInfo ); + hr = componentInfo->QueryInterface( IID_PPV_ARGS( &pixelFormatInfo ) ); if ( FAILED(hr) ) return hr; diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp index b66ee4e..1eae1c1 100644 --- a/DirectXTex/DirectXTexWIC.cpp +++ b/DirectXTex/DirectXTexWIC.cpp @@ -29,7 +29,7 @@ static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream ) { auto randomAccessStream = ref new ::Windows::Storage::Streams::InMemoryRandomAccessStream(); - return CreateStreamOverRandomAccessStream( randomAccessStream, __uuidof(IStream), reinterpret_cast( &stream ) ); + return CreateStreamOverRandomAccessStream( randomAccessStream, IID_PPV_ARGS( stream ) ); } #else @@ -47,7 +47,7 @@ if (SUCCEEDED(hr)) { - hr = CreateStreamOverRandomAccessStream( abiStream.Get(), __uuidof(IStream), reinterpret_cast( &stream ) ); + hr = CreateStreamOverRandomAccessStream( abiStream.Get(), IID_PPV_ARGS( stream ) ); } return hr; }