Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 19:50:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIC_USE_FACTORY_PROXY workaround no longer needed.

Browse Source
This commit is contained in:
walbourn_cp 2013-06-18 14:18:07 -07:00
parent fb6f5aac2e
commit 72c9103b1d
3 changed files with 0 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
DirectXTex/DirectXTexUtil.cpp
View File

@ -181,47 +181,7 @@ IWICImagingFactory* _GetWIC()
if ( s_Factory ) if ( s_Factory )
return 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) #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( HRESULT hr = CoCreateInstance(
CLSID_WICImagingFactory2, CLSID_WICImagingFactory2,
nullptr, nullptr,

40
ScreenGrab/ScreenGrab.cpp
View File

@ -633,47 +633,7 @@ static IWICImagingFactory* _GetWIC()
if ( s_Factory ) if ( s_Factory )
return 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) #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( HRESULT hr = CoCreateInstance(
CLSID_WICImagingFactory2, CLSID_WICImagingFactory2,
nullptr, nullptr,

40
WICTextureLoader/WICTextureLoader.cpp
View File

@ -217,47 +217,7 @@ static IWICImagingFactory* _GetWIC()
if ( s_Factory ) if ( s_Factory )
return 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) #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( HRESULT hr = CoCreateInstance(
CLSID_WICImagingFactory2, CLSID_WICImagingFactory2,
nullptr, nullptr,