mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-05 18:01:34 +00:00
a845b88ead
Sun May 31 13:40:13 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [if1632/signal.c] Added display of exception name. * [loader/task.c] Yet another attempt at fixing SwitchStackTo/SwitchStackBack. * [memory/selector.c] [relay32/builtin32.c] [tools/build.c] [win32/kernel32.c] Generate an assembly stub for Win32 register functions to make their names available at link time. * [programs/*/Makefile.in] Added hacks to support old resource compiler. Fri May 29 16:27:14 1998 Marcus Meissner <marcus@jet.franken.de> * [tools/testrun] Merge of my testscripts at home into one single perl program (tested with perl5). Works only on Linux due to 'ps' and 'ipcs' magic. * [controls/menu.c] Added some DefaultMenuItem stubs. * [debugger/stabs.c] Fixed stabs loading, now supports (int,int) typeinfo format used by gcc-2.8 and egcs-1. If it still crashes, please mail me. * [if1632/][relay32/] Added msvideo.dll (stubs only) Replaced some ptr by str for stringcases Added some new stubs (VxDCall, FindCloseNotif....) * [misc/network.c] Some argument fixes. * [misc/registry.c][misc/cpu.c] Registry initialization partially rewritten and enhanced. * [scheduler/*.c] Some additions so we don't do kill(0,SIGUSR1) (kill processgroup instead of targeted thread) Added SetThreadContext. Thu May 28 23:59:59 1998 Bertho Stultiens <bertho@akhphd.au.dk> * [tools/wrc/*] New resource compiler version 1.0.0 (28-May-1998) * [Make.rules.in] [Makefile.in] Changed and added rc rules to point to tools/wrc/wrc. * [configure.in] [include/config.h.in] Added check for function 'stricmp'. * [include/resource.h] Commented out the old resource structure to catch references. It also includes wrc_rsc.h. * [include/wrc_rsc.h] New file. Definitions for the resources generated with wrc. * [include/windows.h] Added #ifdef RC_INVOKED to exclude stdarg.h. Added SS_NOTIFY flag. * [include/winnls.h] Added SUBLANG_* definitions and corrected some defaults. * [loader/libres.c] Changed the sysres load functions to support wrc generated resources. * [resource/sysres_*.rc] Added #include <windows.h> * [resource/sysres.c] Changed declarations to match wrc's output * [resource/Makefile.in] Changed rules to work with wrc. * [tools/makedep.c] Changed generation of .rc file dependencies to .s target. Thu May 28 22:28:39 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [files/file.c][include/windows.c][relay32/kernel32.spec] Implemented GetFileAttributesEx32A/W. * [misc/imagelist.h][include/commctrl.h][relay32/comctl32.spec] Added ImageList_Read and ImageList_Write stubs. Added ImageList_AddIcon function. Added ImageList_LoadImage. It is the same as ImageList_LoadImage32A. * [controls/header.c] Fixed bitmap drawing bug. Added full bitmap support. * [include/commctrl.h] Added missing header macros. * [controls/toolbar.c][include/toolbar.h][include/commctrl.h] [controls/commctrl.c] [relay32/comctl32.spec] First implementation of toolbar control. Implemented CreateToolbar, CreateToolbarEx and CreateMappedBitmap. * [controls/progress.c][controls/status.c] Some code cleanup. * [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec] Removed CreateStatusWindow16 and DrawStatusText16. CreateStatusWindow is the same as CreateStatusWindow32A. DrawStatusText is the same as DrawStatusText32A. Thu May 28 16:01:28 1998 Matthew J. Francis <asbel@dial.pipex.com> * [objects/bitmap.c] [objects/bitmap.h] [objects/oembitmap.c] [objects/dc.c] [graphics/x11drv/bitblt.c] Added partial implementation of CreateDIBSection, with great thanks to Ulrich Weigand <weigand@informatik.uni-erlangen.de> for contributing the bulk of the patch. Wed May 27 19:04:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [win32/kernel32.c] [if1632/thunk.c] [include/flatthunk.h] ThunkConnect16 and related functions moved to emulator. * [loader/ne/segment.c] Call DllEntryPoint with correct arguments. * [relay32/builtin32.c] Bugfix: Relay debugging did not work for multiple processes. * [controls/menu.c] Bugfix: dwItemData was not set for MF_OWNERDRAW menus. * [if1632/relay.c] [relay32/relay386.c] Relay messages converted to use DPRINTF. * [controls/desktop.c] [relay32/user32.spec] Implemented PaintDesktop. * [files/profile.c] [if1632/kernel.spec] [misc/network.c] [misc/printdrv.c] [relay32/winspool.spec] [win32/ordinals.c] [relay32/kernel32.spec] Some stubs added. * [relay32/mpr.spec] All ordinals were off by one. Tue May 26 13:32:57 1998 Bill Hawes <whawes@star.net> * [misc/lstr.c] [include/casemap.h] [tools/unimap.pl] Added Unicode case conversion routines towupper/towlower, with mapping tables casemap.h created by tools/unimap.pl. * [misc/ntdll.c] [include/winnls.h] [relay32/ntdll.spec] [relay32/advapi.spec] Minimal implementation of IsTextUnicode, just enough to get NT4 notepad to open ascii/unicode files. * [Make.rules.in] [resources/sysres_En.rc] Added include file dlgs.h for building resource files, so that resources can refer to defined values (e.g. pshHelp). * [misc/crtdll.c] [relay32/crtdll.spec] Use towupper/towlower for 32W case conversions. * [memory/string.c] Use towupper for 32W case conversions. * [ole/ole2nls.c] Use towupper for 32W case conversions; fix mem leak; minor cleanup * [controls/edit.c] Added soft break flag to edit state. Print unknown action values for WM_VSCROLL (action 190 occurs when running NT4 notepad.) Mon May 25 22:42:40 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [files/file.c] Care for a pathological case in SetFilePointer. * [graphics/x11drv/xfont.c] Handle longer Font names in LFD_ComposeLFD and try to catch errors. * [loader/pe_image.c] Unload Dummymodule when PE_LoadLibraryEx32A fails with PE_LoadImage (makes Encarta 98 installer proceed). * [misc/registry.c] Move a check for a special case in RegCreateKeyEx32W after the check for existence. Tue May 25 20:18:26 1998 Matthew Becker <mbecker@glasscity.net> * [misc/ntdll.c] Added some stubs, just guessing at the size of their param lists. * [misc/registry.c] Added stubs for RegUnLoadKey, RegSetKeySecurity, RegSaveKey, RegRestoreKey, and RegReplaceKey * [programs/regtest/regtest.c] Updated registry testing program. Sun May 24 18:11:40 1998 Alex Priem <alexp@sci.kun.nl> * [file/profile.c] Added flag 'return_values' to PROFILE_GetSection. Sun May 24 13:41:10 1998 James Juran <jrj120@psu.edu> * [misc/shell.c] [files/directory.c] Documentation/debugging info additions. * [*/*.c] [include/*.h] Moved many extern function definitions to appropriate header files. Cleaned up a few compile warnings. If #include "debug.h" is present, removed #include <stdio.h>. debug.h includes stdio.h, so it is not necessary to include both. * [graphics/*.c] [if1632/signal.c] [ipc/*.c] [scheduler/*.c] [win32/*.c] [windows/*.c] Final patch to convert fprintf statements to new debugging interface. Some fprintfs are still left, especially in the debugger/ directory. However, IMHO, it's not worth the effort to change the rest. Fri May 22 21:58:35 1998 Morten Welinder <terra@diku.dk> * [windows/keyboard.c] Correct handling of keys "`-=[]\;',./". Fri May 22 12:06:00 1998 Per Lindström <pelinstr@algonet.se> * [include/windows.h] [relay32/kernel32.spec] [win32/console.c] Added stub for ReadConsoleOutputCharacter32A. Thu May 21 16:45:48 1998 Pascal Cuoq <pcuoq@ens-lyon.fr> * [ole/ole2nls.c] Began better implementation of LCMapString32A. Not very well tested yet, and still need improvements. * [controls/scroll.c] Documented functions. Wed May 20 21:37:56 1998 Peter Hunnisett <hunnise@nortel.ca> * [include/windows.h][misc/main.c] Change SystemParameterInfo to support SPI_GETHIGHCONTRAST. Also include some missing SPI_ definitions. * [include/dsound.h][multimedia/dsound.c][relay32/dplayx.spec] Added stubs for DirectPlayLobbyCreate[AW]. Not sure if these should go into a new files dplayx.c? Anyone care? * [include/winnls.h] Added two missing flags for the CompareString32 functions.
386 lines
9.5 KiB
C
386 lines
9.5 KiB
C
/*
|
|
* Generate include file dependencies
|
|
*
|
|
* Copyright 1996 Alexandre Julliard
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
/* Max first-level includes per file */
|
|
#define MAX_INCLUDES 124
|
|
|
|
typedef struct _INCL_FILE
|
|
{
|
|
struct _INCL_FILE *next;
|
|
char *name;
|
|
char *filename;
|
|
struct _INCL_FILE *owner;
|
|
struct _INCL_FILE *files[MAX_INCLUDES];
|
|
} INCL_FILE;
|
|
|
|
static INCL_FILE *firstSrc;
|
|
static INCL_FILE *firstInclude;
|
|
|
|
typedef struct _INCL_PATH
|
|
{
|
|
struct _INCL_PATH *next;
|
|
const char *name;
|
|
} INCL_PATH;
|
|
|
|
static INCL_PATH *firstPath;
|
|
|
|
static const char *SrcDir = NULL;
|
|
static const char *OutputFileName = "Makefile";
|
|
static const char *Separator = "### Dependencies";
|
|
static const char *ProgramName;
|
|
|
|
static const char Usage[] =
|
|
"Usage: %s [options] [files]\n"
|
|
"Options:\n"
|
|
" -Idir Search for include files in directory 'dir'\n"
|
|
" -Cdir Search for source files in directory 'dir'\n"
|
|
" -fxxx Store output in file 'xxx' (default: Makefile)\n"
|
|
" -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n";
|
|
|
|
|
|
/*******************************************************************
|
|
* xmalloc
|
|
*/
|
|
static void *xmalloc( int size )
|
|
{
|
|
void *res;
|
|
if (!(res = malloc (size ? size : 1)))
|
|
{
|
|
fprintf( stderr, "%s: Virtual memory exhausted.\n", ProgramName );
|
|
exit(1);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* xstrdup
|
|
*/
|
|
static char *xstrdup( const char *str )
|
|
{
|
|
char *res = strdup( str );
|
|
if (!res)
|
|
{
|
|
fprintf( stderr, "%s: Virtual memory exhausted.\n", ProgramName );
|
|
exit(1);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* add_include_path
|
|
*
|
|
* Add a directory to the include path.
|
|
*/
|
|
static void add_include_path( const char *name )
|
|
{
|
|
INCL_PATH *path = xmalloc( sizeof(*path) );
|
|
INCL_PATH **p = &firstPath;
|
|
while (*p) p = &(*p)->next;
|
|
*p = path;
|
|
path->next = NULL;
|
|
path->name = name;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* add_src_file
|
|
*
|
|
* Add a source file to the list.
|
|
*/
|
|
static INCL_FILE *add_src_file( const char *name )
|
|
{
|
|
INCL_FILE **p = &firstSrc;
|
|
INCL_FILE *file = xmalloc( sizeof(*file) );
|
|
memset( file, 0, sizeof(*file) );
|
|
file->name = xstrdup(name);
|
|
while (*p) p = &(*p)->next;
|
|
*p = file;
|
|
return file;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* add_include
|
|
*
|
|
* Add an include file if it doesn't already exists.
|
|
*/
|
|
static INCL_FILE *add_include( INCL_FILE *pFile, const char *name )
|
|
{
|
|
INCL_FILE **p = &firstInclude;
|
|
int pos;
|
|
|
|
for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break;
|
|
if (pos >= MAX_INCLUDES)
|
|
{
|
|
fprintf( stderr, "%s: %s: too many included files, please fix MAX_INCLUDES\n",
|
|
ProgramName, pFile->name );
|
|
exit(1);
|
|
}
|
|
|
|
while (*p && strcmp( name, (*p)->name )) p = &(*p)->next;
|
|
if (!*p)
|
|
{
|
|
*p = xmalloc( sizeof(INCL_FILE) );
|
|
memset( *p, 0, sizeof(INCL_FILE) );
|
|
(*p)->name = xstrdup(name);
|
|
}
|
|
pFile->files[pos] = *p;
|
|
return *p;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* open_src_file
|
|
*/
|
|
static FILE *open_src_file( INCL_FILE *pFile )
|
|
{
|
|
FILE *file;
|
|
|
|
if (SrcDir)
|
|
{
|
|
pFile->filename = xmalloc( strlen(SrcDir) + strlen(pFile->name) + 2 );
|
|
strcpy( pFile->filename, SrcDir );
|
|
strcat( pFile->filename, "/" );
|
|
strcat( pFile->filename, pFile->name );
|
|
}
|
|
else pFile->filename = xstrdup( pFile->name );
|
|
|
|
if (!(file = fopen( pFile->filename, "r" )))
|
|
{
|
|
perror( pFile->filename );
|
|
exit(1);
|
|
}
|
|
return file;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* open_include_file
|
|
*/
|
|
static FILE *open_include_file( INCL_FILE *pFile )
|
|
{
|
|
FILE *file = NULL;
|
|
INCL_PATH *path;
|
|
|
|
for (path = firstPath; path; path = path->next)
|
|
{
|
|
char *filename = xmalloc(strlen(path->name) + strlen(pFile->name) + 2);
|
|
strcpy( filename, path->name );
|
|
strcat( filename, "/" );
|
|
strcat( filename, pFile->name );
|
|
if ((file = fopen( filename, "r" )))
|
|
{
|
|
pFile->filename = filename;
|
|
break;
|
|
}
|
|
free( filename );
|
|
}
|
|
if (!file)
|
|
{
|
|
if (firstPath) perror( pFile->name );
|
|
else fprintf( stderr, "%s: %s: File not found\n",
|
|
ProgramName, pFile->name );
|
|
exit(1);
|
|
}
|
|
return file;
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* parse_file
|
|
*/
|
|
static void parse_file( INCL_FILE *pFile, int src )
|
|
{
|
|
char buffer[1024];
|
|
char *include;
|
|
int line = 0;
|
|
|
|
FILE *file = src ? open_src_file( pFile ) : open_include_file( pFile );
|
|
while (fgets( buffer, sizeof(buffer)-1, file ))
|
|
{
|
|
char *p = buffer;
|
|
line++;
|
|
while (*p && isspace(*p)) p++;
|
|
if (*p++ != '#') continue;
|
|
while (*p && isspace(*p)) p++;
|
|
if (strncmp( p, "include", 7 )) continue;
|
|
p += 7;
|
|
while (*p && isspace(*p)) p++;
|
|
if (*p++ != '\"') continue;
|
|
include = p;
|
|
while (*p && (*p != '\"')) p++;
|
|
if (!*p)
|
|
{
|
|
fprintf( stderr, "%s:%d: Malformed #include directive\n",
|
|
pFile->filename, line );
|
|
exit(1);
|
|
}
|
|
*p = 0;
|
|
add_include( pFile, include );
|
|
}
|
|
fclose(file);
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* output_include
|
|
*/
|
|
static void output_include( FILE *file, INCL_FILE *pFile,
|
|
INCL_FILE *owner, int *column )
|
|
{
|
|
int i;
|
|
|
|
if (pFile->owner == owner) return;
|
|
pFile->owner = owner;
|
|
if (*column + strlen(pFile->filename) + 1 > 70)
|
|
{
|
|
fprintf( file, " \\\n" );
|
|
*column = 0;
|
|
}
|
|
fprintf( file, " %s", pFile->filename );
|
|
*column += strlen(pFile->filename) + 1;
|
|
for (i = 0; i < MAX_INCLUDES; i++)
|
|
if (pFile->files[i]) output_include( file, pFile->files[i],
|
|
owner, column );
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* output_src
|
|
*/
|
|
static void output_src( FILE *file, INCL_FILE *pFile, int *column )
|
|
{
|
|
char *name = strrchr( pFile->name, '/' );
|
|
char *obj = xstrdup( name ? name + 1 : pFile->name );
|
|
char *ext = strrchr( obj, '.' );
|
|
if (ext)
|
|
{
|
|
if (!strcmp( ext, ".y" )) /* yacc file */
|
|
{
|
|
fprintf( file, "y.tab.o: y.tab.c" );
|
|
*column += 16;
|
|
}
|
|
else if (!strcmp( ext, ".l" )) /* lex file */
|
|
{
|
|
fprintf( file, "lex.yy.o: lex.yy.c" );
|
|
*column += 18;
|
|
}
|
|
else if (!strcmp( ext, ".rc" )) /* resource file */
|
|
{
|
|
*ext = '\0';
|
|
fprintf( file, "%s.s: %s", obj, pFile->filename );
|
|
*column += 2 * strlen(obj) + strlen(pFile->filename) + 7;
|
|
}
|
|
else
|
|
{
|
|
strcpy( ext, ".o" );
|
|
fprintf( file, "%s: %s", obj, pFile->filename );
|
|
*column += strlen(obj) + strlen(pFile->filename) + 2;
|
|
}
|
|
}
|
|
free( obj );
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* output_dependencies
|
|
*/
|
|
static void output_dependencies(void)
|
|
{
|
|
INCL_FILE *pFile;
|
|
int i, column;
|
|
FILE *file = NULL;
|
|
char buffer[1024];
|
|
|
|
if (Separator && ((file = fopen( OutputFileName, "r+" ))))
|
|
{
|
|
while (fgets( buffer, sizeof(buffer), file ))
|
|
if (!strncmp( buffer, Separator, strlen(Separator) )) break;
|
|
ftruncate( fileno(file), ftell(file) );
|
|
fseek( file, 0L, SEEK_END );
|
|
}
|
|
if (!file)
|
|
{
|
|
if (!(file = fopen( OutputFileName, "a" )))
|
|
{
|
|
perror( OutputFileName );
|
|
exit(1);
|
|
}
|
|
}
|
|
for( pFile = firstSrc; pFile; pFile = pFile->next)
|
|
{
|
|
column = 0;
|
|
output_src( file, pFile, &column );
|
|
for (i = 0; i < MAX_INCLUDES; i++)
|
|
if (pFile->files[i]) output_include( file, pFile->files[i],
|
|
pFile, &column );
|
|
fprintf( file, "\n" );
|
|
}
|
|
fclose(file);
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* parse_option
|
|
*/
|
|
static void parse_option( const char *opt )
|
|
{
|
|
switch(opt[1])
|
|
{
|
|
case 'I':
|
|
if (opt[2]) add_include_path( opt + 2 );
|
|
break;
|
|
case 'C':
|
|
if (opt[2]) SrcDir = opt + 2;
|
|
else SrcDir = NULL;
|
|
break;
|
|
case 'f':
|
|
if (opt[2]) OutputFileName = opt + 2;
|
|
break;
|
|
case 's':
|
|
if (opt[2]) Separator = opt + 2;
|
|
else Separator = NULL;
|
|
break;
|
|
default:
|
|
fprintf( stderr, "Unknown option '%s'\n", opt );
|
|
fprintf( stderr, Usage, ProgramName );
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
|
|
/*******************************************************************
|
|
* main
|
|
*/
|
|
int main( int argc, char *argv[] )
|
|
{
|
|
INCL_FILE *pFile;
|
|
|
|
ProgramName = argv[0];
|
|
while (argc > 1)
|
|
{
|
|
if (*argv[1] == '-') parse_option( argv[1] );
|
|
else
|
|
{
|
|
pFile = add_src_file( argv[1] );
|
|
parse_file( pFile, 1 );
|
|
}
|
|
argc--;
|
|
argv++;
|
|
}
|
|
for (pFile = firstInclude; pFile; pFile = pFile->next)
|
|
parse_file( pFile, 0 );
|
|
output_dependencies();
|
|
return 0;
|
|
}
|