mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 08:49:15 +00:00
a69b88b2f2
Sun Mar 15 03:46:50 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [*/*] Fixed some dprintf_ such that there is one and only one new line for each dprintf and that new line occurs at the end. Transformed some fprintfs into proper debug statements. Removed much redundancy from most of the debug statements. The redundancy appeared because now the component and function name is output automatically. Most debug statements also used to output the name of the function. All these changes prepared the source to switch completely to the new debugging interface. For more info, refer to ./documentation/debug-msg Sat Mar 14 19:45:23 1997 Andreas Mohr <100.30936@germany.net> * [misc/shell.c] [if1632/kernel.spec] Changed parameters of FUNC004() to fix a crash. Not sure if this fix is correct (doc wanted). * [windows/user.c] [if1632/user.spec] [include/user.h] Implemented UserSeeUserDo. * [msdos/int21.c] [include/msdos.h] Added "GET LIST OF LISTS" (INT 21/52h). Sat Mar 14 15:48:02 1998 Douglas Ridgway <ridgway@gmcl.com> * [include/windows.h] [relay32/gdi32.spec] [objects/enhmetafile.c] Beginnings of enhanced metafile support. Fri Mar 13 20:53:09 1998 John Richardson <jrichard@zko.dec.com> * [win32/console.c] Restart interrupted console writes. Fri Mar 13 18:59:24 1998 Matthew Becker <mbecker@glasscity.net> * [*/*.c] Updated documentation for API manpages. * [windows/dce.c] ReleaseDC16: Fixed cast. * [include/windows.h] [memory/virtual.c] VirtualQuery{Ex} should return DWORD instead of BOOL32. Fri Mar 13 13:03:06 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [README][documentation/status/] README updated, added lzexpand,version and multimedia status notes to new documentation/status directory. * [ole/*.c][if1632/typelib.spec] Added typelib stubs, several small additions and fixes. * [loader/pe_image.c] Fixed a small bug (fixup_imports got passed the wrong hModule in a remapcase). * [loader/signal.c][if1632/signal.c][misc/winsock_dns.c] [loader/module.c] Fixed some recursive debugger crashes (caused by invalid FS). * [misc/registry.c] Two bugs fixed. Fri Mar 13 04:55:01 1998 David Lee Lambert <lamber45@egr.msu.edu> * [include/winnt.h] [include/winnls.h] Moved LANG_xxx flags to winnls.h * [include/winnls.h] Added flags for GetDateFormat(); fixed validity of LOCALE_SYSTEM_DEFAULT. * [include/windows.h] Added GetTimeFormat() prototypes. * [ole/ole2nls.c] Implemented ASCII date- and time-functions, using an optimized common core; added stubs for Unicode versions; started work on a Unicode core. * [AUTHORS] Added my name. Mon Mar 9 20:10:15 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [relay32/comctl32.spec] [include/imagelist.h] [include/commctrl.h] [misc/imagelist.c] [misc/Makefile.in] First attempt at implementing ImageLists. Sun Mar 8 20:19:49 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [files/dos_fs.c] [configure.in] Try to get FileTimeToLocalFileTime,FileTimeToSystemTime and SystemTimeToFileTime right. Use timegm() where available. * [misc/lstr.c] Fix an off by one error in FormatMessage and handle the case when args = NULL (used by programs to get the length of the string). * [win32/console.c] Actual display a per-process Title string, better working attempt for WriteConsole32W and ReadConsole32W. Fri Mar 6 20:33:45 1998 Slaven Rezic <eserte@cs.tu-berlin.de> * [include/config.h.in][configure.in][multimedia/audio.c] [multimedia/dsound.c] Added check for FreeBSD sound system. Sun Mar 1 17:40:10 1998 Jason Schonberg <schon@mti.sgi.com> * [controls/edit.c] [include/ole.h] [include/shlobj.h] Removed final commas in enum types. Mon Feb 23 07:52:18 1998 Luiz Otavio L. Zorzella <zorzella@nr.conexware.com> * [multimedia/time.c] Workaround to avoid infinite recursion inside timeGetTime. * [multimedia/audio.c] WODM_GETNUMDEVS and WIDM_GETNUMDEVS only return 1 now if the SOUND_DEV can be opened, or if it's busy.
225 lines
6.7 KiB
Perl
Executable file
225 lines
6.7 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 " TRACE(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 " TRACE(x11, \"Ret $fn_name\\n\");\n";
|
|
print OUTC " return r;\n" if $resultdecl;
|
|
print OUTC "}\n";
|
|
$want{$fn_name} = 2;
|
|
return 1;
|
|
}
|