mirror of
https://github.com/reactos/wine.git
synced 2025-02-13 08:44:54 +00:00
![Alexandre Julliard](/assets/img/avatar_default.png)
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
226 lines
6.8 KiB
Perl
Executable File
226 lines
6.8 KiB
Perl
Executable File
#!/usr/bin/perl -w
|
|
|
|
# Create threads safe wrappers around X11 calls.
|
|
#
|
|
# Copyright 1998 Kristian Nielsen.
|
|
#
|
|
|
|
# FIXME: This does not do full C prototype parsing, but relies on
|
|
# knowledge on how the X11 include files are formatted. It will
|
|
# probably need to be modified for new include files. It also fails
|
|
# for certain prototypes (notably those with function pointer
|
|
# arguments or results), so these must be added manually. And it
|
|
# relies on a fixed location of X11 includes (/usr/X11R6/include/).
|
|
#
|
|
# This program expects to be run from Wine's main directory.
|
|
|
|
$X11_include_dir = "/usr/X11R6/include";
|
|
$outdir = "tsx11";
|
|
$wantfile = "$outdir/X11_calls";
|
|
@dolist = ("Xlib", "Xresource", "Xutil", "xpm", "XShm");
|
|
|
|
# First read list of wanted function names.
|
|
|
|
open(WANT, $wantfile) || die "open";
|
|
while(<WANT>) {
|
|
next if /^\s*\#/; # Skip comment lines.
|
|
next if /^\s*$/; # Skip empty lines.
|
|
if(/^\s*([a-zA-Z0-9_]+)\s*$/) {
|
|
$want{$1} = 1;
|
|
} else {
|
|
die "syntax error in file '$wantfile', in line '$_'";
|
|
}
|
|
}
|
|
close(WANT);
|
|
|
|
foreach $name (@dolist) {
|
|
|
|
$ucname = uc $name;
|
|
$lcname = lc $name;
|
|
|
|
$outfile = "/ts_$lcname";
|
|
open(OUTC, ">$outdir/$outfile.c") || die "open";
|
|
open(OUTH, ">include/$outfile.h") || die "open";
|
|
|
|
$x11_incl = "";
|
|
$extensions_dir = "";
|
|
if($name eq "Xutil" || $name eq "Xresource" || $name eq "XShm") {
|
|
$x11_incl = "#include <X11/Xlib.h>\n";
|
|
# For Xutil, we need X11/Xresource.h for XUniqueContext().
|
|
$x11_incl .= "#include <X11/Xresource.h>\n" if $name eq "Xutil";
|
|
}
|
|
if($name eq "XShm") {
|
|
$extensions_dir = "extensions/";
|
|
}
|
|
|
|
print OUTH <<END;
|
|
/*
|
|
* Thread safe wrappers around $name calls.
|
|
* Always include this file instead of <X11/$name.h>.
|
|
* This file was generated automatically by tools/make_X11wrappers
|
|
*
|
|
* Copyright 1998 Kristian Nielsen
|
|
*/
|
|
|
|
#ifndef __WINE_TS$ucname\_H
|
|
#define __WINE_TS$ucname\_H
|
|
|
|
$x11_incl#include <X11/$extensions_dir$name.h>
|
|
|
|
END
|
|
|
|
print OUTC <<END;
|
|
/*
|
|
* Thread safe wrappers around $name calls.
|
|
* This file was generated automatically by tools/make_X11wrappers
|
|
* DO NOT EDIT!
|
|
*/
|
|
|
|
$x11_incl#include <X11/$extensions_dir$name.h>
|
|
#include "x11drv.h"
|
|
#include "debug.h"
|
|
END
|
|
|
|
if($name eq "xpm") { # Handle as special case.
|
|
output_fn("XpmCreatePixmapFromData", "int",
|
|
"Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *",
|
|
"Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5",
|
|
"a0, a1, a2, a3, a4, a5");
|
|
output_fn("XpmAttributesSize", "int", "void", "void", "");
|
|
} elsif($name eq "XShm") {
|
|
output_fn("XShmQueryExtension", "Bool",
|
|
"Display *", "Display *a0", "a0");
|
|
output_fn("XShmPixmapFormat", "int",
|
|
"Display *", "Display *a0", "a0");
|
|
output_fn("XShmDetach", Status,
|
|
"Display *, XShmSegmentInfo *",
|
|
"Display *a0, XShmSegmentInfo *a1", "a0, a1");
|
|
output_fn("XShmAttach", Status,
|
|
"Display *, XShmSegmentInfo *",
|
|
"Display *a0, XShmSegmentInfo *a1", "a0, a1");
|
|
} else {
|
|
open(IN, "echo \"$x11_incl#include <X11/$extensions_dir$name.h>\" | gcc -L$X11_include_dir -E - | grep -v '^[ \t]*\$'|") || die "open";
|
|
|
|
PROTO: while(<IN>) {
|
|
if(m'extern\s+([^()]*)\b([a-zA-Z0-9_]+)\s*\(') {
|
|
$result_type = $1;
|
|
$fn_name = $2;
|
|
$result_type = "int" if $result_type =~ /^\s*$/;
|
|
@args = ();
|
|
while(<IN>) {
|
|
last if m'\)\s*;';
|
|
# Give up on vararg functions and function pointer args.
|
|
if(m'\.\.\.|\(\*\)') {
|
|
undef $fn_name;
|
|
last;
|
|
}
|
|
if(m'\s*([^,]*[^, \t])\s*(,?\n)') {
|
|
$args[$#args+1] = $1;
|
|
}
|
|
}
|
|
# Skip if vararg, function pointer arg, or not needed.
|
|
next unless $fn_name;
|
|
next unless $want{$fn_name} && $want{$fn_name} == 1;
|
|
|
|
# Special case for no arguments (which is specified as "void").
|
|
if($#args == 0 && $args[0] eq "void") {
|
|
@args = ();
|
|
}
|
|
$proto = "";
|
|
$formals = "";
|
|
$actuals = "";
|
|
for($i = 0; $i <= $#args; $i++) {
|
|
$comma = $i < $#args ? ", " : "";
|
|
$proto .= "$args[$i]$comma";
|
|
$formals .= "$args[$i] a$i$comma";
|
|
$actuals .= "a$i$comma";
|
|
}
|
|
$proto = $formals = "void" if $#args == -1;
|
|
output_fn($fn_name, $result_type, $proto, $formals, $actuals);
|
|
}
|
|
}
|
|
}
|
|
|
|
if($name eq "Xlib") {
|
|
raw_output_fn("XSynchronize", "int (*r)(Display *)",
|
|
"int (*TSXSynchronize(Display *, Bool))(Display *)",
|
|
"int (*TSXSynchronize(Display *a0, Bool a1))(Display *)",
|
|
"a0, a1");
|
|
print OUTC "\nextern void _XInitImageFuncPtrs(XImage *);\n";
|
|
output_fn("_XInitImageFuncPtrs", "void", "XImage *", "XImage *a0", "a0");
|
|
} elsif($name eq "Xutil") {
|
|
output_fn("XDestroyImage", "int",
|
|
"struct _XImage *", "struct _XImage *a0", "a0");
|
|
output_fn("XGetPixel", "unsigned long",
|
|
"struct _XImage *, int, int",
|
|
"struct _XImage *a0, int a1, int a2",
|
|
"a0, a1, a2");
|
|
output_fn("XPutPixel", "int",
|
|
"struct _XImage *, int, int, unsigned long",
|
|
"struct _XImage *a0, int a1, int a2, unsigned long a3",
|
|
"a0, a1, a2, a3");
|
|
output_fn("XSubImage", "struct _XImage *",
|
|
"struct _XImage *, int, int, unsigned int, unsigned int",
|
|
"struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4",
|
|
"a0, a1, a2, a3, a4");
|
|
output_fn("XAddPixel", "int",
|
|
"struct _XImage *, long",
|
|
"struct _XImage *a0, long a1", "a0, a1");
|
|
output_fn("XUniqueContext", "XContext", "void", "void", "");
|
|
}
|
|
|
|
print OUTH <<END;
|
|
|
|
#endif /* __WINE_TS$ucname\_H */
|
|
END
|
|
|
|
}
|
|
|
|
foreach $i (keys %want) {
|
|
if($want{$i} == 1) {
|
|
print "Unresolved: $i\n";
|
|
}
|
|
}
|
|
|
|
|
|
sub output_fn {
|
|
# Example call:
|
|
# output_fn("main", "int", "int, char **", "int a0, char **a1", "a0, a1")
|
|
#
|
|
|
|
my ($fn_name, $result_type, $protos, $formals, $actuals) = @_;
|
|
|
|
return raw_output_fn($fn_name,
|
|
$result_type =~ /^\s*void\s*$/ ? "" : "$result_type r",
|
|
"$result_type TS$fn_name($protos)",
|
|
"$result_type TS$fn_name($formals)",
|
|
$actuals);
|
|
}
|
|
|
|
sub raw_output_fn {
|
|
# Example call:
|
|
# output_fn("main", "int r", "int main(int, char **)", "int main(int a0, char **a1)", "a0, a1")
|
|
#
|
|
|
|
my ($fn_name, $resultdecl, $protodecl, $defdecl, $actuals) = @_;
|
|
|
|
return undef unless $want{$fn_name} && $want{$fn_name} == 1;
|
|
|
|
print OUTC "\n$defdecl\n";
|
|
print OUTH "extern $protodecl;\n";
|
|
# print OUTH "#define $fn_name TS$fn_name\n";
|
|
print OUTC "{\n";
|
|
print OUTC " $resultdecl;\n" if $resultdecl;
|
|
print OUTC " dprintf_info(x11, \"Call $fn_name\\n\");\n";
|
|
print OUTC " EnterCriticalSection( &X11DRV_CritSection );\n";
|
|
print OUTC " ";
|
|
print OUTC "r = " if $resultdecl;
|
|
print OUTC "$fn_name($actuals);\n";
|
|
print OUTC " LeaveCriticalSection( &X11DRV_CritSection );\n";
|
|
print OUTC " dprintf_info(x11, \"Ret $fn_name\\n\");\n";
|
|
print OUTC " return r;\n" if $resultdecl;
|
|
print OUTC "}\n";
|
|
$want{$fn_name} = 2;
|
|
return 1;
|
|
}
|