Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19572: Implement adding new sections/lines/fields and writing the resulting file

by gvg＠svn.reactos.com

Implement adding new sections/lines/fields and writing the resulting file Modified: trunk/reactos/lib/inflib/builddep.h Modified: trunk/reactos/lib/inflib/infcommon.h Modified: trunk/reactos/lib/inflib/infcore.c Modified: trunk/reactos/lib/inflib/infget.c Modified: trunk/reactos/lib/inflib/infhost.h Modified: trunk/reactos/lib/inflib/infhostgen.c Modified: trunk/reactos/lib/inflib/infhostget.c Added: trunk/reactos/lib/inflib/infhostglue.c Added: trunk/reactos/lib/inflib/infhostput.c Modified: trunk/reactos/lib/inflib/inflib.h Modified: trunk/reactos/lib/inflib/inflib.mak Modified: trunk/reactos/lib/inflib/inflib.xml Modified: trunk/reactos/lib/inflib/infpriv.h Added: trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/infros.h Modified: trunk/reactos/lib/inflib/infrosgen.c Modified: trunk/reactos/lib/inflib/infrosget.c Added: trunk/reactos/lib/inflib/infrosput.c _____ Modified: trunk/reactos/lib/inflib/builddep.h --- trunk/reactos/lib/inflib/builddep.h 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/builddep.h 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,18 +1,21 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/builddep.h - * PURPOSE: Build dependent definitions - * PROGRAMMER: Ge van Geldorp <gvg(a)reactos.org> + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> */ #ifdef INFLIB_HOST /* Definitions native to the host on which we're building */ +#include <stdarg.h> +#include <stdio.h> #include <string.h> #include <errno.h> +#define FALSE 0 +#define TRUE 1 + #define FREE(Area) free(Area) #define MALLOC(Size) malloc(Size) #define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size)) @@ -39,6 +42,7 @@ #define _tcscpy strcpy #define _tcstoul strtoul #define _tcstol strtol +#define STRFMT "%s" extern void DbgPrint(const char *Fmt, ...); @@ -68,6 +72,8 @@ #define INF_STATUS_BUFFER_OVERFLOW STATUS_BUFFER_OVERFLOW #define INF_SUCCESS(x) (0 <= (x)) +#define STRFMT "%S" + #endif /* INFLIB_HOST */ typedef const TCHAR *PCTSTR; _____ Modified: trunk/reactos/lib/inflib/infcommon.h --- trunk/reactos/lib/inflib/infcommon.h 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infcommon.h 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infcommon.h - * PURPOSE: Public .inf routines - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ #ifndef INFCOMMON_H_INCLUDED _____ Modified: trunk/reactos/lib/inflib/infcore.c --- trunk/reactos/lib/inflib/infcore.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infcore.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infcore.c - * PURPOSE: INF file parser that caches contents of INF file in memory - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ /* INCLUDES *****************************************************************/ @@ -85,7 +83,7 @@ /* PRIVATE FUNCTIONS ********************************************************/ static PINFCACHELINE -InfpCacheFreeLine (PINFCACHELINE Line) +InfpFreeLine (PINFCACHELINE Line) { PINFCACHELINE Next; PINFCACHEFIELD Field; @@ -118,7 +116,7 @@ PINFCACHESECTION -InfpCacheFreeSection (PINFCACHESECTION Section) +InfpFreeSection (PINFCACHESECTION Section) { PINFCACHESECTION Next; @@ -131,7 +129,7 @@ Next = Section->Next; while (Section->FirstLine != NULL) { - Section->FirstLine = InfpCacheFreeLine (Section->FirstLine); + Section->FirstLine = InfpFreeLine (Section->FirstLine); } Section->LastLine = NULL; @@ -141,9 +139,9 @@ } -static PINFCACHESECTION -InfpCacheFindSection (PINFCACHE Cache, - PCTSTR Name) +PINFCACHESECTION +InfpFindSection(PINFCACHE Cache, + PCTSTR Name) { PINFCACHESECTION Section = NULL; @@ -157,9 +155,9 @@ while (Section != NULL) { if (_tcsicmp (Section->Name, Name) == 0) - { - return Section; - } + { + return Section; + } /* get the next section*/ Section = Section->Next; @@ -169,9 +167,9 @@ } -static PINFCACHESECTION -InfpCacheAddSection (PINFCACHE Cache, - PTCHAR Name) +PINFCACHESECTION +InfpAddSection(PINFCACHE Cache, + PCTSTR Name) { PINFCACHESECTION Section = NULL; ULONG Size; @@ -213,8 +211,8 @@ } -static PINFCACHELINE -InfpCacheAddLine (PINFCACHESECTION Section) +PINFCACHELINE +InfpAddLine(PINFCACHESECTION Section) { PINFCACHELINE Line; @@ -251,37 +249,47 @@ } -static PVOID -InfpAddKeyToLine (PINFCACHELINE Line, - PTCHAR Key) +PVOID +InfpAddKeyToLine(PINFCACHELINE Line, + PCTSTR Key) { if (Line == NULL) - return NULL; + { + DPRINT1("Invalid Line\n"); + return NULL; + } if (Line->Key != NULL) - return NULL; + { + DPRINT1("Line already has a key\n"); + return NULL; + } - Line->Key = (PTCHAR)MALLOC ((_tcslen (Key) + 1) * sizeof(TCHAR)); + Line->Key = (PTCHAR)MALLOC((_tcslen(Key) + 1) * sizeof(TCHAR)); if (Line->Key == NULL) - return NULL; + { + DPRINT1("MALLOC() failed\n"); + return NULL; + } - _tcscpy (Line->Key, Key); + _tcscpy(Line->Key, Key); return (PVOID)Line->Key; } -static PVOID -InfpAddFieldToLine (PINFCACHELINE Line, - PTCHAR Data) +PVOID +InfpAddFieldToLine(PINFCACHELINE Line, + PCTSTR Data) { PINFCACHEFIELD Field; ULONG Size; Size = sizeof(INFCACHEFIELD) + (_tcslen(Data) * sizeof(TCHAR)); - Field = (PINFCACHEFIELD)MALLOC (Size); + Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { + DPRINT1("MALLOC() failed\n"); return NULL; } ZEROMEMORY (Field, @@ -307,8 +315,8 @@ PINFCACHELINE -InfpCacheFindKeyLine (PINFCACHESECTION Section, - PTCHAR Key) +InfpFindKeyLine(PINFCACHESECTION Section, + PCTSTR Key) { PINFCACHELINE Line; @@ -316,9 +324,9 @@ while (Line != NULL) { if (Line->Key != NULL && _tcsicmp (Line->Key, Key) == 0) - { - return Line; - } + { + return Line; + } Line = Line->Next; } @@ -363,9 +371,9 @@ inline static int is_eol( struct parser *parser, const CHAR *ptr ) { return (ptr >= parser->end || - *ptr == CONTROL_Z || - *ptr == '\n' || - (*ptr == '\r' && *(ptr + 1) == '\n')); + *ptr == CONTROL_Z || + *ptr == '\n' || + (*ptr == '\r' && *(ptr + 1) == '\n')); } @@ -401,18 +409,18 @@ return NULL; } - Section = InfpCacheFindSection (parser->file, - parser->token); + Section = InfpFindSection(parser->file, + parser->token); if (Section == NULL) { /* need to create a new one */ - Section= InfpCacheAddSection (parser->file, - parser->token); + Section= InfpAddSection(parser->file, + parser->token); if (Section == NULL) - { - parser->error = INF_STATUS_NOT_ENOUGH_MEMORY; - return NULL; - } + { + parser->error = INF_STATUS_NOT_ENOUGH_MEMORY; + return NULL; + } } parser->token_len = 0; @@ -430,14 +438,14 @@ if (!parser->line) /* need to start a new line */ { if (parser->cur_section == NULL) /* got a line before the first section */ - { - parser->error = INF_STATUS_WRONG_INF_STYLE; - return NULL; - } + { + parser->error = INF_STATUS_WRONG_INF_STYLE; + return NULL; + } - parser->line = InfpCacheAddLine (parser->cur_section); + parser->line = InfpAddLine(parser->cur_section); if (parser->line == NULL) - goto error; + goto error; } else { @@ -481,34 +489,34 @@ for (p = pos; !is_eof( parser, p ); p++) { switch(*p) - { - case '\r': - continue; + { + case '\r': + continue; - case '\n': - parser->line_pos++; - close_current_line( parser ); - break; + case '\n': + parser->line_pos++; + close_current_line( parser ); + break; - case ';': - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); - return p + 1; + case ';': + push_state( parser, LINE_START ); + set_state( parser, COMMENT ); + return p + 1; - case '[': - parser->start = p + 1; - set_state( parser, SECTION_NAME ); - return p + 1; + case '[': + parser->start = p + 1; + set_state( parser, SECTION_NAME ); + return p + 1; - default: - if (!isspace(*p)) - { - parser->start = p; - set_state( parser, KEY_NAME ); - return p; - } - break; - } + default: + if (!isspace(*p)) + { + parser->start = p; + set_state( parser, KEY_NAME ); + return p; + } + break; + } } close_current_line( parser ); return NULL; @@ -523,14 +531,14 @@ for (p = pos; !is_eol( parser, p ); p++) { if (*p == ']') - { - push_token( parser, p ); - if (add_section_from_token( parser ) == NULL) - return NULL; - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); /* ignore everything else on the line */ - return p + 1; - } + { + push_token( parser, p ); + if (add_section_from_token( parser ) == NULL) + return NULL; + push_state( parser, LINE_START ); + set_state( parser, COMMENT ); /* ignore everything else on the line */ + return p + 1; + } } parser->error = INF_STATUS_BAD_SECTION_NAME_LINE; /* unfinished section name */ return NULL; @@ -652,31 +660,31 @@ for (p = pos; !is_eof( parser, p ); p++) { switch(*p) - { - case '\r': - continue; + { + case '\r': + continue; - case '\n': - parser->line_pos++; - parser->start = p + 1; - set_state( parser, LEADING_SPACES ); - return p + 1; + case '\n': + parser->line_pos++; + parser->start = p + 1; + set_state( parser, LEADING_SPACES ); + return p + 1; - case '\\': - continue; + case '\\': + continue; - case ';': - push_state( parser, EOL_BACKSLASH ); - set_state( parser, COMMENT ); - return p + 1; + case ';': + push_state( parser, EOL_BACKSLASH ); + set_state( parser, COMMENT ); + return p + 1; - default: - if (isspace(*p)) - continue; - push_token( parser, p ); - pop_state( parser ); - return p; - } + default: + if (isspace(*p)) + continue; + push_token( parser, p ); + pop_state( parser ); + return p; + } } parser->start = p; pop_state( parser ); @@ -693,21 +701,21 @@ for (p = pos; !is_eol( parser, p ); p++) { if (*p == '"') - { - if (p+1 < parser->end && p[1] == '"') /* double quotes */ - { - push_token( parser, p + 1 ); - parser->start = token_end = p + 2; - p++; - } - else /* end of quotes */ - { - push_token( parser, p ); - parser->start = p + 1; - pop_state( parser ); - return p + 1; - } - } + { + if (p+1 < parser->end && p[1] == '"') /* double quotes */ + { + push_token( parser, p + 1 ); + parser->start = token_end = p + 2; + p++; + } + else /* end of quotes */ + { + push_token( parser, p ); + parser->start = p + 1; + pop_state( parser ); + return p + 1; + } + } } push_token( parser, p ); pop_state( parser ); @@ -723,13 +731,13 @@ for (p = pos; !is_eol( parser, p ); p++) { if (*p == '\\') - { - parser->start = p; - set_state( parser, EOL_BACKSLASH ); - return p; - } + { + parser->start = p; + set_state( parser, EOL_BACKSLASH ); + return p; + } if (!isspace(*p)) - break; + break; } parser->start = p; pop_state( parser ); @@ -745,12 +753,12 @@ for (p = pos; !is_eol( parser, p ); p++) { if (*p == '\\') - { - set_state( parser, EOL_BACKSLASH ); - return p; - } + { + set_state( parser, EOL_BACKSLASH ); + return p; + } if (!isspace(*p)) - break; + break; } pop_state( parser ); return p; @@ -772,9 +780,9 @@ /* parse a complete buffer */ INFSTATUS InfpParseBuffer (PINFCACHE file, - const CHAR *buffer, - const CHAR *end, - PULONG error_line) + const CHAR *buffer, + const CHAR *end, + PULONG error_line) { struct parser parser; const CHAR *pos = buffer; @@ -797,13 +805,13 @@ if (parser.error) { if (error_line) - *error_line = parser.line_pos; + *error_line = parser.line_pos; return parser.error; } /* find the [strings] section */ - file->StringsSection = InfpCacheFindSection (file, - _T("Strings")); + file->StringsSection = InfpFindSection(file, + _T("Strings")); return INF_STATUS_SUCCESS; } _____ Modified: trunk/reactos/lib/inflib/infget.c --- trunk/reactos/lib/inflib/infget.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infget.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infrosget.c - * PURPOSE: Read .inf routines for use in ReactOS - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ /* INCLUDES *****************************************************************/ @@ -17,65 +15,53 @@ INFSTATUS -InfpFindFirstLine(HINF InfHandle, +InfpFindFirstLine(PINFCACHE Cache, PCTSTR Section, PCTSTR Key, PINFCONTEXT *Context) { - PINFCACHE Cache; PINFCACHESECTION CacheSection; PINFCACHELINE CacheLine; - if (InfHandle == NULL || Section == NULL || Context == NULL) + if (Cache == NULL || Section == NULL || Context == NULL) { - DPRINT("Invalid parameter\n"); + DPRINT1("Invalid parameter\n"); return INF_STATUS_INVALID_PARAMETER; } - *Context = MALLOC(sizeof(INFCONTEXT)); - if (NULL == *Context) + CacheSection = InfpFindSection(Cache, Section); + if (NULL == CacheSection) { - DPRINT1("MALLOC() failed\n"); - return INF_STATUS_NO_MEMORY; + DPRINT("Section not found\n"); + return INF_STATUS_NOT_FOUND; } - Cache = (PINFCACHE)InfHandle; + if (Key != NULL) + { + CacheLine = InfpFindKeyLine(CacheSection, Key); + } + else + { + CacheLine = CacheSection->FirstLine; + } - /* Iterate through list of sections */ - CacheSection = Cache->FirstSection; - while (CacheSection != NULL) + if (NULL == CacheLine) { - DPRINT("Comparing '%S' and '%S'\n", CacheSection->Name, Section); + DPRINT("Key not found\n"); + return INF_STATUS_NOT_FOUND; + } - /* Are the section names the same? */ - if (_tcsicmp(CacheSection->Name, Section) == 0) - { - if (Key != NULL) - { - CacheLine = InfpCacheFindKeyLine (CacheSection, (PTCHAR)Key); - } - else - { - CacheLine = CacheSection->FirstLine; - } - - if (CacheLine == NULL) - return INF_STATUS_NOT_FOUND; - - (*Context)->Inf = (PVOID)Cache; - (*Context)->Section = (PVOID)CacheSection; - (*Context)->Line = (PVOID)CacheLine; - - return INF_STATUS_SUCCESS; - } - - /* Get the next section */ - CacheSection = CacheSection->Next; + *Context = MALLOC(sizeof(INFCONTEXT)); + if (NULL == *Context) + { + DPRINT1("MALLOC() failed\n"); + return INF_STATUS_NO_MEMORY; } + (*Context)->Inf = (PVOID)Cache; + (*Context)->Section = (PVOID)CacheSection; + (*Context)->Line = (PVOID)CacheLine; - DPRINT("Section not found\n"); - - return INF_STATUS_NOT_FOUND; + return INF_STATUS_SUCCESS; } _____ Modified: trunk/reactos/lib/inflib/infhost.h --- trunk/reactos/lib/inflib/infhost.h 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infhost.h 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,16 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infros.h - * PURPOSE: Public .inf routines for use on the host build system - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ #ifndef INFHOST_H_INCLUDED #define INFHOST_H_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #include <infcommon.h> extern int InfHostOpenBufferedFile(PHINF InfHandle, @@ -18,8 +20,11 @@ unsigned long BufferSize, unsigned long *ErrorLine); extern int InfHostOpenFile(PHINF InfHandle, - char *FileName, + const char *FileName, unsigned long *ErrorLine); +extern int InfHostWriteFile(HINF InfHandle, + const char *FileName, + const char *HeaderComment); extern void InfHostCloseFile(HINF InfHandle); extern int InfHostFindFirstLine(HINF InfHandle, const char *Section, @@ -60,8 +65,17 @@ extern int InfHostGetDataField(PINFCONTEXT Context, unsigned long FieldIndex, char **Data); -extern VOID InfHostFreeContext(PINFCONTEXT Context); +extern int InfHostFindOrAddSection(HINF InfHandle, + const char *Section, + PINFCONTEXT *Context); +extern int InfHostAddLine(PINFCONTEXT Context, const char *Key); +extern int InfHostAddField(PINFCONTEXT Context, const char *Data); +extern void InfHostFreeContext(PINFCONTEXT Context); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* INFROS_H_INCLUDED */ /* EOF */ _____ Modified: trunk/reactos/lib/inflib/infhostgen.c --- trunk/reactos/lib/inflib/infhostgen.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infhostgen.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,17 +1,13 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infhostgen.c - * PURPOSE: General .inf routines for use on the host build system - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ /* INCLUDES *****************************************************************/ -#include <stdio.h> -#include <errno.h> #include "inflib.h" #include "infhost.h" @@ -50,7 +46,7 @@ Cache = (PINFCACHE)MALLOC(sizeof(INFCACHE)); if (Cache == NULL) { - DPRINT("MALLOC() failed\n"); + DPRINT1("MALLOC() failed\n"); FREE(FileBuffer); return(INF_STATUS_INSUFFICIENT_RESOURCES); } @@ -81,7 +77,7 @@ int InfHostOpenFile(PHINF InfHandle, - char *FileName, + const char *FileName, unsigned long *ErrorLine) { FILE *File; @@ -97,7 +93,7 @@ File = fopen(FileName, "rb"); if (NULL == File) { - DPRINT("fopen() failed (errno %d)\n", errno); + DPRINT1("fopen() failed (errno %d)\n", errno); return -1; } @@ -106,7 +102,7 @@ /* Query file size */ if (fseek(File, 0, SEEK_END)) { - DPRINT("fseek() to EOF failed (errno %d)\n", errno); + DPRINT1("fseek() to EOF failed (errno %d)\n", errno); fclose(File); return -1; } @@ -114,7 +110,7 @@ FileLength = ftell(File); if ((unsigned long) -1 == FileLength) { - DPRINT("ftell() failed (errno %d)\n", errno); + DPRINT1("ftell() failed (errno %d)\n", errno); fclose(File); return -1; } @@ -123,7 +119,7 @@ /* Rewind */ if (fseek(File, 0, SEEK_SET)) { - DPRINT("fseek() to BOF failed (errno %d)\n", errno); + DPRINT1("fseek() to BOF failed (errno %d)\n", errno); fclose(File); return -1; } @@ -140,7 +136,7 @@ /* Read file */ if (FileLength != fread(FileBuffer, 1, FileLength, File)) { - DPRINT("fread() failed (errno %d)\n", errno); + DPRINT1("fread() failed (errno %d)\n", errno); fclose(File); return -1; } @@ -154,7 +150,7 @@ Cache = (PINFCACHE)MALLOC(sizeof(INFCACHE)); if (Cache == NULL) { - DPRINT("MALLOC() failed\n"); + DPRINT1("MALLOC() failed\n"); FREE(FileBuffer); return -1; } @@ -197,7 +193,7 @@ while (Cache->FirstSection != NULL) { - Cache->FirstSection = InfpCacheFreeSection(Cache->FirstSection); + Cache->FirstSection = InfpFreeSection(Cache->FirstSection); } Cache->LastSection = NULL; _____ Modified: trunk/reactos/lib/inflib/infhostget.c --- trunk/reactos/lib/inflib/infhostget.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infhostget.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -1,16 +1,13 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: .inf file parser - * FILE: lib/inflib/infrosget.c - * PURPOSE: Read .inf routines for use on the host build system - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - * Ge van Geldorp + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Royce Mitchell III + * Eric Kohl + * Ge van Geldorp <gvg(a)reactos.org> */ /* INCLUDES *****************************************************************/ -#include <errno.h> #include "inflib.h" #include "infhost.h" _____ Added: trunk/reactos/lib/inflib/infhostglue.c --- trunk/reactos/lib/inflib/infhostglue.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infhostglue.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -0,0 +1,24 @@ +/* + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "inflib.h" + +#define NDEBUG +#include <debug.h> + +void +DbgPrint(const char *Fmt, ...) +{ + va_list Args; + + va_start(Args, Fmt); + vfprintf(stderr, Fmt, Args); + va_end(Args); +} + +/* EOF */ Property changes on: trunk/reactos/lib/inflib/infhostglue.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/inflib/infhostput.c --- trunk/reactos/lib/inflib/infhostput.c 2005-11-25 21:29:16 UTC (rev 19571) +++ trunk/reactos/lib/inflib/infhostput.c 2005-11-25 21:37:23 UTC (rev 19572) @@ -0,0 +1,114 @@ +/* + * PROJECT: .inf file parser + * LICENSE: GPL - See COPYING in the top level directory + * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "inflib.h" +#include "infhost.h" + +#define NDEBUG +#include <debug.h> + +int +InfHostWriteFile(HINF InfHandle, const char *FileName, + const char *HeaderComment) +{ + char *Buffer; + unsigned long BufferSize; + INFSTATUS Status; + FILE *File; + + Status = InfpBuildFileBuffer((PINFCACHE) InfHandle, &Buffer, &BufferSize); + if (! INF_SUCCESS(Status)) + { + errno = Status; + return -1; + } + + File = fopen(FileName, "wb"); + if (NULL == File) + { + FREE(Buffer); + DPRINT1("fopen() failed (errno %d)\n", errno); + return -1; + } + + DPRINT("fopen() successful\n"); + + if (NULL != HeaderComment && '\0' != *HeaderComment) + { + fprintf(File, "; %s\r\n\r\n", HeaderComment); + } + + if (BufferSize != fwrite(Buffer, 1, BufferSize, File)) + { + DPRINT1("fwrite() failed (errno %d)\n", errno); + fclose(File); + FREE(Buffer); + return -1; + } + + fclose(File); + + FREE(Buffer); + + return 0; +} + +int +InfHostFindOrAddSection(HINF InfHandle, + const char *Section, + PINFCONTEXT *Context) +{ + INFSTATUS Status; + + Status = InfpFindOrAddSection((PINFCACHE) InfHandle, Section, Context); + if (INF_SUCCESS(Status)) + { + return 0; + } + else + { + errno = Status; + return -1; + } +} + +int +InfHostAddLine(PINFCONTEXT Context, const char *Key) +{ + INFSTATUS Status; + + Status = InfpAddLineWithKey(Context, Key); + if (INF_SUCCESS(Status)) + { + return 0; + } + else + { + errno = Status; + return -1; + } +} + +int [truncated at 1000 lines; 732 more skipped]

18 years, 9 months

[sgasiorek] 19571: fixed package.dll name

by sgasiorek＠svn.reactos.com

fixed package.dll name Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 21:25:42 UTC (rev 19570) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-25 21:29:16 UTC (rev 19571) @@ -341,7 +341,7 @@ modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\packlib.dll 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional

18 years, 9 months

[sgasiorek] 19570: - changed name of package library to package.dll

by sgasiorek＠svn.reactos.com

- changed name of package library to package.dll - fixed PML_TransError function (possibly fixes bug 730) Modified: trunk/rosapps/packmgr/cmd-line/rosget.xml Modified: trunk/rosapps/packmgr/directory.xml Modified: trunk/rosapps/packmgr/gui/main.c Modified: trunk/rosapps/packmgr/gui/packmgr.xml Modified: trunk/rosapps/packmgr/lib/es.rc Modified: trunk/rosapps/packmgr/lib/main.cpp Modified: trunk/rosapps/packmgr/lib/package.cpp Modified: trunk/rosapps/packmgr/lib/package.h Modified: trunk/rosapps/packmgr/lib/package.hpp Added: trunk/rosapps/packmgr/lib/package.xml Deleted: trunk/rosapps/packmgr/lib/packlib.xml _____ Modified: trunk/rosapps/packmgr/cmd-line/rosget.xml --- trunk/rosapps/packmgr/cmd-line/rosget.xml 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/cmd-line/rosget.xml 2005-11-25 21:25:42 UTC (rev 19570) @@ -1,12 +1,12 @@ <module name="rosget" type="win32cui" installbase="system32" installname="rosget.exe"> - <include base="packlib">.</include> + <include base="package">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> - <library>packlib</library> + <library>package</library> <file>main.c</file> <file>ros-get.rc</file> </module> _____ Modified: trunk/rosapps/packmgr/directory.xml --- trunk/rosapps/packmgr/directory.xml 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/directory.xml 2005-11-25 21:25:42 UTC (rev 19570) @@ -5,5 +5,5 @@ <xi:include href="gui/packmgr.xml" /> </directory> <directory name="lib"> - <xi:include href="lib/packlib.xml" /> + <xi:include href="lib/package.xml" /> </directory> \ No newline at end of file _____ Modified: trunk/rosapps/packmgr/gui/main.c --- trunk/rosapps/packmgr/gui/main.c 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/gui/main.c 2005-11-25 21:25:42 UTC (rev 19570) @@ -40,6 +40,7 @@ HWND hwnd; MSG msg; WNDCLASSEX wc = {0}; + WCHAR errbuf[2000]; // Window creation wc.cbSize = sizeof(WNDCLASSEX); @@ -78,7 +79,7 @@ if(error) { - MessageBox(0,PML_TransError(error),0,0); + MessageBox(0,PML_TransError(error, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); return 0; } @@ -154,12 +155,13 @@ { HINSTANCE hinst = GetModuleHandle(NULL); + WCHAR errbuf[2000]; // Create the controls hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, 0, 0, 0, 0, hwnd, NULL, hinst, NULL); - hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, + hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)), WS_CHILD|WS_VISIBLE|ES_MULTILINE, 0, 0, 100, 100, hwnd, NULL, hinst, NULL); hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); @@ -388,6 +390,8 @@ // Warning: This function is called from another thread int SetStatus (int status1, int status2, WCHAR* text) { + WCHAR errbuf[2000]; + // Set the Rage to 1000 SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); @@ -406,7 +410,7 @@ if(status1==1000) { EndDialog(hStatus, TRUE); - MessageBox(0,PML_TransError(status2),0,0); + MessageBox(0,PML_TransError(status2, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); } return 0; _____ Modified: trunk/rosapps/packmgr/gui/packmgr.xml --- trunk/rosapps/packmgr/gui/packmgr.xml 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/gui/packmgr.xml 2005-11-25 21:25:42 UTC (rev 19570) @@ -1,5 +1,5 @@ <module name="packmgr" type="win32gui" installbase="system32" installname="packmgr.exe"> - <include base="packlib">.</include> + <include base="package">.</include> <include base="packmgr">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> @@ -9,7 +9,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> - <library>packlib</library> + <library>package</library> <file>main.c</file> <file>packmgr.rc</file> _____ Modified: trunk/rosapps/packmgr/lib/es.rc --- trunk/rosapps/packmgr/lib/es.rc 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/es.rc 2005-11-25 21:25:42 UTC (rev 19570) @@ -21,4 +21,4 @@ 123 RCDATA "options.xml" -/* EOF */ \ No newline at end of file +/* EOF */ _____ Modified: trunk/rosapps/packmgr/lib/main.cpp --- trunk/rosapps/packmgr/lib/main.cpp 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/main.cpp 2005-11-25 21:25:42 UTC (rev 19570) @@ -119,8 +119,10 @@ //ask WCHAR buffer [2000]; - wsprintf(buffer, PML_TransError(ERR_READY), tree->todo.size()); + WCHAR errbuf [2000]; + wsprintf(buffer, PML_TransError(ERR_READY, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)), tree->todo.size()); + if(!Ask(buffer)) return ERR_GENERIC; @@ -136,13 +138,11 @@ } // Translates Errorcode into human language -extern "C" WCHAR* PML_TransError (int code) +extern "C" WCHAR* PML_TransError (int code, WCHAR *string, INT maxchar) { - // I know we, got a memory leak here - static WCHAR string [256]; - if(!LoadString(GetModuleHandle(L"package"), code, string, 256)) - return PML_TransError(ERR_GENERIC); + if(!LoadString(GetModuleHandle(L"package"), code, string, maxchar)) + return PML_TransError(ERR_GENERIC, string, maxchar); return string; } _____ Modified: trunk/rosapps/packmgr/lib/package.cpp --- trunk/rosapps/packmgr/lib/package.cpp 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/package.cpp 2005-11-25 21:25:42 UTC (rev 19570) @@ -167,8 +167,8 @@ if(pack->depencies.size() && action) { UINT count = pack->depencies.size(); - WCHAR buffer[2000], buffer2[200]; - wcscpy(buffer, PML_TransError(ERR_DEP1)); + WCHAR buffer[2000], buffer2[200], errbuf[2000]; + PML_TransError(ERR_DEP1, (WCHAR*)buffer, sizeof(buffer)/sizeof(WCHAR)); for (i=0; i<pack->depencies.size(); i++) { @@ -187,7 +187,7 @@ wsprintf(buffer, L"%s - %s\n", buffer, buffer2);// } - wcscat(buffer, PML_TransError(ERR_DEP2)); + wcscat(buffer, PML_TransError(ERR_DEP2, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR))); if(count) { _____ Modified: trunk/rosapps/packmgr/lib/package.h --- trunk/rosapps/packmgr/lib/package.h 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/package.h 2005-11-25 21:25:42 UTC (rev 19570) @@ -28,7 +28,7 @@ /* Prototypes */ void PML_Abort (void); -WCHAR* PML_TransError (int code); +WCHAR* PML_TransError (int code, WCHAR* string, INT maxchar); int PML_LoadTree (pTree*, char* url, PML_AddItem); int PML_FindItem (pTree tree, const char* what); _____ Modified: trunk/rosapps/packmgr/lib/package.hpp --- trunk/rosapps/packmgr/lib/package.hpp 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/package.hpp 2005-11-25 21:25:42 UTC (rev 19570) @@ -72,7 +72,7 @@ extern "C" { void PML_Abort (void); - WCHAR* PML_TransError (int code); + WCHAR* PML_TransError (int code, WCHAR* string, INT maxchar); int PML_LoadTree (pTree*, char* url, PML_AddItem); int PML_FindItem (TREE* tree, const char* what); _____ Added: trunk/rosapps/packmgr/lib/package.xml --- trunk/rosapps/packmgr/lib/package.xml 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/package.xml 2005-11-25 21:25:42 UTC (rev 19570) @@ -0,0 +1,25 @@ +<module name="package" type="win32dll" installbase="system32" installname="package.dll"> + <importlibrary definition="package.def" /> + <include base="package">.</include> + + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>expat</library> + <library>urlmon</library> + + <file>download.cpp</file> + <file>functions.cpp</file> + <file>log.cpp</file> + <file>main.cpp</file> + <file>options.cpp</file> + <file>package.cpp</file> + <file>script.cpp</file> + <file>tree.cpp</file> + <file>package.rc</file> +</module> _____ Deleted: trunk/rosapps/packmgr/lib/packlib.xml --- trunk/rosapps/packmgr/lib/packlib.xml 2005-11-25 19:38:07 UTC (rev 19569) +++ trunk/rosapps/packmgr/lib/packlib.xml 2005-11-25 21:25:42 UTC (rev 19570) @@ -1,25 +0,0 @@ -<module name="packlib" type="win32dll" installbase="system32" installname="package.dll"> - <importlibrary definition="package.def" /> - <include base="packlib">.</include> - - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - - <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> - <library>expat</library> - <library>urlmon</library> - - <file>download.cpp</file> - <file>functions.cpp</file> - <file>log.cpp</file> - <file>main.cpp</file> - <file>options.cpp</file> - <file>package.cpp</file> - <file>script.cpp</file> - <file>tree.cpp</file> - <file>package.rc</file> -</module>

18 years, 9 months

[greatlrd] 19569: Fix the trunk so it build again sorry for the break

by greatlrd＠svn.reactos.com

Fix the trunk so it build again sorry for the break Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-25 19:29:16 UTC (rev 19568) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-25 19:38:07 UTC (rev 19569) @@ -91,6 +91,7 @@ switch (pClient->AuxFunction) { case WaveThreadAddBuffer: + { LPWAVEHDR *pHdrSearching; if (pClient->DeviceType == WaveInDevice) @@ -113,7 +114,8 @@ *pHdrSearching = pClient->AuxParam.pHdr; - pClient->AuxReturnCode = waveStart(pClient); + pClient->AuxReturnCode = waveReadWrite(pClient); + } break; case WaveThreadSetState:

18 years, 9 months

[sedwards] 19568: pch and license header fixes part 2

by sedwards＠svn.reactos.com

pch and license header fixes part 2 Modified: trunk/reactos/lib/crt/direct/chdrive.c Modified: trunk/reactos/lib/crt/float/chgsign.c Modified: trunk/reactos/lib/crt/float/clearfp.c Modified: trunk/reactos/lib/crt/float/cntrlfp.c Modified: trunk/reactos/lib/crt/float/copysign.c Modified: trunk/reactos/lib/crt/float/fpclass.c Modified: trunk/reactos/lib/crt/float/fpecode.c Modified: trunk/reactos/lib/crt/float/fpreset.c Modified: trunk/reactos/lib/crt/float/logb.c Modified: trunk/reactos/lib/crt/float/nafter.c Modified: trunk/reactos/lib/crt/float/scalb.c Modified: trunk/reactos/lib/crt/float/statfp.c Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/io/create.c Modified: trunk/reactos/lib/crt/io/fmode.c Modified: trunk/reactos/lib/crt/io/tell.c Modified: trunk/reactos/lib/crt/io/wcreate.c Modified: trunk/reactos/lib/crt/io/wopen.c Modified: trunk/reactos/lib/crt/locale/locale.c Modified: trunk/reactos/lib/crt/mbstring/islwr.c Modified: trunk/reactos/lib/crt/mbstring/ismbpun.c Modified: trunk/reactos/lib/crt/mbstring/isuppr.c Modified: trunk/reactos/lib/crt/mbstring/mbsicmp.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/stdio/fclose.c Modified: trunk/reactos/lib/crt/stdio/fflush.c Modified: trunk/reactos/lib/crt/stdio/fgetws.c Modified: trunk/reactos/lib/crt/stdio/filbuf.c Modified: trunk/reactos/lib/crt/stdio/flsbuf.c Modified: trunk/reactos/lib/crt/stdio/fopen.c Modified: trunk/reactos/lib/crt/stdio/freopen.c Modified: trunk/reactos/lib/crt/stdio/fseek.c Modified: trunk/reactos/lib/crt/stdio/fsopen.c Modified: trunk/reactos/lib/crt/stdio/ftell.c Modified: trunk/reactos/lib/crt/stdio/sprintf.c Modified: trunk/reactos/lib/crt/stdio/swprintf.c Modified: trunk/reactos/lib/crt/stdio/tmpfile.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Modified: trunk/reactos/lib/crt/stdio/vsprintf.c Modified: trunk/reactos/lib/crt/stdlib/atoi64.c Modified: trunk/reactos/lib/crt/stdlib/ecvt.c Modified: trunk/reactos/lib/crt/stdlib/fcvt.c Modified: trunk/reactos/lib/crt/stdlib/mbtowc.c Modified: trunk/reactos/lib/crt/stdlib/strtol.c Modified: trunk/reactos/lib/crt/stdlib/strtold.c Modified: trunk/reactos/lib/crt/stdlib/strtoul.c Modified: trunk/reactos/lib/crt/stdlib/strtoull.c Modified: trunk/reactos/lib/crt/stdlib/wcstol.c Modified: trunk/reactos/lib/crt/stdlib/wcstoul.c Modified: trunk/reactos/lib/crt/stdlib/wctomb.c Modified: trunk/reactos/lib/crt/stdlib/wmakpath.c Modified: trunk/reactos/lib/crt/stdlib/wtoi64.c Modified: trunk/reactos/lib/crt/time/ctime.c _____ Modified: trunk/reactos/lib/crt/direct/chdrive.c --- trunk/reactos/lib/crt/direct/chdrive.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/direct/chdrive.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,8 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + #include "precomp.h" -#include <ctype.h> -#include <direct.h> -#include <stdlib.h> -#include <errno.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/chgsign.c --- trunk/reactos/lib/crt/float/chgsign.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/chgsign.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,7 +1,17 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + +#include "precomp.h" + #include <internal/ieee.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/float/clearfp.c --- trunk/reactos/lib/crt/float/clearfp.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/clearfp.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,5 +1,15 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" + unsigned int _statusfp( void ); /* _____ Modified: trunk/reactos/lib/crt/float/cntrlfp.c --- trunk/reactos/lib/crt/float/cntrlfp.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/cntrlfp.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <float.h> +#include "precomp.h" #define X87_CW_IM (1<<0) /* Invalid operation mask */ #define X87_CW_DM (1<<1) /* Denormal operand mask */ _____ Modified: trunk/reactos/lib/crt/float/copysign.c --- trunk/reactos/lib/crt/float/copysign.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/copysign.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,4 +1,14 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + +#include "precomp.h" #include <internal/ieee.h> /* _____ Modified: trunk/reactos/lib/crt/float/fpclass.c --- trunk/reactos/lib/crt/float/fpclass.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/fpclass.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,4 +1,14 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + +#include "precomp.h" #include <math.h> #include <internal/ieee.h> _____ Modified: trunk/reactos/lib/crt/float/fpecode.c --- trunk/reactos/lib/crt/float/fpecode.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/fpecode.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,5 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + #include "precomp.h" -#include <float.h> #include <internal/tls.h> /* _____ Modified: trunk/reactos/lib/crt/float/fpreset.c --- trunk/reactos/lib/crt/float/fpreset.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/fpreset.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,5 +1,14 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" /* * @unimplemented _____ Modified: trunk/reactos/lib/crt/float/logb.c --- trunk/reactos/lib/crt/float/logb.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/logb.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -20,8 +20,6 @@ #include "precomp.h" -#include <float.h> - double _logb (double __x) { register double __val; _____ Modified: trunk/reactos/lib/crt/float/nafter.c --- trunk/reactos/lib/crt/float/nafter.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/nafter.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,5 +1,14 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/scalb.c --- trunk/reactos/lib/crt/float/scalb.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/scalb.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,4 +1,14 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + +#include "precomp.h" #include <internal/ieee.h> /* _____ Modified: trunk/reactos/lib/crt/float/statfp.c --- trunk/reactos/lib/crt/float/statfp.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/float/statfp.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,5 +1,15 @@ -#include <float.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" + /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-11-25 19:29:16 UTC (rev 19568) @@ -13,14 +13,13 @@ #ifndef __CRT_INTERNAL_FILE_H #define __CRT_INTERNAL_FILE_H -#include <stdio.h> -#include <fcntl.h> +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + #include <stdarg.h> #include <time.h> -#include <windef.h> -#include <winbase.h> - #ifndef _IORMONCL #define _IORMONCL 004000 /* remove on close, for temp files */ #endif _____ Modified: trunk/reactos/lib/crt/io/create.c --- trunk/reactos/lib/crt/io/create.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/io/create.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <fcntl.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/fmode.c --- trunk/reactos/lib/crt/io/fmode.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/io/fmode.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,8 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <fcntl.h> - int _fmode = O_TEXT; /* _____ Modified: trunk/reactos/lib/crt/io/tell.c --- trunk/reactos/lib/crt/io/tell.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/io/tell.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,8 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <sys/types.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/wcreate.c --- trunk/reactos/lib/crt/io/wcreate.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/io/wcreate.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <fcntl.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/wopen.c --- trunk/reactos/lib/crt/io/wopen.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/io/wopen.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -16,7 +16,6 @@ #if !defined(NDEBUG) && defined(DBG) #include <stdarg.h> #endif -#include <fcntl.h> #include <sys/stat.h> #include <share.h> _____ Modified: trunk/reactos/lib/crt/locale/locale.c --- trunk/reactos/lib/crt/locale/locale.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/locale/locale.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -6,7 +6,6 @@ #include "precomp.h" #include <locale.h> -#include <limits.h> #include <internal/tls.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/mbstring/islwr.c --- trunk/reactos/lib/crt/mbstring/islwr.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/mbstring/islwr.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -8,8 +8,7 @@ * 12/04/99: Created */ -#include <mbctype.h> -#include <ctype.h> +#include "precomp.h" /* * code page 952 only _____ Modified: trunk/reactos/lib/crt/mbstring/ismbpun.c --- trunk/reactos/lib/crt/mbstring/ismbpun.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/mbstring/ismbpun.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,4 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" + #include <mbstring.h> #include <mbctype.h> #include <ctype.h> _____ Modified: trunk/reactos/lib/crt/mbstring/isuppr.c --- trunk/reactos/lib/crt/mbstring/isuppr.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/mbstring/isuppr.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -8,8 +8,7 @@ * 12/04/99: Created */ -#include <mbctype.h> -#include <ctype.h> +#include "precomp.h" /* * code page 952 only _____ Modified: trunk/reactos/lib/crt/mbstring/mbsicmp.c --- trunk/reactos/lib/crt/mbstring/mbsicmp.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/mbstring/mbsicmp.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -7,9 +7,9 @@ * UPDATE HISTORY: * 12/04/99: Created */ +#include "precomp.h" #include <mbstring.h> #include <mbctype.h> -#include <ctype.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/precomp.h 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,3 +1,7 @@ +#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +/* Some global constants to hack around the msvc build */ #define _CRT_SECURE_NO_DEPRECATE #define _INC_WTIME_INL #define _INC_UTIME_INL @@ -3,8 +7,12 @@ #define _INC_TIME_INL +/* Headers to be compiled */ #include <stdio.h> #include <errno.h> +#include <fcntl.h> +#include <float.h> #include <malloc.h> #include <math.h> +#include <limits.h> #define WIN32_NO_STATUS @@ -17,5 +25,8 @@ #include <stdint.h> #endif -/* This file is a hack and should for the most part go away */ +/* CRT Internal data */ #include <internal/file.h> +#include <internal/ieee.h> + +#endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/crt/stdio/fclose.c --- trunk/reactos/lib/crt/stdio/fclose.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fclose.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,5 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <sys/types.h> #include <sys/stat.h> _____ Modified: trunk/reactos/lib/crt/stdio/fflush.c --- trunk/reactos/lib/crt/stdio/fflush.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fflush.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -11,7 +11,6 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <sys/types.h> #include <sys/stat.h> /* _____ Modified: trunk/reactos/lib/crt/stdio/fgetws.c --- trunk/reactos/lib/crt/stdio/fgetws.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fgetws.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -26,7 +26,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -//#include <msvcrt/ctype.h> #ifndef WEOF #define WEOF (wchar_t)(0xFFFF) #endif _____ Modified: trunk/reactos/lib/crt/stdio/filbuf.c --- trunk/reactos/lib/crt/stdio/filbuf.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/filbuf.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -2,8 +2,6 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <sys/types.h> -#include <wchar.h> int _readcnv(int fn, void* buf, size_t siz); _____ Modified: trunk/reactos/lib/crt/stdio/flsbuf.c --- trunk/reactos/lib/crt/stdio/flsbuf.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/flsbuf.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -2,7 +2,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" #include <wchar.h> -#include <sys/types.h> int cntcr(char* bufp, int bufsiz); int convert(char* endp, int bufsiz, int n); _____ Modified: trunk/reactos/lib/crt/stdio/fopen.c --- trunk/reactos/lib/crt/stdio/fopen.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fopen.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -27,14 +27,10 @@ #include "precomp.h" -#include <sys/types.h> -#include <fcntl.h> #include <tchar.h> //might change fopen(file,mode) -> fsopen(file,mode,_SH_DENYNO); - - FILE* _tfopen(const _TCHAR *file, const _TCHAR *mode) { FILE *f; _____ Modified: trunk/reactos/lib/crt/stdio/freopen.c --- trunk/reactos/lib/crt/stdio/freopen.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/freopen.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -2,8 +2,6 @@ #include "precomp.h" -#include <sys/types.h> -#include <fcntl.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/stdio/fseek.c --- trunk/reactos/lib/crt/stdio/fseek.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fseek.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -4,8 +4,6 @@ #include "precomp.h" -#include <fcntl.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdio/fsopen.c --- trunk/reactos/lib/crt/stdio/fsopen.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/fsopen.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -11,10 +11,7 @@ #include "precomp.h" -#include <sys/types.h> #include <sys/stat.h> -#include <stdlib.h> -#include <fcntl.h> #include <share.h> #include <tchar.h> _____ Modified: trunk/reactos/lib/crt/stdio/ftell.c --- trunk/reactos/lib/crt/stdio/ftell.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/ftell.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -3,9 +3,6 @@ #include "precomp.h" -#include <fcntl.h> -#include <errno.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdio/sprintf.c --- trunk/reactos/lib/crt/stdio/sprintf.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/sprintf.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -21,7 +21,6 @@ #include "precomp.h" #include <wchar.h> -#include <limits.h> #include <tchar.h> #undef sprintf _____ Modified: trunk/reactos/lib/crt/stdio/swprintf.c --- trunk/reactos/lib/crt/stdio/swprintf.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/swprintf.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -22,7 +22,6 @@ #define _UNICODE #include "precomp.h" #include <wchar.h> -#include <limits.h> #include <tchar.h> #undef sprintf _____ Modified: trunk/reactos/lib/crt/stdio/tmpfile.c --- trunk/reactos/lib/crt/stdio/tmpfile.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/tmpfile.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -4,7 +4,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <fcntl.h> #include <share.h> FILE * __alloc_file(void); _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -59,7 +59,6 @@ * Appropiated for the reactos kernel, March 1998 -- David Welch */ -#include <ctype.h> #include <math.h> #include <internal/ieee.h> _____ Modified: trunk/reactos/lib/crt/stdio/vsprintf.c --- trunk/reactos/lib/crt/stdio/vsprintf.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdio/vsprintf.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,7 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <limits.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/stdlib/atoi64.c --- trunk/reactos/lib/crt/stdlib/atoi64.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/atoi64.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ -#include <ctype.h> -#include <stdlib.h> +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/stdlib/ecvt.c --- trunk/reactos/lib/crt/stdlib/ecvt.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/ecvt.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,5 @@ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <float.h> +#include "precomp.h" char *ecvtbuf (double, int, int *, int *, char *); _____ Modified: trunk/reactos/lib/crt/stdlib/fcvt.c --- trunk/reactos/lib/crt/stdlib/fcvt.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/fcvt.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,5 @@ /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <float.h> +#include "precomp.h" char *fcvtbuf (double, int, int *, int *, char *); _____ Modified: trunk/reactos/lib/crt/stdlib/mbtowc.c --- trunk/reactos/lib/crt/stdlib/mbtowc.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/mbtowc.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,8 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + #include "precomp.h" -#include <stdlib.h> -#include <ctype.h> - #if 1 /* _____ Modified: trunk/reactos/lib/crt/stdlib/strtol.c --- trunk/reactos/lib/crt/stdlib/strtol.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/strtol.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,9 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <limits.h> -#include <ctype.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdlib/strtold.c --- trunk/reactos/lib/crt/stdlib/strtold.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/strtold.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,7 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <stdlib.h> #include <msvcrt/ctype.h> -//#include <msvcrt/unconst.h> static double powten[] = { _____ Modified: trunk/reactos/lib/crt/stdlib/strtoul.c --- trunk/reactos/lib/crt/stdlib/strtoul.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/strtoul.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,7 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" - -#include <limits.h> #include <ctype.h> /* _____ Modified: trunk/reactos/lib/crt/stdlib/strtoull.c --- trunk/reactos/lib/crt/stdlib/strtoull.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/strtoull.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -2,9 +2,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <limits.h> -#include <ctype.h> - #if defined (_MSC_VER) #define UINT64_MAX 0xffffffffffffffff #endif _____ Modified: trunk/reactos/lib/crt/stdlib/wcstol.c --- trunk/reactos/lib/crt/stdlib/wcstol.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/wcstol.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,14 @@ -#include <stdlib.h> -#include <ctype.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/stdlib/wcstoul.c --- trunk/reactos/lib/crt/stdlib/wcstoul.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/wcstoul.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <limits.h> /* * Convert a unicode string to an unsigned long integer. _____ Modified: trunk/reactos/lib/crt/stdlib/wctomb.c --- trunk/reactos/lib/crt/stdlib/wctomb.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/wctomb.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -17,8 +17,6 @@ Boston, MA 02111-1307, USA. */ #include "precomp.h" -#include <ctype.h> -#include <wchar.h> int STDCALL _____ Modified: trunk/reactos/lib/crt/stdlib/wmakpath.c --- trunk/reactos/lib/crt/stdlib/wmakpath.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/wmakpath.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -1,9 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: gdalsnes + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + /* $Id$ */ -#include <stdlib.h> -#include <string.h> +#include "precomp.h" - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdlib/wtoi64.c --- trunk/reactos/lib/crt/stdlib/wtoi64.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/stdlib/wtoi64.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -10,10 +10,6 @@ #include "precomp.h" -#include <ctype.h> -#include <stdlib.h> - - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/time/ctime.c --- trunk/reactos/lib/crt/time/ctime.c 2005-11-25 19:12:04 UTC (rev 19567) +++ trunk/reactos/lib/crt/time/ctime.c 2005-11-25 19:29:16 UTC (rev 19568) @@ -37,7 +37,6 @@ #include "precomp.h" -#include <fcntl.h> #include "tzfile.h" #include "posixrul.h"

18 years, 9 months

[royce] 19567: fix signed/unsigned comparison warning

by royce＠svn.reactos.com

fix signed/unsigned comparison warning Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-11-25 18:43:51 UTC (rev 19566) +++ trunk/reactos/tools/rsym.c 2005-11-25 19:12:04 UTC (rev 19567) @@ -610,7 +610,7 @@ { RosSymOffset = CurrentSectionHeader->PointerToRawData + CurrentSectionHeader->SizeOfRawData; } - if (Section == InRelocSectionIndex) + if (Section == (ULONG)InRelocSectionIndex) { OutRelocSection = CurrentSectionHeader; }

18 years, 9 months

[chorns] 19566: Speed up compilation of ntoskrnl

by chorns＠svn.reactos.com

Speed up compilation of ntoskrnl Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-11-25 18:21:42 UTC (rev 19565) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-11-25 18:43:51 UTC (rev 19566) @@ -48,43 +48,49 @@ <file>vdm.c</file> </directory> </if> - <file>apc.c</file> - <file>bug.c</file> - <file>clock.c</file> - <file>device.c</file> - <file>dpc.c</file> - <file>event.c</file> - <file>exception.c</file> - <file>gate.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>kqueue.c</file> - <file>kthread.c</file> - <file>main.c</file> - <file>mutex.c</file> - <file>process.c</file> - <file>profile.c</file> - <file>queue.c</file> - <file>sem.c</file> - <file>spinlock.c</file> - <file>timer.c</file> - <file>usercall.c</file> - <file>wait.c</file> + <compilationunit name="ke.c"> + <file>apc.c</file> + <file>bug.c</file> + <file>clock.c</file> + <file>device.c</file> + <file>dpc.c</file> + <file>event.c</file> + <file>exception.c</file> + <file>gate.c</file> + <file>gmutex.c</file> + <file>ipi.c</file> + <file>kqueue.c</file> + <file>kthread.c</file> + <file>main.c</file> + <file>mutex.c</file> + <file>process.c</file> + <file>profile.c</file> + <file>queue.c</file> + <file>sem.c</file> + <file>spinlock.c</file> + <file>timer.c</file> + <file>usercall.c</file> + <file>wait.c</file> + </compilationunit> </directory> <directory name="cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> + <compilationunit name="cc.c"> + <file>cacheman.c</file> + <file>copy.c</file> + <file>fs.c</file> + <file>mdl.c</file> + <file>pin.c</file> + <file>view.c</file> + </compilationunit> </directory> <directory name="cm"> - <file>import.c</file> - <file>ntfunc.c</file> - <file>regfile.c</file> - <file>registry.c</file> - <file>regobj.c</file> + <compilationunit name="cm.c"> + <file>import.c</file> + <file>ntfunc.c</file> + <file>regfile.c</file> + <file>registry.c</file> + <file>regobj.c</file> + </compilationunit> </directory> <directory name="kdbg"> <if property="ARCH" value="i386"> @@ -116,116 +122,128 @@ <file>debug.c</file> </directory> <directory name="ex"> - <file>atom.c</file> <if property="ARCH" value="i386"> <directory name="i386"> <file>interlck_asm.S</file> </directory> </if> - <file>callback.c</file> - <file>dbgctrl.c</file> - <file>error.c</file> - <file>event.c</file> - <file>evtpair.c</file> - <file>fmutex.c</file> - <file>handle.c</file> - <file>init.c</file> - <file>interlck.c</file> - <file>list.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>power.c</file> - <file>profile.c</file> - <file>resource.c</file> - <file>rundown.c</file> - <file>sem.c</file> - <file>synch.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> - <file>win32k.c</file> - <file>work.c</file> - <file>zone.c</file> + <compilationunit name="ex.c"> + <file>atom.c</file> + <file>callback.c</file> + <file>dbgctrl.c</file> + <file>error.c</file> + <file>event.c</file> + <file>evtpair.c</file> + <file>fmutex.c</file> + <file>handle.c</file> + <file>init.c</file> + <file>interlck.c</file> + <file>list.c</file> + <file>lookas.c</file> + <file>mutant.c</file> + <file>power.c</file> + <file>profile.c</file> + <file>resource.c</file> + <file>rundown.c</file> + <file>sem.c</file> + <file>synch.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>uuid.c</file> + <file>win32k.c</file> + <file>work.c</file> + <file>zone.c</file> + </compilationunit> <file>zw.S</file> </directory> <directory name="fs"> - <file>context.c</file> - <file>fastio.c</file> - <file>filelock.c</file> - <file>mcb.c</file> - <file>name.c</file> - <file>notify.c</file> - <file>oplock.c</file> - <file>pool.c</file> - <file>tunnel.c</file> - <file>unc.c</file> - <file>util.c</file> + <compilationunit name="fs.c"> + <file>context.c</file> + <file>fastio.c</file> + <file>filelock.c</file> + <file>mcb.c</file> + <file>name.c</file> + <file>notify.c</file> + <file>oplock.c</file> + <file>pool.c</file> + <file>tunnel.c</file> + <file>unc.c</file> + <file>util.c</file> + </compilationunit> </directory> <directory name="inbv"> <file>inbv.c</file> </directory> <directory name="io"> - <file>adapter.c</file> - <file>arcname.c</file> - <file>bootlog.c</file> - <file>controller.c</file> - <file>device.c</file> - <file>deviface.c</file> - <file>disk.c</file> - <file>driver.c</file> - <file>efi.c</file> - <file>error.c</file> - <file>event.c</file> + <compilationunit name="io.c"> + <file>adapter.c</file> + <file>arcname.c</file> + <file>bootlog.c</file> + <file>controller.c</file> + <file>device.c</file> + <file>deviface.c</file> + <file>disk.c</file> + <file>driver.c</file> + <file>efi.c</file> + <file>error.c</file> + <file>event.c</file> + <file>fs.c</file> + <file>iocomp.c</file> + <file>iomgr.c</file> + <file>iowork.c</file> + <file>irp.c</file> + <file>irq.c</file> + <file>mdl.c</file> + <file>plugplay.c</file> + <file>pnpdma.c</file> + <file>pnpmgr.c</file> + <file>pnpnotify.c</file> + <file>pnpreport.c</file> + <file>pnproot.c</file> + <file>rawfs.c</file> + <file>remlock.c</file> + <file>resource.c</file> + <file>share.c</file> + <file>symlink.c</file> + <file>timer.c</file> + <file>vpb.c</file> + <file>wmi.c</file> + </compilationunit> <file>file.c</file> - <file>fs.c</file> - <file>iocomp.c</file> - <file>iomgr.c</file> - <file>iowork.c</file> - <file>irp.c</file> - <file>irq.c</file> - <file>mdl.c</file> - <file>plugplay.c</file> - <file>pnpdma.c</file> - <file>pnpmgr.c</file> - <file>pnpnotify.c</file> - <file>pnpreport.c</file> - <file>pnproot.c</file> - <file>rawfs.c</file> - <file>remlock.c</file> - <file>resource.c</file> - <file>share.c</file> - <file>symlink.c</file> - <file>timer.c</file> - <file>vpb.c</file> - <file>wmi.c</file> </directory> <directory name="kd"> - <directory name="wrappers"> - <file>bochs.c</file> - <file>gdbstub.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> + <compilationunit name="kd.c"> + <directory name="wrappers"> + <file>bochs.c</file> + <file>gdbstub.c</file> + </directory> + <file>kdinit.c</file> + <file>kdio.c</file> + <file>kdmain.c</file> + </compilationunit> </directory> <directory name="ldr"> - <file>loader.c</file> - <file>resource.c</file> - <file>rtl.c</file> + <compilationunit name="ldr.c"> + <file>loader.c</file> + <file>resource.c</file> + <file>rtl.c</file> + </compilationunit> </directory> <directory name="lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>query.c</file> - <file>queue.c</file> - <file>receive.c</file> - <file>reply.c</file> - <file>send.c</file> + <compilationunit name="lpc.c"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>query.c</file> + <file>queue.c</file> + <file>receive.c</file> + <file>reply.c</file> + <file>send.c</file> + </compilationunit> </directory> <directory name="mm"> <if property="ARCH" value="i386"> @@ -235,69 +253,75 @@ <file>pfault.c</file> </directory> </if> - <file>anonmem.c</file> - <file>aspace.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> + <compilationunit name="mm.c"> + <file>anonmem.c</file> + <file>aspace.c</file> + <file>balance.c</file> + <file>cont.c</file> + <file>drvlck.c</file> + <file>freelist.c</file> + <file>iospace.c</file> + <file>kmap.c</file> + <file>marea.c</file> + <file>mdl.c</file> + <file>mm.c</file> + <file>process.c</file> + <file>mminit.c</file> + <file>mpw.c</file> + <file>ncache.c</file> + <file>npool.c</file> + <file>pagefile.c</file> + <file>pageop.c</file> + <file>pager.c</file> + <file>pagfault.c</file> + <file>paging.c</file> + <file>pe.c</file> + <file>physical.c</file> + <file>pool.c</file> + <file>ppool.c</file> + <file>region.c</file> + <file>rmap.c</file> + <file>section.c</file> + <file>verifier.c</file> + <file>virtual.c</file> + <file>wset.c</file> + </compilationunit> <file>elf32.c</file> <file>elf64.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdl.c</file> - <file>mm.c</file> - <file>process.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pager.c</file> - <file>pagfault.c</file> - <file>paging.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> </directory> <directory name="ob"> - <file>dirobj.c</file> - <file>handle.c</file> - <file>namespc.c</file> - <file>ntobj.c</file> - <file>object.c</file> - <file>sdcache.c</file> - <file>security.c</file> - <file>symlink.c</file> - <file>wait.c</file> + <compilationunit name="ob.c"> + <file>dirobj.c</file> + <file>handle.c</file> + <file>namespc.c</file> + <file>ntobj.c</file> + <file>object.c</file> + <file>sdcache.c</file> + <file>security.c</file> + <file>symlink.c</file> + <file>wait.c</file> + </compilationunit> </directory> <directory name="po"> <file>power.c</file> </directory> <directory name="ps"> - <file>debug.c</file> - <file>idle.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>locale.c</file> - <file>notify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>suspend.c</file> - <file>thread.c</file> - <file>win32.c</file> + <compilationunit name="ps.c"> + <file>debug.c</file> + <file>idle.c</file> + <file>job.c</file> + <file>kill.c</file> + <file>locale.c</file> + <file>notify.c</file> + <file>process.c</file> + <file>psmgr.c</file> + <file>query.c</file> + <file>quota.c</file> + <file>security.c</file> + <file>suspend.c</file> + <file>thread.c</file> + <file>win32.c</file> + </compilationunit> </directory> <directory name="rtl"> <if property="ARCH" value="i386"> @@ -306,23 +330,27 @@ <file>seh.s</file> </directory> </if> - <file>libsupp.c</file> - <file>misc.c</file> - <file>nls.c</file> - <file>regio.c</file> - <file>strtok.c</file> + <compilationunit name="rtl.c"> + <file>libsupp.c</file> + <file>misc.c</file> + <file>nls.c</file> + <file>regio.c</file> + <file>strtok.c</file> + </compilationunit> </directory> <directory name="se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>luid.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> + <compilationunit name="se.c"> + <file>access.c</file> + <file>acl.c</file> + <file>audit.c</file> + <file>lsa.c</file> + <file>luid.c</file> + <file>priv.c</file> + <file>sd.c</file> + <file>semgr.c</file> + <file>sid.c</file> + <file>token.c</file> + </compilationunit> </directory> <file>ntoskrnl.rc</file> <linkerflag>-nostartfiles</linkerflag>

18 years, 9 months

[greatlrd] 19565: implement addbuffer to waveTheard. it can play wave one time if it is same file in windows

by greatlrd＠svn.reactos.com

implement addbuffer to waveTheard. it can play wave one time if it is same file in windows Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-25 18:05:42 UTC (rev 19564) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-25 18:21:42 UTC (rev 19565) @@ -91,9 +91,31 @@ switch (pClient->AuxFunction) { case WaveThreadAddBuffer: - DPRINT("UNIMPLMENENT WaveThreadAddBuffer "); + LPWAVEHDR *pHdrSearching; + + if (pClient->DeviceType == WaveInDevice) + pClient->AuxParam.pHdr->dwBytesRecorded = 0; + + pHdrSearching = &pClient->DeviceQueue; + pClient->AuxParam.pHdr->lpNext = NULL; + + while (*pHdrSearching) + { + pHdrSearching = &(*pHdrSearching)->lpNext; + } + + if (pClient->NextBuffer == NULL) + { + pClient->BufferPosition = 0; + pClient->NextBuffer = pClient->AuxParam.pHdr; + + } + + *pHdrSearching = pClient->AuxParam.pHdr; + + pClient->AuxReturnCode = waveStart(pClient); break; - + case WaveThreadSetState: pClient->AuxReturnCode = waveSetState(pClient, pClient->AuxParam.State); @@ -549,7 +571,7 @@ BOOL Result; DWORD BytesReturned; LPWAVEFORMATEX pFormats; - PWAVEALLOC *pUserHandle = &pClient; + PWAVEALLOC *pUserHandle = NULL; HANDLE hDevice; pFormats = (LPWAVEFORMATEX)((LPWAVEOPENDESC)dwParam1)->lpFormat;

18 years, 9 months

[sedwards] 19564: Fix pch usage in most of the rest of crt.lib. Stop the abuse of including io.h, stdio.h and a few others directly. Add a generic license header to those source files that were missing it. There is still a few other headers left to fix and a few files missing pch and license headers

by sedwards＠svn.reactos.com

Fix pch usage in most of the rest of crt.lib. Stop the abuse of including io.h, stdio.h and a few others directly. Add a generic license header to those source files that were missing it. There is still a few other headers left to fix and a few files missing pch and license headers Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cputs.c Modified: trunk/reactos/lib/crt/conio/getch.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/direct/chdir.c Modified: trunk/reactos/lib/crt/direct/chdrive.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/direct/mkdir.c Modified: trunk/reactos/lib/crt/direct/rmdir.c Modified: trunk/reactos/lib/crt/except/abnorter.c Modified: trunk/reactos/lib/crt/float/logb.c Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/chmod.c Modified: trunk/reactos/lib/crt/io/chsize.c Modified: trunk/reactos/lib/crt/io/close.c Modified: trunk/reactos/lib/crt/io/commit.c Modified: trunk/reactos/lib/crt/io/create.c Modified: trunk/reactos/lib/crt/io/dup.c Modified: trunk/reactos/lib/crt/io/dup2.c Modified: trunk/reactos/lib/crt/io/eof.c Modified: trunk/reactos/lib/crt/io/filelen.c Modified: trunk/reactos/lib/crt/io/fileleni.c Modified: trunk/reactos/lib/crt/io/find.c Modified: trunk/reactos/lib/crt/io/fmode.c Modified: trunk/reactos/lib/crt/io/isatty.c Modified: trunk/reactos/lib/crt/io/locking.c Modified: trunk/reactos/lib/crt/io/lseek.c Modified: trunk/reactos/lib/crt/io/lseeki64.c Modified: trunk/reactos/lib/crt/io/mktemp.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/pipe.c Modified: trunk/reactos/lib/crt/io/read.c Modified: trunk/reactos/lib/crt/io/setmode.c Modified: trunk/reactos/lib/crt/io/sopen.c Modified: trunk/reactos/lib/crt/io/tell.c Modified: trunk/reactos/lib/crt/io/telli64.c Modified: trunk/reactos/lib/crt/io/unlink.c Modified: trunk/reactos/lib/crt/io/utime.c Modified: trunk/reactos/lib/crt/io/wcreate.c Modified: trunk/reactos/lib/crt/io/wmktemp.c Modified: trunk/reactos/lib/crt/io/wopen.c Modified: trunk/reactos/lib/crt/io/write.c Modified: trunk/reactos/lib/crt/io/wunlink.c Modified: trunk/reactos/lib/crt/io/wutime.c Modified: trunk/reactos/lib/crt/locale/locale.c Modified: trunk/reactos/lib/crt/math/hypot.c Modified: trunk/reactos/lib/crt/mbstring/mbbtype.c Modified: trunk/reactos/lib/crt/mbstring/mbsdec.c Modified: trunk/reactos/lib/crt/misc/amsg.c Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_cwait.c Modified: trunk/reactos/lib/crt/process/_system.c Modified: trunk/reactos/lib/crt/process/process.c Modified: trunk/reactos/lib/crt/process/thread.c Modified: trunk/reactos/lib/crt/process/threadx.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/allocfil.c Modified: trunk/reactos/lib/crt/stdio/clearerr.c Modified: trunk/reactos/lib/crt/stdio/fclose.c Modified: trunk/reactos/lib/crt/stdio/fdopen.c Modified: trunk/reactos/lib/crt/stdio/feof.c Modified: trunk/reactos/lib/crt/stdio/ferror.c Modified: trunk/reactos/lib/crt/stdio/fflush.c Modified: trunk/reactos/lib/crt/stdio/fgetc.c Modified: trunk/reactos/lib/crt/stdio/fgetchar.c Modified: trunk/reactos/lib/crt/stdio/fgetpos.c Modified: trunk/reactos/lib/crt/stdio/fgets.c Modified: trunk/reactos/lib/crt/stdio/fgetws.c Modified: trunk/reactos/lib/crt/stdio/filbuf.c Modified: trunk/reactos/lib/crt/stdio/fileno.c Modified: trunk/reactos/lib/crt/stdio/flsbuf.c Modified: trunk/reactos/lib/crt/stdio/fopen.c Modified: trunk/reactos/lib/crt/stdio/fprintf.c Modified: trunk/reactos/lib/crt/stdio/fputc.c Modified: trunk/reactos/lib/crt/stdio/fputchar.c Modified: trunk/reactos/lib/crt/stdio/fputs.c Modified: trunk/reactos/lib/crt/stdio/fread.c Modified: trunk/reactos/lib/crt/stdio/freopen.c Modified: trunk/reactos/lib/crt/stdio/fseek.c Modified: trunk/reactos/lib/crt/stdio/fsetpos.c Modified: trunk/reactos/lib/crt/stdio/fsopen.c Modified: trunk/reactos/lib/crt/stdio/ftell.c Modified: trunk/reactos/lib/crt/stdio/fwalk.c Modified: trunk/reactos/lib/crt/stdio/fwrite.c Modified: trunk/reactos/lib/crt/stdio/getc.c Modified: trunk/reactos/lib/crt/stdio/getchar.c Modified: trunk/reactos/lib/crt/stdio/gets.c Modified: trunk/reactos/lib/crt/stdio/getw.c Modified: trunk/reactos/lib/crt/stdio/perror.c Modified: trunk/reactos/lib/crt/stdio/popen.c Modified: trunk/reactos/lib/crt/stdio/printf.c Modified: trunk/reactos/lib/crt/stdio/putc.c Modified: trunk/reactos/lib/crt/stdio/putchar.c Modified: trunk/reactos/lib/crt/stdio/puts.c Modified: trunk/reactos/lib/crt/stdio/putw.c Modified: trunk/reactos/lib/crt/stdio/remove.c Modified: trunk/reactos/lib/crt/stdio/rename.c [truncated at 100 lines; 91 more skipped] _____ Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -6,8 +6,8 @@ * PROGRAMMER: Eric Kohl (Imported from DJGPP) */ -#include <stdio.h> -#include <stdarg.h> +#include "precomp.h" + #include <conio.h> /* _____ Modified: trunk/reactos/lib/crt/conio/cputs.c --- trunk/reactos/lib/crt/conio/cputs.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/conio/cputs.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -10,11 +10,7 @@ #include "precomp.h" #include <conio.h> -#include <string.h> -#include <stdio.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/conio/getch.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -10,8 +10,6 @@ #include "precomp.h" #include <conio.h> -#include <stdio.h> -#include <io.h> #include <internal/console.h> _____ Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -10,7 +10,8 @@ * 28/12/98: Created */ -#include <stdio.h> +#include "precomp.h" + #include <conio.h> #include <internal/console.h> _____ Modified: trunk/reactos/lib/crt/direct/chdir.c --- trunk/reactos/lib/crt/direct/chdir.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/chdir.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,6 @@ #include "precomp.h" #include <ctype.h> #include <direct.h> -#include <internal/file.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/direct/chdrive.c --- trunk/reactos/lib/crt/direct/chdrive.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/chdrive.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -3,9 +3,7 @@ #include <direct.h> #include <stdlib.h> #include <errno.h> -#include <internal/file.h> - /* * @implemented * _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -2,7 +2,6 @@ #include <direct.h> #include <stdlib.h> #include <errno.h> -#include <internal/file.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,5 @@ #include "precomp.h" #include <direct.h> -#include <internal/file.h> #include <internal/debug.h> #include <tchar.h> #include <errno.h> _____ Modified: trunk/reactos/lib/crt/direct/mkdir.c --- trunk/reactos/lib/crt/direct/mkdir.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/mkdir.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,5 @@ #include "precomp.h" #include <direct.h> -#include <internal/file.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/direct/rmdir.c --- trunk/reactos/lib/crt/direct/rmdir.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/direct/rmdir.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,5 @@ #include "precomp.h" #include <direct.h> -#include <internal/file.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/except/abnorter.c --- trunk/reactos/lib/crt/except/abnorter.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/except/abnorter.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,5 @@ #include "precomp.h" -#include <stdio.h> - #ifdef __GNUC__ /* _____ Modified: trunk/reactos/lib/crt/float/logb.c --- trunk/reactos/lib/crt/float/logb.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/float/logb.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -18,6 +18,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "precomp.h" + #include <float.h> double _logb (double __x) _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-11-25 18:05:42 UTC (rev 19564) @@ -18,10 +18,8 @@ #include <stdarg.h> #include <time.h> - #include <windef.h> #include <winbase.h> -#include <winnt.h> #ifndef _IORMONCL #define _IORMONCL 004000 /* remove on close, for temp files */ @@ -194,3 +192,4 @@ #endif /* __dj_include_libc_file_h__ */ + _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/access.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,6 @@ #include "precomp.h" -#include <io.h> #include <errno.h> #include <tchar.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/chmod.c --- trunk/reactos/lib/crt/io/chmod.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/chmod.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ #include "precomp.h" -#include <io.h> #include <sys/stat.h> #include <tchar.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/chsize.c --- trunk/reactos/lib/crt/io/chsize.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/chsize.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,5 +1,5 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -#include <io.h> +#include "precomp.h" #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/close.c --- trunk/reactos/lib/crt/io/close.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/close.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,4 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/commit.c --- trunk/reactos/lib/crt/io/commit.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/commit.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <errno.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/create.c --- trunk/reactos/lib/crt/io/create.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/create.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,4 +1,14 @@ -#include <io.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ + +#include "precomp.h" #include <fcntl.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/io/dup.c --- trunk/reactos/lib/crt/io/dup.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/dup.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <errno.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/dup2.c --- trunk/reactos/lib/crt/io/dup2.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/dup2.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,4 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/eof.c --- trunk/reactos/lib/crt/io/eof.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/eof.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,6 +1,15 @@ -#include <stdio.h> -#include <io.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ +#include "precomp.h" + /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/filelen.c --- trunk/reactos/lib/crt/io/filelen.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/filelen.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/fileleni.c --- trunk/reactos/lib/crt/io/fileleni.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/fileleni.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/find.c --- trunk/reactos/lib/crt/io/find.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/find.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,10 +1,6 @@ #include "precomp.h" -#include <io.h> -#include <string.h> #include <tchar.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/fmode.c --- trunk/reactos/lib/crt/io/fmode.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/fmode.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,8 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include "precomp.h" + #include <fcntl.h> -#include <io.h> - int _fmode = O_TEXT; /* _____ Modified: trunk/reactos/lib/crt/io/isatty.c --- trunk/reactos/lib/crt/io/isatty.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/isatty.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,5 @@ #include "precomp.h" -#include <internal/file.h> - #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/locking.c --- trunk/reactos/lib/crt/io/locking.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/locking.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/lseek.c --- trunk/reactos/lib/crt/io/lseek.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/lseek.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/lseeki64.c --- trunk/reactos/lib/crt/io/lseeki64.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/lseeki64.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ #include "precomp.h" -#include <io.h> -#include <internal/file.h> - //#define SETFILEPOINTEREX_AVAILABLE /* _____ Modified: trunk/reactos/lib/crt/io/mktemp.c --- trunk/reactos/lib/crt/io/mktemp.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/mktemp.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -13,14 +13,11 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <stdio.h> -#include <string.h> -#include <io.h> +#include "precomp.h" #define NDEBUG #include <internal/debug.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/open.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -42,14 +42,10 @@ #include <stdarg.h> #endif -#include <io.h> #include <fcntl.h> #include <sys/stat.h> -#include <stdlib.h> #include <string.h> #include <share.h> -#include <errno.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/pipe.c --- trunk/reactos/lib/crt/io/pipe.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/pipe.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -10,9 +10,6 @@ */ #include "precomp.h" -#include <io.h> -#include <errno.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/read.c --- trunk/reactos/lib/crt/io/read.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/read.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -12,9 +12,7 @@ * behavior for line-buffered streams (KJK::Hyperion) */ -#include <windows.h> -#include <io.h> -#include <internal/file.h> +#include "precomp.h" #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/setmode.c --- trunk/reactos/lib/crt/io/setmode.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/setmode.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -10,10 +10,6 @@ */ #include "precomp.h" -#include <io.h> -#include <stdio.h> -#include <internal/file.h> - #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/sopen.c --- trunk/reactos/lib/crt/io/sopen.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/sopen.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,5 +1,14 @@ -#include <io.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/tell.c --- trunk/reactos/lib/crt/io/tell.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/tell.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <errno.h> -#include <io.h> -#include <stdio.h> +#include "precomp.h" + #include <sys/types.h> /* _____ Modified: trunk/reactos/lib/crt/io/telli64.c --- trunk/reactos/lib/crt/io/telli64.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/telli64.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,14 @@ -#include <errno.h> -#include <io.h> -#include <stdio.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/unlink.c --- trunk/reactos/lib/crt/io/unlink.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/unlink.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -9,8 +9,6 @@ */ #include "precomp.h" -#include <io.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/utime.c --- trunk/reactos/lib/crt/io/utime.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/utime.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,12 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ + #include "precomp.h" - -#include <stdio.h> -#include <io.h> -#include <errno.h> #include <sys/utime.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/io/wcreate.c --- trunk/reactos/lib/crt/io/wcreate.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/wcreate.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,4 +1,14 @@ -#include <io.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ + +#include "precomp.h" #include <fcntl.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/io/wmktemp.c --- trunk/reactos/lib/crt/io/wmktemp.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/wmktemp.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -13,9 +13,7 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <stdio.h> -#include <string.h> -#include <io.h> +#include "precomp.h" #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/wopen.c --- trunk/reactos/lib/crt/io/wopen.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/wopen.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -16,14 +16,9 @@ #if !defined(NDEBUG) && defined(DBG) #include <stdarg.h> #endif -#include <io.h> #include <fcntl.h> #include <sys/stat.h> -#include <stdlib.h> -#include <string.h> #include <share.h> -#include <errno.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/write.c --- trunk/reactos/lib/crt/io/write.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/write.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -9,11 +9,6 @@ */ #include "precomp.h" -#include <io.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/wunlink.c --- trunk/reactos/lib/crt/io/wunlink.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/wunlink.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -9,8 +9,6 @@ */ #include "precomp.h" -#include <io.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/wutime.c --- trunk/reactos/lib/crt/io/wutime.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/io/wutime.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Created + */ + #include "precomp.h" -#include <stdio.h> -#include <io.h> -#include <errno.h> #include <sys/utime.h> -#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/locale/locale.c --- trunk/reactos/lib/crt/locale/locale.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/locale/locale.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -5,12 +5,9 @@ */ #include "precomp.h" -#include <stdio.h> #include <locale.h> -#include <string.h> #include <limits.h> #include <internal/tls.h> -#include <stdlib.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/math/hypot.c --- trunk/reactos/lib/crt/math/hypot.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/math/hypot.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -15,6 +15,7 @@ * inflicting too much of a performance hit. * */ +#include "precomp.h" #include <float.h> #include <math.h> _____ Modified: trunk/reactos/lib/crt/mbstring/mbbtype.c --- trunk/reactos/lib/crt/mbstring/mbbtype.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/mbstring/mbbtype.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -8,7 +8,8 @@ * 12/04/99: Created */ -#include <stdio.h> +#include "precomp.h" + #include <mbstring.h> #include <mbctype.h> _____ Modified: trunk/reactos/lib/crt/mbstring/mbsdec.c --- trunk/reactos/lib/crt/mbstring/mbsdec.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/mbstring/mbsdec.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,4 +1,4 @@ -#include <stdio.h> +#include "precomp.h" #include <mbstring.h> /* _____ Modified: trunk/reactos/lib/crt/misc/amsg.c --- trunk/reactos/lib/crt/misc/amsg.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/misc/amsg.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -8,10 +8,8 @@ * 28/12/98: Created */ -#include <stdlib.h> -#include <stdio.h> +#include "precomp.h" - static char *__rt_err_msg[] = { "stack overflow", /* _RT_STACK */ _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/crt/misc/environ.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/misc/environ.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -9,7 +9,6 @@ #include <internal/tls.h> #include <stdlib.h> #include <string.h> -#include <internal/file.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/precomp.h 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,13 @@ -#define CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE #define _INC_WTIME_INL #define _INC_UTIME_INL #define _INC_TIME_INL +#include <stdio.h> +#include <errno.h> +#include <malloc.h> +#include <math.h> + #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER @@ -11,3 +16,6 @@ #if !defined(_MSC_VER) #include <stdint.h> #endif + +/* This file is a hack and should for the most part go away */ +#include <internal/file.h> _____ Modified: trunk/reactos/lib/crt/process/_cwait.c --- trunk/reactos/lib/crt/process/_cwait.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/process/_cwait.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -9,11 +9,7 @@ */ #include "precomp.h" -#include <process.h> -#include <errno.h> -#include <internal/file.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/process/_system.c --- trunk/reactos/lib/crt/process/_system.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/process/_system.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -14,7 +14,6 @@ #include <string.h> #include <process.h> #include <errno.h> -#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/process/process.c --- trunk/reactos/lib/crt/process/process.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/process/process.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,5 @@ #include "precomp.h" #include <process.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <internal/file.h> #include <tchar.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/process/thread.c --- trunk/reactos/lib/crt/process/thread.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/process/thread.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,4 @@ #include "precomp.h" -#include <errno.h> -#include <process.h> -#include <internal/file.h> #if 0 /* _____ Modified: trunk/reactos/lib/crt/process/threadx.c --- trunk/reactos/lib/crt/process/threadx.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/process/threadx.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,9 +1,5 @@ #include "precomp.h" -#include <errno.h> -#include <process.h> -#include <internal/file.h> - /* * @unimplemented */ _____ Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/signal/signal.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -4,7 +4,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <internal/file.h> void _default_handler(int signal); _____ Modified: trunk/reactos/lib/crt/stdio/allocfil.c --- trunk/reactos/lib/crt/stdio/allocfil.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/allocfil.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,12 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <internal/file.h> - - char __validfp (FILE *f) { if ( (unsigned int)f < 256) _____ Modified: trunk/reactos/lib/crt/stdio/clearerr.c --- trunk/reactos/lib/crt/stdio/clearerr.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/clearerr.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,10 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <errno.h> -#include <internal/file.h> - #ifdef clearerr #undef clearerr void clearerr(FILE *stream); _____ Modified: trunk/reactos/lib/crt/stdio/fclose.c --- trunk/reactos/lib/crt/stdio/fclose.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/fclose.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,13 +1,7 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <stdarg.h> -#include <io.h> #include <sys/types.h> #include <sys/stat.h> -#include <stdlib.h> -#include <errno.h> -#include <internal/file.h> // changed check for writable stream _____ Modified: trunk/reactos/lib/crt/stdio/fdopen.c --- trunk/reactos/lib/crt/stdio/fdopen.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/fdopen.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,6 @@ #include "precomp.h" -#include <stdio.h> #include <tchar.h> -#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/stdio/feof.c --- trunk/reactos/lib/crt/stdio/feof.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/feof.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,8 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <errno.h> -#include <internal/file.h> #ifdef feof #undef feof _____ Modified: trunk/reactos/lib/crt/stdio/ferror.c --- trunk/reactos/lib/crt/stdio/ferror.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/ferror.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -1,7 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <internal/file.h> #ifdef ferror #undef ferror _____ Modified: trunk/reactos/lib/crt/stdio/fflush.c --- trunk/reactos/lib/crt/stdio/fflush.c 2005-11-25 17:13:40 UTC (rev 19563) +++ trunk/reactos/lib/crt/stdio/fflush.c 2005-11-25 18:05:42 UTC (rev 19564) @@ -11,16 +11,9 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <stdio.h> -#include <stdarg.h> -#include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include <stdlib.h> -#include <io.h> -#include <internal/file.h> - /* [truncated at 1000 lines; 2157 more skipped]

18 years, 9 months

[royce] 19563: more descriptive debug message

by royce＠svn.reactos.com

more descriptive debug message Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-11-25 17:02:43 UTC (rev 19562) +++ trunk/reactos/ntoskrnl/io/device.c 2005-11-25 17:13:40 UTC (rev 19563) @@ -569,7 +569,8 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Cannot insert Device Object into Handle Table (status 0x%08lx)\n", Status); + DPRINT1("Cannot insert Device Object '%wZ' into Handle Table (status 0x%08lx)\n", + DeviceName, Status); *DeviceObject = NULL; return Status; }

18 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005