Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by royce＠svn.reactos.com

raddr2line utility moved code common betw rsym and raddr2line to rsym_common.c simplified tools/Makefile Modified: trunk/reactos/tools/Makefile Added: trunk/reactos/tools/raddr2line.c Modified: trunk/reactos/tools/rsym.c Added: trunk/reactos/tools/rsym.h Added: trunk/reactos/tools/rsym_common.c _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-04-08 01:11:32 UTC (rev 14541) +++ trunk/reactos/tools/Makefile 2005-04-08 05:35:20 UTC (rev 14542) @@ -3,6 +3,14 @@ include $(PATH_TO_TOP)/rules.mak CFLAGS += -Wall -Werror +ifeq ($(HOST),mingw32-linux) +CFLAGS += -DUNIX_PATHS +rm := @rm +endif +ifeq ($(HOST),mingw32-windows) +CFLAGS += -DDOS_PATHS +rm := -@del +endif TOOLS = \ regtests$(EXE_POSTFIX) \ @@ -12,6 +20,7 @@ rmkdir$(EXE_POSTFIX) \ rrmdir$(EXE_POSTFIX) \ rsym$(EXE_POSTFIX) \ + raddr2line$(EXE_POSTFIX) \ rtouch$(EXE_POSTFIX) \ mkflpimg$(EXE_POSTFIX) \ ppc-le2be$(EXE_POSTFIX) \ @@ -30,95 +39,56 @@ $(MAKE) -f tools-check.mak regtests$(EXE_POSTFIX): regtests.c - @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c + @$(HOST_CC) $(CFLAGS) -o $@ $< -ifeq ($(HOST),mingw32-linux) rcopy$(EXE_POSTFIX): rcopy.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rcopy.c -o rcopy$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rcopy$(EXE_POSTFIX): rcopy.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rcopy.c -o rcopy$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ rdel$(EXE_POSTFIX): rdel.c - @$(HOST_CC) $(CFLAGS) rdel.c -o rdel$(EXE_POSTFIX) + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) rline$(EXE_POSTFIX): rline.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rline.c -o rline$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rline$(EXE_POSTFIX): rline.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rline.c -o rline$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) rmkdir$(EXE_POSTFIX): rmkdir.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rmkdir$(EXE_POSTFIX): rmkdir.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) rrmdir$(EXE_POSTFIX): rrmdir.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rrmdir.c -o rrmdir$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rrmdir$(EXE_POSTFIX): rrmdir.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rrmdir.c -o rrmdir$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) -rsym$(EXE_POSTFIX): rsym.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rsym.c -o rsym$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rsym$(EXE_POSTFIX): rsym.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rsym.c -o rsym$(EXE_POSTFIX) -endif +rsym_common.o: rsym_common.c rsym.h + @$(HOST_CC) $(CFLAGS) -c $< -o $@ -ifeq ($(HOST),mingw32-linux) +rsym.o: rsym.c rsym.h + @$(HOST_CC) $(CFLAGS) -c $< -o $@ + +rsym$(EXE_POSTFIX): rsym.o rsym_common.o + @$(HOST_CC) $(CFLAGS) $^ -o $@ + +raddr2line.o: raddr2line.c rsym.h + @$(HOST_CC) $(CFLAGS) -c $< -o $@ + +raddr2line$(EXE_POSTFIX): raddr2line.o rsym_common.o + @$(HOST_CC) $(CFLAGS) $^ -o $@ + rtouch$(EXE_POSTFIX): rtouch.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS rtouch.c -o rtouch$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -rtouch$(EXE_POSTFIX): rtouch.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS rtouch.c -o rtouch$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) mkflpimg$(EXE_POSTFIX): mkflpimg.c - @$(HOST_CC) $(CFLAGS) -DUNIX_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -mkflpimg$(EXE_POSTFIX): mkflpimg.c - @$(HOST_CC) $(CFLAGS) -DDOS_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) hack-coff$(EXE_POSTFIX): hack-coff.c - @$(HOST_CC) $(CFLAGS) hack-coff.c -o hack-coff$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -hack-coff$(EXE_POSTFIX): hack-coff.c - @$(HOST_CC) $(CFLAGS) hack-coff.c -o hack-coff$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ -ifeq ($(HOST),mingw32-linux) ppc-le2be$(EXE_POSTFIX): ppc-le2be.c - @$(HOST_CC) $(CFLAGS) ppc-le2be.c -o ppc-le2be$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -ppc-le2be$(EXE_POSTFIX): ppc-le2be.c - @$(HOST_CC) $(CFLAGS) ppc-le2be.c -o ppc-le2be$(EXE_POSTFIX) -endif + @$(HOST_CC) $(CFLAGS) $< -o $@ depends$(EXE_POSTFIX): depends.c - @$(HOST_CC) $(CFLAGS) depends.c -o depends$(EXE_POSTFIX) + @$(HOST_CC) $(CFLAGS) $< -o $@ +.PHONY: zlib_target wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target \ + widl_target buildno_target lib_unicode lib_wpp + zlib_target: $(MAKE) --silent -C ../lib/zlib -f Makefile.host @@ -166,11 +136,7 @@ lib_wpp: $(MAKE) -C wpp -.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target \ - widl_target buildno_target lib_unicode lib_wpp - -ifeq ($(HOST),mingw32-linux) clean: $(MAKE) --silent -C buildno clean $(MAKE) --silent -C widl clean @@ -186,27 +152,13 @@ $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean $(MAKE) -C wpp clean $(MAKE) -C unicode clean +ifeq ($(HOST),mingw32-linux) @rm mkconfig @rm $(TOOLS) endif ifeq ($(HOST),mingw32-windows) -clean: - $(MAKE) --silent -C buildno clean - $(MAKE) --silent -C widl clean - $(MAKE) --silent -C wrc clean - $(MAKE) --silent -C cabman clean - $(MAKE) --silent -C cdmake clean - $(MAKE) --silent -C mkhive clean - $(MAKE) --silent -C wmc clean - $(MAKE) --silent -C rgenstat clean $(MAKE) --silent -C pipetools clean - $(MAKE) --silent -C wine2ros clean - $(MAKE) --silent -C winebuild clean - $(MAKE) --silent -C bin2res clean - $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean - $(MAKE) -C wpp clean - $(MAKE) -C unicode clean - -@del *$(EXE_POSTFIX) + $(rm) *$(EXE_POSTFIX) endif .PHONY: all clean _____ Added: trunk/reactos/tools/raddr2line.c --- trunk/reactos/tools/raddr2line.c 2005-04-08 01:11:32 UTC (rev 14541) +++ trunk/reactos/tools/raddr2line.c 2005-04-08 05:35:20 UTC (rev 14542) @@ -0,0 +1,188 @@ +/* + * Usage: raddr2line input-file address/offset + * + * This is a tool and is compiled using the host compiler, + * i.e. on Linux gcc and not mingw-gcc (cross-compiler). + * Therefore we can't include SDK headers and we have to + * duplicate some definitions here. + * Also note that the internal functions are "old C-style", + * returning an int, where a return of 0 means success and + * non-zero is failure. + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "rsym.h" + +size_t fixup_offset ( size_t ImageBase, size_t offset ) +{ + if ( offset >= ImageBase ) + offset -= ImageBase; + return offset; +} + +long +my_atoi ( const char* a ) +{ + int i = 0; + const char* fmt = "%x"; + + if ( *a == '0' ) + { + switch ( *++a ) + { + case 'x': + fmt = "%x"; + ++a; + break; + case 'd': + fmt = "%d"; + ++a; + break; + default: + fmt = "%o"; + break; + } + } + sscanf ( a, fmt, &i ); + return i; +} + +PIMAGE_SECTION_HEADER +find_rossym_section ( PIMAGE_FILE_HEADER PEFileHeader, + PIMAGE_SECTION_HEADER PESectionHeaders ) +{ + size_t i; + for ( i = 0; i < PEFileHeader->NumberOfSections; i++ ) + { + if ( 0 == strcmp ( PESectionHeaders[i].Name, ".rossym" ) ) + return &PESectionHeaders[i]; + } + return NULL; +} + +int +find_and_print_offset ( + void* data, + size_t offset ) +{ + PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER)data; + PROSSYM_ENTRY Entries = (PROSSYM_ENTRY)((char*)data + RosSymHeader->SymbolsOffset); + char* Strings = (char*)data + RosSymHeader->StringsOffset; + size_t symbols = RosSymHeader->SymbolsLength / sizeof(ROSSYM_ENTRY); + size_t i; + + //if ( RosSymHeader->SymbolsOffset ) + + for ( i = 0; i < symbols; i++ ) + { + if ( Entries[i].Address > offset ) + { + if ( !i-- ) + return 1; + else + { + PROSSYM_ENTRY e = &Entries[i]; + printf ( "%s:%lu (%s)", + &Strings[e->FileOffset], + e->SourceLine, + &Strings[e->FunctionOffset] ); + return 0; + } + } + } + return 1; +} + +int +process_data ( const void* FileData, size_t FileSize, size_t offset ) +{ + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + PIMAGE_SECTION_HEADER PERosSymSectionHeader; + size_t ImageBase; + int res; + + /* Check if MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER)FileData; + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) + { + perror("Input file is not a PE image.\n"); + return 1; + } + + /* Locate PE file header */ + /* sizeof(ULONG) = sizeof(MAGIC) */ + PEFileHeader = (PIMAGE_FILE_HEADER)((char *)FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); + + /* Locate optional header */ + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); + ImageBase = PEOptHeader->ImageBase; + + /* Locate PE section headers */ + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + /* make sure offset is what we want */ + offset = fixup_offset ( ImageBase, offset ); + + /* find rossym section */ + PERosSymSectionHeader = find_rossym_section ( + PEFileHeader, PESectionHeaders ); + if ( !PERosSymSectionHeader ) + { + fprintf ( stderr, "Couldn't find rossym section in executable\n" ); + return 1; + } + res = find_and_print_offset ( (char*)FileData + PERosSymSectionHeader->PointerToRawData, + offset ); + if ( res ) + printf ( "??:0\n" ); + return res; +} + +int +process_file ( const char* file_name, size_t offset ) +{ + void* FileData; + size_t FileSize; + int res = 1; + + FileData = load_file ( file_name, &FileSize ); + if ( !FileData ) + { + fprintf ( stderr, "An error occured loading '%s'\n", file_name ); + } + else + { + res = process_data ( FileData, FileSize, offset ); + free ( FileData ); + } + + return res; +} + +int main ( int argc, const char** argv ) +{ + char* path; + size_t offset; + int res; + + if ( argc != 3 ) + { + fprintf(stderr, "Usage: raddr2line <exefile> <offset>\n"); + exit(1); + } + + path = convert_path ( argv[1] ); + offset = my_atoi ( argv[2] ); + + res = process_file ( path, offset ); + + free ( path ); + + return res; +} Property changes on: trunk/reactos/tools/raddr2line.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-04-08 01:11:32 UTC (rev 14541) +++ trunk/reactos/tools/rsym.c 2005-04-08 05:35:20 UTC (rev 14542) @@ -24,288 +24,8 @@ #include <string.h> #include <stdlib.h> -#define IMAGE_DOS_MAGIC 0x5a4d -#define IMAGE_PE_MAGIC 0x00004550 +#include "rsym.h" -#define IMAGE_SIZEOF_SHORT_NAME 8 - -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 - -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef signed long LONG; -typedef unsigned long ULONG; -#if defined(_WIN64) -typedef unsigned __int64 ULONG_PTR; -#else -typedef unsigned long ULONG_PTR; -#endif - -#pragma pack(push,2) -typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) - -#define IMAGE_FILE_LINE_NUMS_STRIPPED 4 -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 -#define IMAGE_FILE_DEBUG_STRIPPED 512 - -#pragma pack(push,4) -typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; - -typedef struct _IMAGE_DATA_DIRECTORY { - DWORD VirtualAddress; - DWORD Size; -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; - -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -typedef struct _IMAGE_OPTIONAL_HEADER { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Reserved1; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; - -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_LNK_REMOVE 0x00000800 -#define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 - -typedef struct _IMAGE_SECTION_HEADER { - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; - -typedef struct _IMAGE_BASE_RELOCATION { - DWORD VirtualAddress; - DWORD SizeOfBlock; -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; - - -typedef struct { - unsigned short f_magic; /* magic number */ - unsigned short f_nscns; /* number of sections */ - unsigned long f_timdat; /* time & date stamp */ - unsigned long f_symptr; /* file pointer to symtab */ - unsigned long f_nsyms; /* number of symtab entries */ - unsigned short f_opthdr; /* sizeof(optional hdr) */ - unsigned short f_flags; /* flags */ -} FILHDR; - -typedef struct { - char s_name[8]; /* section name */ - unsigned long s_paddr; /* physical address, aliased s_nlib */ - unsigned long s_vaddr; /* virtual address */ - unsigned long s_size; /* section size */ - unsigned long s_scnptr; /* file ptr to raw data for section */ - unsigned long s_relptr; /* file ptr to relocation */ - unsigned long s_lnnoptr; /* file ptr to line numbers */ - unsigned short s_nreloc; /* number of relocation entries */ - unsigned short s_nlnno; /* number of line number entries */ - unsigned long s_flags; /* flags */ -} SCNHDR; -#pragma pack(pop) - -typedef struct _SYMBOLFILE_HEADER { - unsigned long SymbolsOffset; - unsigned long SymbolsLength; - unsigned long StringsOffset; - unsigned long StringsLength; -} SYMBOLFILE_HEADER, *PSYMBOLFILE_HEADER; - -typedef struct _STAB_ENTRY { - unsigned long n_strx; /* index into string table of name */ - unsigned char n_type; /* type of symbol */ - unsigned char n_other; /* misc info (usually empty) */ - unsigned short n_desc; /* description field */ - unsigned long n_value; /* value of symbol */ -} STAB_ENTRY, *PSTAB_ENTRY; - -#define N_FUN 0x24 -#define N_SLINE 0x44 -#define N_SO 0x64 - -/* COFF symbol table */ - -#define E_SYMNMLEN 8 /* # characters in a symbol name */ -#define E_FILNMLEN 14 /* # characters in a file name */ -#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ - -#define N_BTMASK (0xf) -#define N_TMASK (0x30) -#define N_BTSHFT (4) -#define N_TSHIFT (2) - -/* derived types, in e_type */ -#define DT_NON (0) /* no derived type */ -#define DT_PTR (1) /* pointer */ -#define DT_FCN (2) /* function */ -#define DT_ARY (3) /* array */ - -#define BTYPE(x) ((x) & N_BTMASK) - -#define ISPTR(x) (((x) & N_TMASK) == (DT_PTR << N_BTSHFT)) -#define ISFCN(x) (((x) & N_TMASK) == (DT_FCN << N_BTSHFT)) -#define ISARY(x) (((x) & N_TMASK) == (DT_ARY << N_BTSHFT)) -#define ISTAG(x) ((x)==C_STRTAG||(x)==C_UNTAG||(x)==C_ENTAG) -#define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK)) - -#define C_EFCN 0xff /* physical end of function */ -#define C_NULL 0 -#define C_AUTO 1 /* automatic variable */ -#define C_EXT 2 /* external symbol */ -#define C_STAT 3 /* static */ -#define C_REG 4 /* register variable */ -#define C_EXTDEF 5 /* external definition */ -#define C_LABEL 6 /* label */ -#define C_ULABEL 7 /* undefined label */ -#define C_MOS 8 /* member of structure */ -#define C_ARG 9 /* function argument */ -#define C_STRTAG 10 /* structure tag */ -#define C_MOU 11 /* member of union */ -#define C_UNTAG 12 /* union tag */ -#define C_TPDEF 13 /* type definition */ -#define C_USTATIC 14 /* undefined static */ -#define C_ENTAG 15 /* enumeration tag */ -#define C_MOE 16 /* member of enumeration */ -#define C_REGPARM 17 /* register parameter */ -#define C_FIELD 18 /* bit field */ -#define C_AUTOARG 19 /* auto argument */ -#define C_LASTENT 20 /* dummy entry (end of block) */ -#define C_BLOCK 100 /* ".bb" or ".eb" */ -#define C_FCN 101 /* ".bf" or ".ef" */ -#define C_EOS 102 /* end of structure */ -#define C_FILE 103 /* file name */ -#define C_LINE 104 /* line # reformatted as symbol table entry */ -#define C_ALIAS 105 /* duplicate tag */ -#define C_HIDDEN 106 /* ext symbol in dmert public lib */ - -#pragma pack(push,1) -typedef struct _COFF_SYMENT -{ - union - { - char e_name[E_SYMNMLEN]; - struct - { - unsigned long e_zeroes; - unsigned long e_offset; - } - e; - } - e; - unsigned long e_value; - short e_scnum; - unsigned short e_type; - unsigned char e_sclass; - unsigned char e_numaux; -} COFF_SYMENT, *PCOFF_SYMENT; -#pragma pack(pop) - -typedef struct _ROSSYM_ENTRY { - ULONG_PTR Address; - ULONG FunctionOffset; - ULONG FileOffset; - ULONG SourceLine; -} ROSSYM_ENTRY, *PROSSYM_ENTRY; - -#define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) - -char* convert_path(char* origpath) -{ - char* newpath; - int i; - - newpath = strdup(origpath); - - i = 0; - while (newpath[i] != 0) - { -#ifdef UNIX_PATHS - if (newpath[i] == '\\') - { - newpath[i] = '/'; - } -#else -#ifdef DOS_PATHS - if (newpath[i] == '/') - { - newpath[i] = '\\'; - } -#endif -#endif - i++; - } - return(newpath); -} - static int CompareSymEntry(const PROSSYM_ENTRY SymEntry1, const PROSSYM_ENTRY SymEntry2) { @@ -342,7 +62,7 @@ if ((strncmp((char*)PESectionHeaders[Idx].Name, ".stab", 5) == 0) && (PESectionHeaders[Idx].Name[5] == 0)) { - /* printf(".stab section found. Size %d\n", + /* printf(".stab section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; @@ -351,7 +71,7 @@ if (strncmp((char*)PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) { - /* printf(".stabstr section found. Size %d\n", + /* printf(".stabstr section found. Size %d\n", PESectionHeaders[Idx].SizeOfRawData); */ *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; @@ -462,9 +182,9 @@ (*SymbolsBase)[*SymbolsCount].FunctionOffset = 0; (*SymbolsBase)[*SymbolsCount].SourceLine = 0; LastFunctionAddress = 0; - break; + break; case N_FUN: - if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) /* line # 0 isn't valid */ + if (0 == StabEntry[i].n_desc || StabEntry[i].n_value < ImageBase) /* line # 0 isn't valid */ { continue; } @@ -492,7 +212,7 @@ StringsBase); (*SymbolsBase)[*SymbolsCount].SourceLine = 0; LastFunctionAddress = Address; - break; + break; case N_SLINE: if (0 == LastFunctionAddress) { @@ -512,7 +232,7 @@ (*SymbolsBase)[*SymbolsCount].SourceLine = StabEntry[i].n_desc; break; default: - continue; + continue; } First = 0; } @@ -1022,9 +742,7 @@ ULONG CoffStringsLength; char* path1; char* path2; - FILE* in; FILE* out; - int n_in; void *StringBase; ULONG StringsLength; ULONG StabSymbolsCount; @@ -1033,7 +751,7 @@ PROSSYM_ENTRY CoffSymbols; ULONG MergedSymbolsCount; PROSSYM_ENTRY MergedSymbols; - long FileSize; + size_t FileSize; void *FileData; ULONG RosSymLength; void *RosSymSection; @@ -1047,31 +765,12 @@ path1 = convert_path(argv[1]); path2 = convert_path(argv[2]); - in = fopen(path1, "rb"); - if (in == NULL) - { - perror("Cannot open input file"); - exit(1); - } - fseek(in, 0L, SEEK_END); - FileSize = ftell(in); - fseek(in, 0L, SEEK_SET); - FileData = malloc(FileSize); - if (NULL == FileData) - { - fclose(in); - fprintf(stderr, "Can't allocate %ld bytes to read input file\n", FileSize); - exit(1); - } - n_in = fread(FileData, 1, FileSize, in); - if (n_in != FileSize) - { - perror("Error reading from input file"); - free(FileData); - fclose(in); - exit(1); - } - fclose(in); + FileData = load_file ( path1, &FileSize ); + if ( !FileData ) + { + fprintf ( stderr, "An error occured loading '%s'\n", path1 ); + exit(1); + } /* Check if MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) FileData; _____ Added: trunk/reactos/tools/rsym.h --- trunk/reactos/tools/rsym.h 2005-04-08 01:11:32 UTC (rev 14541) +++ trunk/reactos/tools/rsym.h 2005-04-08 05:35:20 UTC (rev 14542) @@ -0,0 +1,266 @@ +/* rsym.h */ + +#ifndef RSYM_H +#define RSYM_H + +#define IMAGE_DOS_MAGIC 0x5a4d +#define IMAGE_PE_MAGIC 0x00004550 + +#define IMAGE_SIZEOF_SHORT_NAME 8 + +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 + +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned long DWORD; +typedef signed long LONG; +typedef unsigned long ULONG; +#if defined(_WIN64) +typedef unsigned __int64 ULONG_PTR; +#else +typedef unsigned long ULONG_PTR; +#endif + +#pragma pack(push,2) +typedef struct _IMAGE_DOS_HEADER { + WORD e_magic; + WORD e_cblp; + WORD e_cp; + WORD e_crlc; + WORD e_cparhdr; + WORD e_minalloc; + WORD e_maxalloc; + WORD e_ss; + WORD e_sp; + WORD e_csum; + WORD e_ip; + WORD e_cs; + WORD e_lfarlc; + WORD e_ovno; + WORD e_res[4]; + WORD e_oemid; + WORD e_oeminfo; + WORD e_res2[10]; + LONG e_lfanew; +} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; +#pragma pack(pop) + +#define IMAGE_FILE_LINE_NUMS_STRIPPED 4 +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 +#define IMAGE_FILE_DEBUG_STRIPPED 512 + +#pragma pack(push,4) +typedef struct _IMAGE_FILE_HEADER { + WORD Machine; + WORD NumberOfSections; + DWORD TimeDateStamp; + DWORD PointerToSymbolTable; + DWORD NumberOfSymbols; + WORD SizeOfOptionalHeader; + WORD Characteristics; +} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; + +typedef struct _IMAGE_DATA_DIRECTORY { + DWORD VirtualAddress; + DWORD Size; +} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; + +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 + +typedef struct _IMAGE_OPTIONAL_HEADER { + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + DWORD BaseOfData; + DWORD ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Reserved1; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + DWORD SizeOfStackReserve; + DWORD SizeOfStackCommit; + DWORD SizeOfHeapReserve; + DWORD SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; + +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 +#define IMAGE_SCN_LNK_REMOVE 0x00000800 +#define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 + +typedef struct _IMAGE_SECTION_HEADER { + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; + union { + DWORD PhysicalAddress; + DWORD VirtualSize; + } Misc; + DWORD VirtualAddress; + DWORD SizeOfRawData; + DWORD PointerToRawData; + DWORD PointerToRelocations; + DWORD PointerToLinenumbers; + WORD NumberOfRelocations; + WORD NumberOfLinenumbers; + DWORD Characteristics; +} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; + +typedef struct _IMAGE_BASE_RELOCATION { + DWORD VirtualAddress; + DWORD SizeOfBlock; +} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; + + +typedef struct { + unsigned short f_magic; /* magic number */ + unsigned short f_nscns; /* number of sections */ + unsigned long f_timdat; /* time & date stamp */ + unsigned long f_symptr; /* file pointer to symtab */ + unsigned long f_nsyms; /* number of symtab entries */ + unsigned short f_opthdr; /* sizeof(optional hdr) */ + unsigned short f_flags; /* flags */ +} FILHDR; + +typedef struct { + char s_name[8]; /* section name */ + unsigned long s_paddr; /* physical address, aliased s_nlib */ + unsigned long s_vaddr; /* virtual address */ + unsigned long s_size; /* section size */ + unsigned long s_scnptr; /* file ptr to raw data for section */ + unsigned long s_relptr; /* file ptr to relocation */ + unsigned long s_lnnoptr; /* file ptr to line numbers */ + unsigned short s_nreloc; /* number of relocation entries */ + unsigned short s_nlnno; /* number of line number entries */ + unsigned long s_flags; /* flags */ +} SCNHDR; +#pragma pack(pop) + +typedef struct _SYMBOLFILE_HEADER { + unsigned long SymbolsOffset; + unsigned long SymbolsLength; + unsigned long StringsOffset; + unsigned long StringsLength; +} SYMBOLFILE_HEADER, *PSYMBOLFILE_HEADER; + +typedef struct _STAB_ENTRY { + unsigned long n_strx; /* index into string table of name */ + unsigned char n_type; /* type of symbol */ + unsigned char n_other; /* misc info (usually empty) */ + unsigned short n_desc; /* description field */ + unsigned long n_value; /* value of symbol */ +} STAB_ENTRY, *PSTAB_ENTRY; + +#define N_FUN 0x24 +#define N_SLINE 0x44 +#define N_SO 0x64 + +/* COFF symbol table */ + +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ + +#define N_BTMASK (0xf) +#define N_TMASK (0x30) +#define N_BTSHFT (4) +#define N_TSHIFT (2) + +/* derived types, in e_type */ +#define DT_NON (0) /* no derived type */ +#define DT_PTR (1) /* pointer */ +#define DT_FCN (2) /* function */ +#define DT_ARY (3) /* array */ + +#define BTYPE(x) ((x) & N_BTMASK) + +#define ISPTR(x) (((x) & N_TMASK) == (DT_PTR << N_BTSHFT)) +#define ISFCN(x) (((x) & N_TMASK) == (DT_FCN << N_BTSHFT)) +#define ISARY(x) (((x) & N_TMASK) == (DT_ARY << N_BTSHFT)) +#define ISTAG(x) ((x)==C_STRTAG||(x)==C_UNTAG||(x)==C_ENTAG) +#define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK)) + +#define C_EFCN 0xff /* physical end of function */ +#define C_NULL 0 +#define C_AUTO 1 /* automatic variable */ +#define C_EXT 2 /* external symbol */ +#define C_STAT 3 /* static */ +#define C_REG 4 /* register variable */ [truncated at 1000 lines; 141 more skipped]

19 years, 5 months

[arty] 14541: Initialize these in case handle locking fails.

by arty＠svn.reactos.com

Initialize these in case handle locking fails. Modified: trunk/reactos/drivers/net/afd/afd/lock.c _____ Modified: trunk/reactos/drivers/net/afd/afd/lock.c --- trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-07 20:28:35 UTC (rev 14540) +++ trunk/reactos/drivers/net/afd/afd/lock.c 2005-04-08 01:11:32 UTC (rev 14541) @@ -126,6 +126,7 @@ for( i = 0; FileObjects && i < HandleCount; i++ ) { HandleArray[i].Status = 0; HandleArray[i].Events = HandleArray[i].Events; + FileObjects[i].Handle = 0; Status = ObReferenceObjectByHandle ( (PVOID)HandleArray[i].Handle, FILE_ALL_ACCESS,

19 years, 5 months

[chorns] 14540: * Clean object files

by chorns＠svn.reactos.com

* Clean object files * Clean generated files for cabman Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-07 19:57:05 UTC (rev 14539) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-07 20:28:35 UTC (rev 14540) @@ -65,3 +65,4 @@ .PHONY: cabman_clean cabman_clean: -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL) +clean: cabman_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-07 19:57:05 UTC (rev 14539) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-07 20:28:35 UTC (rev 14540) @@ -738,7 +738,7 @@ if ( module.pch && use_pch ) deps += " " + module.pch->header + ".gch"; string objectFilename = GetObjectFilename ( - sourceFilename, NULL ); + sourceFilename, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", objectFilename.c_str (), @@ -1073,7 +1073,7 @@ const string& windresflagsMacro ) { size_t i; - + const vector<File*>& files = data.files; for ( i = 0; i < files.size (); i++ ) {

19 years, 5 months

[chorns] 14539: Add missing file

by chorns＠svn.reactos.com

Add missing file Added: branches/xmlbuildsystem/reactos/subsys/system/rundll32/rundll32.xml _____ Added: branches/xmlbuildsystem/reactos/subsys/system/rundll32/rundll32.xml --- branches/xmlbuildsystem/reactos/subsys/system/rundll32/rundll32.xml 2005-04-07 19:39:39 UTC (rev 14538) +++ branches/xmlbuildsystem/reactos/subsys/system/rundll32/rundll32.xml 2005-04-07 19:57:05 UTC (rev 14539) @@ -0,0 +1,9 @@ +<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.dll"> + <include base="rundll32">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <file>rundll32.c</file> + <file>rundll32.rc</file> +</module>

19 years, 5 months

[chorns] 14538: Use order-only prerequisites for directories to prevent spurious rebuilds when building on non-FAT volumes

by chorns＠svn.reactos.com

Use order-only prerequisites for directories to prevent spurious rebuilds when building on non-FAT volumes Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ BIN2RES_OUT = $(OUTPUT_)$(BIN2RES_BASE) BIN2RES_OUT_ = $(BIN2RES_OUT)$(SEP) -$(BIN2RES_INT): $(TOOLS_INT) +$(BIN2RES_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(BIN2RES_OUT): $(TOOLS_OUT) +$(BIN2RES_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -30,15 +30,15 @@ BIN2RES_HOST_LFLAGS = -g -$(BIN2RES_TARGET): $(BIN2RES_OBJECTS) $(BIN2RES_OUT) +$(BIN2RES_TARGET): $(BIN2RES_OBJECTS) | $(BIN2RES_OUT) $(ECHO_LD) ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $@ -$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c $(BIN2RES_INT) +$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ -$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c $(BIN2RES_INT) +$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ BUILDNO_OUT = $(OUTPUT_)$(BUILDNO_BASE) BUILDNO_OUT_ = $(BUILDNO_OUT)$(SEP) -$(BUILDNO_INT): $(TOOLS_INT) +$(BUILDNO_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(BUILDNO_OUT): $(TOOLS_OUT) +$(BUILDNO_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -32,23 +32,23 @@ BUILDNO_HOST_LFLAGS = -g -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(BUILDNO_OUT) +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) | $(BUILDNO_OUT) $(ECHO_LD) ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $@ -$(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp $(BUILDNO_INT) +$(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_INT_)exception.o: $(BUILDNO_BASE_)exception.cpp $(BUILDNO_INT) +$(BUILDNO_INT_)exception.o: $(BUILDNO_BASE_)exception.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_INT_)ssprintf.o: $(BUILDNO_BASE_)ssprintf.cpp $(BUILDNO_INT) +$(BUILDNO_INT_)ssprintf.o: $(BUILDNO_BASE_)ssprintf.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -$(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp $(BUILDNO_INT) +$(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ CABMAN_OUT = $(OUTPUT_)$(CABMAN_BASE) CABMAN_OUT_ = $(CABMAN_OUT)$(SEP) -$(CABMAN_INT): $(TOOLS_INT) +$(CABMAN_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CABMAN_OUT): $(TOOLS_OUT) +$(CABMAN_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -38,27 +38,27 @@ .PHONY: cabman cabman: $(CABMAN_TARGET) -$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) +$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) | $(CABMAN_OUT) $(ECHO_LD) ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ -$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_INT) +$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx | $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_INT) +$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx | $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_INT) +$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx | $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_INT) +$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx | $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_INT) +$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx | $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ CDMAKE_OUT = $(OUTPUT_)$(CDMAKE_BASE) CDMAKE_OUT_ = $(CDMAKE_OUT)$(SEP) -$(CDMAKE_INT): $(TOOLS_INT) +$(CDMAKE_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CDMAKE_OUT): $(TOOLS_OUT) +$(CDMAKE_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -33,15 +33,15 @@ .PHONY: cdmake cdmake: $(CDMAKE_TARGET) -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) $(CDMAKE_OUT) +$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) | $(CDMAKE_OUT) $(ECHO_LD) ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@ -$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c $(CDMAKE_INT) +$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c | $(CDMAKE_INT) $(ECHO_CC) ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ -$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c $(CDMAKE_INT) +$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c | $(CDMAKE_INT) $(ECHO_CC) ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak --- branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/mkhive/mkhive.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE) MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP) -$(MKHIVE_INT): $(TOOLS_INT) +$(MKHIVE_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(MKHIVE_OUT): $(TOOLS_OUT) +$(MKHIVE_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -36,27 +36,27 @@ .PHONY: mkhive mkhive: $(MKHIVE_TARGET) -$(MKHIVE_TARGET): $(MKHIVE_OBJECTS) $(MKHIVE_OUT) +$(MKHIVE_TARGET): $(MKHIVE_OBJECTS) | $(MKHIVE_OUT) $(ECHO_LD) ${host_gcc} $(MKHIVE_OBJECTS) $(MKHIVE_HOST_LFLAGS) -o $@ -$(MKHIVE_INT_)binhive.o: $(MKHIVE_BASE_)binhive.c $(MKHIVE_INT) +$(MKHIVE_INT_)binhive.o: $(MKHIVE_BASE_)binhive.c | $(MKHIVE_INT) $(ECHO_CC) ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ -$(MKHIVE_INT_)infcache.o: $(MKHIVE_BASE_)infcache.c $(MKHIVE_INT) +$(MKHIVE_INT_)infcache.o: $(MKHIVE_BASE_)infcache.c | $(MKHIVE_INT) $(ECHO_CC) ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ -$(MKHIVE_INT_)mkhive.o: $(MKHIVE_BASE_)mkhive.c $(MKHIVE_INT) +$(MKHIVE_INT_)mkhive.o: $(MKHIVE_BASE_)mkhive.c | $(MKHIVE_INT) $(ECHO_CC) ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ -$(MKHIVE_INT_)reginf.o: $(MKHIVE_BASE_)reginf.c $(MKHIVE_INT) +$(MKHIVE_INT_)reginf.o: $(MKHIVE_BASE_)reginf.c | $(MKHIVE_INT) $(ECHO_CC) ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ -$(MKHIVE_INT_)registry.o: $(MKHIVE_BASE_)registry.c $(MKHIVE_INT) +$(MKHIVE_INT_)registry.o: $(MKHIVE_BASE_)registry.c | $(MKHIVE_INT) $(ECHO_CC) ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ NCI_OUT = $(OUTPUT_)$(NCI_BASE) NCI_OUT_ = $(NCI_OUT)$(SEP) -$(NCI_INT): $(TOOLS_INT) +$(NCI_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(NCI_OUT): $(TOOLS_OUT) +$(NCI_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -28,11 +28,11 @@ NCI_HOST_LFLAGS = -g -$(NCI_TARGET): $(NCI_OBJECTS) $(NCI_OUT) +$(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT) $(ECHO_LD) ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ -$(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c $(NCI_INT) +$(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) $(ECHO_CC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-07 19:39:39 UTC (rev 14538) @@ -740,7 +740,7 @@ string objectFilename = GetObjectFilename ( sourceFilename, NULL ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s | %s\n", objectFilename.c_str (), deps.c_str (), GetDirectory ( objectFilename ).c_str () ); @@ -760,7 +760,7 @@ string objectFilename = GetObjectFilename ( sourceFilename, &clean_files ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s | %s\n", objectFilename.c_str (), sourceFilename.c_str (), GetDirectory ( objectFilename ).c_str () ); @@ -779,7 +779,7 @@ string objectFilename = GetObjectFilename ( sourceFilename, &clean_files ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s | %s\n", objectFilename.c_str (), sourceFilename.c_str (), GetDirectory ( objectFilename ).c_str () ); @@ -802,7 +802,7 @@ string resFilename = ros_temp + ReplaceExtension ( sourceFilename, ".res" ); fprintf ( fMakefile, - "%s: %s %s $(WRC_TARGET)\n", + "%s: %s $(WRC_TARGET) | %s\n", objectFilename.c_str (), sourceFilename.c_str (), GetDirectory ( objectFilename ).c_str () ); @@ -975,7 +975,7 @@ string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) ); fprintf ( fMakefile, - "%s: %s %s $(RSYM_TARGET)\n", + "%s: %s $(RSYM_TARGET) | %s\n", target.c_str (), dependencies.c_str (), target_folder.c_str () ); @@ -1058,7 +1058,7 @@ string targetMacro ( GetTargetMacro(module) ); fprintf ( fMakefile, ".PHONY: %s\n\n", targetMacro.c_str ()); - fprintf ( fMakefile, "%s: %s\n", + fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), GetDirectory(GetTargetFilename(module,NULL)).c_str () ); } @@ -1147,7 +1147,7 @@ string archiveFilename ( GetModuleArchiveFilename () ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s | %s\n", archiveFilename.c_str (), objs_macro.c_str (), GetDirectory(archiveFilename).c_str() ); @@ -1513,7 +1513,7 @@ fprintf ( fMakefile, " %s", deps[i].c_str () ); - fprintf ( fMakefile, " %s\n", + fprintf ( fMakefile, " | %s\n", GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -1589,7 +1589,7 @@ else linker = "${host_gcc}"; - fprintf ( fMakefile, "%s: %s %s %s\n", + fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), @@ -1641,7 +1641,7 @@ GenerateImportLibraryTargetIfNeeded (); - fprintf ( fMakefile, "%s: %s %s %s $(RSYM_TARGET)\n", + fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), @@ -2121,7 +2121,7 @@ GenerateRules (); - fprintf ( fMakefile, "%s: %s %s %s\n", + fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ RBUILD_OUT = $(OUTPUT_)$(RBUILD_BASE) RBUILD_OUT_ = $(RBUILD_OUT)$(SEP) -$(RBUILD_INT): $(TOOLS_INT) +$(RBUILD_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_OUT): $(TOOLS_OUT) +$(RBUILD_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -23,12 +23,12 @@ RBUILD_BACKEND_OUT = $(OUTPUT)$(RBUILD_BACKEND_BASE) RBUILD_BACKEND_OUT_ = $(RBUILD_BACKEND_OUT)$(SEP) -$(RBUILD_BACKEND_INT): $(RBUILD_INT) +$(RBUILD_BACKEND_INT): | $(RBUILD_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_BACKEND_OUT): $(RBUILD_OUT) +$(RBUILD_BACKEND_OUT): | $(RBUILD_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -41,12 +41,12 @@ RBUILD_MINGW_OUT = $(OUTPUT)$(RBUILD_MINGW_BASE) RBUILD_MINGW_OUT_ = $(RBUILD_MINGW_OUT)$(SEP) -$(RBUILD_MINGW_INT): $(RBUILD_BACKEND_INT) +$(RBUILD_MINGW_INT): | $(RBUILD_BACKEND_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_MINGW_OUT): $(RBUILD_BACKEND_OUT) +$(RBUILD_MINGW_OUT): | $(RBUILD_BACKEND_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -58,12 +58,12 @@ RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP) RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE) -$(RBUILD_TESTS_INT): $(RBUILD_INT) +$(RBUILD_TESTS_INT): | $(RBUILD_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_TESTS_OUT): $(RBUILD_OUT) +$(RBUILD_TESTS_OUT): | $(RBUILD_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -76,12 +76,12 @@ RBUILD_DEVCPP_OUT = $(OUTPUT)$(RBUILD_DEVCPP_BASE) RBUILD_DEVCPP_OUT_ = $(RBUILD_DEVCPP_OUT)$(SEP) -$(RBUILD_DEVCPP_INT): $(RBUILD_BACKEND_INT) +$(RBUILD_DEVCPP_INT): | $(RBUILD_BACKEND_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_DEVCPP_OUT): $(RBUILD_BACKEND_OUT) +$(RBUILD_DEVCPP_OUT): | $(RBUILD_BACKEND_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -201,135 +201,135 @@ .PHONY: rbuild rbuild: $(RBUILD_TARGET) -$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(RBUILD_OUT) +$(RBUILD_TARGET): $(RBUILD_OBJECTS) | $(RBUILD_OUT) $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ -$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_INT) $(RBUILD_HEADERS) +$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_BACKEND_INT) $(RBUILD_HEADERS) +$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_HEADERS) | $(RBUILD_BACKEND_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_MINGW_INT) $(RBUILD_HEADERS) +$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_MINGW_INT) $(RBUILD_HEADERS) +$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_DEVCPP_INT) $(RBUILD_HEADERS) +$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT) $(RBUILD_HEADERS) +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) $(ECHO_LD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ -$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_TESTS_INT) $(RBUILD_HEADERS) +$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -$(TOOLS_INT): $(INTERMEDIATE) +$(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(TOOLS_OUT): $(OUTPUT) +$(TOOLS_OUT): | $(OUTPUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -39,11 +39,11 @@ .PHONY: rsym rsym: $(RSYM_TARGET) -$(RSYM_TARGET): $(RSYM_OBJECTS) $(RSYM_OUT) +$(RSYM_TARGET): $(RSYM_OBJECTS) | $(RSYM_OUT) $(ECHO_LD) ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $@ -$(RSYM_INT_)rsym.o: $(RSYM_BASE_)rsym.c $(RSYM_INT) +$(RSYM_INT_)rsym.o: $(RSYM_BASE_)rsym.c | $(RSYM_INT) $(ECHO_CC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-04-07 18:01:29 UTC (rev 14537) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-04-07 19:39:39 UTC (rev 14538) @@ -5,12 +5,12 @@ UNICODE_OUT = $(OUTPUT_)$(UNICODE_BASE) UNICODE_OUT_ = $(UNICODE_OUT)$(SEP) -$(UNICODE_INT): $(TOOLS_INT) +$(UNICODE_INT): | $(TOOLS_INT) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(UNICODE_OUT): $(TOOLS_OUT) +$(UNICODE_OUT): | $(TOOLS_OUT) $(ECHO_MKDIR) ${mkdir} $@ endif @@ -102,275 +102,275 @@ .PHONY: unicode unicode: $(UNICODE_TARGET) -$(UNICODE_TARGET): $(UNICODE_OBJECTS) $(UNICODE_OUT) +$(UNICODE_TARGET): $(UNICODE_OBJECTS) | $(UNICODE_OUT) $(ECHO_AR) ${host_ar} -rc $@ $(UNICODE_OBJECTS) -$(UNICODE_INT_)casemap.o: $(UNICODE_BASE_)casemap.c $(UNICODE_INT) +$(UNICODE_INT_)casemap.o: $(UNICODE_BASE_)casemap.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)compose.o: $(UNICODE_BASE_)compose.c $(UNICODE_INT) +$(UNICODE_INT_)compose.o: $(UNICODE_BASE_)compose.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)cptable.o: $(UNICODE_BASE_)cptable.c $(UNICODE_INT) +$(UNICODE_INT_)cptable.o: $(UNICODE_BASE_)cptable.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)mbtowc.o: $(UNICODE_BASE_)mbtowc.c $(UNICODE_INT) +$(UNICODE_INT_)mbtowc.o: $(UNICODE_BASE_)mbtowc.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)string.o: $(UNICODE_BASE_)string.c $(UNICODE_INT) +$(UNICODE_INT_)string.o: $(UNICODE_BASE_)string.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)wctomb.o: $(UNICODE_BASE_)wctomb.c $(UNICODE_INT) +$(UNICODE_INT_)wctomb.o: $(UNICODE_BASE_)wctomb.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)wctype.o: $(UNICODE_BASE_)wctype.c $(UNICODE_INT) +$(UNICODE_INT_)wctype.o: $(UNICODE_BASE_)wctype.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_037.o: $(UNICODE_BASE_)c_037.c $(UNICODE_INT) +$(UNICODE_INT_)c_037.o: $(UNICODE_BASE_)c_037.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_424.o: $(UNICODE_BASE_)c_424.c $(UNICODE_INT) +$(UNICODE_INT_)c_424.o: $(UNICODE_BASE_)c_424.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_437.o: $(UNICODE_BASE_)c_437.c $(UNICODE_INT) +$(UNICODE_INT_)c_437.o: $(UNICODE_BASE_)c_437.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_500.o: $(UNICODE_BASE_)c_500.c $(UNICODE_INT) +$(UNICODE_INT_)c_500.o: $(UNICODE_BASE_)c_500.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_737.o: $(UNICODE_BASE_)c_737.c $(UNICODE_INT) +$(UNICODE_INT_)c_737.o: $(UNICODE_BASE_)c_737.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_775.o: $(UNICODE_BASE_)c_775.c $(UNICODE_INT) +$(UNICODE_INT_)c_775.o: $(UNICODE_BASE_)c_775.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_850.o: $(UNICODE_BASE_)c_850.c $(UNICODE_INT) +$(UNICODE_INT_)c_850.o: $(UNICODE_BASE_)c_850.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_852.o: $(UNICODE_BASE_)c_852.c $(UNICODE_INT) +$(UNICODE_INT_)c_852.o: $(UNICODE_BASE_)c_852.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_855.o: $(UNICODE_BASE_)c_855.c $(UNICODE_INT) +$(UNICODE_INT_)c_855.o: $(UNICODE_BASE_)c_855.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_856.o: $(UNICODE_BASE_)c_856.c $(UNICODE_INT) +$(UNICODE_INT_)c_856.o: $(UNICODE_BASE_)c_856.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_857.o: $(UNICODE_BASE_)c_857.c $(UNICODE_INT) +$(UNICODE_INT_)c_857.o: $(UNICODE_BASE_)c_857.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_860.o: $(UNICODE_BASE_)c_860.c $(UNICODE_INT) +$(UNICODE_INT_)c_860.o: $(UNICODE_BASE_)c_860.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_861.o: $(UNICODE_BASE_)c_861.c $(UNICODE_INT) +$(UNICODE_INT_)c_861.o: $(UNICODE_BASE_)c_861.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_862.o: $(UNICODE_BASE_)c_862.c $(UNICODE_INT) +$(UNICODE_INT_)c_862.o: $(UNICODE_BASE_)c_862.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_863.o: $(UNICODE_BASE_)c_863.c $(UNICODE_INT) +$(UNICODE_INT_)c_863.o: $(UNICODE_BASE_)c_863.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_864.o: $(UNICODE_BASE_)c_864.c $(UNICODE_INT) +$(UNICODE_INT_)c_864.o: $(UNICODE_BASE_)c_864.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_865.o: $(UNICODE_BASE_)c_865.c $(UNICODE_INT) +$(UNICODE_INT_)c_865.o: $(UNICODE_BASE_)c_865.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_866.o: $(UNICODE_BASE_)c_866.c $(UNICODE_INT) +$(UNICODE_INT_)c_866.o: $(UNICODE_BASE_)c_866.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_869.o: $(UNICODE_BASE_)c_869.c $(UNICODE_INT) +$(UNICODE_INT_)c_869.o: $(UNICODE_BASE_)c_869.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_874.o: $(UNICODE_BASE_)c_874.c $(UNICODE_INT) +$(UNICODE_INT_)c_874.o: $(UNICODE_BASE_)c_874.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_875.o: $(UNICODE_BASE_)c_875.c $(UNICODE_INT) +$(UNICODE_INT_)c_875.o: $(UNICODE_BASE_)c_875.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_878.o: $(UNICODE_BASE_)c_878.c $(UNICODE_INT) +$(UNICODE_INT_)c_878.o: $(UNICODE_BASE_)c_878.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_932.o: $(UNICODE_BASE_)c_932.c $(UNICODE_INT) +$(UNICODE_INT_)c_932.o: $(UNICODE_BASE_)c_932.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_936.o: $(UNICODE_BASE_)c_936.c $(UNICODE_INT) +$(UNICODE_INT_)c_936.o: $(UNICODE_BASE_)c_936.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_949.o: $(UNICODE_BASE_)c_949.c $(UNICODE_INT) +$(UNICODE_INT_)c_949.o: $(UNICODE_BASE_)c_949.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_950.o: $(UNICODE_BASE_)c_950.c $(UNICODE_INT) +$(UNICODE_INT_)c_950.o: $(UNICODE_BASE_)c_950.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1006.o: $(UNICODE_BASE_)c_1006.c $(UNICODE_INT) +$(UNICODE_INT_)c_1006.o: $(UNICODE_BASE_)c_1006.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1026.o: $(UNICODE_BASE_)c_1026.c $(UNICODE_INT) +$(UNICODE_INT_)c_1026.o: $(UNICODE_BASE_)c_1026.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1250.o: $(UNICODE_BASE_)c_1250.c $(UNICODE_INT) +$(UNICODE_INT_)c_1250.o: $(UNICODE_BASE_)c_1250.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1251.o: $(UNICODE_BASE_)c_1251.c $(UNICODE_INT) +$(UNICODE_INT_)c_1251.o: $(UNICODE_BASE_)c_1251.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1252.o: $(UNICODE_BASE_)c_1252.c $(UNICODE_INT) +$(UNICODE_INT_)c_1252.o: $(UNICODE_BASE_)c_1252.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1253.o: $(UNICODE_BASE_)c_1253.c $(UNICODE_INT) +$(UNICODE_INT_)c_1253.o: $(UNICODE_BASE_)c_1253.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1254.o: $(UNICODE_BASE_)c_1254.c $(UNICODE_INT) +$(UNICODE_INT_)c_1254.o: $(UNICODE_BASE_)c_1254.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1255.o: $(UNICODE_BASE_)c_1255.c $(UNICODE_INT) +$(UNICODE_INT_)c_1255.o: $(UNICODE_BASE_)c_1255.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1256.o: $(UNICODE_BASE_)c_1256.c $(UNICODE_INT) +$(UNICODE_INT_)c_1256.o: $(UNICODE_BASE_)c_1256.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1257.o: $(UNICODE_BASE_)c_1257.c $(UNICODE_INT) +$(UNICODE_INT_)c_1257.o: $(UNICODE_BASE_)c_1257.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_1258.o: $(UNICODE_BASE_)c_1258.c $(UNICODE_INT) +$(UNICODE_INT_)c_1258.o: $(UNICODE_BASE_)c_1258.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10000.o: $(UNICODE_BASE_)c_10000.c $(UNICODE_INT) +$(UNICODE_INT_)c_10000.o: $(UNICODE_BASE_)c_10000.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10006.o: $(UNICODE_BASE_)c_10006.c $(UNICODE_INT) +$(UNICODE_INT_)c_10006.o: $(UNICODE_BASE_)c_10006.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10007.o: $(UNICODE_BASE_)c_10007.c $(UNICODE_INT) +$(UNICODE_INT_)c_10007.o: $(UNICODE_BASE_)c_10007.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10029.o: $(UNICODE_BASE_)c_10029.c $(UNICODE_INT) +$(UNICODE_INT_)c_10029.o: $(UNICODE_BASE_)c_10029.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10079.o: $(UNICODE_BASE_)c_10079.c $(UNICODE_INT) +$(UNICODE_INT_)c_10079.o: $(UNICODE_BASE_)c_10079.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_10081.o: $(UNICODE_BASE_)c_10081.c $(UNICODE_INT) +$(UNICODE_INT_)c_10081.o: $(UNICODE_BASE_)c_10081.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_20866.o: $(UNICODE_BASE_)c_20866.c $(UNICODE_INT) +$(UNICODE_INT_)c_20866.o: $(UNICODE_BASE_)c_20866.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_20932.o: $(UNICODE_BASE_)c_20932.c $(UNICODE_INT) +$(UNICODE_INT_)c_20932.o: $(UNICODE_BASE_)c_20932.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_21866.o: $(UNICODE_BASE_)c_21866.c $(UNICODE_INT) +$(UNICODE_INT_)c_21866.o: $(UNICODE_BASE_)c_21866.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28591.o: $(UNICODE_BASE_)c_28591.c $(UNICODE_INT) +$(UNICODE_INT_)c_28591.o: $(UNICODE_BASE_)c_28591.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28592.o: $(UNICODE_BASE_)c_28592.c $(UNICODE_INT) +$(UNICODE_INT_)c_28592.o: $(UNICODE_BASE_)c_28592.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28593.o: $(UNICODE_BASE_)c_28593.c $(UNICODE_INT) +$(UNICODE_INT_)c_28593.o: $(UNICODE_BASE_)c_28593.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28594.o: $(UNICODE_BASE_)c_28594.c $(UNICODE_INT) +$(UNICODE_INT_)c_28594.o: $(UNICODE_BASE_)c_28594.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28595.o: $(UNICODE_BASE_)c_28595.c $(UNICODE_INT) +$(UNICODE_INT_)c_28595.o: $(UNICODE_BASE_)c_28595.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28596.o: $(UNICODE_BASE_)c_28596.c $(UNICODE_INT) +$(UNICODE_INT_)c_28596.o: $(UNICODE_BASE_)c_28596.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28597.o: $(UNICODE_BASE_)c_28597.c $(UNICODE_INT) +$(UNICODE_INT_)c_28597.o: $(UNICODE_BASE_)c_28597.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28598.o: $(UNICODE_BASE_)c_28598.c $(UNICODE_INT) +$(UNICODE_INT_)c_28598.o: $(UNICODE_BASE_)c_28598.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28599.o: $(UNICODE_BASE_)c_28599.c $(UNICODE_INT) +$(UNICODE_INT_)c_28599.o: $(UNICODE_BASE_)c_28599.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28600.o: $(UNICODE_BASE_)c_28600.c $(UNICODE_INT) +$(UNICODE_INT_)c_28600.o: $(UNICODE_BASE_)c_28600.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28603.o: $(UNICODE_BASE_)c_28603.c $(UNICODE_INT) +$(UNICODE_INT_)c_28603.o: $(UNICODE_BASE_)c_28603.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ -$(UNICODE_INT_)c_28604.o: $(UNICODE_BASE_)c_28604.c $(UNICODE_INT) +$(UNICODE_INT_)c_28604.o: $(UNICODE_BASE_)c_28604.c | $(UNICODE_INT) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ [truncated at 1000 lines; 291 more skipped]

19 years, 5 months

[weiden] 14537: forward CommConfigDialogA to CommConfigDialogW

by weiden＠svn.reactos.com

forward CommConfigDialogA to CommConfigDialogW Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-04-07 13:25:34 UTC (rev 14536) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-04-07 18:01:29 UTC (rev 14537) @@ -831,28 +831,20 @@ STDCALL CommConfigDialogA(LPCSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC) { - BOOL (STDCALL *drvCommDlgA)(LPCSTR, HWND, LPCOMMCONFIG); - HMODULE hSerialuiDll; + PWCHAR NameW; BOOL result; - //FIXME: Get dll name from registry. (setupapi needed) - if(!(hSerialuiDll = LoadLibraryW(L"serialui.dll"))) + /* don't use the static thread buffer so operations in serialui + don't overwrite the string */ + if(!(NameW = FilenameA2W(lpszName, TRUE))) { - DPRINT("CommConfigDialogA: serialui.dll not found.\n"); return FALSE; } - drvCommDlgA = GetProcAddress(hSerialuiDll, "drvCommConfigDialogA"); + result = CommConfigDialogW(NameW, hWnd, lpCC); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameW); - if(!drvCommDlgA) - { - DPRINT("CommConfigDialogA: serialui does not export drvCommConfigDialogA\n"); - FreeLibrary(hSerialuiDll); - return FALSE; - } - - result = drvCommDlgA(lpszName, hWnd, lpCC); - FreeLibrary(hSerialuiDll); return result; }

19 years, 5 months

[weiden] 14536: - don't redefine public structures in taskmgr

by weiden＠svn.reactos.com

- don't redefine public structures in taskmgr - minor taskmgr changes and make better use of PCH - fixed definition of SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION and depending code Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/lib/kernel32/misc/time.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/subsys/system/taskmgr/De.rc Modified: trunk/reactos/subsys/system/taskmgr/Dk.rc Modified: trunk/reactos/subsys/system/taskmgr/En.rc Modified: trunk/reactos/subsys/system/taskmgr/Es.rc Modified: trunk/reactos/subsys/system/taskmgr/Sv.rc Modified: trunk/reactos/subsys/system/taskmgr/about.c Modified: trunk/reactos/subsys/system/taskmgr/affinity.c Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/column.c Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c Modified: trunk/reactos/subsys/system/taskmgr/debug.c Modified: trunk/reactos/subsys/system/taskmgr/endproc.c Modified: trunk/reactos/subsys/system/taskmgr/font.c Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c Modified: trunk/reactos/subsys/system/taskmgr/makefile Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.h Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Modified: trunk/reactos/subsys/system/taskmgr/priority.c Modified: trunk/reactos/subsys/system/taskmgr/proclist.c Modified: trunk/reactos/subsys/system/taskmgr/procpage.c Modified: trunk/reactos/subsys/system/taskmgr/resource.h Modified: trunk/reactos/subsys/system/taskmgr/run.c Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/include/ntos/zwtypes.h 2005-04-07 13:25:34 UTC (rev 14536) @@ -1401,17 +1401,17 @@ // SystemProcessorPerformanceInformation (8) // (one per processor in the system) typedef -struct _SYSTEM_PROCESSORTIME_INFO +struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION { - TIME TotalProcessorRunTime; - TIME TotalProcessorTime; - TIME TotalProcessorUserTime; - TIME TotalDPCTime; - TIME TotalInterruptTime; - ULONG TotalInterrupts; - ULONG Unused; + LARGE_INTEGER IdleTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER DpcTime; + LARGE_INTEGER InterruptTime; + ULONG InterruptCount; + ULONG Reserved; -} SYSTEM_PROCESSORTIME_INFO, *PSYSTEM_PROCESSORTIME_INFO; +} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; // SystemFlagsInformation (9) typedef _____ Modified: trunk/reactos/lib/kernel32/misc/time.c --- trunk/reactos/lib/kernel32/misc/time.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/lib/kernel32/misc/time.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -500,12 +500,12 @@ LPFILETIME lpUserTime ) { - SYSTEM_PROCESSORTIME_INFO SysProcTime; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcPerfInfo; NTSTATUS Status; Status = ZwQuerySystemInformation(SystemProcessorPerformanceInformation, - &SysProcTime, - sizeof(SysProcTime), + &SysProcPerfInfo, + sizeof(SysProcPerfInfo), NULL); if (!NT_SUCCESS(Status)) @@ -517,14 +517,14 @@ Good only for one processor system. */ - lpIdleTime->dwLowDateTime = SysProcTime.TotalProcessorRunTime.LowPart; - lpIdleTime->dwHighDateTime = SysProcTime.TotalProcessorRunTime.HighPart; + lpIdleTime->dwLowDateTime = SysProcPerfInfo.IdleTime.LowPart; + lpIdleTime->dwHighDateTime = SysProcPerfInfo.IdleTime.HighPart; - lpKernelTime->dwLowDateTime = SysProcTime.TotalProcessorTime.LowPart; - lpKernelTime->dwHighDateTime = SysProcTime.TotalProcessorTime.HighPart; + lpKernelTime->dwLowDateTime = SysProcPerfInfo.KernelTime.LowPart; + lpKernelTime->dwHighDateTime = SysProcPerfInfo.KernelTime.HighPart; - lpUserTime->dwLowDateTime = SysProcTime.TotalProcessorUserTime.LowPart; - lpUserTime->dwHighDateTime = SysProcTime.TotalProcessorUserTime.HighPart; + lpUserTime->dwLowDateTime = SysProcPerfInfo.UserTime.LowPart; + lpUserTime->dwHighDateTime = SysProcPerfInfo.UserTime.HighPart; return TRUE; } _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -725,18 +725,18 @@ /* Class 8 - Processor Performance Information */ QSI_DEF(SystemProcessorPerformanceInformation) { - PSYSTEM_PROCESSORTIME_INFO Spi - = (PSYSTEM_PROCESSORTIME_INFO) Buffer; + PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION Spi + = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) Buffer; ULONG i; LARGE_INTEGER CurrentTime; PKPRCB Prcb; - *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSORTIME_INFO); + *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); /* - * Check user buffer's size + * Check user buffer's size */ - if (Size < KeNumberProcessors * sizeof(SYSTEM_PROCESSORTIME_INFO)) + if (Size < KeNumberProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)) { return (STATUS_INFO_LENGTH_MISMATCH); } @@ -745,16 +745,16 @@ Prcb = ((PKPCR)KPCR_BASE)->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - Spi->TotalProcessorRunTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime - Spi->TotalProcessorTime.QuadPart = Prcb->KernelTime * 100000LL; // KernelTime - Spi->TotalProcessorUserTime.QuadPart = Prcb->UserTime * 100000LL; - Spi->TotalDPCTime.QuadPart = Prcb->DpcTime * 100000LL; - Spi->TotalInterruptTime.QuadPart = Prcb->InterruptTime * 100000LL; - Spi->TotalInterrupts = Prcb->InterruptCount; // Interrupt Count + Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime + Spi->KernelTime.QuadPart = Prcb->KernelTime * 100000LL; // KernelTime + Spi->UserTime.QuadPart = Prcb->UserTime * 100000LL; + Spi->DpcTime.QuadPart = Prcb->DpcTime * 100000LL; + Spi->InterruptTime.QuadPart = Prcb->InterruptTime * 100000LL; + Spi->InterruptCount = Prcb->InterruptCount; // Interrupt Count Spi++; Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); } - + return (STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-04-07 13:25:34 UTC (rev 14536) @@ -583,6 +583,7 @@ BEGIN IDS_APP_TITLE "Task-Manager" IDC_TASKMGR "Task-Manager" + IDS_IDLE_PROCESS "Leerlaufprozess" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/taskmgr/Dk.rc --- trunk/reactos/subsys/system/taskmgr/Dk.rc 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/Dk.rc 2005-04-07 13:25:34 UTC (rev 14536) @@ -538,6 +538,7 @@ BEGIN IDS_APP_TITLE "Opgavestyring" IDC_TASKMGR "Opgavestyring" + IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/taskmgr/En.rc --- trunk/reactos/subsys/system/taskmgr/En.rc 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/En.rc 2005-04-07 13:25:34 UTC (rev 14536) @@ -538,6 +538,7 @@ BEGIN IDS_APP_TITLE "Task Manager" IDC_TASKMGR "Task Manager" + IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/taskmgr/Es.rc --- trunk/reactos/subsys/system/taskmgr/Es.rc 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/Es.rc 2005-04-07 13:25:34 UTC (rev 14536) @@ -611,6 +611,7 @@ BEGIN IDS_APP_TITLE "Administrador de Tareas" IDC_TASKMGR "Administrador de Tareas" + IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/taskmgr/Sv.rc --- trunk/reactos/subsys/system/taskmgr/Sv.rc 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/Sv.rc 2005-04-07 13:25:34 UTC (rev 14536) @@ -555,6 +555,7 @@ BEGIN IDS_APP_TITLE "Aktivitetshanteraren" IDC_TASKMGR "Aktivitetshanteraren" + IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/taskmgr/about.c --- trunk/reactos/subsys/system/taskmgr/about.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/about.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,14 +21,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> - -#include "about.h" INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/taskmgr/affinity.c --- trunk/reactos/subsys/system/taskmgr/affinity.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/affinity.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -22,17 +22,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <winnt.h> -#include <stdio.h> - -#include "procpage.h" -#include "affinity.h" -#include "perfdata.h" HANDLE hProcessAffinityHandle; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -22,16 +22,7 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include "applpage.h" -#include "procpage.h" - typedef struct { HWND hWnd; @@ -370,7 +361,7 @@ /* It is not already in the list so add it */ else { - pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)malloc(sizeof(APPLICATION_PAGE_LIST_ITEM)) ; + pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(APPLICATION_PAGE_LIST_ITEM)); pAPLI->hWnd = hWnd; pAPLI->hIcon = hIcon; @@ -409,7 +400,7 @@ ImageList_Remove(hImageListSmall, item.iItem); ListView_DeleteItem(hApplicationPageListCtrl, item.iItem); - free(pAPLI); + HeapFree(GetProcessHeap(), 0, pAPLI); bItemRemoved = TRUE; } } @@ -704,7 +695,7 @@ HWND* hWndArray; int nWndCount; - hWndArray = (HWND*)malloc(sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); + hWndArray = (HWND*)HeapAlloc(GetProcessHeap(), 0, sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); nWndCount = 0; for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++) { @@ -724,7 +715,7 @@ } } TileWindows(NULL, MDITILE_HORIZONTAL, NULL, nWndCount, hWndArray); - free(hWndArray); + HeapFree(GetProcessHeap(), 0, hWndArray); } void ApplicationPage_OnWindowsTileVertically(void) @@ -735,7 +726,7 @@ HWND* hWndArray; int nWndCount; - hWndArray = (HWND*)malloc(sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); + hWndArray = (HWND*)HeapAlloc(GetProcessHeap(), 0, sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); nWndCount = 0; for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++) { @@ -755,7 +746,7 @@ } TileWindows(NULL, MDITILE_VERTICAL, NULL, nWndCount, hWndArray); - free(hWndArray); + HeapFree(GetProcessHeap(), 0, hWndArray); } void ApplicationPage_OnWindowsMinimize(void) @@ -808,7 +799,7 @@ HWND* hWndArray; int nWndCount; - hWndArray = (HWND*)malloc(sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); + hWndArray = (HWND*)HeapAlloc(GetProcessHeap(), 0, sizeof(HWND) * ListView_GetItemCount(hApplicationPageListCtrl)); nWndCount = 0; for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++) { @@ -826,7 +817,7 @@ } } CascadeWindows(NULL, 0, NULL, nWndCount, hWndArray); - free(hWndArray); + HeapFree(GetProcessHeap(), 0, hWndArray); } void ApplicationPage_OnWindowsBringToFront(void) _____ Modified: trunk/reactos/subsys/system/taskmgr/column.c --- trunk/reactos/subsys/system/taskmgr/column.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/column.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -22,15 +22,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> - -#include "column.h" -#include "procpage.h" UINT ColumnDataHints[25]; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c --- trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,20 +21,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <winnt.h> - -#include "procpage.h" -#include "perfdata.h" -#include "column.h" -#include "proclist.h" -#include "dbgchnl.h" -#include <ctype.h> /* TODO: * - the dialog box could be non modal _____ Modified: trunk/reactos/subsys/system/taskmgr/debug.c --- trunk/reactos/subsys/system/taskmgr/debug.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/debug.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -22,17 +22,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <winnt.h> - -#include "debug.h" -#include "procpage.h" -#include "perfdata.h" void ProcessPage_OnDebug(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/endproc.c --- trunk/reactos/subsys/system/taskmgr/endproc.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/endproc.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -22,17 +22,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <winnt.h> - -#include "endproc.h" -#include "procpage.h" -#include "perfdata.h" TCHAR szTemp[256]; TCHAR szTempA[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/font.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,14 +21,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> - -#include "font.h" void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) { _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,19 +21,7 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <winnt.h> - -#include "graph.h" -#include "font.h" -#include "perfdata.h" - LONG OldGraphWndProc; void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd); _____ Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c --- trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,16 +21,7 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <math.h> -#include "graphctl.h" - LONG OldGraphCtrlWndProc; static void GraphCtrl_Init(TGraphCtrl* this) _____ Modified: trunk/reactos/subsys/system/taskmgr/makefile --- trunk/reactos/subsys/system/taskmgr/makefile 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/makefile 2005-04-07 13:25:34 UTC (rev 14536) @@ -16,7 +16,7 @@ TARGET_PCH = precomp.h -TARGET_CFLAGS = -Werror -Wall -DDBG -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API +TARGET_CFLAGS = -Werror -Wall -DDBG -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API TARGET_SDKLIBS = ntdll.a kernel32.a user32.a gdi32.a comctl32.a _____ Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c --- trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -27,15 +27,6 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> - -#include "optnmenu.h" -#include "procpage.h" void TaskManager_OnOptionsAlwaysOnTop(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-04-07 13:25:34 UTC (rev 14536) @@ -21,19 +21,8 @@ */ #include "precomp.h" -#include <commctrl.h> -#include <stdlib.h> -#include <malloc.h> -#include <memory.h> -#include <tchar.h> -#include <stdio.h> -#include <winnt.h> -#include "perfdata.h" -PROCNTQSI NtQuerySystemInformation = NULL; -PROCGGR pGetGuiResources = NULL; -PROCGPIC pGetProcessIoCounters = NULL; -CRITICAL_SECTION PerfDataCriticalSection; +CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ ULONG ProcessCountOld = 0; @@ -48,21 +37,14 @@ SYSTEM_BASIC_INFORMATION SystemBasicInfo; SYSTEM_CACHE_INFORMATION SystemCacheInfo; SYSTEM_HANDLE_INFORMATION SystemHandleInfo; -PSYSTEM_PROCESSORTIME_INFO SystemProcessorTimeInfo = NULL; +PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; BOOL PerfDataInitialize(void) { - LONG status; - - NtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandle(_T("ntdll.dll")), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandle(_T("user32.dll")), "GetGuiResources"); - pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandle(_T("kernel32.dll")), "GetProcessIoCounters"); + NTSTATUS status; InitializeCriticalSection(&PerfDataCriticalSection); - if (!NtQuerySystemInformation) - return FALSE; - /* * Get number of processors in the system */ @@ -75,15 +57,13 @@ void PerfDataUninitialize(void) { - NtQuerySystemInformation = NULL; - DeleteCriticalSection(&PerfDataCriticalSection); } void PerfDataRefresh(void) { ULONG ulSize; - LONG status; + NTSTATUS status; LPBYTE pBuffer; ULONG BufferSize; PSYSTEM_PROCESS_INFORMATION pSPI; @@ -94,18 +74,14 @@ TCHAR szTemp[MAX_PATH]; DWORD dwSize; SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; - SYSTEM_TIME_INFORMATION SysTimeInfo; + SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; SYSTEM_CACHE_INFORMATION SysCacheInfo; LPBYTE SysHandleInfoData; - PSYSTEM_PROCESSORTIME_INFO SysProcessorTimeInfo; + PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; - - if (!NtQuerySystemInformation) - return; - /* Get new system time */ - status = NtQuerySystemInformation(SystemTimeInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); + status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); if (status != NO_ERROR) return; @@ -120,8 +96,8 @@ return; /* Get processor time information */ - SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors); - status = NtQuerySystemInformation(SystemProcessorTimeInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors, &ulSize); + SysProcessorTimeInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)HeapAlloc(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors); + status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors, &ulSize); if (status != NO_ERROR) return; @@ -133,12 +109,12 @@ do { BufferSize += 0x10000; - SysHandleInfoData = (LPBYTE)malloc(BufferSize); + SysHandleInfoData = (LPBYTE)HeapAlloc(GetProcessHeap(), 0, BufferSize); status = NtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize); if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { - free(SysHandleInfoData); + HeapFree(GetProcessHeap(), 0, SysHandleInfoData); } } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); @@ -151,12 +127,12 @@ do { BufferSize += 0x10000; - pBuffer = (LPBYTE)malloc(BufferSize); + pBuffer = (LPBYTE)HeapAlloc(GetProcessHeap(), 0, BufferSize); status = NtQuerySystemInformation(SystemProcessInformation, pBuffer, BufferSize, &ulSize); if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { - free(pBuffer); + HeapFree(GetProcessHeap(), 0, pBuffer); } } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); @@ -177,7 +153,7 @@ * Save system processor time info */ if (SystemProcessorTimeInfo) { - free(SystemProcessorTimeInfo); + HeapFree(GetProcessHeap(), 0, SystemProcessorTimeInfo); } SystemProcessorTimeInfo = SysProcessorTimeInfo; @@ -185,9 +161,9 @@ * Save system handle info */ memcpy(&SystemHandleInfo, SysHandleInfoData, sizeof(SYSTEM_HANDLE_INFORMATION)); - free(SysHandleInfoData); + HeapFree(GetProcessHeap(), 0, SysHandleInfoData); - for (CurrentKernelTime=0, Idx=0; Idx<SystemBasicInfo.bKeNumberProcessors; Idx++) { + for (CurrentKernelTime=0, Idx=0; Idx<SystemBasicInfo.NumberProcessors; Idx++) { CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].KernelTime); CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].DpcTime); CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].InterruptTime); @@ -196,22 +172,22 @@ /* If it's a first call - skip idle time calcs */ if (liOldIdleTime.QuadPart != 0) { /* CurrentValue = NewValue - OldValue */ - dbIdleTime = Li2Double(SysPerfInfo.liIdleTime) - Li2Double(liOldIdleTime); + dbIdleTime = Li2Double(SysPerfInfo.IdleTime) - Li2Double(liOldIdleTime); dbKernelTime = CurrentKernelTime - OldKernelTime; - dbSystemTime = Li2Double(SysTimeInfo.liKeSystemTime) - Li2Double(liOldSystemTime); + dbSystemTime = Li2Double(SysTimeInfo.CurrentTime) - Li2Double(liOldSystemTime); /* CurrentCpuIdle = IdleTime / SystemTime */ dbIdleTime = dbIdleTime / dbSystemTime; dbKernelTime = dbKernelTime / dbSystemTime; /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ - dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.bKeNumberProcessors; /* + 0.5; */ - dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.bKeNumberProcessors; /* + 0.5; */ + dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ + dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ } /* Store new CPU's idle and system time */ - liOldIdleTime = SysPerfInfo.liIdleTime; - liOldSystemTime = SysTimeInfo.liKeSystemTime; + liOldIdleTime = SysPerfInfo.IdleTime; + liOldSystemTime = SysTimeInfo.CurrentTime; OldKernelTime = CurrentKernelTime; /* Determine the process count @@ -223,24 +199,24 @@ pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; while (pSPI) { ProcessCount++; - if (pSPI->RelativeOffset == 0) + if (pSPI->NextEntryOffset == 0) break; - pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); + pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->NextEntryOffset); } /* Now alloc a new PERFDATA array and fill in the data */ if (pPerfDataOld) { - free(pPerfDataOld); + HeapFree(GetProcessHeap(), 0, pPerfDataOld); } pPerfDataOld = pPerfData; - pPerfData = (PPERFDATA)malloc(sizeof(PERFDATA) * ProcessCount); + pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), 0, sizeof(PERFDATA) * ProcessCount); pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; for (Idx=0; Idx<ProcessCount; Idx++) { /* Get the old perf data for this process (if any) */ /* so that we can establish delta values */ pPDOld = NULL; for (Idx2=0; Idx2<ProcessCountOld; Idx2++) { - if (pPerfDataOld[Idx2].ProcessId == pSPI->ProcessId) { + if (pPerfDataOld[Idx2].ProcessId == pSPI->UniqueProcessId) { pPDOld = &pPerfDataOld[Idx2]; break; } @@ -249,25 +225,26 @@ /* Clear out process perf data structure */ memset(&pPerfData[Idx], 0, sizeof(PERFDATA)); - if (pSPI->Name.Buffer) - wcscpy(pPerfData[Idx].ImageName, pSPI->Name.Buffer); + if (pSPI->ImageName.Buffer) + wcscpy(pPerfData[Idx].ImageName, pSPI->ImageName.Buffer); else - wcscpy(pPerfData[Idx].ImageName, L"System Idle Process"); + LoadStringW(hInst, IDS_IDLE_PROCESS, pPerfData[Idx].ImageName, + sizeof(pPerfData[Idx].ImageName) / sizeof(pPerfData[Idx].ImageName[0])); - pPerfData[Idx].ProcessId = pSPI->ProcessId; + pPerfData[Idx].ProcessId = pSPI->UniqueProcessId; if (pPDOld) { double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); double CpuTime = (CurTime - OldTime) / dbSystemTime; - CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.bKeNumberProcessors; /* + 0.5; */ + CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ pPerfData[Idx].CPUUsage = (ULONG)CpuTime; } pPerfData[Idx].CPUTime.QuadPart = pSPI->UserTime.QuadPart + pSPI->KernelTime.QuadPart; - pPerfData[Idx].WorkingSetSizeBytes = pSPI->TotalWorkingSetSizeBytes; - pPerfData[Idx].PeakWorkingSetSizeBytes = pSPI->PeakWorkingSetSizeBytes; + pPerfData[Idx].WorkingSetSizeBytes = pSPI->WorkingSetSize; + pPerfData[Idx].PeakWorkingSetSizeBytes = pSPI->PeakWorkingSetSize; if (pPDOld) - pPerfData[Idx].WorkingSetSizeDelta = labs((LONG)pSPI->TotalWorkingSetSizeBytes - (LONG)pPDOld->WorkingSetSizeBytes); + pPerfData[Idx].WorkingSetSizeDelta = labs((LONG)pSPI->WorkingSetSize - (LONG)pPDOld->WorkingSetSizeBytes); else pPerfData[Idx].WorkingSetSizeDelta = 0; pPerfData[Idx].PageFaultCount = pSPI->PageFaultCount; @@ -275,15 +252,15 @@ pPerfData[Idx].PageFaultCountDelta = labs((LONG)pSPI->PageFaultCount - (LONG)pPDOld->PageFaultCount); else pPerfData[Idx].PageFaultCountDelta = 0; - pPerfData[Idx].VirtualMemorySizeBytes = pSPI->TotalVirtualSizeBytes; - pPerfData[Idx].PagedPoolUsagePages = pSPI->TotalPagedPoolUsagePages; - pPerfData[Idx].NonPagedPoolUsagePages = pSPI->TotalNonPagedPoolUsagePages; + pPerfData[Idx].VirtualMemorySizeBytes = pSPI->VirtualSize; + pPerfData[Idx].PagedPoolUsagePages = pSPI->QuotaPagedPoolUsage; + pPerfData[Idx].NonPagedPoolUsagePages = pSPI->QuotaPeakNonPagedPoolUsage; pPerfData[Idx].BasePriority = pSPI->BasePriority; pPerfData[Idx].HandleCount = pSPI->HandleCount; - pPerfData[Idx].ThreadCount = pSPI->ThreadCount; + pPerfData[Idx].ThreadCount = pSPI->NumberOfThreads; pPerfData[Idx].SessionId = pSPI->SessionId; - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pSPI->ProcessId); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pSPI->UniqueProcessId); if (hProcess) { if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { ImpersonateLoggedOnUser(hProcessToken); @@ -306,19 +283,16 @@ RevertToSelf(); CloseHandle(hProcessToken); } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } - if (pGetProcessIoCounters) - pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); + GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); CloseHandle(hProcess); } pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; pPerfData[Idx].KernelTime.QuadPart = pSPI->KernelTime.QuadPart; - pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); + pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->NextEntryOffset); } - free(pBuffer); + HeapFree(GetProcessHeap(), 0, pBuffer); LeaveCriticalSection(&PerfDataCriticalSection); } @@ -365,7 +339,7 @@ EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - ProcessId = pPerfData[Index].ProcessId; + ProcessId = (ULONG)pPerfData[Index].ProcessId; else ProcessId = 0; @@ -677,8 +651,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemPerfInfo.MmTotalCommitedPages; - PageSize = SystemBasicInfo.uPageSize; + Total = SystemPerfInfo.TotalCommittedPages; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -694,8 +668,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Limit = SystemPerfInfo.MmTotalCommitLimit; - PageSize = SystemBasicInfo.uPageSize; + Limit = SystemPerfInfo.TotalCommitLimit; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -711,8 +685,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Peak = SystemPerfInfo.MmPeakLimit; - PageSize = SystemBasicInfo.uPageSize; + Peak = SystemPerfInfo.PeakCommitment; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -730,9 +704,9 @@ EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PoolPagedBytes; - NonPaged = SystemPerfInfo.PoolNonPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + Paged = SystemPerfInfo.PagedPoolUsage; + NonPaged = SystemPerfInfo.NonPagedPoolUsage; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -751,8 +725,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PoolPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + Paged = SystemPerfInfo.PagedPoolUsage; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -768,8 +742,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - NonPaged = SystemPerfInfo.PoolNonPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + NonPaged = SystemPerfInfo.NonPagedPoolUsage; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -785,8 +759,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemBasicInfo.uMmNumberOfPhysicalPages; - PageSize = SystemBasicInfo.uPageSize; + Total = SystemBasicInfo.NumberOfPhysicalPages; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -802,8 +776,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Available = SystemPerfInfo.MmAvailablePages; - PageSize = SystemBasicInfo.uPageSize; + Available = SystemPerfInfo.AvailablePages; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -820,7 +794,7 @@ EnterCriticalSection(&PerfDataCriticalSection); SystemCache = SystemCacheInfo.CurrentSize; - PageSize = SystemBasicInfo.uPageSize; + PageSize = SystemBasicInfo.PhysicalPageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -836,7 +810,7 @@ EnterCriticalSection(&PerfDataCriticalSection); - HandleCount = SystemHandleInfo.Count; + HandleCount = SystemHandleInfo.NumberOfHandles; LeaveCriticalSection(&PerfDataCriticalSection); _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.h --- trunk/reactos/subsys/system/taskmgr/perfdata.h 2005-04-07 13:11:46 UTC (rev 14535) +++ trunk/reactos/subsys/system/taskmgr/perfdata.h 2005-04-07 13:25:34 UTC (rev 14536) @@ -27,27 +27,12 @@ extern "C" { #endif +#define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + (double)((x).LowPart)) -#if 0 -typedef struct _TIME { - DWORD LowPart; - LONG HighPart; -} TIME, *PTIME; -#endif - -typedef ULARGE_INTEGER TIME, *PTIME; - -/* typedef WCHAR UNICODE_STRING; */ -typedef struct _UNICODE_STRING { - USHORT Length; - USHORT MaximumLength; - PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; - typedef struct _PERFDATA { WCHAR ImageName[MAX_PATH]; - ULONG ProcessId; + HANDLE ProcessId; WCHAR UserName[MAX_PATH]; ULONG SessionId; ULONG CPUUsage; @@ -71,277 +56,6 @@ TIME KernelTime; } PERFDATA, *PPERFDATA; -typedef struct _CLIENT_ID -{ - HANDLE UniqueProcess; - HANDLE UniqueThread; -} CLIENT_ID, *PCLIENT_ID; - -typedef enum _KWAIT_REASON -{ - Executive, - FreePage, - PageIn, - PoolAllocation, - DelayExecution, - Suspended, - UserRequest, - WrExecutive, - WrFreePage, - WrPageIn, - WrDelayExecution, - WrSuspended, - WrUserRequest, - WrQueue, - WrLpcReceive, - WrLpcReply, - WrVirtualMemory, - WrPageOut, - WrRendezvous, - Spare2, - Spare3, - Spare4, - Spare5, - Spare6, - WrKernel, - MaximumWaitReason, -} KWAIT_REASON; - -/* SystemProcessThreadInfo (5) */ -typedef struct _SYSTEM_THREAD_INFORMATION -{ - TIME KernelTime; - TIME UserTime; - TIME CreateTime; - ULONG TickCount; - ULONG StartEIP; - CLIENT_ID ClientId; - ULONG DynamicPriority; - ULONG BasePriority; - ULONG nSwitches; - DWORD State; - KWAIT_REASON WaitReason; - [truncated at 1000 lines; 442 more skipped]

19 years, 5 months

[weiden] 14535: fixed warnings

by weiden＠svn.reactos.com

fixed warnings Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/thread/thread.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-04-07 11:24:38 UTC (rev 14534) +++ trunk/reactos/lib/kernel32/process/create.c 2005-04-07 13:11:46 UTC (rev 14535) @@ -283,7 +283,7 @@ void * DispatcherContext) { EXCEPTION_POINTERS ExceptionInfo; - EXCEPTION_DISPOSITION ExceptionDisposition; + EXCEPTION_DISPOSITION ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; ExceptionInfo.ExceptionRecord = ExceptionRecord; ExceptionInfo.ContextRecord = ContextRecord; @@ -300,10 +300,6 @@ } _SEH_END; } - else - { - ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - } if (ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) ExitProcess(ExceptionRecord->ExceptionCode); _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-04-07 11:24:38 UTC (rev 14534) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-04-07 13:11:46 UTC (rev 14535) @@ -29,7 +29,7 @@ void * DispatcherContext) { EXCEPTION_POINTERS ExceptionInfo; - EXCEPTION_DISPOSITION ExceptionDisposition; + EXCEPTION_DISPOSITION ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; ExceptionInfo.ExceptionRecord = ExceptionRecord; ExceptionInfo.ContextRecord = ContextRecord; @@ -46,10 +46,6 @@ } _SEH_END; } - else - { - ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - } if (ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) ExitThread(ExceptionRecord->ExceptionCode);

19 years, 5 months

[greatlrd] 14534: Remove more hardcode string to En.rc

by greatlrd＠svn.reactos.com

Remove more hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-07 11:24:38 UTC (rev 14534) @@ -147,10 +147,69 @@ /%c Yes. Kill even *.* without asking.\n \ /%c Zap. Delete hidden, read-only and system files).\n" +STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" STRING_DEL_HELP3, " %lu file deleted\n" - STRING_DEL_HELP4, " %lu files deleted\n" +STRING_DELAY_HELP, "pause for n seconds or milliseconds\n \ +DELAY [/m]n\n\n \ + /m specifiy than n are milliseconds\n \ + otherwise n are seconds" + +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n \ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n \ + [drive:][path][filename]\n \ + Specifies drive, directory, and/or files to list.\n\n \ + /A Displays files with specified attributes.\n \ + attributes D Directories R Read-only files\n \ + H Hidden files A Files ready for archiving\n \ + S System files - Prefix meaning not\n \ + /B Uses bare format (no heading information or summary).\n \ + /C Display the thousand separator in file sizes. This is the\n \ + default. Use /-C to disable display of separator.\n \ + /D Same as wide but files are list sorted by column.\n \ + /L Uses lowercase.\n \ + /N New long list format where filenames are on the far right.\n \ + /O List by files in sorted order.\n \ + sortorder N By name (alphabetic) S By size (smallest first)\n \ + E By extension (alphabetic) D By date/time (oldest first)\n \ + G Group directories first - Prefix to reverse order\n \ + /P Pauses after each screenful of information.\n \ + /Q Display the owner of the file.\n \ + /S Displays files in specified directory and all subdirectories.\n \ + /T Controls which time field displayed or used for sorting\n \ + timefield C Creation\n \ + A Last Access\n \ + W Last Written\n \ + /W Uses wide list format.\n \ + /X This displays the short names generated for non-8dot3 file\n \ + names. The format is that of /N with the short name inserted\n \ + before the long name. If no short name is present, blanks are\n \ + displayed in its place.\n \ + /4 Displays four-digit years\n\n \ +Switches may be preset in the DIRCMD environment variable. Override\n \ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n " + +STRING_DIR_HELP2, " Volume in drive %c is %s" +STRING_DIR_HELP3, " Volume in drive %c has no label" +STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" +STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP7, "\n Directory of %s\n\n" +STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n \ +changes to the specified directory.\n\n \ +PUSHD [path | ..]\n\n \ + path Specifies the directory to make the current directory" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + + STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_MKDIR_HELP, "Creates a directory.\n\n \ @@ -161,15 +220,16 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" -STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" + + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" STRING_DEL_OPTION, "AENPQSTWXYZ" _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -10,6 +10,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_DELAY @@ -18,17 +19,14 @@ { DWORD val; DWORD mul=1000; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T( - "pause for n seconds or milliseconds" - "\n" - "DELAY [/m]n\n" - "\n" - " /m specifiy than n are milliseconds\n" - " otherwise n are seconds")); - return 0; + LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + + return 0; } if (*param==0) _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -129,6 +129,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_DIR @@ -209,44 +210,9 @@ static VOID DirHelp (VOID) { - ConOutPuts(_T( - "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n" - " [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n" - "\n" - " [drive:][path][filename]\n" - " Specifies drive, directory, and/or files to list.\n" - "\n" - " /A Displays files with specified attributes.\n" - " attributes D Directories R Read-only files\n" - " H Hidden files A Files ready for archiving\n" - " S System files - Prefix meaning not\n" - " /B Uses bare format (no heading information or summary).\n" - " /C Display the thousand separator in file sizes. This is the\n" - " default. Use /-C to disable display of separator.\n" - " /D Same as wide but files are list sorted by column.\n" - " /L Uses lowercase.\n" - " /N New long list format where filenames are on the far right.\n" - " /O List by files in sorted order.\n" - " sortorder N By name (alphabetic) S By size (smallest first)\n" - " E By extension (alphabetic) D By date/time (oldest first)\n" - " G Group directories first - Prefix to reverse order\n" - " /P Pauses after each screenful of information.\n" - " /Q Display the owner of the file.\n" - " /S Displays files in specified directory and all subdirectories.\n" - " /T Controls which time field displayed or used for sorting\n" - " timefield C Creation\n" - " A Last Access\n" - " W Last Written\n" - " /W Uses wide list format.\n" - " /X This displays the short names generated for non-8dot3 file\n" - " names. The format is that of /N with the short name inserted\n" - " before the long name. If no short name is present, blanks are\n" - " displayed in its place.\n" - " /4 Displays four-digit years\n" - " \n" - "Switches may be preset in the DIRCMD environment variable. Override\n" - "preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" - )); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); } @@ -807,6 +773,7 @@ TCHAR szVolName[80]; DWORD dwSerialNr; LPTSTR p; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (lpFlags->bBareFormat) return(TRUE); @@ -858,17 +825,27 @@ } /* print drive info */ - ConOutPrintf(_T(" Volume in drive %c"), szRootName[0]); - + if (szVolName[0] != _T('\0')) - ConOutPrintf(_T(" is %s\n"), szVolName); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); + } else - ConOutPrintf(_T(" has no label\n")); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); + } + + + /* print the volume serial number if the return was successful */ - ConOutPrintf(_T(" Volume Serial Number is %04X-%04X\n"), - HIWORD(dwSerialNr), - LOWORD(dwSerialNr)); + + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), + HIWORD(dwSerialNr), + LOWORD(dwSerialNr)); return(TRUE); } @@ -1079,6 +1056,7 @@ TCHAR szBuffer[64]; ULARGE_INTEGER uliFree; TCHAR szRoot[] = _T("A:\\"); +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Here we check if we didn't find anything */ @@ -1095,15 +1073,17 @@ if (lpFlags->bRecursive) { ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - ConOutPrintf (_T("\n Total Files Listed:\n")); - ConOutPrintf(_T("%16i File(s)% 14s bytes\n"),ulFiles, szBuffer); + + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); } /* Print total directories and freespace */ szRoot[0] = szPath[0]; GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - ConOutPrintf (_T("%16i Dir(s)% 15s bytes\n"),ulDirs, szBuffer); + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); return 0; } @@ -1408,6 +1388,7 @@ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Print directory header */ _tcscpy(szTemp, szCurPath); @@ -1417,7 +1398,10 @@ We are not printing in bare format and if we are in recursive mode... we must have results */ if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) - ConOutPrintf("\n Directory of %s\n\n", szTemp); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T( (LPTSTR)szMsg), szTemp); + } /* Bare format */ if (lpFlags->bBareFormat) @@ -1626,6 +1610,7 @@ DWORD dwCountDirs; /* Counter for directories */ ULARGE_INTEGER u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64Temp; /* A temporary counter */ +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Initialize Variables */ ptrStartNode = NULL; @@ -1743,8 +1728,8 @@ if (!(lpFlags->bBareFormat) && (dwCount > 0)) { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); - ConOutPrintf(_T("%16i File(s) %14s bytes\n"), - dwCountFiles, szBytes); + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); } /* Add statistics to recursive statistics*/ _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -15,6 +15,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef FEATURE_DIRECTORY_STACK @@ -139,13 +140,13 @@ TCHAR curPath[MAX_PATH]; TCHAR newPath[MAX_PATH]; BOOL bChangePath = FALSE; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (rest, _T("/?"), 2)) { - ConOutPuts (_T("Stores the current directory for use by the POPD command, then\n" - "changes to the specified directory.\n\n" - "PUSHD [path | ..]\n\n" - " path Specifies the directory to make the current directory")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -172,11 +173,13 @@ INT CommandPopd (LPTSTR first, LPTSTR rest) { TCHAR szPath[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp(rest, _T("/?"), 2)) - { - ConOutPuts (_T("Changes to the directory stored by the PUSHD command.\n\n" - "POPD")); + { + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -198,12 +201,13 @@ INT CommandDirs (LPTSTR first, LPTSTR rest) { LPDIRENTRY lpDir; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp(rest, _T("/?"), 2)) { - ConOutPuts (_T("Prints the contents of the directory stack.\n" - "\n" - "DIRS")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -212,7 +216,9 @@ if (lpDir == NULL) { - ConOutPuts (_T("Directory stack empty")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-07 11:24:38 UTC (rev 14534) @@ -65,13 +65,29 @@ #define STRING_DEL_HELP2 424 #define STRING_DEL_HELP3 425 #define STRING_DEL_HELP4 426 -#define STRING_EXIT_HELP 427 -#define STRING_MKDIR_HELP 428 -#define STRING_RMDIR_HELP 429 -#define STRING_REM_HELP 430 +#define STRING_DELAY_HELP 427 +#define STRING_DIR_HELP1 428 +#define STRING_DIR_HELP2 429 +#define STRING_DIR_HELP3 430 +#define STRING_DIR_HELP4 431 +#define STRING_DIR_HELP5 432 +#define STRING_DIR_HELP6 433 +#define STRING_DIR_HELP7 434 +#define STRING_DIR_HELP8 435 +#define STRING_DIRSTACK_HELP1 436 +#define STRING_DIRSTACK_HELP2 437 +#define STRING_DIRSTACK_HELP3 438 +#define STRING_DIRSTACK_HELP4 439 +#define STRING_EXIT_HELP 440 +#define STRING_MKDIR_HELP 441 +#define STRING_RMDIR_HELP 442 +#define STRING_REM_HELP 443 + + +

19 years, 5 months

[chorns] 14533: Add the files where they are located

by chorns＠svn.reactos.com

Add the files where they are located Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx Modified: branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-06 22:27:22 UTC (rev 14533) @@ -181,7 +181,7 @@ ifneq ($(ROS_TEMPORARY),) TEMPORARY := $(ROS_TEMPORARY) else - TEMPORARY := . + TEMPORARY := endif TEMPORARY_ := $(TEMPORARY)$(SEP) _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-06 22:27:22 UTC (rev 14533) @@ -31,6 +31,9 @@ <directory name="reporterror"> <xi:include href="reporterror/reporterror.xml" /> </directory> +<directory name="rundll32"> + <xi:include href="rundll32/rundll32.xml" /> +</directory> <directory name="services"> <xi:include href="services/services.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-04-06 22:27:22 UTC (rev 14533) @@ -1755,23 +1755,20 @@ { FILEHANDLE SrcFile; PCFFILE_NODE FileNode; + char* NewFileName; - FileNode = NewFileNode(); - if (!FileNode) { + NewFileName = (char*)AllocateMemory(strlen(FileName) + 1); + if (!NewFileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); return CAB_STATUS_NOMEMORY; } + strcpy(NewFileName, FileName); + ConvertPath(NewFileName, false); - FileNode->FolderNode = CurrentFolderNode; - - FileNode->FileName = (char*)AllocateMemory(strlen(FileName) + 1); - strcpy(FileNode->FileName, FileName); - ConvertPath(FileNode->FileName, false); - /* Try to open file */ #if defined(WIN32) SrcFile = CreateFile( - FileNode->FileName, // Open this file + NewFileName, // Open this file GENERIC_READ, // Open for reading FILE_SHARE_READ, // Share for reading NULL, // No security @@ -1779,21 +1776,34 @@ FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (SrcFile == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_OPEN; } #else /* !WIN32 */ - SrcFile = fopen(FileNode->FileName, "rb"); + SrcFile = fopen(NewFileName, "rb"); if (SrcFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_OPEN; } #endif + FileNode = NewFileNode(); + if (!FileNode) { + DPRINT(MIN_TRACE, ("Insufficient memory.\n")); + FreeMemory(NewFileName); + return CAB_STATUS_NOMEMORY; + } + + FileNode->FolderNode = CurrentFolderNode; + FileNode->FileName = NewFileName; + /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); if (FileNode->File.FileSize == (unsigned long)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_READ; } _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx 2005-04-06 22:27:22 UTC (rev 14533) @@ -1016,8 +1016,9 @@ char SrcName[MAX_PATH]; char DstName[MAX_PATH]; char InfLine[MAX_PATH]; + char BaseFilename[MAX_PATH]; - strcpy(SrcName, FileRelativePath); + strcpy(SrcName, ""); strcpy(DstName, ""); i = CurrentChar; @@ -1031,7 +1032,8 @@ CurrentString[i] = '\0'; CurrentToken = TokenString; CurrentChar = i + 1; - strcat(SrcName, CurrentString); + strcpy(BaseFilename, CurrentString); + strcat(SrcName, BaseFilename); SkipSpaces(); @@ -1080,6 +1082,11 @@ WriteInfLine(InfLine); Status = AddFile(SrcName); + if (Status == CAB_STATUS_CANNOT_OPEN) { + strcpy(SrcName, FileRelativePath); + strcat(SrcName, BaseFilename); + Status = AddFile(SrcName); + } if (Status != CAB_STATUS_SUCCESS) { if (Status == CAB_STATUS_CANNOT_OPEN) printf("File does not exist: %s.\n", SrcName); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 22:27:22 UTC (rev 14533) @@ -2195,6 +2195,9 @@ const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) { + string sourceFilename = PassThruCacheDirectory ( + NormalizeFilename ( m.GetPath () ), + backend->outputDirectory ); string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd ); string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), @@ -2203,7 +2206,7 @@ "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - m.GetPath ().c_str (), + sourceFilename.c_str (), targetFilename.c_str () ); } } @@ -2314,16 +2317,21 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; + string bootcd = PassThruCacheDirectory ( + NormalizeFilename ( bootcdDirectory + SSEP ), + backend->outputDirectory ); string isoboot = PassThruCacheDirectory ( - NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ), - backend->intermediateDirectory ); - string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; + NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ), + backend->outputDirectory ); + string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos"; string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup ), backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); - string reactosInf = ros_temp + NormalizeFilename ( bootcdReactosNoFixup + "/reactos.inf" ); - string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); + string reactosInf = PassThruCacheDirectory ( + NormalizeFilename ( bootcdReactosNoFixup + SSEP "reactos.inf" ), + backend->outputDirectory ); + string reactosDff = NormalizeFilename ( "bootdata" SSEP "packages" SSEP "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); vector<string> vCdFiles; GetCdFiles ( vCdFiles ); @@ -2340,7 +2348,7 @@ cdFiles.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I\n", + "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", reactosDff.c_str (), bootcdReactos.c_str () ); fprintf ( fMakefile, @@ -2357,7 +2365,7 @@ fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n", isoboot.c_str (), - bootcdDirectory.c_str () ); + bootcd.c_str () ); fprintf ( fMakefile, "\n" ); }

19 years, 5 months

← Newer
1
...
31
32
33
34
35
36
37
...
48
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 April 2005