diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp index 33fab51..4a051e4 100644 --- a/DirectXTex/DirectXTexUtil.cpp +++ b/DirectXTex/DirectXTexUtil.cpp @@ -181,47 +181,7 @@ IWICImagingFactory* _GetWIC() if ( s_Factory ) return s_Factory; -#ifdef WIC_USE_FACTORY_PROXY - HINSTANCE hInst = LoadLibraryEx( TEXT("WindowsCodecs.dll"), nullptr, 0 ); - if ( !hInst ) - return nullptr; - - typedef HRESULT (WINAPI *WICCREATEFACTORY)(UINT, IWICImagingFactory**); - WICCREATEFACTORY pFactory = (WICCREATEFACTORY) GetProcAddress(hInst, "WICCreateImagingFactory_Proxy"); - if ( !pFactory ) - { - FreeLibrary( hInst ); - return nullptr; - } - #if(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) - HRESULT hr = pFactory( WINCODEC_SDK_VERSION2, &s_Factory ); - if ( SUCCEEDED(hr) ) - { - // WIC2 is available on Windows 8 and Windows 7 SP1 with KB 2670838 installed - g_WIC2 = true; - } - else - { - hr = pFactory( WINCODEC_SDK_VERSION1, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } - } -#else - HRESULT hr = pFactory( WINCODEC_SDK_VERSION, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } -#endif - -#elif(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory2, nullptr, diff --git a/ScreenGrab/ScreenGrab.cpp b/ScreenGrab/ScreenGrab.cpp index 06c39e0..29f0af4 100644 --- a/ScreenGrab/ScreenGrab.cpp +++ b/ScreenGrab/ScreenGrab.cpp @@ -633,47 +633,7 @@ static IWICImagingFactory* _GetWIC() if ( s_Factory ) return s_Factory; -#ifdef WIC_USE_FACTORY_PROXY - HINSTANCE hInst = LoadLibraryEx( TEXT("WindowsCodecs.dll"), nullptr, 0 ); - if ( !hInst ) - return nullptr; - - typedef HRESULT (WINAPI *WICCREATEFACTORY)(UINT, IWICImagingFactory**); - WICCREATEFACTORY pFactory = (WICCREATEFACTORY) GetProcAddress(hInst, "WICCreateImagingFactory_Proxy"); - if ( !pFactory ) - { - FreeLibrary( hInst ); - return nullptr; - } - #if(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) - HRESULT hr = pFactory( WINCODEC_SDK_VERSION2, &s_Factory ); - if ( SUCCEEDED(hr) ) - { - // WIC2 is available on Windows 8 and Windows 7 SP1 with KB 2670838 installed - g_WIC2 = true; - } - else - { - hr = pFactory( WINCODEC_SDK_VERSION1, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } - } -#else - HRESULT hr = pFactory( WINCODEC_SDK_VERSION, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } -#endif - -#elif(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory2, nullptr, diff --git a/WICTextureLoader/WICTextureLoader.cpp b/WICTextureLoader/WICTextureLoader.cpp index fd01db0..4d11366 100644 --- a/WICTextureLoader/WICTextureLoader.cpp +++ b/WICTextureLoader/WICTextureLoader.cpp @@ -217,47 +217,7 @@ static IWICImagingFactory* _GetWIC() if ( s_Factory ) return s_Factory; -#ifdef WIC_USE_FACTORY_PROXY - HINSTANCE hInst = LoadLibraryEx( TEXT("WindowsCodecs.dll"), nullptr, 0 ); - if ( !hInst ) - return nullptr; - - typedef HRESULT (WINAPI *WICCREATEFACTORY)(UINT, IWICImagingFactory**); - WICCREATEFACTORY pFactory = (WICCREATEFACTORY) GetProcAddress(hInst, "WICCreateImagingFactory_Proxy"); - if ( !pFactory ) - { - FreeLibrary( hInst ); - return nullptr; - } - #if(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) - HRESULT hr = pFactory( WINCODEC_SDK_VERSION2, &s_Factory ); - if ( SUCCEEDED(hr) ) - { - // WIC2 is available on Windows 8 and Windows 7 SP1 with KB 2670838 installed - g_WIC2 = true; - } - else - { - hr = pFactory( WINCODEC_SDK_VERSION1, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } - } -#else - HRESULT hr = pFactory( WINCODEC_SDK_VERSION, &s_Factory ); - if ( FAILED(hr) ) - { - FreeLibrary( hInst ); - s_Factory = nullptr; - return nullptr; - } -#endif - -#elif(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory2, nullptr,