Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[chorns] 13395: Build keyboard layout DLLs

by chorns＠svn.reactos.com

Build keyboard layout DLLs Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml Added: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml Added: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml Added: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml Added: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml Added: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml Added: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -88,6 +88,27 @@ <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.xml" /> </directory> +<directory name="kbdda"> + <xi:include href="kbdda/kbdda.xml" /> +</directory> +<directory name="kbddv"> + <xi:include href="kbddv/kbddv.xml" /> +</directory> +<directory name="kbdfr"> + <xi:include href="kbdfr/kbdfr.xml" /> +</directory> +<directory name="kbdgr"> + <xi:include href="kbdgr/kbdgr.xml" /> +</directory> +<directory name="kbdse"> + <xi:include href="kbdse/kbdse.xml" /> +</directory> +<directory name="kbduk"> + <xi:include href="kbduk/kbduk.xml" /> +</directory> +<directory name="kbdus"> + <xi:include href="kbdus/kbdus.xml" /> +</directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml --- branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbdda" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbdda.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdda.c</file> + <file>kbdda.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml --- branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbddv" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbddv.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbddv.c</file> + <file>kbddv.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml --- branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbdfr" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbdfr.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdfr.c</file> + <file>kbdfr.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml --- branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbdgr" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbdgr.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdgr.c</file> + <file>kbdgr.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml --- branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbdse" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbdse.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdse.c</file> + <file>kbdse.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml --- branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbduk" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbduk.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbduk.c</file> + <file>kbduk.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml --- branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-02-03 19:08:54 UTC (rev 13394) +++ branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-02-03 19:14:46 UTC (rev 13395) @@ -0,0 +1,7 @@ +<module name="kbdus" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="kbdus.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdus.c</file> + <file>kbdus.rc</file> +</module>

19 years, 10 months

[navaraf] 13394: Prevent linking to MSVCRT in case some CRT function isn't found.

by navaraf＠svn.reactos.com

Prevent linking to MSVCRT in case some CRT function isn't found. Modified: trunk/reactos/ntoskrnl/Makefile _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-02-03 15:43:51 UTC (rev 13393) +++ trunk/reactos/ntoskrnl/Makefile 2005-02-03 19:08:54 UTC (rev 13394) @@ -10,8 +10,6 @@ TARGET_NAME = ntoskrnl -TARGET_BASE = 0xc0000000 - TARGET_BOOTSTRAP = yes CONFIG := @@ -526,8 +524,11 @@ -Wl,--image-base,$(TARGET_BASE) \ -Wl,--file-alignment,0x1000 \ -Wl,--section-alignment,0x1000 \ - -Wl,--entry,_NtProcessStartup + -Wl,--entry,_NtProcessStartup \ + -nostdlib +TARGET_GCCLIBS = gcc + TAGS: $(TAG_OBJECTS) etags $(addprefix -i , $(TAG_OBJECTS))

19 years, 10 months

[arty] 13393: Add a . to an empty path to make a relative path, before the initial /

by arty＠svn.reactos.com

Add a . to an empty path to make a relative path, before the initial / is added. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-02-02 23:07:33 UTC (rev 13392) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-02-03 15:43:51 UTC (rev 13393) @@ -187,7 +187,7 @@ #ifdef WIN32 if ( i ) out += "/"; #else - out += "/"; + out += out.size() ? "/" : "./"; #endif out += vout[i]; }

19 years, 10 months

[gvg] 13392: Store symbolic information in a .rossym section in the

by gvg＠svn.reactos.com

Store symbolic information in a .rossym section in the executable/library/driver/whatever Modified: trunk/reactos/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/include/ntdll/ldr.h Deleted: trunk/reactos/include/ntos/kdbgsyms.h Modified: trunk/reactos/include/ntos.h Added: trunk/reactos/include/reactos/rossym.h Added: trunk/reactos/lib/rossym/ Added: trunk/reactos/lib/rossym/Makefile Added: trunk/reactos/lib/rossym/delete.c Added: trunk/reactos/lib/rossym/find.c Added: trunk/reactos/lib/rossym/fromfile.c Added: trunk/reactos/lib/rossym/frommem.c Added: trunk/reactos/lib/rossym/fromraw.c Added: trunk/reactos/lib/rossym/getraw.c Added: trunk/reactos/lib/rossym/init.c Added: trunk/reactos/lib/rossym/initkm.c Added: trunk/reactos/lib/rossym/initum.c Added: trunk/reactos/lib/rossym/rossympriv.h Added: trunk/reactos/lib/rossym/zwfile.c Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/dbg/kdb.h Deleted: trunk/reactos/ntoskrnl/dbg/kdb_stabs.c Deleted: trunk/reactos/ntoskrnl/dbg/kdb_stabs.h Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/dbg/profile.c Modified: trunk/reactos/ntoskrnl/include/internal/module.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/tools/helper.mk Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/Makefile 2005-02-02 23:07:33 UTC (rev 13392) @@ -42,7 +42,7 @@ LIB_FSLIB = vfatlib # Static libraries -LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt +LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym # Keyboard layout libraries DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus _____ Modified: trunk/reactos/boot/freeldr/freeldr/Makefile --- trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-02 23:07:33 UTC (rev 13392) @@ -95,7 +95,7 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) -COMPILER_INCLUDES = -I$(SRCDIR)/include +COMPILER_INCLUDES = -I$(SRCDIR)/include -I$(PATH_TO_TOP)/include CFLAGS = $(COMPILER_OPTIONS) \ $(COMPILER_DEFINES) \ @@ -262,9 +262,9 @@ @echo Make ALL done. -freeldr.sys : $(ALL_OBJS) +freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a @echo ===================================================== LINKING $@ - @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) + @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S freeldr.exe > freeldr.map else _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-02-02 23:07:33 UTC (rev 13392) @@ -28,12 +28,18 @@ #define BOOLEAN int typedef BOOLEAN *PBOOLEAN; -#define CHAR char -#define PCHAR char * -#define UCHAR unsigned char -#define PUCHAR unsigned char * -#define WCHAR unsigned short -#define PWCHAR unsigned short * +#define CHAR char +#define PCHAR char * +#define UCHAR unsigned char +#define PUCHAR unsigned char * +#define WCHAR unsigned short +#define PWCHAR unsigned short * +#define ULONG unsigned long +#if defined(_WIN64) +#define ULONG_PTR __int64 +#else +#define ULONG_PTR unsigned long +#endif #define VOID void #define PVOID VOID* _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -130,44 +130,6 @@ return TRUE; } -#if 0 -BOOL MultiBootLoadModule(FILE *ModuleImage, char *ModuleName) -{ - U32 dwModuleSize; - module_t* pModule; - char* ModuleNameString; - char * TempName; - - /* - * Get current module data structure and module name string array - */ - pModule = &multiboot_modules[mb_info.mods_count]; - do { - TempName = strchr( ModuleName, '\\' ); - if( TempName ) - ModuleName = TempName + 1; - } while( TempName ); - - ModuleNameString = multiboot_module_strings[mb_info.mods_count]; - - dwModuleSize = FsGetFileSize(ModuleImage); - pModule->mod_start = next_module_load_base; - pModule->mod_end = next_module_load_base + dwModuleSize; - strcpy(ModuleNameString, ModuleName); - pModule->string = (unsigned long)ModuleNameString; - - /* - * Load the file image - */ - FsReadFile(ModuleImage, dwModuleSize, NULL, (void*)next_module_load_base); - - next_module_load_base = ROUND_UP(pModule->mod_end, /*PAGE_SIZE*/4096); - mb_info.mods_count++; - - return TRUE; -} -#endif - PVOID MultiBootLoadModule(FILE *ModuleImage, char *ModuleName, U32* ModuleSize) { U32 dwModuleSize; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -31,6 +31,8 @@ #include <machine.h> #include <inifile.h> +#include <reactos/rossym.h> + #include "registry.h" @@ -85,71 +87,73 @@ return(TRUE); } -static BOOL -LoadSymbolFile(PCHAR szSystemRoot, - PCHAR ModuleName, - int nPos) +static PVOID +FreeldrAllocMem(ULONG_PTR Size) { - CHAR SymbolFileName[1024]; - PFILE FilePointer; - U32 Length; - PCHAR Start; - PCHAR Ext; - char value[256]; - char *p; + return MmAllocateMemory((U32) Size); +} - /* Get the path to the symbol store */ - strcpy(SymbolFileName, szSystemRoot); - strcat(SymbolFileName, "symbols\\"); +static VOID +FreeldrFreeMem(PVOID Area) +{ + MmFreeMemory(Area); +} - /* Get the symbol filename from the module name */ - Start = strrchr(ModuleName, '\\'); - if (Start == NULL) - Start = ModuleName; - else - Start++; +static BOOLEAN +FreeldrReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) +{ + U32 BytesRead; - Ext = strrchr(ModuleName, '.'); - if (Ext != NULL) - Length = Ext - Start; - else - Length = strlen(Start); + return FsReadFile((PFILE) FileContext, (U32) Size, &BytesRead, Buffer) + && Size == BytesRead; +} - strncat(SymbolFileName, Start, Length); - strcat(SymbolFileName, ".sym"); +static BOOLEAN +FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position) +{ + FsSetFilePointer((PFILE) FileContext, (U32) Position); - FilePointer = FsOpenFile((PCHAR)&SymbolFileName[0]); + return TRUE; +} + +static BOOL +LoadKernelSymbols(PCHAR szKernelName, int nPos) +{ + static ROSSYM_CALLBACKS FreeldrCallbacks = + { + FreeldrAllocMem, + FreeldrFreeMem, + FreeldrReadFile, + FreeldrSeekFile + }; + PFILE FilePointer; + PROSSYM_INFO RosSymInfo; + U32 Size; + PVOID Base; + + RosSymInit(&FreeldrCallbacks); + + FilePointer = FsOpenFile(szKernelName); if (FilePointer == NULL) { - DbgPrint((DPRINT_REACTOS, "Symbol file %s not loaded.\n", SymbolFileName)); - /* This is not critical */ return FALSE; } - DbgPrint((DPRINT_REACTOS, "Symbol file %s is loaded.\n", SymbolFileName)); + if (! RosSymCreateFromFile(FilePointer, &RosSymInfo)) + { + return FALSE; + } - /* - * Update the status bar with the current file - */ - strcpy(value, "Reading "); - p = strrchr(SymbolFileName, '\\'); - if (p == NULL) - strcat(value, SymbolFileName); - else - strcat(value, p + 1); - UiDrawStatusText(value); + Base = MultiBootCreateModule("NTOSKRNL.SYM"); + Size = RosSymGetRawDataLength(RosSymInfo); + RosSymGetRawData(RosSymInfo, Base); + MultiBootCloseModule(Base, Size); - /* - * Load the symbol file - */ - MultiBootLoadModule(FilePointer, SymbolFileName, NULL); + RosSymDelete(RosSymInfo); - UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); - - return (TRUE); + return TRUE; } - static BOOL LoadDriver(PCHAR szFileName, int nPos) { @@ -366,7 +370,6 @@ nPos += 5; LoadDriver(ImagePath, nPos); - LoadSymbolFile(szSystemRoot, ImagePath, nPos); } else { @@ -446,7 +449,6 @@ nPos += 5; LoadDriver(ImagePath, nPos); - LoadSymbolFile(szSystemRoot, ImagePath, nPos); } else { @@ -880,22 +882,19 @@ UiMessageBox(MsgBuffer); return; } - UiDrawProgressBarCenter(25, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(30, 100, "Loading ReactOS..."); /* - * Load symbol files + * Load kernel symbols */ - LoadSymbolFile(szBootPath, szKernelName, 30); - LoadSymbolFile(szBootPath, szHalName, 30); + LoadKernelSymbols(szKernelName, 30); + UiDrawProgressBarCenter(40, 100, "Loading ReactOS..."); - UiDrawProgressBarCenter(30, 100, "Loading ReactOS..."); - /* * Load boot drivers */ - LoadBootDrivers(szBootPath, 30); + LoadBootDrivers(szBootPath, 40); - #if 0 /* * Clear the screen and redraw the backdrop and status bar @@ -921,4 +920,12 @@ boot_reactos(); } +#undef DbgPrint +ULONG +DbgPrint(char *Fmt, ...) +{ + UiMessageBox(Fmt); + return 0; +} + /* EOF */ _____ Modified: trunk/reactos/include/ntdll/ldr.h --- trunk/reactos/include/ntdll/ldr.h 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/include/ntdll/ldr.h 2005-02-02 23:07:33 UTC (rev 13392) @@ -1,9 +1,9 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_LDR_H #define __NTOSKRNL_INCLUDE_INTERNAL_LDR_H -#include <ntos/kdbgsyms.h> #include <roscfg.h> #include <napi/teb.h> +#include <reactos/rossym.h> typedef NTSTATUS STDCALL_FUNC (*PEPFUNC)(PPEB); @@ -69,7 +69,7 @@ ULONG CheckSum; ULONG TimeDateStamp; #if defined(DBG) || defined(KDBG) - IMAGE_SYMBOL_INFO SymbolInfo; + PROSSYM_INFO RosSymInfo; #endif /* KDBG */ } LDR_MODULE, *PLDR_MODULE; _____ Deleted: trunk/reactos/include/ntos/kdbgsyms.h --- trunk/reactos/include/ntos/kdbgsyms.h 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/include/ntos/kdbgsyms.h 2005-02-02 23:07:33 UTC (rev 13392) @@ -1,22 +0,0 @@ -#ifndef __KDBGSYMS_H -#define __KDBGSYMS_H - -#include <ddk/ntddk.h> - -typedef struct _IMAGE_SYMBOL_INFO -{ - ULONG_PTR ImageBase; - ULONG_PTR ImageSize; - PVOID FileBuffer; - PVOID StabsBase; - ULONG StabsLength; - PVOID StabStringsBase; - ULONG StabStringsLength; - PVOID SymbolsBase; - ULONG SymbolsLength; - PVOID SymbolStringsBase; - ULONG SymbolStringsLength; -} IMAGE_SYMBOL_INFO, *PIMAGE_SYMBOL_INFO; - -#endif /* __KDBGSYMS_H */ - _____ Modified: trunk/reactos/include/ntos.h --- trunk/reactos/include/ntos.h 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/include/ntos.h 2005-02-02 23:07:33 UTC (rev 13392) @@ -20,7 +20,6 @@ #include "ntos/gditypes.h" #include "ntos/fstypes.h" /* AG */ #include "ntos/heap.h" -#include "ntos/kdbgsyms.h" #include "ntos/keyboard.h" #include "ntos/minmax.h" #include "ntos/mm.h" @@ -61,7 +60,6 @@ #include "ntos/file.h" #include "ntos/gditypes.h" #include "ntos/heap.h" -#include "ntos/kdbgsyms.h" #include "ntos/keyboard.h" #include "ntos/minmax.h" #include "ntos/mm.h" _____ Added: trunk/reactos/include/reactos/rossym.h --- trunk/reactos/include/reactos/rossym.h 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/include/reactos/rossym.h 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,59 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/reactos/rossym.h + * PURPOSE: Handling of rossym symbol info + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#ifndef REACTOS_ROSSYM_H_INCLUDED +#define REACTOS_ROSSYM_H_INCLUDED + +#define ROSSYM_SECTION_NAME ".rossym" + +typedef struct _ROSSYM_HEADER { + unsigned long SymbolsOffset; + unsigned long SymbolsLength; + unsigned long StringsOffset; + unsigned long StringsLength; +} ROSSYM_HEADER, *PROSSYM_HEADER; + +typedef struct _ROSSYM_ENTRY { + ULONG_PTR Address; + ULONG FunctionOffset; + ULONG FileOffset; + ULONG SourceLine; +} ROSSYM_ENTRY, *PROSSYM_ENTRY; + +typedef struct _ROSSYM_CALLBACKS { + PVOID (*AllocMemProc)(ULONG_PTR Size); + VOID (*FreeMemProc)(PVOID Area); + BOOLEAN (*ReadFileProc)(PVOID FileContext, PVOID Buffer, ULONG Size); + BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); +} ROSSYM_CALLBACKS, *PROSSYM_CALLBACKS; + +typedef struct _ROSSYM_INFO *PROSSYM_INFO; + +VOID RosSymInit(PROSSYM_CALLBACKS Callbacks); +VOID RosSymInitKernelMode(VOID); +VOID RosSymInitUserMode(VOID); + +BOOLEAN RosSymCreateFromRaw(PVOID RawData, ULONG_PTR DataSize, + PROSSYM_INFO *RosSymInfo); +BOOLEAN RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, + PROSSYM_INFO *RosSymInfo); +BOOLEAN RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo); +ULONG RosSymGetRawDataLength(PROSSYM_INFO RosSymInfo); +VOID RosSymGetRawData(PROSSYM_INFO RosSymInfo, PVOID RawData); +BOOLEAN RosSymGetAddressInformation(PROSSYM_INFO RosSymInfo, + ULONG_PTR RelativeAddress, + ULONG *LineNumber, + char *FileName, + char *FunctionName); +VOID RosSymDelete(PROSSYM_INFO RosSymInfo); + +#endif /* REACTOS_ROSSYM_H_INCLUDED */ + +/* EOF */ + Property changes on: trunk/reactos/include/reactos/rossym.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/rossym ___________________________________________________________________ Name: svn:ignore + *.d *.o _____ Added: trunk/reactos/lib/rossym/Makefile --- trunk/reactos/lib/rossym/Makefile 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/Makefile 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,33 @@ +PATH_TO_TOP = ../.. + +TARGET_TYPE = library + +TARGET_NAME = rossym + +include $(PATH_TO_TOP)/config + +TARGET_CFLAGS = -Wall -Werror -ffreestanding -D__USE_W32API + +TARGET_OBJECTS = \ + delete.o \ + find.o \ + fromfile.o \ + frommem.o \ + fromraw.o \ + getraw.o \ + init.o \ + initkm.o \ + initum.o \ + zwfile.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +DEP_OBJECTS := $(TARGET_OBJECTS) + +TARGET_CLEAN = $(DEP_FILES) + +include $(PATH_TO_TOP)/tools/depend.mk + +# EOF Property changes on: trunk/reactos/lib/rossym/Makefile ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/delete.c --- trunk/reactos/lib/rossym/delete.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/delete.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/delete.c + * PURPOSE: Free rossym info + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#define NTOSAPI +#include <ddk/ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +VOID +RosSymDelete(PROSSYM_INFO RosSymInfo) +{ + RosSymFreeMem(RosSymInfo); +} + +/* EOF */ Property changes on: trunk/reactos/lib/rossym/delete.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/find.c --- trunk/reactos/lib/rossym/find.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/find.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,150 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/find.c + * PURPOSE: Find symbol info for an address + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ +/* + * Parts of this file based on work Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define NTOSAPI +#include <ddk/ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +static PROSSYM_ENTRY +FindEntry(IN PROSSYM_INFO RosSymInfo, IN ULONG_PTR RelativeAddress) +{ + /* + * Perform a binary search. + * + * The code below is a bit sneaky. After a comparison fails, we + * divide the work in half by moving either left or right. If lim + * is odd, moving left simply involves halving lim: e.g., when lim + * is 5 we look at item 2, so we change lim to 2 so that we will + * look at items 0 & 1. If lim is even, the same applies. If lim + * is odd, moving right again involes halving lim, this time moving + * the base up one item past p: e.g., when lim is 5 we change base + * to item 3 and make lim 2 so that we will look at items 3 and 4. + * If lim is even, however, we have to shrink it by one before + * halving: e.g., when lim is 4, we still looked at item 2, so we + * have to make lim 3, then halve, obtaining 1, so that we will only + * look at item 3. + */ + PROSSYM_ENTRY Base = RosSymInfo->Symbols; + ULONG Lim; + PROSSYM_ENTRY Mid, Low; + + if (RelativeAddress < Base->Address) + { + return NULL; + } + + Low = Base; + for (Lim = RosSymInfo->SymbolsCount; Lim != 0; Lim >>= 1) + { + Mid = Base + (Lim >> 1); + if (RelativeAddress == Mid->Address) + { + return Mid; + } + if (Mid->Address < RelativeAddress) /* key > mid: move right */ + { + Low = Mid; + Base = Mid + 1; + Lim--; + } /* else move left */ + } + + return Low; +} + + +BOOLEAN +RosSymGetAddressInformation(PROSSYM_INFO RosSymInfo, + ULONG_PTR RelativeAddress, + ULONG *LineNumber, + char *FileName, + char *FunctionName) +{ + PROSSYM_ENTRY RosSymEntry; + + DPRINT("RelativeAddress = 0x%08x\n", RelativeAddress); + + if (RosSymInfo->Symbols == NULL || RosSymInfo->SymbolsCount == 0 || + RosSymInfo->Strings == NULL || RosSymInfo->StringsLength == 0) + { +__asm__("int $3\n"); + DPRINT1("Uninitialized RosSymInfo\n"); + return FALSE; + } + + ASSERT(LineNumber || FileName || FunctionName); + + /* find symbol entry for function */ + RosSymEntry = FindEntry(RosSymInfo, RelativeAddress); + + if (NULL == RosSymEntry) + { + DPRINT("None of the requested information was found!\n"); + return FALSE; + } + + if (LineNumber != NULL) + { + *LineNumber = RosSymEntry->SourceLine; + } + if (FileName != NULL) + { + PCHAR Name = ""; + if (RosSymEntry->FileOffset != 0) + { + Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset; + } + strcpy(FileName, Name); + } + if (FunctionName != NULL) + { + PCHAR Name = ""; + if (RosSymEntry->FunctionOffset != 0) + { + Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset; + } + strcpy(FunctionName, Name); + } + + return TRUE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rossym/find.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/fromfile.c --- trunk/reactos/lib/rossym/fromfile.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/fromfile.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,146 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/fromfile.c + * PURPOSE: Creating rossym info from a file + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#define NTOSAPI +#include <ddk/ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +BOOLEAN +RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) +{ + IMAGE_DOS_HEADER DosHeader; + IMAGE_NT_HEADERS NtHeaders; + PIMAGE_SECTION_HEADER SectionHeaders, SectionHeader; + unsigned SectionIndex; + char SectionName[IMAGE_SIZEOF_SHORT_NAME]; + ROSSYM_HEADER RosSymHeader; + + /* Load DOS header */ + if (! RosSymReadFile(FileContext, &DosHeader, sizeof(IMAGE_DOS_HEADER))) + { + DPRINT1("Failed to read DOS header\n"); + return FALSE; + } + if (! ROSSYM_IS_VALID_DOS_HEADER(&DosHeader)) + { + DPRINT1("Image doesn't have a valid DOS header\n"); + return FALSE; + } + + /* Load NT headers */ + if (! RosSymSeekFile(FileContext, DosHeader.e_lfanew)) + { + DPRINT1("Failed seeking to NT headers\n"); + return FALSE; + } + if (! RosSymReadFile(FileContext, &NtHeaders, sizeof(IMAGE_NT_HEADERS))) + { + DPRINT1("Failed to read NT headers\n"); + return FALSE; + } + if (! ROSSYM_IS_VALID_NT_HEADERS(&NtHeaders)) + { + DPRINT1("Image doesn't have a valid PE header\n"); + return FALSE; + } + + /* Load section headers */ + if (! RosSymSeekFile(FileContext, (char *) IMAGE_FIRST_SECTION(&NtHeaders) - + (char *) &NtHeaders + DosHeader.e_lfanew)) + { + DPRINT1("Failed seeking to section headers\n"); + return FALSE; + } + SectionHeaders = RosSymAllocMem(NtHeaders.FileHeader.NumberOfSections + * sizeof(IMAGE_SECTION_HEADER)); + if (NULL == SectionHeaders) + { + DPRINT1("Failed to allocate memory for %u section headers\n", + NtHeaders.FileHeader.NumberOfSections); + return FALSE; + } + if (! RosSymReadFile(FileContext, SectionHeaders, + NtHeaders.FileHeader.NumberOfSections + * sizeof(IMAGE_SECTION_HEADER))) + { + RosSymFreeMem(SectionHeaders); + DPRINT1("Failed to read section headers\n"); + return FALSE; + } + + /* Search for the section header */ + strncpy(SectionName, ROSSYM_SECTION_NAME, IMAGE_SIZEOF_SHORT_NAME); + SectionHeader = SectionHeaders; + for (SectionIndex = 0; SectionIndex < NtHeaders.FileHeader.NumberOfSections; SectionIndex++) + { + if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) + { + break; + } + SectionHeader++; + } + if (NtHeaders.FileHeader.NumberOfSections <= SectionIndex) + { + RosSymFreeMem(SectionHeaders); + DPRINT("No %s section found\n", ROSSYM_SECTION_NAME); + return FALSE; + } + + /* Load rossym header */ + if (! RosSymSeekFile(FileContext, SectionHeader->PointerToRawData)) + { + RosSymFreeMem(SectionHeaders); + DPRINT1("Failed seeking to section data\n"); + return FALSE; + } + RosSymFreeMem(SectionHeaders); + if (! RosSymReadFile(FileContext, &RosSymHeader, sizeof(ROSSYM_HEADER))) + { + DPRINT1("Failed to read rossym header\n"); + return FALSE; + } + if (RosSymHeader.SymbolsOffset < sizeof(ROSSYM_HEADER) + || RosSymHeader.StringsOffset < RosSymHeader.SymbolsOffset + RosSymHeader.SymbolsLength + || 0 != (RosSymHeader.SymbolsLength % sizeof(ROSSYM_ENTRY))) + { + DPRINT1("Invalid ROSSYM_HEADER\n"); + return FALSE; + } + + *RosSymInfo = RosSymAllocMem(sizeof(ROSSYM_INFO) - sizeof(ROSSYM_HEADER) + + RosSymHeader.StringsOffset + RosSymHeader.StringsLength + 1); + if (NULL == *RosSymInfo) + { + DPRINT1("Failed to allocate memory for rossym\n"); + return FALSE; + } + (*RosSymInfo)->Symbols = (PROSSYM_ENTRY)((char *) *RosSymInfo + sizeof(ROSSYM_INFO) + - sizeof(ROSSYM_HEADER) + RosSymHeader.SymbolsOffset); + (*RosSymInfo)->SymbolsCount = RosSymHeader.SymbolsLength / sizeof(ROSSYM_ENTRY); + (*RosSymInfo)->Strings = (PCHAR) *RosSymInfo + sizeof(ROSSYM_INFO) - sizeof(ROSSYM_HEADER) + + RosSymHeader.StringsOffset; + (*RosSymInfo)->StringsLength = RosSymHeader.StringsLength; + if (! RosSymReadFile(FileContext, *RosSymInfo + 1, + RosSymHeader.StringsOffset + RosSymHeader.StringsLength + - sizeof(ROSSYM_HEADER))) + { + DPRINT1("Failed to read rossym headers\n"); + return FALSE; + } + /* Make sure the last string is null terminated, we allocated an extra byte for that */ + (*RosSymInfo)->Strings[(*RosSymInfo)->StringsLength] = '\0'; + + return TRUE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rossym/fromfile.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/frommem.c --- trunk/reactos/lib/rossym/frommem.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/frommem.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,81 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/frommem.c + * PURPOSE: Creating rossym info from an in-memory image + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#define NTOSAPI +#include <ddk/ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +BOOLEAN +RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymInfo) +{ + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_SECTION_HEADER SectionHeader; + unsigned SectionIndex; + char SectionName[IMAGE_SIZEOF_SHORT_NAME]; + + /* Check if MZ header is valid */ + DosHeader = (PIMAGE_DOS_HEADER) ImageStart; + if (ImageSize < sizeof(IMAGE_DOS_HEADER) + || ! ROSSYM_IS_VALID_DOS_HEADER(DosHeader)) + { + DPRINT1("Image doesn't have a valid DOS header\n"); + return FALSE; + } + + /* Locate NT header */ + NtHeaders = (PIMAGE_NT_HEADERS)((char *) ImageStart + DosHeader->e_lfanew); + if (ImageSize < DosHeader->e_lfanew + sizeof(IMAGE_NT_HEADERS) + || ! ROSSYM_IS_VALID_NT_HEADERS(NtHeaders)) + { + DPRINT1("Image doesn't have a valid PE header\n"); + return FALSE; + } + + /* Search for the section header */ + SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); + if (ImageSize < (char *) (SectionHeader + NtHeaders->FileHeader.NumberOfSections) + - (char *) ImageStart) + { + DPRINT1("Image doesn't have valid section headers\n"); + return FALSE; + } + strncpy(SectionName, ROSSYM_SECTION_NAME, IMAGE_SIZEOF_SHORT_NAME); + for (SectionIndex = 0; SectionIndex < NtHeaders->FileHeader.NumberOfSections; SectionIndex++) + { + if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) + { + break; + } + SectionHeader++; + } + if (NtHeaders->FileHeader.NumberOfSections <= SectionIndex) + { + DPRINT("No %s section found\n", ROSSYM_SECTION_NAME); + return FALSE; + } + + /* Locate the section itself */ + if (ImageSize < SectionHeader->PointerToRawData + SectionHeader->SizeOfRawData + || SectionHeader->SizeOfRawData < sizeof(ROSSYM_HEADER)) + { + DPRINT1("Invalid %s section\n", ROSSYM_SECTION_NAME); + return FALSE; + } + + /* Load it */ + return RosSymCreateFromRaw((char *) ImageStart + SectionHeader->PointerToRawData, + SectionHeader->SizeOfRawData, RosSymInfo); +} + +/* EOF */ Property changes on: trunk/reactos/lib/rossym/frommem.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/fromraw.c --- trunk/reactos/lib/rossym/fromraw.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/fromraw.c 2005-02-02 23:07:33 UTC (rev 13392) @@ -0,0 +1,55 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/frommem.c + * PURPOSE: Creating rossym info from an in-memory image + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#define NTOSAPI +#include <ddk/ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +BOOLEAN +RosSymCreateFromRaw(PVOID RawData, ULONG_PTR DataSize, PROSSYM_INFO *RosSymInfo) +{ + PROSSYM_HEADER RosSymHeader; + + RosSymHeader = (PROSSYM_HEADER) RawData; + if (RosSymHeader->SymbolsOffset < sizeof(ROSSYM_HEADER) + || RosSymHeader->StringsOffset < RosSymHeader->SymbolsOffset + RosSymHeader->SymbolsLength + || DataSize < RosSymHeader->StringsOffset + RosSymHeader->StringsLength + || 0 != (RosSymHeader->SymbolsLength % sizeof(ROSSYM_ENTRY))) + { + DPRINT1("Invalid ROSSYM_HEADER\n"); + return FALSE; + } + + /* Copy */ + *RosSymInfo = RosSymAllocMem(sizeof(ROSSYM_INFO) + RosSymHeader->SymbolsLength + + RosSymHeader->StringsLength + 1); + if (NULL == *RosSymInfo) + { + DPRINT1("Failed to allocate memory for rossym\n"); + return FALSE; + } + (*RosSymInfo)->Symbols = (PROSSYM_ENTRY)((char *) *RosSymInfo + sizeof(ROSSYM_INFO)); + (*RosSymInfo)->SymbolsCount = RosSymHeader->SymbolsLength / sizeof(ROSSYM_ENTRY); + (*RosSymInfo)->Strings = (PCHAR) *RosSymInfo + sizeof(ROSSYM_INFO) + RosSymHeader->SymbolsLength; + (*RosSymInfo)->StringsLength = RosSymHeader->StringsLength; + memcpy((*RosSymInfo)->Symbols, (char *) RosSymHeader + RosSymHeader->SymbolsOffset, + RosSymHeader->SymbolsLength); + memcpy((*RosSymInfo)->Strings, (char *) RosSymHeader + RosSymHeader->StringsOffset, + RosSymHeader->StringsLength); + /* Make sure the last string is null terminated, we allocated an extra byte for that */ + (*RosSymInfo)->Strings[(*RosSymInfo)->StringsLength] = '\0'; + + return TRUE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rossym/fromraw.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rossym/getraw.c --- trunk/reactos/lib/rossym/getraw.c 2005-02-02 22:51:23 UTC (rev 13391) +++ trunk/reactos/lib/rossym/getraw.c 2005-02-02 23:07:33 UTC (rev 13392) [truncated at 1000 lines; 3233 more skipped]

19 years, 10 months

[gvg] 13391: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/lib/crt ___________________________________________________________________ Name: svn:ignore + *.d *.gch Property changes on: trunk/reactos/lib/setupapi ___________________________________________________________________ Name: svn:ignore + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.spec.def *.stubs.c Makefile.ros

19 years, 10 months

[chorns] 13390: * Parse .cpp, .rc, and .s files

by chorns＠svn.reactos.com

* Parse .cpp, .rc, and .s files * #include_next support Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile_includenext.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.c Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu denext.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-02-02 22:30:55 UTC (rev 13390) @@ -87,15 +87,31 @@ } bool -SourceFile::ReadInclude ( string& filename ) +SourceFile::ReadInclude ( string& filename, + bool& includeNext) { while ( p < end ) { - if ( ( *p == '#') && ( end - p > 8 ) ) + if ( ( *p == '#') && ( end - p > 13 ) ) { - if ( strncmp ( p, "#include", 8 ) == 0 ) + bool include = false; + p++; + SkipWhitespace (); + if ( strncmp ( p, "include ", 8 ) == 0 ) { p += 8; + includeNext = false; + include = true; + } + if ( strncmp ( p, "include_next ", 13 ) == 0 ) + { + p += 13; + includeNext = true; + include = true; + } + + if ( include ) + { SkipWhitespace (); if ( p < end && *p == '<' || *p == '"' ) { @@ -112,6 +128,7 @@ p++; } filename = ""; + includeNext = false; return false; } @@ -162,11 +179,27 @@ return this; } +bool +SourceFile::CanProcessFile ( const string& extension ) +{ + if ( extension == ".h" || extension == ".H" ) + return true; + if ( extension == ".c" || extension == ".C" ) + return true; + if ( extension == ".cpp" || extension == ".CPP" ) + return true; + if ( extension == ".rc" || extension == ".RC" ) + return true; + if ( extension == ".s" || extension == ".S" ) + return true; + return false; +} + SourceFile* SourceFile::ParseFile ( const string& normalizedFilename ) { string extension = GetExtension ( normalizedFilename ); - if ( extension == ".c" || extension == ".C" || extension == ".h" || extension == ".H" ) + if ( CanProcessFile ( extension ) ) { if ( IsIncludedFrom ( normalizedFilename ) ) return NULL; @@ -188,11 +221,15 @@ string includedFilename ( "" ); //printf ( "Parsing '%s'\n", filename.c_str () ); - while ( ReadInclude ( includedFilename )) + bool includeNext; + while ( ReadInclude ( includedFilename, + includeNext ) ) { string resolvedFilename ( "" ); - bool locatedFile = automaticDependency->LocateIncludedFile ( module, + bool locatedFile = automaticDependency->LocateIncludedFile ( this, + module, includedFilename, + includeNext, resolvedFilename ); if ( locatedFile ) { @@ -275,9 +312,22 @@ return false; } +string +AutomaticDependency::GetFilename ( const string& filename ) +{ + size_t index = filename.find_last_of ( CSEP ); + if (index == string::npos) + return filename; + else + return filename.substr ( index + 1, + filename.length () - index - 1); +} + bool -AutomaticDependency::LocateIncludedFile ( Module& module, +AutomaticDependency::LocateIncludedFile ( SourceFile* sourceFile, + Module& module, const string& includedFilename, + bool includeNext, string& resolvedFilename ) { size_t i; @@ -287,7 +337,12 @@ if ( LocateIncludedFile ( include->directory, includedFilename, resolvedFilename ) ) + { + if ( includeNext && stricmp ( resolvedFilename.c_str (), + sourceFile->filename.c_str () ) == 0 ) + continue; return true; + } } /* FIXME: Ifs */ @@ -298,7 +353,12 @@ if ( LocateIncludedFile ( include->directory, includedFilename, resolvedFilename ) ) + { + if ( includeNext && stricmp ( resolvedFilename.c_str (), + sourceFile->filename.c_str () ) == 0 ) + continue; return true; + } } resolvedFilename = ""; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-02 22:30:55 UTC (rev 13390) @@ -63,7 +63,6 @@ std::vector<Property*> properties; std::vector<If*> ifs; - //Project (); Project ( const std::string& filename ); ~Project (); void ProcessXML ( const std::string& path ); @@ -385,9 +384,11 @@ void Close (); void Open (); void SkipWhitespace (); - bool ReadInclude ( std::string& filename ); + bool ReadInclude ( std::string& filename, + bool& includeNext ); bool IsIncludedFrom ( const std::string& normalizedFilename ); SourceFile* GetParentSourceFile (); + bool CanProcessFile ( const std::string& extension ); bool IsParentOf ( const SourceFile* parent, const SourceFile* child ); std::string buf; @@ -405,11 +406,14 @@ AutomaticDependency ( const Project& project ); ~AutomaticDependency (); void Process (); + std::string GetFilename ( const std::string& filename ); bool LocateIncludedFile ( const std::string& directory, const std::string& includedFilename, std::string& resolvedFilename ); - bool LocateIncludedFile ( Module& module, + bool LocateIncludedFile ( SourceFile* sourceFile, + Module& module, const std::string& includedFilename, + bool includeNext, std::string& resolvedFilename ); SourceFile* RetrieveFromCacheOrParse ( Module& module, const std::string& filename, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-02-02 22:30:55 UTC (rev 13390) @@ -8,37 +8,38 @@ { public: bool Failed; - BaseTest(); - virtual ~BaseTest(); - virtual void Run() = 0; + BaseTest (); + virtual ~BaseTest (); + virtual void Run () = 0; protected: - void Assert(const char *message, ...); - void IsNull(void* reference, - const char* file, - int line); - void IsNotNull(void* reference, - const char* file, - int line); - void IsTrue(bool condition, - const char* file, - int line); - void IsFalse(bool condition, - const char* file, - int line); - void AreEqual(int expected, - int actual, + void Assert ( const char *message, + ... ); + void IsNull ( void* reference, const char* file, - int line); - void AreEqual(const std::string& expected, - const std::string& actual, + int line ); + void IsNotNull ( void* reference, + const char* file, + int line ); + void IsTrue ( bool condition, const char* file, - int line); - void AreNotEqual(int expected, - int actual, - const char* file, - int line); + int line ); + void IsFalse ( bool condition, + const char* file, + int line ); + void AreEqual ( int expected, + int actual, + const char* file, + int line ); + void AreEqual ( const std::string& expected, + const std::string& actual, + const char* file, + int line ); + void AreNotEqual ( int expected, + int actual, + const char* file, + int line ); private: - void Fail(); + void Fail (); }; #define IS_NULL(reference) IsNull((void*)reference,__FILE__,__LINE__) @@ -51,63 +52,65 @@ class ProjectTest : public BaseTest { public: - void Run(); + void Run (); }; class ModuleTest : public BaseTest { public: - void Run(); + void Run (); }; class DefineTest : public BaseTest { public: - void Run(); + void Run (); }; class IncludeTest : public BaseTest { public: - void Run(); + void Run (); }; class InvokeTest : public BaseTest { public: - void Run(); + void Run (); }; class LinkerFlagTest : public BaseTest { public: - void Run(); + void Run (); }; class IfTest : public BaseTest { public: - void Run(); + void Run (); }; class FunctionTest : public BaseTest { public: - void Run(); + void Run (); }; class SourceFileTest : public BaseTest { public: - void Run(); + void Run (); + void IncludeTest (); + void FullParseTest (); private: bool IsParentOf ( const SourceFile* parent, const SourceFile* child ); _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml 2005-02-02 22:30:55 UTC (rev 13390) @@ -0,0 +1,12 @@ +<?xml version="1.0" ?> +<project name="Project" makefile="Makefile"> + <directory name="tests"> + <directory name="data"> + <module name="module1" type="buildtool"> + <include base="module1">.</include> + <include base="module1">sourcefile1</include> + <file>sourcefile_include.c</file> + </module> + </directory> + </directory> +</project> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile_includenext.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile_includenext.h 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile_includenext.h 2005-02-02 22:30:55 UTC (rev 13390) @@ -0,0 +1 @@ +/* empty */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.c --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.c 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.c 2005-02-02 22:30:55 UTC (rev 13390) @@ -0,0 +1,2 @@ +# include <sourcefile_include.h> +#include <sourcefile_includenext.h> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.h 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.h 2005-02-02 22:30:55 UTC (rev 13390) @@ -0,0 +1 @@ +/* empty */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu denext.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu denext.h 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu denext.h 2005-02-02 22:30:55 UTC (rev 13390) @@ -0,0 +1 @@ +#include_next <sourcefile_includenext.h> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-02-02 21:40:33 UTC (rev 13389) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-02-02 22:30:55 UTC (rev 13390) @@ -32,11 +32,24 @@ } void -SourceFileTest::Run () +SourceFileTest::IncludeTest () { - const Project project ( "tests/data/automaticdependency.xml" ); + const Project project ( "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); + ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); + const SourceFile* include = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile_include.h" ); + IS_NOT_NULL( include ); + const SourceFile* includenext = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" ); + IS_NOT_NULL( includenext ); +} + +void +SourceFileTest::FullParseTest () +{ + const Project project ( "tests" SSEP "data" SSEP "automaticdependency.xml" ); + AutomaticDependency automaticDependency ( project ); + automaticDependency.Process (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); IS_NOT_NULL( header1 ); @@ -46,4 +59,12 @@ recurse ) ); IS_FALSE( IsParentOf ( recurse, header1 ) ); + } + +void +SourceFileTest::Run () +{ + IncludeTest (); + FullParseTest (); +}

19 years, 10 months

[ea] 13389: Make Jim Tabor visible.

by ea＠svn.reactos.com

Make Jim Tabor visible. Modified: trunk/rosapps/notevil/makefile Modified: trunk/rosapps/notevil/resource.h _____ Modified: trunk/rosapps/notevil/makefile --- trunk/rosapps/notevil/makefile 2005-02-02 20:10:14 UTC (rev 13388) +++ trunk/rosapps/notevil/makefile 2005-02-02 21:40:33 UTC (rev 13389) @@ -24,4 +24,6 @@ include $(TOOLS_PATH)/helper.mk +$(TARGET_NAME).o: resource.h + # EOF _____ Modified: trunk/rosapps/notevil/resource.h --- trunk/rosapps/notevil/resource.h 2005-02-02 20:10:14 UTC (rev 13388) +++ trunk/rosapps/notevil/resource.h 2005-02-02 21:40:33 UTC (rev 13389) @@ -1,2 +1,2 @@ #define RES_FIRST_INDEX 1 -#define RES_LAST_INDEX 43 +#define RES_LAST_INDEX 44

19 years, 10 months

[sedwards] 13388: MAX_PATH is PATH_MAX on Posix

by sedwards＠svn.reactos.com

MAX_PATH is PATH_MAX on Posix Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-02 15:42:48 UTC (rev 13387) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-02 20:10:14 UTC (rev 13388) @@ -29,6 +29,7 @@ #define _finite __finite #define _isnan __isnan #define stricmp strcasecmp +#define MAX_PATH PATH_MAX #endif #endif//PCH_H

19 years, 10 months

[fireball] 13387: Make dev node count correct, since for example Mac Virtual PC BIOS reports slightly wrong number which must be &0xFF.

by fireball＠svn.reactos.com

Make dev node count correct, since for example Mac Virtual PC BIOS reports slightly wrong number which must be &0xFF. This patch removes "Memory allocation failed: Out of memory" error while booting Freeldr. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-02-01 21:21:33 UTC (rev 13386) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-02-02 15:42:48 UTC (rev 13387) @@ -351,6 +351,9 @@ x = PnpBiosGetDeviceNodeCount(&NodeSize, &NodeCount); + NodeCount &= 0xFF; // needed since some fscked up BIOSes return + // wrong info (e.g. Mac Virtual PC) + // e.g. look: http://my.execpc.com/~geezer/osd/pnp/pnp16.c if (x != 0 || NodeSize == 0 || NodeCount == 0) { DbgPrint((DPRINT_HWDETECT, "PnP-BIOS failed to enumerate device nodes\n"));

19 years, 10 months

[navaraf] 13386: Protect against writes beyond the end of partition.

by navaraf＠svn.reactos.com

Protect against writes beyond the end of partition. Modified: trunk/reactos/drivers/storage/disk/disk.c _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-02-01 20:49:03 UTC (rev 13385) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-02-01 21:21:33 UTC (rev 13386) @@ -390,6 +390,8 @@ { PDEVICE_EXTENSION DeviceExtension; PDISK_DATA DiskData; + PIO_STACK_LOCATION IrpStack; + ULARGE_INTEGER EndingOffset; DPRINT("DiskClassCheckReadWrite() called\n"); @@ -404,6 +406,16 @@ return(STATUS_INVALID_PARAMETER); } + IrpStack = IoGetCurrentIrpStackLocation(Irp); + EndingOffset.QuadPart = IrpStack->Parameters.Read.ByteOffset.QuadPart + + IrpStack->Parameters.Read.Length; + + if (EndingOffset.QuadPart > DeviceExtension->PartitionLength.QuadPart) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + return(STATUS_INVALID_PARAMETER); + } + return(STATUS_SUCCESS); }

19 years, 10 months

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 February 2005