timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-17 21:24:47 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix image rendering on Win7

Browse Source 
Fixes #1023 #90.
This commit is contained in:
ge0rdi
2022-11-19 21:44:13 +01:00
parent 9397d58986
commit f7334882c3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Lib/ResourceHelper.cpp
View File

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

3
Src/StartMenu/StartMenuDLL/ItemManager.cpp
View File

@@ -489,7 +489,8 @@ void CItemManager::LoadIconData::Init( void )
HIMAGELIST_QueryInterface(m_TempLists[i],IID_IImageList2,(void**)&m_pTempLists[i]); 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 ) void CItemManager::LoadIconData::Close( void )