Fix image rendering on Win7

Fixes #1023 #90.

Author: ge0rdi

Src/Lib/ResourceHelper.cpp

@@ -396,8 +396,11 @@ HBITMAP LoadImageFile( const wchar_t *path, const SIZE *pSize, bool bUseAlpha, b
 	CComPtr<IWICImagingFactory> pFactory;
 	if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
 	{
-		if (srcBmp) DeleteObject(srcBmp);
-		return NULL;
+		if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory1)))
+		{
+			if (srcBmp) DeleteObject(srcBmp);
+			return NULL;
+		}
 	}
 
 	CComPtr<IWICBitmapSource> pBitmap;
@@ -534,7 +537,10 @@ HBITMAP LoadImageResource( HMODULE hModule, const wchar_t *name, bool bTopDown,
 {
 	CComPtr<IWICImagingFactory> pFactory;
 	if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
-		return NULL;
+	{
+		if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory1)))
+			return NULL;
+	}
 
 	CComPtr<IWICBitmapSource> pBitmap;
 	if (hModule)

Src/StartMenu/StartMenuDLL/ItemManager.cpp

@@ -489,7 +489,8 @@ void CItemManager::LoadIconData::Init( void )
 			HIMAGELIST_QueryInterface(m_TempLists[i],IID_IImageList2,(void**)&m_pTempLists[i]);
 		}
 	}
-	m_pFactory.CoCreateInstance(CLSID_WICImagingFactory);
+	if (FAILED(m_pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
+		m_pFactory.CoCreateInstance(CLSID_WICImagingFactory1);
 }
 
 void CItemManager::LoadIconData::Close( void )