Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL] CImage: Hack fix for getting filter string (#5528)

Browse source 
- Fix the crash on opening/saving file.
- To get the filename extension info from CODECs, we have to keep gdiplus.dll loaded.
- The perfect fix will take time.
CORE-19093, CORE-19094
This commit is contained in:
Katayama Hirofumi MZ 2023-08-05 21:23:21 +09:00 committed by GitHub
parent b4bc6f0a6a
commit 36a35ee203
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sdk/lib/atl/atlimage.h
View file

@ -811,6 +811,7 @@ public:
DWORD dwExclude = excludeDefaultLoad, DWORD dwExclude = excludeDefaultLoad,
TCHAR chSeparator = TEXT('|')) TCHAR chSeparator = TEXT('|'))
{ {
CImage dummy; // HACK: Initialize common
UINT cDecoders = 0; UINT cDecoders = 0;
Gdiplus::ImageCodecInfo* pDecoders = _getAllDecoders(cDecoders); Gdiplus::ImageCodecInfo* pDecoders = _getAllDecoders(cDecoders);
HRESULT hr = BuildCodecFilterString(pDecoders, HRESULT hr = BuildCodecFilterString(pDecoders,
@ -831,6 +832,7 @@ public:
DWORD dwExclude = excludeDefaultSave, DWORD dwExclude = excludeDefaultSave,
TCHAR chSeparator = TEXT('|')) TCHAR chSeparator = TEXT('|'))
{ {
CImage dummy; // HACK: Initialize common
UINT cEncoders = 0; UINT cEncoders = 0;
Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders);
HRESULT hr = BuildCodecFilterString(pEncoders, HRESULT hr = BuildCodecFilterString(pEncoders,
@ -1057,6 +1059,7 @@ protected:
// Deprecated. Don't use this // Deprecated. Don't use this
static const GUID *FileTypeFromExtension(LPCTSTR dotext) static const GUID *FileTypeFromExtension(LPCTSTR dotext)
{ {
CImage dummy; // HACK: Initialize common
UINT cEncoders = 0; UINT cEncoders = 0;
Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders);
@ -1111,6 +1114,7 @@ protected:
// Deprecated. Don't use this // Deprecated. Don't use this
static bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) static bool GetClsidFromFileType(CLSID *clsid, const GUID *guid)
{ {
CImage dummy; // HACK: Initialize common
UINT cEncoders = 0; UINT cEncoders = 0;
Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders);
*clsid = FindCodecForFileType(*guid, pEncoders, cEncoders); *clsid = FindCodecForFileType(*guid, pEncoders, cEncoders);
@ -1120,8 +1124,6 @@ protected:
static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders)
{ {
CImage image; // Initialize common
UINT total_size = 0; UINT total_size = 0;
GetCommon().GetImageEncodersSize(&cEncoders, &total_size); GetCommon().GetImageEncodersSize(&cEncoders, &total_size);
if (total_size == 0) if (total_size == 0)
@ -1141,8 +1143,6 @@ protected:
static Gdiplus::ImageCodecInfo* _getAllDecoders(UINT& cDecoders) static Gdiplus::ImageCodecInfo* _getAllDecoders(UINT& cDecoders)
{ {
CImage image; // Initialize common
UINT total_size = 0; UINT total_size = 0;
GetCommon().GetImageDecodersSize(&cDecoders, &total_size); GetCommon().GetImageDecodersSize(&cDecoders, &total_size);
if (total_size == 0) if (total_size == 0)