mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-02 15:21:54 +00:00
ebfc0fee51
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.
268 lines
9.7 KiB
Text
268 lines
9.7 KiB
Text
Release 1.0.2 of wrc (20-Jun-1998), the wine resource compiler.
|
|
|
|
See the file CHANGES for differences between the version and what has been
|
|
corrected in the current version.
|
|
|
|
Wrc features:
|
|
|
|
- source preprocessing
|
|
- 16 and 32 bit support
|
|
- LANGUAGE support (32 bit only)
|
|
- almost all resource types are supported
|
|
- enhanced expression capabilities and resource naming
|
|
- indirect loadable resources
|
|
- NE/PE resource directory generation
|
|
- binary .res file generation/reading
|
|
|
|
Wrc generates an assembly file that can be assembled with GNU's gas, or
|
|
passed to gcc. The assembly became necessary for two reasons. First, C does
|
|
not ensure relative position of declared data. Secondly, C complaints about
|
|
complex initialization schemes that became necessary with the NE/PE
|
|
directory generation.
|
|
|
|
|
|
Wrc command-line
|
|
----------------
|
|
You can get this message by typing 'wrc -?':
|
|
|
|
Usage: wrc [options...] [infile[.rc|.res]]
|
|
-a n Alignment of resource (win16 only, default is 4)
|
|
-A Auto register resources (only with gcc 2.7 and better)
|
|
-b Create a C array from a binary .res file
|
|
-c Add 'const' prefix to C constants
|
|
-C cp Set the resource's codepage to cp (default is 0)
|
|
-d n Set debug level to 'n'
|
|
-D id[=val] Define preprocessor identifier id=val
|
|
-e Disable recognition of win32 keywords in 16bit compile
|
|
-g Add symbols to the global c namespace
|
|
-h Also generate a .h file
|
|
-H file Same as -h but written to file
|
|
-I path Set include search dir to path (multiple -I allowed)
|
|
-l lan Set default language to lan (default is neutral {0})
|
|
-L Leave case of embedded filenames as is
|
|
-n Do not generate .s file
|
|
-o file Output to file (default is infile.[res|s|h]
|
|
-p prefix Give a prefix for the generated names
|
|
-r Create binary .res file (compile only)
|
|
-s Add structure with win32/16 (PE/NE) resource directory
|
|
-t Generate indirect loadable resource tables
|
|
-T Generate only indirect loadable resources tables
|
|
-V Print version end exit
|
|
-w 16|32 Select win16 or win32 output (default is win32)
|
|
-W Enable pedantic warnings
|
|
|
|
Input is taken from stdin if no sourcefile specified.
|
|
|
|
Debug level 'n' is a bitmask with following meaning:
|
|
* 0x01 Tell which resource is parsed (verbose mode)
|
|
* 0x02 Dump internal structures
|
|
* 0x04 Create a parser trace (yydebug=1)
|
|
|
|
The -o option only applies to the final destination file, which is
|
|
in case of normal compile a .s file. You must use the '-H header.h'
|
|
option to override the header-filename.
|
|
If no input filename is given and the output name is not overridden
|
|
with -o and/or -H, then the output is written to "wrc.tab.[sh]"
|
|
|
|
|
|
Preprocessing
|
|
-------------
|
|
The build-in preprocessor is not a full implementation of the C counterpart.
|
|
Wrc does not understand function-type macros. These are discarded as they
|
|
are scanned. This will be a future project. Wrc does understand these:
|
|
#define
|
|
#if
|
|
#ifdef
|
|
#ifndef
|
|
#elif
|
|
#else
|
|
#endif
|
|
#error
|
|
|
|
Also 'defined' is supported as operator (both with and without parenthesis).
|
|
'#if' expressions can be anything valid that evaluates to an integer
|
|
expression (where 0 is false and anything else is true). Others (#pragma,
|
|
#line) are ignored. A special case '#' generates an error. This is due to
|
|
the implementation to enable generation of errors on preprocessing and will
|
|
be improved in the future.
|
|
|
|
|
|
16 and 32 bit support
|
|
---------------------
|
|
All of wrc is layed out in such a way that it enables compilation of both 16
|
|
and 32 bit resources. They mainly differ in code-generation and extra
|
|
keywords. Win32 keywords are recognized by default in 16 bit compile. You
|
|
can disable recognition of win32 reserved keywords by using the '-e' option,
|
|
if you encounter .rc-files that use win32 reserved keywords (I strongly
|
|
recommend that you just rename things in the source).
|
|
|
|
|
|
Language support
|
|
----------------
|
|
Wrc also understands the LANGUAGE keyword (win32 only) for both global and
|
|
local definitions of language. There are differences with respect to MS' and
|
|
Borland's implementation. Wrc uses 0,0 as the default language if non is
|
|
specified. Both MS and Borland use the language of the system that the
|
|
compiler runs on.
|
|
|
|
Not all resource-types can have local language keywords attached yet
|
|
(notably: BITMAP, CURSOR, ICON and usertype). This is due to implementation
|
|
of filename-scanning and the complexity that it poses. This will be changed
|
|
in the next release. You can work arround this problem by putting a LANGUAGE
|
|
statement before (and evt. after) the code in the resource file.
|
|
|
|
|
|
Resource types supported
|
|
------------------------
|
|
All types are supported except for:
|
|
- FONT
|
|
- MESSAGETABLE
|
|
- extensions like TOOLBAR and the like (is this a user-type?)
|
|
|
|
These types will be implemented as soon as I get a proper specification of
|
|
the layout.
|
|
|
|
Note: Usertype resources with character strings as types have a different
|
|
layout and do not accept expressions when a numerical type is specified. The
|
|
must be enclosed in double quotes. These are examples of valid usertype
|
|
resources:
|
|
|
|
MyName "MyType" mydata.bin
|
|
MyName 12345 mydata.bin
|
|
MyName "MyType" "mydata.bin"
|
|
MyName 12345 "mydata.bin"
|
|
|
|
MyName "MyType"
|
|
{
|
|
..., data, ...
|
|
}
|
|
|
|
or
|
|
|
|
MyName 12345
|
|
{
|
|
..., data, ...
|
|
}
|
|
|
|
|
|
Expression capabilities and resource names
|
|
------------------------------------------
|
|
You can use an expression in most places where the resource definition
|
|
expects a number (except usertype type). Operators supported:
|
|
() parenthesis
|
|
* multiply
|
|
/ divide
|
|
+ add
|
|
- minus/substract
|
|
| binary or
|
|
& binary and
|
|
~ binary not (unary operator though)
|
|
NOT ... (sigh)
|
|
|
|
Minus (-) can both be unary and binary. The NOT operator is (primarily)
|
|
used to disable window styles but I strongly suggest to refrain from using
|
|
this operator.
|
|
There is a shift/reduce conflict on the unary minus, but this is not
|
|
problematic. I was too lazy to make a new expression parser (next version or
|
|
so). Unary plus (+) would cause another confilct, so I let it out for now.
|
|
|
|
Resource names can be both numerical (expressions) and character typed. Wrc
|
|
does supports this insane (deep sigh) construct:
|
|
|
|
MENU MENU
|
|
{
|
|
...
|
|
}
|
|
|
|
It is _ONLY_ supported for backwards compatibility so that old sources can
|
|
be compiled with winelib. DO NOT USE IT IN NEW RESOURCES, PLEASE!
|
|
|
|
|
|
Indirect loadable resources
|
|
---------------------------
|
|
|
|
Wrc can generate tables for indirect resource loading like winerc did. There
|
|
are two new structures defined in 'wine-base-dir/include/wrc_rsc.h':
|
|
|
|
typedef struct wrc_resource16
|
|
{
|
|
INT32 resid; /* The resource id if resname == NULL */
|
|
LPSTR resname;
|
|
INT32 restype; /* The resource type-id if typename == NULL */
|
|
LPSTR typename;
|
|
LPBYTE data; /* Actual resource data */
|
|
UINT32 datasize; /* The size of the resource */
|
|
} wrc_resource16_t;
|
|
|
|
typedef struct wrc_resource32
|
|
{
|
|
INT32 resid; /* The resource id if resname == NULL */
|
|
LPWSTR resname;
|
|
INT32 restype; /* The resource type-id if typename == NULL */
|
|
LPWSTR typename;
|
|
LPBYTE data; /* Actual resource data */
|
|
UINT32 datasize; /* The size of the resource */
|
|
} wrc_resource32_t;
|
|
|
|
The extension to winerc lies in the addition of the 'typename' field to
|
|
support usertype resoursec with names for types.
|
|
|
|
Note that _ALL_ names generated by wrc and to be used in interfacing with
|
|
wine are PASCAL-style strings, unlike winerc. The first element contains the
|
|
length and the strings are _not_ '\0'-terminated!
|
|
|
|
You can also generate header files with wrc when specifying the '-h' or
|
|
'-H<filename>' option.
|
|
|
|
|
|
NE/PE resource directory generation
|
|
-----------------------------------
|
|
A windows executable has a table/directory of resources avalable in that
|
|
module. Wrc will generate this directory with the '-s' option and place it
|
|
in the assembly output (and header-file). This will enable the separation
|
|
of different modules (dlls) in wine, which is the next project after wrc.
|
|
|
|
The layout of the PE directory should be exactly like the executable file.
|
|
The NE-directory layout _DIFFERS_ from the real NE-executable in such way
|
|
that all offsets to actual resource-data is relative to the NE-directory and
|
|
_NOT_ the beginning of the file.
|
|
|
|
|
|
Binary .res file generation/reading
|
|
-----------------------------------
|
|
Wrc can both generate (32 and 16 bit) and read (32 bit only) .res-files.
|
|
These can be used as intermediate files or binary files can be imported from
|
|
other sources. The reading of 16 bit .res-files is on the list for the next
|
|
release.
|
|
|
|
You cannot convert 32 bit .res-files into 16 bit output or vice versa. I
|
|
might implement 16 bit res into 32 bit output in the future, but I stronly
|
|
oppose to the other way arround.
|
|
|
|
|
|
Bugs
|
|
----
|
|
Inherent to programs you have bugs. These I know are there, plus a few
|
|
things that I noted in the above text (more lack of implementation than bug
|
|
though):
|
|
- No codepage translation
|
|
- UNICODE translations are not/not correct implemented
|
|
- No documentation ('wrc -?' gives command-line options though)
|
|
- grep for FIXME in the source
|
|
- Memory options are wrong under some conditions. There seems to be a
|
|
different action for win32 and win16.
|
|
- User-type resources have slightly different layout.
|
|
- Filename scanning is still hopeless.
|
|
|
|
Reporting bugs and patches
|
|
--------------------------
|
|
Send problems to the wine newsgroup or, preferrably, directly to me at:
|
|
|
|
bertho@akhphd.au.dk
|
|
|
|
Please send the problematic rc-source with the bug so I can reproduce it.
|
|
Patches should _not_ be send to Alexandre but to me. I will then review the
|
|
change and send a full patch to be included into the new wine release (I
|
|
prefer 'diff -u' format). You can always upload suggestions to wine
|
|
headquarters, but be sure to send me a copy.
|
|
|