Release 980601
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/signal.c]
Added display of exception name.
* [loader/task.c]
Yet another attempt at fixing SwitchStackTo/SwitchStackBack.
* [memory/selector.c] [relay32/builtin32.c] [tools/build.c]
[win32/kernel32.c]
Generate an assembly stub for Win32 register functions to make
their names available at link time.
* [programs/*/Makefile.in]
Added hacks to support old resource compiler.
Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de>
* [tools/testrun]
Merge of my testscripts at home into one single perl program
(tested with perl5). Works only on Linux due to 'ps' and 'ipcs'
magic.
* [controls/menu.c]
Added some DefaultMenuItem stubs.
* [debugger/stabs.c]
Fixed stabs loading, now supports (int,int) typeinfo format used
by gcc-2.8 and egcs-1. If it still crashes, please mail me.
* [if1632/][relay32/]
Added msvideo.dll (stubs only)
Replaced some ptr by str for stringcases
Added some new stubs (VxDCall, FindCloseNotif....)
* [misc/network.c]
Some argument fixes.
* [misc/registry.c][misc/cpu.c]
Registry initialization partially rewritten and enhanced.
* [scheduler/*.c]
Some additions so we don't do kill(0,SIGUSR1) (kill processgroup
instead of targeted thread)
Added SetThreadContext.
Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [tools/wrc/*]
New resource compiler version 1.0.0 (28-May-1998)
* [Make.rules.in] [Makefile.in]
Changed and added rc rules to point to tools/wrc/wrc.
* [configure.in] [include/config.h.in]
Added check for function 'stricmp'.
* [include/resource.h]
Commented out the old resource structure to catch references.
It also includes wrc_rsc.h.
* [include/wrc_rsc.h]
New file. Definitions for the resources generated with wrc.
* [include/windows.h]
Added #ifdef RC_INVOKED to exclude stdarg.h.
Added SS_NOTIFY flag.
* [include/winnls.h]
Added SUBLANG_* definitions and corrected some defaults.
* [loader/libres.c]
Changed the sysres load functions to support wrc generated
resources.
* [resource/sysres_*.rc]
Added #include <windows.h>
* [resource/sysres.c]
Changed declarations to match wrc's output
* [resource/Makefile.in]
Changed rules to work with wrc.
* [tools/makedep.c]
Changed generation of .rc file dependencies to .s target.
Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [files/file.c][include/windows.c][relay32/kernel32.spec]
Implemented GetFileAttributesEx32A/W.
* [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec]
Added ImageList_Read and ImageList_Write stubs.
Added ImageList_AddIcon function.
Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A.
* [controls/header.c]
Fixed bitmap drawing bug.
Added full bitmap support.
* [include/commctrl.h]
Added missing header macros.
* [controls/toolbar.c][include/toolbar.h][include/commctrl.h]
[controls/commctrl.c] [relay32/comctl32.spec]
First implementation of toolbar control.
Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap.
* [controls/progress.c][controls/status.c]
Some code cleanup.
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Removed CreateStatusWindow16 and DrawStatusText16.
CreateStatusWindow is the same as CreateStatusWindow32A.
DrawStatusText is the same as DrawStatusText32A.
Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com>
* [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c]
[objects/dc.c] [graphics/x11drv/bitblt.c]
Added partial implementation of CreateDIBSection, with great thanks
to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for
contributing the bulk of the patch.
Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h]
ThunkConnect16 and related functions moved to emulator.
* [loader/ne/segment.c]
Call DllEntryPoint with correct arguments.
* [relay32/builtin32.c]
Bugfix: Relay debugging did not work for multiple processes.
* [controls/menu.c]
Bugfix: dwItemData was not set for MF_OWNERDRAW menus.
* [if1632/relay.c] [relay32/relay386.c]
Relay messages converted to use DPRINTF.
* [controls/desktop.c] [relay32/user32.spec]
Implemented PaintDesktop.
* [files/profile.c] [if1632/kernel.spec] [misc/network.c]
[misc/printdrv.c] [relay32/winspool.spec]
[win32/ordinals.c] [relay32/kernel32.spec]
Some stubs added.
* [relay32/mpr.spec]
All ordinals were off by one.
Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net>
* [misc/lstr.c] [include/casemap.h] [tools/unimap.pl]
Added Unicode case conversion routines towupper/towlower,
with mapping tables casemap.h created by tools/unimap.pl.
* [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec]
[relay32/advapi.spec]
Minimal implementation of IsTextUnicode, just enough to get
NT4 notepad to open ascii/unicode files.
* [Make.rules.in] [resources/sysres_En.rc]
Added include file dlgs.h for building resource files, so that
resources can refer to defined values (e.g. pshHelp).
* [misc/crtdll.c] [relay32/crtdll.spec]
Use towupper/towlower for 32W case conversions.
* [memory/string.c]
Use towupper for 32W case conversions.
* [ole/ole2nls.c]
Use towupper for 32W case conversions; fix mem leak; minor cleanup
* [controls/edit.c]
Added soft break flag to edit state. Print unknown action values
for WM_VSCROLL (action 190 occurs when running NT4 notepad.)
Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [files/file.c]
Care for a pathological case in SetFilePointer.
* [graphics/x11drv/xfont.c]
Handle longer Font names in LFD_ComposeLFD and try to catch errors.
* [loader/pe_image.c]
Unload Dummymodule when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [misc/registry.c]
Move a check for a special case in RegCreateKeyEx32W after the
check for existence.
Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Added some stubs, just guessing at the size of their param lists.
* [misc/registry.c]
Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey,
RegRestoreKey, and RegReplaceKey
* [programs/regtest/regtest.c]
Updated registry testing program.
Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl>
* [file/profile.c]
Added flag 'return_values' to PROFILE_GetSection.
Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu>
* [misc/shell.c] [files/directory.c]
Documentation/debugging info additions.
* [*/*.c] [include/*.h]
Moved many extern function definitions to appropriate header files.
Cleaned up a few compile warnings.
If #include "debug.h" is present, removed #include <stdio.h>.
debug.h includes stdio.h, so it is not necessary to include both.
* [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c]
[win32/*.c] [windows/*.c]
Final patch to convert fprintf statements to new debugging interface.
Some fprintfs are still left, especially in the debugger/ directory.
However, IMHO, it's not worth the effort to change the rest.
Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk>
* [windows/keyboard.c]
Correct handling of keys "`-=[]\;',./".
Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel32.spec] [win32/console.c]
Added stub for ReadConsoleOutputCharacter32A.
Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c]
Began better implementation of LCMapString32A.
Not very well tested yet, and still need improvements.
* [controls/scroll.c]
Documented functions.
Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/windows.h][misc/main.c]
Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also
include some missing SPI_ definitions.
* [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec]
Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these
should go into a new files dplayx.c? Anyone care?
* [include/winnls.h]
Added two missing flags for the CompareString32 functions.
1998-06-01 12:44:35 +02:00
|
|
|
/*
|
|
|
|
* Read a .res file and create a resource-tree
|
|
|
|
*
|
|
|
|
* Copyright 1998 Bertho A. Stultiens
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include "wrc.h"
|
|
|
|
#include "readres.h"
|
|
|
|
#include "newstruc.h"
|
|
|
|
#include "utils.h"
|
|
|
|
#include "genres.h"
|
|
|
|
|
|
|
|
struct resheader32 {
|
|
|
|
DWORD ressize; /* 0 */
|
|
|
|
DWORD hdrsize; /* 0x20 */
|
|
|
|
WORD restype1; /* 0xffff */
|
|
|
|
WORD restype2; /* 0 */
|
|
|
|
WORD resname1; /* 0xffff */
|
|
|
|
WORD resname2; /* 0 */
|
|
|
|
DWORD dversion; /* 0 */
|
|
|
|
WORD memopt; /* 0 */
|
|
|
|
WORD language; /* 0 */
|
|
|
|
DWORD version; /* 0 */
|
|
|
|
DWORD characts; /* 0 */
|
|
|
|
} emptyheader = {0, 0x20, 0xffff, 0, 0xffff, 0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
int read_data(FILE *fp, size_t size, void *buf)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
int pos = ftell(fp);
|
|
|
|
r = fread(buf, 1, size, fp);
|
|
|
|
if(r == size)
|
|
|
|
return 0;
|
|
|
|
if(r == 0 && ftell(fp) - pos > 0)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
enum res_e res_type_from_id(name_id_t *nid)
|
|
|
|
{
|
|
|
|
if(nid->type == name_str)
|
|
|
|
return res_usr;
|
|
|
|
|
|
|
|
if(nid->type != name_ord)
|
|
|
|
internal_error(__FILE__, __LINE__, "Invalid name_id descriptor %d", nid->type);
|
|
|
|
|
|
|
|
switch(nid->name.i_name)
|
|
|
|
{
|
|
|
|
case WRC_RT_CURSOR: return res_cur;
|
|
|
|
case WRC_RT_BITMAP: return res_bmp;
|
|
|
|
case WRC_RT_ICON: return res_ico;
|
|
|
|
case WRC_RT_MENU: return res_men;
|
|
|
|
case WRC_RT_DIALOG: return res_dlg;
|
|
|
|
case WRC_RT_STRING: return res_stt;
|
|
|
|
case WRC_RT_FONTDIR: return res_fntdir;
|
|
|
|
case WRC_RT_FONT: return res_fnt;
|
|
|
|
case WRC_RT_ACCELERATOR: return res_acc;
|
|
|
|
case WRC_RT_RCDATA: return res_rdt;
|
|
|
|
case WRC_RT_MESSAGETABLE: return res_msg;
|
|
|
|
case WRC_RT_GROUP_CURSOR: return res_curg;
|
|
|
|
case WRC_RT_GROUP_ICON: return res_icog;
|
|
|
|
case WRC_RT_VERSION: return res_ver;
|
1999-01-17 17:32:32 +01:00
|
|
|
case WRC_RT_TOOLBAR: return res_toolbar;
|
Release 980601
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/signal.c]
Added display of exception name.
* [loader/task.c]
Yet another attempt at fixing SwitchStackTo/SwitchStackBack.
* [memory/selector.c] [relay32/builtin32.c] [tools/build.c]
[win32/kernel32.c]
Generate an assembly stub for Win32 register functions to make
their names available at link time.
* [programs/*/Makefile.in]
Added hacks to support old resource compiler.
Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de>
* [tools/testrun]
Merge of my testscripts at home into one single perl program
(tested with perl5). Works only on Linux due to 'ps' and 'ipcs'
magic.
* [controls/menu.c]
Added some DefaultMenuItem stubs.
* [debugger/stabs.c]
Fixed stabs loading, now supports (int,int) typeinfo format used
by gcc-2.8 and egcs-1. If it still crashes, please mail me.
* [if1632/][relay32/]
Added msvideo.dll (stubs only)
Replaced some ptr by str for stringcases
Added some new stubs (VxDCall, FindCloseNotif....)
* [misc/network.c]
Some argument fixes.
* [misc/registry.c][misc/cpu.c]
Registry initialization partially rewritten and enhanced.
* [scheduler/*.c]
Some additions so we don't do kill(0,SIGUSR1) (kill processgroup
instead of targeted thread)
Added SetThreadContext.
Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [tools/wrc/*]
New resource compiler version 1.0.0 (28-May-1998)
* [Make.rules.in] [Makefile.in]
Changed and added rc rules to point to tools/wrc/wrc.
* [configure.in] [include/config.h.in]
Added check for function 'stricmp'.
* [include/resource.h]
Commented out the old resource structure to catch references.
It also includes wrc_rsc.h.
* [include/wrc_rsc.h]
New file. Definitions for the resources generated with wrc.
* [include/windows.h]
Added #ifdef RC_INVOKED to exclude stdarg.h.
Added SS_NOTIFY flag.
* [include/winnls.h]
Added SUBLANG_* definitions and corrected some defaults.
* [loader/libres.c]
Changed the sysres load functions to support wrc generated
resources.
* [resource/sysres_*.rc]
Added #include <windows.h>
* [resource/sysres.c]
Changed declarations to match wrc's output
* [resource/Makefile.in]
Changed rules to work with wrc.
* [tools/makedep.c]
Changed generation of .rc file dependencies to .s target.
Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [files/file.c][include/windows.c][relay32/kernel32.spec]
Implemented GetFileAttributesEx32A/W.
* [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec]
Added ImageList_Read and ImageList_Write stubs.
Added ImageList_AddIcon function.
Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A.
* [controls/header.c]
Fixed bitmap drawing bug.
Added full bitmap support.
* [include/commctrl.h]
Added missing header macros.
* [controls/toolbar.c][include/toolbar.h][include/commctrl.h]
[controls/commctrl.c] [relay32/comctl32.spec]
First implementation of toolbar control.
Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap.
* [controls/progress.c][controls/status.c]
Some code cleanup.
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Removed CreateStatusWindow16 and DrawStatusText16.
CreateStatusWindow is the same as CreateStatusWindow32A.
DrawStatusText is the same as DrawStatusText32A.
Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com>
* [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c]
[objects/dc.c] [graphics/x11drv/bitblt.c]
Added partial implementation of CreateDIBSection, with great thanks
to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for
contributing the bulk of the patch.
Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h]
ThunkConnect16 and related functions moved to emulator.
* [loader/ne/segment.c]
Call DllEntryPoint with correct arguments.
* [relay32/builtin32.c]
Bugfix: Relay debugging did not work for multiple processes.
* [controls/menu.c]
Bugfix: dwItemData was not set for MF_OWNERDRAW menus.
* [if1632/relay.c] [relay32/relay386.c]
Relay messages converted to use DPRINTF.
* [controls/desktop.c] [relay32/user32.spec]
Implemented PaintDesktop.
* [files/profile.c] [if1632/kernel.spec] [misc/network.c]
[misc/printdrv.c] [relay32/winspool.spec]
[win32/ordinals.c] [relay32/kernel32.spec]
Some stubs added.
* [relay32/mpr.spec]
All ordinals were off by one.
Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net>
* [misc/lstr.c] [include/casemap.h] [tools/unimap.pl]
Added Unicode case conversion routines towupper/towlower,
with mapping tables casemap.h created by tools/unimap.pl.
* [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec]
[relay32/advapi.spec]
Minimal implementation of IsTextUnicode, just enough to get
NT4 notepad to open ascii/unicode files.
* [Make.rules.in] [resources/sysres_En.rc]
Added include file dlgs.h for building resource files, so that
resources can refer to defined values (e.g. pshHelp).
* [misc/crtdll.c] [relay32/crtdll.spec]
Use towupper/towlower for 32W case conversions.
* [memory/string.c]
Use towupper for 32W case conversions.
* [ole/ole2nls.c]
Use towupper for 32W case conversions; fix mem leak; minor cleanup
* [controls/edit.c]
Added soft break flag to edit state. Print unknown action values
for WM_VSCROLL (action 190 occurs when running NT4 notepad.)
Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [files/file.c]
Care for a pathological case in SetFilePointer.
* [graphics/x11drv/xfont.c]
Handle longer Font names in LFD_ComposeLFD and try to catch errors.
* [loader/pe_image.c]
Unload Dummymodule when PE_LoadLibraryEx32A fails with
PE_LoadImage (makes Encarta 98 installer proceed).
* [misc/registry.c]
Move a check for a special case in RegCreateKeyEx32W after the
check for existence.
Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Added some stubs, just guessing at the size of their param lists.
* [misc/registry.c]
Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey,
RegRestoreKey, and RegReplaceKey
* [programs/regtest/regtest.c]
Updated registry testing program.
Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl>
* [file/profile.c]
Added flag 'return_values' to PROFILE_GetSection.
Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu>
* [misc/shell.c] [files/directory.c]
Documentation/debugging info additions.
* [*/*.c] [include/*.h]
Moved many extern function definitions to appropriate header files.
Cleaned up a few compile warnings.
If #include "debug.h" is present, removed #include <stdio.h>.
debug.h includes stdio.h, so it is not necessary to include both.
* [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c]
[win32/*.c] [windows/*.c]
Final patch to convert fprintf statements to new debugging interface.
Some fprintfs are still left, especially in the debugger/ directory.
However, IMHO, it's not worth the effort to change the rest.
Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk>
* [windows/keyboard.c]
Correct handling of keys "`-=[]\;',./".
Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel32.spec] [win32/console.c]
Added stub for ReadConsoleOutputCharacter32A.
Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c]
Began better implementation of LCMapString32A.
Not very well tested yet, and still need improvements.
* [controls/scroll.c]
Documented functions.
Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca>
* [include/windows.h][misc/main.c]
Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also
include some missing SPI_ definitions.
* [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec]
Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these
should go into a new files dplayx.c? Anyone care?
* [include/winnls.h]
Added two missing flags for the CompareString32 functions.
1998-06-01 12:44:35 +02:00
|
|
|
|
|
|
|
default:
|
|
|
|
case WRC_RT_DLGINCLUDE:
|
|
|
|
case WRC_RT_PLUGPLAY:
|
|
|
|
case WRC_RT_VXD:
|
|
|
|
case WRC_RT_ANICURSOR:
|
|
|
|
case WRC_RT_ANIICON:
|
|
|
|
warning("Cannot be sure of resource type, using usertype settings");
|
|
|
|
return res_usr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
#define get_word(idx) (*((WORD *)(&res->data[idx])))
|
|
|
|
#define get_dword(idx) (*((DWORD *)(&res->data[idx])))
|
|
|
|
|
|
|
|
resource_t *read_res32(FILE *fp)
|
|
|
|
{
|
|
|
|
static char wrong_format[] = "Wrong resfile format (32bit)";
|
|
|
|
DWORD ressize;
|
|
|
|
DWORD hdrsize;
|
|
|
|
DWORD totsize;
|
|
|
|
WORD memopt;
|
|
|
|
WORD language;
|
|
|
|
int err;
|
|
|
|
res_t *res;
|
|
|
|
resource_t *rsc;
|
|
|
|
resource_t *tail = NULL;
|
|
|
|
resource_t *list = NULL;
|
|
|
|
name_id_t *type = NULL;
|
|
|
|
name_id_t *name = NULL;
|
|
|
|
int idx;
|
|
|
|
enum res_e res_type;
|
|
|
|
user_t *usrres;
|
|
|
|
|
|
|
|
while(1)
|
|
|
|
{
|
|
|
|
/* Get headersize and resource size */
|
|
|
|
err = read_data(fp, sizeof(ressize), &ressize);
|
|
|
|
if(err < 0)
|
|
|
|
break;
|
|
|
|
else if(err > 0)
|
|
|
|
error(wrong_format);
|
|
|
|
err = read_data(fp, sizeof(hdrsize), &hdrsize);
|
|
|
|
if(err)
|
|
|
|
error(wrong_format);
|
|
|
|
|
|
|
|
/* Align sizes and compute total size */
|
|
|
|
totsize = hdrsize;
|
|
|
|
if(hdrsize & 3)
|
|
|
|
{
|
|
|
|
warning("Hu? .res header needed alignment (anything can happen now)");
|
|
|
|
totsize += 4 - (hdrsize & 3);
|
|
|
|
}
|
|
|
|
totsize += ressize;
|
|
|
|
if(ressize & 3)
|
|
|
|
totsize += 4 - (ressize & 3);
|
|
|
|
|
|
|
|
/* Read in entire data-block */
|
|
|
|
fseek(fp, -8, SEEK_CUR);
|
|
|
|
res = new_res();
|
|
|
|
if(res->allocsize < totsize)
|
|
|
|
grow_res(res, totsize - res->allocsize + 8);
|
|
|
|
err = read_data(fp, totsize, res->data);
|
|
|
|
if(err)
|
|
|
|
error(wrong_format);
|
|
|
|
|
|
|
|
res->dataidx = hdrsize;
|
|
|
|
res->size = hdrsize + ressize;
|
|
|
|
|
|
|
|
/* Analyse the content of the header */
|
|
|
|
idx = 8;
|
|
|
|
/* Get restype */
|
|
|
|
if(get_word(idx) == 0xffff)
|
|
|
|
{
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
type = new_name_id();
|
|
|
|
type->type = name_ord;
|
|
|
|
type->name.i_name = get_word(idx);
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
}
|
|
|
|
else if(get_word(idx) == 0)
|
|
|
|
{
|
|
|
|
error("ResType name has zero length (32 bit)");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int tag = idx;
|
|
|
|
string_t *str;
|
|
|
|
while(1)
|
|
|
|
{
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
if(!get_word(idx))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
str = new_string();
|
|
|
|
str->type = str_unicode;
|
|
|
|
str->size = (idx - tag) / 2;
|
|
|
|
str->str.wstr = (short *)xmalloc(idx-tag+2);
|
|
|
|
memcpy(str->str.wstr, &res->data[tag], idx-tag);
|
|
|
|
str->str.wstr[str->size] = 0;
|
|
|
|
type = new_name_id();
|
|
|
|
type->type = name_str;
|
|
|
|
type->name.s_name = str;
|
|
|
|
}
|
|
|
|
/* Get resname */
|
|
|
|
if(get_word(idx) == 0xffff)
|
|
|
|
{
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
name = new_name_id();
|
|
|
|
name->type = name_ord;
|
|
|
|
name->name.i_name = get_word(idx);
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
}
|
|
|
|
else if(get_word(idx) == 0)
|
|
|
|
{
|
|
|
|
error("ResName name has zero length (32 bit)");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int tag = idx;
|
|
|
|
string_t *str;
|
|
|
|
while(1)
|
|
|
|
{
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
if(!get_word(idx))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
str = new_string();
|
|
|
|
str->type = str_unicode;
|
|
|
|
str->size = (idx - tag) / 2;
|
|
|
|
str->str.wstr = (short *)xmalloc(idx-tag+2);
|
|
|
|
memcpy(str->str.wstr, &res->data[tag], idx-tag);
|
|
|
|
str->str.wstr[str->size] = 0;
|
|
|
|
name = new_name_id();
|
|
|
|
name->type = name_str;
|
|
|
|
name->name.s_name = str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* align */
|
|
|
|
if(idx & 0x3)
|
|
|
|
idx += 4 - (idx & 3);
|
|
|
|
|
|
|
|
idx += sizeof(DWORD); /* Skip DataVersion */
|
|
|
|
memopt = get_word(idx);
|
|
|
|
idx += sizeof(WORD);
|
|
|
|
language = get_word(idx);
|
|
|
|
|
|
|
|
/* Build a resource_t list */
|
|
|
|
res_type = res_type_from_id(type);
|
|
|
|
if(res_type == res_usr)
|
|
|
|
{
|
|
|
|
/* User-type has custom ResType for .[s|h] generation */
|
|
|
|
usrres = new_user(type, NULL, new_int(memopt));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
usrres = NULL;
|
|
|
|
rsc = new_resource(res_type,
|
|
|
|
usrres,
|
|
|
|
memopt,
|
|
|
|
new_language(PRIMARYLANGID(language),
|
|
|
|
SUBLANGID(language)));
|
|
|
|
rsc->binres = res;
|
|
|
|
rsc->name = name;
|
|
|
|
rsc->c_name = make_c_name(get_c_typename(res_type), name, rsc->lan);
|
|
|
|
if(!list)
|
|
|
|
{
|
|
|
|
list = rsc;
|
|
|
|
tail = rsc;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rsc->prev = tail;
|
|
|
|
tail->next = rsc;
|
|
|
|
tail = rsc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function :
|
|
|
|
* Syntax :
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
resource_t *read_res16(FILE *fp)
|
|
|
|
{
|
|
|
|
internal_error(__FILE__, __LINE__, "Can't yet read 16 bit .res files");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
* Function : read_resfile
|
|
|
|
* Syntax : resource_t *read_resfile(char *inname)
|
|
|
|
* Input :
|
|
|
|
* Output :
|
|
|
|
* Description :
|
|
|
|
* Remarks :
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
resource_t *read_resfile(char *inname)
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
struct resheader32 rh;
|
|
|
|
int is32bit;
|
|
|
|
resource_t *top;
|
|
|
|
|
|
|
|
fp = fopen(inname, "rb");
|
|
|
|
if(!fp)
|
|
|
|
error("Could not open inputfile %s", inname);
|
|
|
|
|
|
|
|
/* Determine 16 or 32 bit .res file */
|
|
|
|
if(fread(&rh, 1, sizeof(rh), fp) != sizeof(rh))
|
|
|
|
is32bit = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(!memcmp(&emptyheader, &rh, sizeof(rh)))
|
|
|
|
is32bit = 1;
|
|
|
|
else
|
|
|
|
is32bit = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(is32bit && !win32)
|
|
|
|
error("Cannot convert 32-bit .res-file into 16-bit resources (and will, hopefully never, implement it)");
|
|
|
|
|
|
|
|
if(!is32bit && win32)
|
|
|
|
error("Cannot (yet) convert 16-bit .res-file into 32-bit resources");
|
|
|
|
|
|
|
|
if(!is32bit)
|
|
|
|
{
|
|
|
|
fseek(fp, 0, SEEK_SET);
|
|
|
|
top = read_res16(fp);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
top = read_res32(fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
return top;
|
|
|
|
}
|