wine/tools/wrc/wrctypes.h
Alexandre Julliard ebfc0fee51 Release 980628
Sun Jun 28 18:37:02 1998  Alexandre Julliard  <julliard@lrc.epfl.ch>

	* [if1632/signal.c] [miscemu/instr.c] [memory/virtual.c]
	Moved page-fault handling to INSTR_EmulateInstruction.

	* [scheduler/thread.c]
	Added locking and check for own thread in Suspend/ResumeThread.

Sat Jun 27 21:25:21 1998  Ulrich Weigand <weigand@informatik.uni-erlangen.de>

	* [objects/dib.c] [objects/bitmap.c] [objects/oembitmap.c] 
	  [graphics/x11drv/bitblt.c] [include/bitmap.h]
	Improved DIB section handling using page fault handlers.
	(Note: This patch includes code contributed by Matthew J. Francis.)

	* [memory/virtual.c] [if1632/signal.c] [include/global.h]
	Page Fault handler support added.

	* [if1632/signal.c] [loader/signal.c] [tools/build.c] [misc/system.c]
	  [misc/winsock_dns.c] [include/sig_context.h] [include/thread.h]
	16-bit %fs handling improved: Always preserve 16-bit %fs value,
	always restore 32-bit %fs value for signal handlers.

	* [if1632/thunk.c] [loader/module.c] [misc/callback.c] [windows/user.c]
	  [loader/ne/resource.c] [include/callback.h] [include/module.h]
	  [if1632/kernel.spec] [if1632/wprocs.spec]
	Resource Handler function pointer stored as 16-bit SEGPTR.

	* [loader/task.c] [windows/win.c] [windows/winpos.c] [if1632/user.spec]
	  [if1632/kernel.spec] [loader/ne/module.c]
	Some minor incompatibilities fixed (Win32s relies on those):
	GetExePtr, IsWindow16 should set ES on return; WINPOS_SendNCCalcSize
	should cope with having the WINDOWPOS structure trashed;
	the OFSTRUCT in the NE module image should be placed *last*.

	* [include/windows.h]
	Missing prototype for FlushViewOfFile.

	* [loader/task.c]
	Bugfix: Command line should *not* start with a blank.
	
	* [loader/ne/segment.c]
	Bugfix: Fixups to offset 0 were never applied.

	* [misc/lstr.c]
	Use debugstr_a in OutputDebugString16.

	* [msdos/dpmi.c]
	Stub for int 31 BL=2f AX=7a20 (NetWare: Get VLM Call Address) added.

	* [msdos/int21.c]
	Stub for int 21 AX=440d CL=6f (get drive map information) added.

Fri Jun 26 18:08:30 1998  Rein Klazes <rklazes@casema.net>

	* [windows/winpos.c]
	Fix small buglet that mixed up maximized and minimized windows.

	* [include/x11drv.h] [objects/dc.c] [graphics/x11drv/pen.c]
	  [graphics/x11drv/graphics.c]
	Fix some bugs with lines joining styles. Draws rectangles
	with thick pens now correctly.

Fri Jun 26 16:22:23 1998  James Juran <jrj120@psu.edu>

	* [misc/shell.c]
	Fixed bug I introduced last release in InternalExtractIcon.

	* [win32/file.c]
	Added documentation for CreateFile32A.

	* [documentation/wine.man]
	Updated manpage.	

	* [ChangeLog]
	Added my entry from last release.

Fri Jun 26 13:33:30 1998  Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>

	* [graphics/psdrv/*] [if1632/wineps.spec] [include/psdrv.h]
	  [include/print.h] [objects/gdiobj.c]
	First stages of an internal Postscript driver. See
	graphics/psdrv/README . Should print text (badly) from win3.1 notepad,
	write and winword6.

	* [documentation/printing]
	Some notes on printing.

	* [controls/edit.c]
	Strip off WS_BORDER in WM_NCREATE, edit draws its own rectangle.
	EC_USEFONTINFO seems to be used as a left/right value for EM_SETMARGINS
	and not as an action as the docs say. This actually makes more sense.
	Scroll the caret back to zero after a WM_SETTEXT.

Fri Jun 26 10:56:25 1998  Marcus Meissner <marcus@jet.franken.de>

	* [if1632/snoop.c]
	Added win16 inter-dll snooping.

	* [win32/ordinals.c]
	KERNEL_485 is GetProcessDword.

	* [include/xmalloc.h][include/bitmap.h][misc/xmalloc.c]
	Added xcalloc so we 0 initialize XImages. 
	Fixes/Hides the 'junk around MOPYFish'.

	* [misc/ntdll.c]
	Some stubs added.

Thu Jun 25 15:22:43 1998  Adrian Harvey <adrian@select.com.au>

	* [scheduler/thread.c] 
	Implemented SuspendThread and ResumeThread.

Thu Jun 25 00:55:03 1998  Peter Hunnisett <hunnise@nortel.ca>

	* [include/debug.h,dplay.h,dsound.h][multimedia/dsound.c,dplay.c]
	  [relay32/dplayx.spec,dplay.spec][multimedia/Makefile.in]
	  [documentation/status/directplay]
	Added preliminary support for DirectPlay & DirectPlayLobby. Moved the
	preliminary stubs put in the dsound files into two new files
	dplay.h and dplay.c.
	Added new debug channel (dplay) for this.
	Created new document to keep track of implementation.

	* [include/winioctl.h][win32/device.c]
	Added some framework in DeviceIoControl to, in the future, support
	the "builtin" windows dwIoControlCodes. Added new header file
	winioctl.h . 

	* [multimedia/mmsystem.c]
	Added slightly improved debugging information for PlaySound.

Wed Jun 24 12:00:00 1998  Juergen Schmied <juergen.schmied@metronet.de> 

	* [files/profile.c][graphics/x11drv/xfont.c][loader/module.c]
	Changed lstrcmpi32A to strcasecmp, lstrncmpi32A to strncasecmp,
	lstrcpy32A to strcpy, lstrlen32A to strlen, lstrcmp32A to strcmp
	because it's not necessary to support locale on such places.
	It causes a huge overhead and even fails sometimes 

	* [include/oleauto.h][include/winerror.h]
	Added some ole-related constants.

	* [misc/shell.c]
	SHELL32_DllGetClassObject, SHGetSpecialFolderLocation,
	SHGetPathFromIDList improved the stubs

	* [ole/folders.c]
	IShellFolder* functions rewrote the stubs so don't crash and give
	something sensible back, started implementation of.

	* [ole/typelib.c][relay32/oleaut32.spec]
	LoadTypeLib32, RegisterTypeLib stub.

	* [ole/ole2nls.c]
	Fixed a buffer overrun in CompareString32A.
	Test for a bad pointer in LCMapString32A (happens
	in winhlp32 while building a index for searching). 

	* [relay32/oleaut32.spec] [ole/typelib.c]
	Added stub for LoadTypeLib (ole32) to make excel95 happy.

Tue Jun 23 22:47:09 1998  Alex Priem <alexp@sci.kun.nl>

	* [files/profile.c] [relay32/kernel32.spec]
	Added WritePrivateProfileStructA, GetPrivateProfileStructA,
	GetPrivateProfileSectionNames16.

Tue Jun 23 01:34:43 1998  Pascal Cuoq <pcuoq@ens-lyon.fr>

	* [ole/ole2nls.c]
	GetStringTypeEx32A: Implemented CT_CTYPE2 and CT_CTYPE3 cases.
	LCMapString32A: Map final '\0' for '\0'-terminated strings.

	* [misc/shellord.c] [files/profile.c] [graphics/driver.c] 
	  [loader/module.c] [msdos/int21.c] [windows/driver.c] [files/drive.c]
	Changed lstrcmpi32A -> strcasecmp.  Should be OK in these places.

Sat Jun 20 23:40:00 1998  Bertho Stultiens <bertho@akhphd.au.dk>

	* [tools/wrc/]
	Wrc version 1.0.2 (20-Jun-1998). Please revert to 
	the file tools/wrc/CHANGES for details.

Sat Jun 20 14:58:00 1998  Marcel Baur  <mbaur@g26.ethz.ch>

	* [ole/ole2nls.c] [ole/nls/*]
	Added the first 57 nls files, most are not yet complete.

Wed Jun 17 11:16:54 1998  David Luyer <luyer@ucs.uwa.edu.au>

	* [relay32/relay386.c] [if1632/relay.c]
	Move debug_relay_(include|exclude)_list handling into
	seperate function RELAY_ShowDebugmsgsRelay().  Include
	checking of this for 16 bit calls (originally only
	32-bit calls).

	* [relay32/snoop.c] [misc/main.c]
	Add debug_snoop_(include|exclude)_list as per the relay stuff.
	Fix typo and add information on -debugmsg +/-relay=... in
	help on -debugmsg.  Refer to availability of snoop too.

Tue Jun 10 22:00:18 1998  Eric Kohl <ekohl@abo.rhein-zeitung.de>

	* [controls/header.c][include/header.h][include/commctrl.h]
	Added owner draw support.

	* [windows/nonclient.c][windows/sysmetics.c]
	Fixed menu bar height for Win95 look.
	Split NC_AdjustRect95() into NC_AdjustRectOuter95() and
	NC_AdjustRectInner95 to fix a menu bar bug.
	Improved Win95 look.

	* [controls/progress.c]
	Improved drawing code. Borders will be drawn by non-client code.

	* [controls/updown.c]
	Changed memory allocation and fixed some bugs.

	* [controls/toolbar.c]
	Fixed TB_BUTTONSTRUCTSIZE bug in MFC programs.
	Several improvements.

	* [misc/shell.c]
	Added stub for BrowseForFoldersA().

	* [misc/shellord.c]
	Added stub for SHELL32_147().

	* [controls/comctl32undoc.c]
	Minor changes.

	* [documentation/common_controls]
	New File: Documentation about development status, undocumented
	features and functions of the common controls.
1998-06-28 18:40:26 +00:00

472 lines
8.9 KiB
C

/*
* General type definitions
*
* Copyright 1998 Bertho A. Stultiens (BS)
*
*/
#ifndef __WRC_WRCTYPES_H
#define __WRC_WRCTYPES_H
/* First is MS style, second wine style */
#if !defined(_INC_WINDOWS) && !defined(__WINE_WINDOWS_H)
#include "windows.h"
#endif
#ifndef MAKELANGID
#include "winnls.h"
#endif
#ifndef VS_FFI_SIGNATURE
#include "ver.h"
#endif
/* Binary resource structure */
#define RES_BLOCKSIZE 512
typedef struct res {
int allocsize; /* Allocated datablock size */
int size; /* Actual size of data */
int dataidx; /* Tag behind the resource-header */
char *data;
} res_t;
/* Resource strings are slightly more complex because they include '\0' */
enum str_e {str_char, str_unicode};
typedef struct string {
int size;
enum str_e type;
union {
char *cstr;
short *wstr;
} str;
} string_t;
/* Resources are identified either by name or by number */
enum name_e {name_str, name_ord};
typedef struct name_id {
union {
string_t *s_name;
int i_name;
} name;
enum name_e type;
} name_id_t;
/* Language definitions */
typedef struct language {
int id;
int sub;
} language_t;
typedef DWORD characts_t;
typedef DWORD version_t;
typedef struct lvc {
language_t *language;
version_t *version;
characts_t *characts;
} lvc_t;
typedef struct font_id {
string_t *name;
int size;
int weight;
int italic;
} font_id_t;
/* resource types */
/* These are in the same order (and ordinal) as the RT_xxx
* defines. This is _required_.
* I rolled my own numbers for the win32 extension that are
* documented, but generate either old RT_xxx numbers, or
* don't have an ordinal associated (user type).
* I don't know any specs for those noted such, for that matter,
* I don't even know whether they can be generated other than by
* using a user-type resource.
*/
enum res_e {
res_0 = 0,
res_cur,
res_ico,
res_bmp,
res_men,
res_dlg,
res_stt,
res_fntdir,
res_fnt,
res_acc,
res_rdt,
res_msg,
res_curg,
res_13, /* Hm, wonder why its not used... */
res_icog,
res_15,
res_ver,
res_dlginc, /* Not implemented, no layout available */
res_18,
res_pnp, /* Not implemented, no layout available */
res_vxd, /* Not implemented, no layout available */
res_anicur, /* Not implemented, no layout available */
res_aniico, /* Not implemented, no layout available */
res_menex = 256 + 4,
res_dlgex,
res_usr,
};
/* Raw bytes in a row... */
typedef struct raw_data {
int size;
char *data;
} raw_data_t;
/* Dialog structures */
typedef struct control {
struct control *next; /* List of controls */
struct control *prev;
name_id_t *ctlclass; /* ControlClass */
string_t *title; /* Title of control */
int id;
int x; /* Position */
int y;
int width; /* Size */
int height;
DWORD style; /* Style */
DWORD exstyle;
DWORD helpid; /* EX: */
int gotstyle; /* Used to determine whether the default */
int gotexstyle; /* styles must be set */
int gothelpid;
raw_data_t *extra; /* EX: number of extra bytes in resource */
} control_t;
typedef struct dialog {
DWORD memopt;
int x; /* Position */
int y;
int width; /* Size */
int height;
DWORD style; /* Style */
DWORD exstyle;
int gotstyle; /* Used to determine whether the default */
int gotexstyle; /* styles must be set */
name_id_t *menu;
name_id_t *dlgclass;
string_t *title;
font_id_t *font;
lvc_t lvc;
control_t *controls;
} dialog_t;
/* DialogEx structures */
typedef struct dialogex {
DWORD memopt;
int x; /* Position */
int y;
int width; /* Size */
int height;
DWORD style; /* Style */
DWORD exstyle;
DWORD helpid; /* EX: */
int gotstyle; /* Used to determine whether the default */
int gotexstyle; /* styles must be set */
int gothelpid;
name_id_t *menu;
name_id_t *dlgclass;
string_t *title;
font_id_t *font;
lvc_t lvc;
control_t *controls;
} dialogex_t;
/* Menu structures */
typedef struct menu_item {
struct menu_item *next;
struct menu_item *prev;
struct menu_item *popup;
int id;
DWORD state;
string_t *name;
} menu_item_t;
typedef struct menu {
DWORD memopt;
lvc_t lvc;
menu_item_t *items;
} menu_t;
/* MenuEx structures */
typedef struct menuex_item {
struct menuex_item *next;
struct menuex_item *prev;
struct menuex_item *popup;
int id;
DWORD type;
DWORD state;
int helpid;
string_t *name;
int gotid;
int gottype;
int gotstate;
int gothelpid;
} menuex_item_t;
typedef struct menuex {
DWORD memopt;
lvc_t lvc;
menuex_item_t *items;
} menuex_t;
typedef struct itemex_opt
{
int id;
DWORD type;
DWORD state;
int helpid;
int gotid;
int gottype;
int gotstate;
int gothelpid;
} itemex_opt_t;
/* RC structures for types read from file or supplied binary */
typedef struct font {
DWORD memopt;
raw_data_t *data;
} font_t;
typedef struct icon_dir_entry {
BYTE width; /* From the SDK doc. */
BYTE height;
BYTE nclr;
BYTE reserved;
WORD planes;
WORD bits;
DWORD ressize;
DWORD offset;
} icon_dir_entry_t;
typedef struct icon {
struct icon *next;
struct icon *prev;
lvc_t lvc;
int id; /* Unique icon id within resource file */
int width; /* Field from the IconDirEntry */
int height;
int nclr;
int planes;
int bits;
raw_data_t *data;
} icon_t;
typedef struct icon_group {
DWORD memopt;
lvc_t lvc;
icon_t *iconlist;
int nicon;
} icon_group_t;
typedef struct cursor_dir_entry {
BYTE width; /* From the SDK doc. */
BYTE height;
BYTE nclr;
BYTE reserved;
WORD xhot;
WORD yhot;
DWORD ressize;
DWORD offset;
} cursor_dir_entry_t;
typedef struct cursor {
struct cursor *next;
struct cursor *prev;
lvc_t lvc;
int id; /* Unique icon id within resource file */
int width; /* Field from the CursorDirEntry */
int height;
int nclr;
int planes;
int bits;
int xhot;
int yhot;
raw_data_t *data;
} cursor_t;
typedef struct cursor_group {
DWORD memopt;
lvc_t lvc;
cursor_t *cursorlist;
int ncursor;
} cursor_group_t;
typedef struct bitmap {
DWORD memopt;
raw_data_t *data;
} bitmap_t;
typedef struct rcdata {
DWORD memopt;
lvc_t lvc;
raw_data_t *data;
} rcdata_t;
typedef struct user {
DWORD memopt;
name_id_t *type;
raw_data_t *data;
} user_t;
typedef struct messagetable {
raw_data_t *data;
} messagetable_t;
/* StringTable structures */
typedef struct stt_entry {
string_t *str;
int id;
DWORD memopt;
characts_t *characts;
version_t *version;
} stt_entry_t;
typedef struct stringtable {
struct stringtable *next;
struct stringtable *prev;
DWORD memopt;
lvc_t lvc;
int idbase;
int nentries;
stt_entry_t *entries;
} stringtable_t;
/* VersionInfo structures */
enum ver_val_e {val_str, val_words, val_block};
struct ver_block; /* Forward ref */
typedef struct ver_words {
WORD *words;
int nwords;
} ver_words_t;
typedef struct ver_value {
struct ver_value *next;
struct ver_value *prev;
string_t *key;
union {
string_t *str;
ver_words_t *words;
struct ver_block *block;
} value;
enum ver_val_e type;
} ver_value_t;
typedef struct ver_block {
struct ver_block *next;
struct ver_block *prev;
string_t *name;
ver_value_t *values;
} ver_block_t;
typedef struct versioninfo {
int filever_maj1;
int filever_maj2;
int filever_min1;
int filever_min2;
int prodver_maj1;
int prodver_maj2;
int prodver_min1;
int prodver_min2;
int fileos;
int fileflags;
int fileflagsmask;
int filetype;
int filesubtype;
struct {
int fv:1;
int pv:1;
int fo:1;
int ff:1;
int ffm:1;
int ft:1;
int fst:1;
} gotit;
ver_block_t *blocks;
} versioninfo_t;
/* Accelerator structures */
#define WRC_AF_VIRTKEY 0x0001
#define WRC_AF_NOINVERT 0x0002
#define WRC_AF_SHIFT 0x0004
#define WRC_AF_CONTROL 0x0008
#define WRC_AF_ALT 0x0010
#define WRC_AF_ASCII 0x4000
typedef struct event {
struct event *next;
struct event *prev;
int flags;
int key;
int id;
} event_t;
typedef struct accelerator {
DWORD memopt;
lvc_t lvc;
event_t *events;
} accelerator_t;
/* A top-level resource node */
typedef struct resource {
struct resource *next;
struct resource *prev;
enum res_e type;
name_id_t *name; /* resource's name */
language_t *lan; /* Only used as a sorting key and c-name creation*/
union {
accelerator_t *acc;
bitmap_t *bmp;
cursor_t *cur;
cursor_group_t *curg;
dialog_t *dlg;
dialogex_t *dlgex;
font_t *fnt;
icon_t *ico;
icon_group_t *icog;
menu_t *men;
menuex_t *menex;
messagetable_t *msg;
rcdata_t *rdt;
stringtable_t *stt;
user_t *usr;
versioninfo_t *ver;
void *overlay; /* To catch all types at once... */
} res;
res_t *binres; /* To binary converted resource */
char *c_name; /* BaseName in output */
DWORD memopt;
} resource_t;
/* Resource count */
typedef struct res32_count {
int count;
resource_t **rsc;
} res32_count_t;
typedef struct res_count {
name_id_t type;
int count; /* win16 mode */
resource_t **rscarray;
int count32;
res32_count_t *rsc32array; /* win32 mode */
int n_id_entries;
int n_name_entries;
} res_count_t;
#endif