Release 961215
Sun Dec 15 16:18:15 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [graphics/x11drv/bitblt.c]
Fixed BITBLT_StretchImage for partially covered or inverted
bitmaps.
* [objects/dib.c]
Fixed the upside-down bitmap problem.
Sat Dec 14 02:49:57 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
IsMenu and RemoveMenu added (use existing Win16 functions).
* [include/windows.h]
Corrections to BITMAPINFOHEADER structure.
* [loader/module.c] [if1632/kernel32.spec]
New function GetModuleFileName32A (heavily based on original
Win16 version).
* [loader/pe_image.c]
Hack to allow files with short PE header to be loaded (e.g.
COMDLG32.DLL from Win32s).
* [misc/winsock_async.c]
#if out EIDRM case (not present in FreeBSD).
* [tools/build.c]
Remove trailing comments from .s files generated by build
as these break assembly when not run through pre-processor.
* [windows/graphics.c] [if1632/gdi32.spec]
New function Polyline32 - based on original Polyline. Needs
metafile support adding still.
Fri Dec 13 13:04:06 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [win32/findfile.c] [if1632/kernel.spec]
FindFirstFile32A(): Use dos current directory for drive prefixes.
FindNextFile32A(): Fill in file attribute information.
Implement FindFirstFile16, FindNextFile16, FindClose16.
* [files/drive.c]
GetCurrentDirectory32A - Fix problem with null 3rd character in
string.
Tue Dec 10 14:49:07 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/painting.c][windows/message.c]
Don't use linked lists to call SendMessage(), for it might destroy
the current listentry.
* [misc/registry.c]
Fixed temporary file saving (rename doesn't work across
partitions).
* [files/*.c]
GetFullPathName*,GetDriveType32A fixed, CreateDirectoryEx*,
GetVolumeInformation32W fixed.
* [win32/process.c][if1632/kernel.spec][if1632/kernel32.spec]
LoadLibrary* updated to new naming std., *32W added.
* [win32/console.c] [include/wincon.h]
Additions for NT commandline executables.
* [if1632/advapi32.spec][if1632/kernel32.spec][win32/init.c]
GetUserName32W added, GetComputerName32W added,
GetStartupInfo32W added, GetSystemInfo updated to NT standard.
* [windows/msgbox.c][misc/shell.c][windows/graphics.c]
MessageBox32W, ShellAbout32W, CommandLineToArgvW, Polygon32 added.
* [misc/crtdll.c][include/crtdll.h][if1632/crtdll.spec][misc/ntdll.c]
[if1632/ntdll.spec]
Lot of new unicode functions added (needed for NT).
* [loader/pe_image.c]
NtCurrentTeb added.
Tue Dec 10 22:39:33 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/keyboard.c]
Rewrote function TranslateAccelerator().
Mon Dec 9 14:52:13 1996 Slaven Rezic <eserte@cs.tu-berlin.de>
* [windows/defwnd.c]
DEFWND_SetText(): Set icon name.
Sun Dec 8 23:30:00 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [loader/signal.c] [misc/winsock.c] [misc/winsock_async.c]
[if1632/winsock.spec]
IPC resource cleanup, bugfixes.
* [windows/dialog.c] [windows/defdlg.c]
More DefDlgProc() fixes.
Sun Dec 8 14:01:42 1996 Vadim Strizhevsky <striv@ms.com>
* [misc/clipboard.c] [objects/font.c] [win32/init.c]
[win32/newfns.c] [windows/graphics.c]
Added a few WIN32 functions which needed to run some win32
accessories. Clock should now work almost as well as 16 bit version.
Add: RegisterClipboardFormat32W GetTextExtentExPoint32*
GetModuleHandleW, DisableThreadLibraryCalls (empty stub),
Polygon32
Fix: Polygon16 possible memory leak on error return.
diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c
index 1e292a0..5e8b5b2 100644
--- a/programs/progman/grpfile.c
+++ b/programs/progman/grpfile.c
@@ -172,6 +172,14 @@
if (lpszName >= buffer + size) return(0);
/* unknown bytes 24 - 31 ignored */
+ /*
+ Unknown bytes should be:
+ wLogPixelsX = GET_SHORT(buffer, 24);
+ wLogPixelsY = GET_SHORT(buffer, 26);
+ byBitsPerPixel = byte at 28;
+ byPlanes = byte at 29;
+ wReserved = GET_SHORT(buffer, 30);
+ */
hGroup = GROUP_AddGroup(lpszName, lpszGrpFile, nCmdShow, x, y,
width, height, iconx, icony,
diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l
index ef246e1..f0d1498 100644
--- a/programs/winhelp/macro.lex.l
+++ b/programs/winhelp/macro.lex.l
@@ -144,7 +144,7 @@
{
BEGIN INITIAL;
*strptr++ = '\0';
- return STRING;
+ return tSTRING;
}
}
diff --git a/programs/winhelp/macro.yacc.y b/programs/winhelp/macro.yacc.y
index c88983c..ceb125f 100644
--- a/programs/winhelp/macro.yacc.y
+++ b/programs/winhelp/macro.yacc.y
@@ -44,7 +44,7 @@
%token NOT
%token IF_THEN
%token IF_THEN_ELSE
-%token <string> STRING
+%token <string> tSTRING
%token <integer> INTEGER
%token <bool_function_string> BOOL_FUNCTION_STRING
%token <bool_function_void> BOOL_FUNCTION_VOID
@@ -91,49 +91,49 @@
'(' ')'
{if (! skip) (*$1)();} |
VOID_FUNCTION_STRING
- '(' STRING ')'
+ '(' tSTRING ')'
{if (! skip) (*$1)($3);} |
VOID_FUNCTION_2STRING
- '(' STRING ',' STRING ')'
+ '(' tSTRING ',' tSTRING ')'
{if (! skip) (*$1)($3, $5);} |
VOID_FUNCTION_2STRING_UINT
- '(' STRING ',' STRING ',' INTEGER ')'
+ '(' tSTRING ',' tSTRING ',' INTEGER ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_2STRING_UINT_STRING
- '(' STRING ',' STRING ',' INTEGER ',' STRING ')'
+ '(' tSTRING ',' tSTRING ',' INTEGER ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9);} |
VOID_FUNCTION_2STRING_2UINT_2STRING
- '(' STRING ',' STRING ',' INTEGER ',' INTEGER ',' STRING ',' STRING ')'
+ '(' tSTRING ',' tSTRING ',' INTEGER ',' INTEGER ',' tSTRING ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9, $11, $13);} |
VOID_FUNCTION_2STRING_WPARAM_LPARAM_STRING
- '(' STRING ',' STRING ',' INTEGER ',' INTEGER ',' STRING ')'
+ '(' tSTRING ',' tSTRING ',' INTEGER ',' INTEGER ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9, $11);} |
VOID_FUNCTION_3STRING
- '(' STRING ',' STRING ',' STRING ')'
+ '(' tSTRING ',' tSTRING ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_3STRING_2UINT
- '(' STRING ',' STRING ',' STRING ',' INTEGER ',' INTEGER ')'
+ '(' tSTRING ',' tSTRING ',' tSTRING ',' INTEGER ',' INTEGER ')'
{if (! skip) (*$1)($3, $5, $7, $9, $11);} |
VOID_FUNCTION_4STRING
- '(' STRING ',' STRING ',' STRING ',' STRING ')'
+ '(' tSTRING ',' tSTRING ',' tSTRING ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9);} |
VOID_FUNCTION_4STRING_UINT
- '(' STRING ',' STRING ',' STRING ',' STRING ',' INTEGER')'
+ '(' tSTRING ',' tSTRING ',' tSTRING ',' tSTRING ',' INTEGER')'
{if (! skip) (*$1)($3, $5, $7, $9, $11);} |
VOID_FUNCTION_4STRING_2UINT
- '(' STRING ',' STRING ',' STRING ',' STRING ',' INTEGER ',' INTEGER')'
+ '(' tSTRING ',' tSTRING ',' tSTRING ',' tSTRING ',' INTEGER ',' INTEGER')'
{if (! skip) (*$1)($3, $5, $7, $9, $11, $13);} |
VOID_FUNCTION_STRING_UINT
- '(' STRING ',' INTEGER ')'
+ '(' tSTRING ',' INTEGER ')'
{if (! skip) (*$1)($3, $5);} |
VOID_FUNCTION_STRING_UINT_STRING
- '(' STRING ',' INTEGER ',' STRING ')'
+ '(' tSTRING ',' INTEGER ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_STRING_UINT_2STRING
- '(' STRING ',' INTEGER ',' STRING ',' STRING ')'
+ '(' tSTRING ',' INTEGER ',' tSTRING ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9);} |
VOID_FUNCTION_STRING_WPARAM_LPARAM
- '(' STRING ',' INTEGER ',' INTEGER ')'
+ '(' tSTRING ',' INTEGER ',' INTEGER ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_UINT
'(' INTEGER ')'
@@ -142,25 +142,25 @@
'(' INTEGER ',' INTEGER ')'
{if (! skip) (*$1)($3, $5);} |
VOID_FUNCTION_2UINT_STRING
- '(' INTEGER ',' INTEGER ',' STRING ')'
+ '(' INTEGER ',' INTEGER ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_3UINT
'(' INTEGER ',' INTEGER ',' INTEGER ')'
{if (! skip) (*$1)($3, $5, $7);} |
VOID_FUNCTION_2INT_3UINT_STRING
- '(' INTEGER ',' INTEGER ',' INTEGER ',' INTEGER ',' INTEGER ',' STRING ')'
+ '(' INTEGER ',' INTEGER ',' INTEGER ',' INTEGER ',' INTEGER ',' tSTRING ')'
{if (! skip) (*$1)($3, $5, $7, $9, $11, $13);} |
VOID_FUNCTION_FILE_WIN
'(' file_win ')'
{if (! skip) (*$1)(filename, windowname);} |
VOID_FUNCTION_FILE_WIN_STRING
- '(' file_win ',' STRING ')'
+ '(' file_win ',' tSTRING ')'
{if (! skip) (*$1)(filename, windowname, $5);} |
VOID_FUNCTION_FILE_WIN_UINT
'(' file_win ',' INTEGER ')'
{if (! skip) (*$1)(filename, windowname, $5);} ;
-file_win: STRING
+file_win: tSTRING
{
filename = windowname = $1;
while (*windowname && *windowname != '>') windowname++;
@@ -168,6 +168,6 @@
} ;
bool_macro: NOT '(' bool_macro ')' {$$ = ! $3;} |
- STRING {$$ = MACRO_IsMark($1);} |
+ tSTRING {$$ = MACRO_IsMark($1);} |
BOOL_FUNCTION_VOID '(' ')' {$$ = (*$1)();} |
- BOOL_FUNCTION_STRING '(' STRING ')' {$$ = (*$1)($3);} ;
+ BOOL_FUNCTION_STRING '(' tSTRING ')' {$$ = (*$1)($3);} ;
