m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed struct packing everywhere, except RGB 24bit struct (and thus 768-byte palettes). This might fix some issue on Caanoo, where either the packing didn't work (and the struct had wrong size) or it worked and caused unaligned reads/writes.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1639 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2010-10-26 22:51:07 +00:00
parent e5272e74f7
commit fba72c9ebd
5 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/init.c
View File

@@ -1824,7 +1824,7 @@ int Load_CFG(int reload_all)
if ((Handle=fopen(filename,"rb"))==NULL)
return ERROR_CFG_MISSING;
if ( (file_size<(long)sizeof(cfg_header))
if ( (file_size<7)
|| (!Read_bytes(Handle, &cfg_header.Signature, 3))
|| memcmp(cfg_header.Signature,"CFG",3)
|| (!Read_byte(Handle, &cfg_header.Version1))
@@ -1865,7 +1865,7 @@ int Load_CFG(int reload_all)
case CHUNK_KEYS: // Touches
if (reload_all)
{
for (index=0; index<(long)(Chunk.Size/sizeof(cfg_shortcut_info)); index++)
for (index=0; index<(long)(Chunk.Size/6); index++)
{
if (!Read_word_le(Handle, &cfg_shortcut_info.Number) ||
!Read_word_le(Handle, &cfg_shortcut_info.Key) ||
@@ -1918,7 +1918,7 @@ int Load_CFG(int reload_all)
}
break;
case CHUNK_VIDEO_MODES: // Modes vidéo
for (index=0; index<(long)(Chunk.Size/sizeof(cfg_video_mode)); index++)
for (index=0; index<(long)(Chunk.Size/5); index++)
{
if (!Read_byte(Handle, &cfg_video_mode.State) ||
!Read_word_le(Handle, &cfg_video_mode.Width) ||