Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 25434: 1. finish the peloader, left todo add decoder for each sectionheader, add the base address when u call a brain, and some other minior fix 2. fix some comment that was wrong.
by greatlrd＠svn.reactos.org 13 Jan '07

13 Jan '07

Author: greatlrd Date: Sat Jan 13 12:56:05 2007 New Revision: 25434 URL: http://svn.reactos.org/svn/reactos?rev=25434&view=rev Log: 1. finish the peloader, left todo add decoder for each sectionheader, add the base address when u call a brain, and some other minior fix 2. fix some comment that was wrong. Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sat Jan 13 12:56:05 2007 @@ -8,6 +8,10 @@ #include "ARM/ARM.h" #include "m68k/m68k.h" #include "PPC/PPC.h" + +/* + * + */ CPU_INT LoadPFileImage( char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, @@ -135,10 +139,11 @@ CPU_UNINT base, CPU_UNINT size, FILE *outfp) { - //INT sizeofHeader = IMAGE_NT_SIGNATURE; PIMAGE_DOS_HEADER DosHeader; PIMAGE_NT_HEADERS NtHeader; PIMAGE_SECTION_HEADER SectionHeader; + INT NumberOfSections; + INT NumberOfSectionsCount=0; DosHeader = (PIMAGE_DOS_HEADER)memory; if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || @@ -147,8 +152,6 @@ printf("No MZ file \n"); return -1; } - - NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew)); if (NtHeader->Signature != IMAGE_NT_SIGNATURE) @@ -217,9 +220,6 @@ printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem); break; } - - - /* SectionHeader->Name == ".tls$" @@ -248,141 +248,147 @@ SectionHeader->Name == ".textbss" // bss segment */ - - //*base = NtHeader->OptionalHeader.AddressOfEntryPoint; - SectionHeader = IMAGE_FIRST_SECTION(NtHeader); - while (SectionHeader != NULL) - { - if (strcmpi(SectionHeader->Name,".rsrc")) + SectionHeader = IMAGE_FIRST_SECTION(NtHeader); + NumberOfSections = NtHeader->FileHeader.NumberOfSections; + + for (NumberOfSectionsCount = 0; NumberOfSectionsCount < NumberOfSections; NumberOfSectionsCount++, SectionHeader++) + { + if (strnicmp(SectionHeader->Name,".rsrc",5)==0) { /* FIXME add a rc bin to text scanner */ } - else if (strcmpi(SectionHeader->Name,".textbss")) + else if (strnicmp(SectionHeader->Name,".textbss",8)==0) { /* FIXME add a bss to text scanner */ } - else if (strcmpi(SectionHeader->Name,".text")) + + else if (strnicmp(SectionHeader->Name,".text",5)==0) { switch (NtHeader->FileHeader.Machine) { case IMAGE_FILE_MACHINE_ALPHA: printf("CPU ALPHA Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_ALPHA64: printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_AM33: printf("CPU AM33 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_AMD64: printf("CPU AMD64 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_ARM: printf("CPU ARM Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_CEE: printf("CPU CEE Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_CEF: printf("CPU CEF Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_EBC: printf("CPU EBC Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_I386: printf("CPU I386 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_IA64: printf("CPU IA64 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_M32R: printf("CPU M32R Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_MIPS16: printf("CPU MIPS16 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_MIPSFPU: printf("CPU MIPSFPU Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_MIPSFPU16: printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_POWERPC: printf("CPU POWERPC Detected no CPUBrain implement for it\n"); - return -1; + //PPCBrain(memory, pos, cpu_size, base, 0, outfp); + return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp); + + return 3; case IMAGE_FILE_MACHINE_POWERPCFP: printf("CPU POWERPCFP Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_R10000: printf("CPU R10000 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_R3000: printf("CPU R3000 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_R4000: printf("CPU R4000 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_SH3: printf("CPU SH3 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_SH3DSP: printf("CPU SH3DSP Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_SH3E: printf("CPU SH3E Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_SH4: printf("CPU SH4 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_SH5: printf("CPU SH5 Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_THUMB: printf("CPU THUMB Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_TRICORE: printf("CPU TRICORE Detected no CPUBrain implement for it\n"); - return -1; + return 3; case IMAGE_FILE_MACHINE_WCEMIPSV2: printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n"); - return -1; + return 3; default: printf("Unknown Machine : %d",NtHeader->FileHeader.Machine); - return -1; + return 4; + /* End case swich */ } + /* End if .text statment */ } - /* FIXME add couter to next sections */ + /* End for loop */ } return 0; Modified: trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/PPC/PP… ============================================================================== --- trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c Sat Jan 13 12:56:05 2007 @@ -25,6 +25,8 @@ * 0 : Ok * 1 : unimplemt * 2 : Unkonwn Opcode + * 3 : unimplement cpu + * 4 : unknown machine */ CPU_INT PPCBrain( CPU_BYTE *cpu_buffer, Modified: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c Sat Jan 13 12:56:05 2007 @@ -27,6 +27,8 @@ * 0 : Ok * 1 : unimplemt * 2 : Unkonwn Opcode + * 3 : unimplement cpu + * 4 : unknown machine */ CPU_INT DummyBrain( CPU_BYTE *cpu_buffer, Modified: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c Sat Jan 13 12:56:05 2007 @@ -6,16 +6,11 @@ #include "../misc.h" /* retun - * 0 = Ok - * 1 = unimplemt - * 2 = Unkonwn Opcode - * 3 = can not open read file - * 4 = can not open write file - * 5 = can not seek to end of read file - * 6 = can not get the file size of the read file - * 7 = read file size is Zero - * 8 = can not alloc memory - * 9 = can not read file + * 0 : Ok + * 1 : unimplemt + * 2 : Unkonwn Opcode + * 3 : unimplement cpu + * 4 : unknown machine */ CPU_INT M68KBrain( CPU_BYTE *cpu_buffer,

1 0

[greatlrd] 25433: backport the start of a pe loader, backport allot of bug fix. like open file, reading file. My working copy have allot of hacks and is a big mess. This stuff is cleanup from it.
by greatlrd＠svn.reactos.org 12 Jan '07

12 Jan '07

Author: greatlrd Date: Sat Jan 13 00:11:44 2007 New Revision: 25433 URL: http://svn.reactos.org/svn/reactos?rev=25433&view=rev Log: backport the start of a pe loader, backport allot of bug fix. like open file, reading file. My working copy have allot of hacks and is a big mess. This stuff is cleanup from it. Added: trunk/rosapps/devutils/cputointel/ImageLoader.c (with props) Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/cputointel.rbuild trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c trunk/rosapps/devutils/cputointel/misc.c trunk/rosapps/devutils/cputointel/misc.h Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sat Jan 13 00:11:44 2007 @@ -84,6 +84,8 @@ } return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type); + //return LoadPFileImage("e:\\cputointel.exe","e:\\cputointel.asm",0,0,0); + } Added: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (added) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sat Jan 13 00:11:44 2007 @@ -1,0 +1,389 @@ +#include <windows.h> +#include <winnt.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "ARM/ARM.h" +#include "m68k/m68k.h" +#include "PPC/PPC.h" + +CPU_INT LoadPFileImage( char *infileName, char *outputfileName, + CPU_UNINT BaseAddress, char *cpuid, + CPU_UNINT type) +{ + FILE *infp; + FILE *outfp; + CPU_BYTE *cpu_buffer; + CPU_UNINT cpu_pos = 0; + CPU_UNINT cpu_size=0; + //fopen("testms.exe","RB"); + + + /* Open file for read */ + + if (!(infp = fopen(infileName, "rb"))) + { + printf("Can not open file %s\n",infileName); + return 3; + } + + /* Open file for write */ + if (!(outfp = fopen(outputfileName,"wb"))) + { + printf("Can not open file %s\n",outputfileName); + return 4; + } + + /* Load the binary file to a memory buffer */ + fseek(infp,0,SEEK_END); + if (ferror(infp)) + { + printf("error can not seek in the read file"); + fclose(infp); + fclose(outfp); + return 5; + } + + /* get the memory size buffer */ + cpu_size = ftell(infp); + if (ferror(infp)) + { + printf("error can not get file size of the read file"); + fclose(infp); + fclose(outfp); + return 6; + } + + /* Load the binary file to a memory buffer */ + fseek(infp,0,SEEK_SET); + if (ferror(infp)) + { + printf("error can not seek in the read file"); + fclose(infp); + fclose(outfp); + return 5; + } + + if (cpu_size==0) + { + printf("error file size is Zero lenght of the read file"); + fclose(infp); + fclose(outfp); + return 7; + } + + /* alloc memory now */ + ; + if (!(cpu_buffer = (unsigned char *) malloc(cpu_size+1))) + { + printf("error can not alloc %uld size for memory buffer",cpu_size); + fclose(infp); + fclose(outfp); + return 8; + } + ZeroMemory(cpu_buffer,cpu_size); + + /* read from the file now in one sweep */ + fread((void *)cpu_buffer,1,cpu_size,infp); + if (ferror(infp)) + { + printf("error can not read file "); + fclose(infp); + fclose(outfp); + return 9; + } + fclose(infp); + + if (type==0) + { + if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp) !=0) + { + type=1; + } + } + + if (type== 1) + { + if (stricmp(cpuid,"m68000")) + return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp); + else if (stricmp(cpuid,"m68010")) + return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp); + else if (stricmp(cpuid,"m68020")) + return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp); + else if (stricmp(cpuid,"m68030")) + return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp); + else if (stricmp(cpuid,"m68040")) + return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp); + else if (stricmp(cpuid,"ppc")) + return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp); + else if (stricmp(cpuid,"arm4")) + return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp); + } + + if (type==2) + { + return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp); + + } + + return 0; +} + +CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, + CPU_UNINT base, CPU_UNINT size, + FILE *outfp) +{ + //INT sizeofHeader = IMAGE_NT_SIGNATURE; + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER SectionHeader; + + DosHeader = (PIMAGE_DOS_HEADER)memory; + if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || + (size < 0x3c+2) ) + { + printf("No MZ file \n"); + return -1; + } + + + + NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew)); + if (NtHeader->Signature != IMAGE_NT_SIGNATURE) + { + printf("No PE header found \n"); + } + + if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) + { + printf("No execute image found \n"); + return -1; + } + + switch(NtHeader->OptionalHeader.Subsystem) + { + case IMAGE_SUBSYSTEM_EFI_APPLICATION: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_APPLICATION"); + printf("This exe file is desgin run in EFI bios as applactions\n"); + break; + case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER"); + printf("This exe file is desgin run in EFI bios as service driver\n"); + break; + case IMAGE_SUBSYSTEM_EFI_ROM: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_ROM"); + printf("This exe file is EFI ROM\n"); + break; + case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER"); + printf("This exe file is desgin run in EFI bios as driver\n"); + break; + case IMAGE_SUBSYSTEM_NATIVE: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE"); + printf("This exe file does not need any subsystem\n"); + break; + case IMAGE_SUBSYSTEM_NATIVE_WINDOWS: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE_WINDOWS"); + printf("This exe file is desgin run on Windows 9x as driver \n"); + break; + case IMAGE_SUBSYSTEM_OS2_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_OS2_CUI"); + printf("This exe file is desgin run on OS2 as CUI\n"); + break; + case IMAGE_SUBSYSTEM_POSIX_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_POSIX_CUI"); + printf("This exe file is desgin run on POSIX as CUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CE_GUI"); + printf("This exe file is desgin run on Windows CE as GUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CUI"); + printf("This exe file is desgin run on Windows as CUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_GUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_GUI"); + printf("This exe file is desgin run on Windows as GUI\n"); + break; + case IMAGE_SUBSYSTEM_XBOX: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_XBOX"); + printf("This exe file is desgin run on X-Box\n"); + break; + default: + fprintf(outfp,"; OS type : Unknown"); + printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem); + break; + } + + + + + /* + SectionHeader->Name == ".tls$" + SectionHeader->Name == ".tls" + SectionHeader->Name == ".text" // Executable code + SectionHeader->Name == ".sxdata" + SectionHeader->Name == ".sdata" + SectionHeader->Name == ".sbss" + SectionHeader->Name == ".rsrc" // rc data + SectionHeader->Name == ".reloc" + SectionHeader->Name == ".rdata" // read only initialized data + SectionHeader->Name == ".pdata" + SectionHeader->Name == ".idlsym" + SectionHeader->Name == ".idata" // Import tables + SectionHeader->Name == ".edata" // Export tables + SectionHeader->Name == ".drective" + SectionHeader->Name == ".debug$T" + SectionHeader->Name == ".debug$S" + SectionHeader->Name == ".debug$P" + SectionHeader->Name == ".debug$F" + SectionHeader->Name == ".data" //data segment + SectionHeader->Name == ".cormeta" + SectionHeader->Name == ".bss" // bss segment + + undoc + SectionHeader->Name == ".textbss" // bss segment + */ + + + + //*base = NtHeader->OptionalHeader.AddressOfEntryPoint; + + SectionHeader = IMAGE_FIRST_SECTION(NtHeader); + while (SectionHeader != NULL) + { + if (strcmpi(SectionHeader->Name,".rsrc")) + { + /* FIXME add a rc bin to text scanner */ + } + + else if (strcmpi(SectionHeader->Name,".textbss")) + { + /* FIXME add a bss to text scanner */ + } + + else if (strcmpi(SectionHeader->Name,".text")) + { + switch (NtHeader->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_ALPHA: + printf("CPU ALPHA Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_ALPHA64: + printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_AM33: + printf("CPU AM33 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_AMD64: + printf("CPU AMD64 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_ARM: + printf("CPU ARM Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_CEE: + printf("CPU CEE Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_CEF: + printf("CPU CEF Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_EBC: + printf("CPU EBC Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_I386: + printf("CPU I386 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_IA64: + printf("CPU IA64 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_M32R: + printf("CPU M32R Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_MIPS16: + printf("CPU MIPS16 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_MIPSFPU: + printf("CPU MIPSFPU Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_MIPSFPU16: + printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_POWERPC: + printf("CPU POWERPC Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_POWERPCFP: + printf("CPU POWERPCFP Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_R10000: + printf("CPU R10000 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_R3000: + printf("CPU R3000 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_R4000: + printf("CPU R4000 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_SH3: + printf("CPU SH3 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_SH3DSP: + printf("CPU SH3DSP Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_SH3E: + printf("CPU SH3E Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_SH4: + printf("CPU SH4 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_SH5: + printf("CPU SH5 Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_THUMB: + printf("CPU THUMB Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_TRICORE: + printf("CPU TRICORE Detected no CPUBrain implement for it\n"); + return -1; + + case IMAGE_FILE_MACHINE_WCEMIPSV2: + printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n"); + return -1; + + default: + printf("Unknown Machine : %d",NtHeader->FileHeader.Machine); + return -1; + } + } + /* FIXME add couter to next sections */ + } + + return 0; +} Propchange: trunk/rosapps/devutils/cputointel/ImageLoader.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/PPC/PP… ============================================================================== --- trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c Sat Jan 13 00:11:44 2007 @@ -5,17 +5,26 @@ #include "PPC.h" #include "../misc.h" -/* retun - * 0 = Ok - * 1 = unimplemt - * 2 = Unkonwn Opcode - * 3 = can not open read file - * 4 = can not open write file - * 5 = can not seek to end of read file - * 6 = can not get the file size of the read file - * 7 = read file size is Zero - * 8 = can not alloc memory - * 9 = can not read file +/* + * DummyBrain is example how you create you own cpu brain to translate from + * cpu to intel assembler, I have not add DummyBrain to the loader it is not + * need it in our example. When you write you own brain, it must be setup in + * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not + * need the brain you have writen so you do not need setup it there then. + * + * input param: + * cpu_buffer : the memory buffer with loaded program we whant translate + * cpu_pos : the positions in the cpu_buffer + * cpu_size : the alloced memory size of the cpu_buffer + * BaseAddress : the virtual memory address we setup to use. + * cpuarch : the sub arch for the brain, example if it exists more one + * cpu with same desgin but few other opcode or extend opcode + * outfp : the output file pointer + * + * return value + * 0 : Ok + * 1 : unimplemt + * 2 : Unkonwn Opcode */ CPU_INT PPCBrain( CPU_BYTE *cpu_buffer, Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (original) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Sat Jan 13 00:11:44 2007 @@ -7,6 +7,7 @@ <library>user32</library> <file>CpuToIntel.c</file> + <file>ImageLoader.c</file> <file>misc.c</file> <file>ARM/ARMBrain.c</file> Modified: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c Sat Jan 13 00:11:44 2007 @@ -5,17 +5,28 @@ #include "Dummy.h" #include "../misc.h" -/* retun - * 0 = Ok - * 1 = unimplemt - * 2 = Unkonwn Opcode - * 3 = can not open read file - * 4 = can not open write file - * 5 = can not seek to end of read file - * 6 = can not get the file size of the read file - * 7 = read file size is Zero - * 8 = can not alloc memory - * 9 = can not read file + + +/* + * DummyBrain is example how you create you own cpu brain to translate from + * cpu to intel assembler, I have not add DummyBrain to the loader it is not + * need it in our example. When you write you own brain, it must be setup in + * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not + * need the brain you have writen so you do not need setup it there then. + * + * input param: + * cpu_buffer : the memory buffer with loaded program we whant translate + * cpu_pos : the positions in the cpu_buffer + * cpu_size : the alloced memory size of the cpu_buffer + * BaseAddress : the virtual memory address we setup to use. + * cpuarch : the sub arch for the brain, example if it exists more one + * cpu with same desgin but few other opcode or extend opcode + * outfp : the output file pointer + * + * return value + * 0 : Ok + * 1 : unimplemt + * 2 : Unkonwn Opcode */ CPU_INT DummyBrain( CPU_BYTE *cpu_buffer, @@ -30,10 +41,7 @@ CPU_INT retcode = 0; CPU_INT retsize; - - - - /* now we start the process */ + /* now we start the process */ while (cpu_pos<cpu_size) { cpu_oldpos = cpu_pos; @@ -75,5 +83,5 @@ break; } } - return retcode; + return retcode; } Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Sat Jan 13 00:11:44 2007 @@ -29,303 +29,6 @@ * type 2 : exe/dll/sys */ -CPU_INT LoadPFileImage( char *infileName, char *outputfileName, - CPU_UNINT BaseAddress, char *cpuid, - CPU_UNINT type) -{ - FILE *infp; - FILE *outfp; - CPU_BYTE *cpu_buffer; - CPU_UNINT cpu_pos = 0; - CPU_UNINT cpu_size=0; - - - /* Open file for read */ - if (!(infp = fopen(infileName,"RB"))) - { - printf("Can not open file %s\n",infileName); - return 3; - } - - /* Open file for write */ - if (!(outfp = fopen(outputfileName,"WB"))) - { - printf("Can not open file %s\n",outputfileName); - return 4; - } - - /* Load the binary file to a memory buffer */ - fseek(infp,0,SEEK_END); - if (!ferror(infp)) - { - printf("error can not seek in the read file"); - fclose(infp); - fclose(outfp); - return 5; - } - - /* get the memory size buffer */ - cpu_size = ftell(infp); - if (!ferror(infp)) - { - printf("error can not get file size of the read file"); - fclose(infp); - fclose(outfp); - return 6; - } - - if (cpu_size==0) - { - printf("error file size is Zero lenght of the read file"); - fclose(infp); - fclose(outfp); - return 7; - } - - /* alloc memory now */ - if (!(cpu_buffer = (unsigned char *) malloc(cpu_size))) - { - printf("error can not alloc %uld size for memory buffer",cpu_size); - fclose(infp); - fclose(outfp); - return 8; - } - - /* read from the file now in one sweep */ - fread(cpu_buffer,1,cpu_size,infp); - if (!ferror(infp)) - { - printf("error can not read file "); - fclose(infp); - fclose(outfp); - return 9; - } - fclose(infp); - - if (type==0) - { - if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size) !=0) - { - type=1; - } - } - - if (type== 1) - { - if (stricmp(cpuid,"m68000")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp); - else if (stricmp(cpuid,"m68010")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp); - else if (stricmp(cpuid,"m68020")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp); - else if (stricmp(cpuid,"m68030")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp); - else if (stricmp(cpuid,"m68040")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp); - else if (stricmp(cpuid,"ppc")) - return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp); - else if (stricmp(cpuid,"arm4")) - return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp); - } - - if (type==2) - { - return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size); - - } - - return 0; -} - -CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, - CPU_UNINT base, CPU_UNINT size) -{ - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NtHeader; - - DosHeader = (PIMAGE_DOS_HEADER)memory; - if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || - (size < 0x3c+2) ) - { - printf("No MZ file \n"); - return -1; - } - - NtHeader = (PIMAGE_NT_HEADERS) memory+ DosHeader->e_lfanew; - if (NtHeader->Signature != IMAGE_NT_SIGNATURE) - { - printf("No PE header found \n"); - } - - if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) - { - printf("No execute image found \n"); - return -1; - } - - switch(NtHeader->OptionalHeader.Subsystem) - { - case IMAGE_SUBSYSTEM_EFI_APPLICATION: - printf("This exe file is desgin run in EFI bios as applactions\n"); - break; - case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: - printf("This exe file is desgin run in EFI bios as service driver\n"); - break; - case IMAGE_SUBSYSTEM_EFI_ROM: - printf("This exe file is EFI ROM\n"); - break; - case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: - printf("This exe file is desgin run in EFI bios as driver\n"); - break; - case IMAGE_SUBSYSTEM_NATIVE: - printf("This exe file does not need any subsystem\n"); - break; - case IMAGE_SUBSYSTEM_NATIVE_WINDOWS: - printf("This exe file is desgin run on Windows 9x as driver \n"); - break; - case IMAGE_SUBSYSTEM_OS2_CUI: - printf("This exe file is desgin run on OS2 as CUI\n"); - break; - case IMAGE_SUBSYSTEM_POSIX_CUI: - printf("This exe file is desgin run on POSIX as CUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: - printf("This exe file is desgin run on Windows CE as GUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_CUI: - printf("This exe file is desgin run on Windows as CUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_GUI: - printf("This exe file is desgin run on Windows as GUI\n"); - break; - case IMAGE_SUBSYSTEM_XBOX: - printf("This exe file is desgin run on X-Box\n"); - break; - default: - printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem); - break; - } - - //*base = NtHeader->OptionalHeader.AddressOfEntryPoint; - - - /* return */ - switch (NtHeader->FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_ALPHA: - printf("CPU ALPHA Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_ALPHA64: - printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_AM33: - printf("CPU AM33 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_AMD64: - printf("CPU AMD64 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_ARM: - printf("CPU ARM Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_CEE: - printf("CPU CEE Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_CEF: - printf("CPU CEF Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_EBC: - printf("CPU EBC Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_I386: - printf("CPU I386 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_IA64: - printf("CPU IA64 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_M32R: - printf("CPU M32R Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_MIPS16: - printf("CPU MIPS16 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_MIPSFPU: - printf("CPU MIPSFPU Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_MIPSFPU16: - printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_POWERPC: - printf("CPU POWERPC Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_POWERPCFP: - printf("CPU POWERPCFP Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_R10000: - printf("CPU R10000 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_R3000: - printf("CPU R3000 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_R4000: - printf("CPU R4000 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_SH3: - printf("CPU SH3 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_SH3DSP: - printf("CPU SH3DSP Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_SH3E: - printf("CPU SH3E Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_SH4: - printf("CPU SH4 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_SH5: - printf("CPU SH5 Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_THUMB: - printf("CPU THUMB Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_TRICORE: - printf("CPU TRICORE Detected no CPUBrain implement for it\n"); - return -1; - - case IMAGE_FILE_MACHINE_WCEMIPSV2: - printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n"); - return -1; - - default: - printf("Unknown Machine : %d",NtHeader->FileHeader.Machine); - return -1; - } - -} /* Conveting bit array to a int byte */ @@ -393,3 +96,11 @@ } + +// add no carry + + + + + + Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Sat Jan 13 00:11:44 2007 @@ -12,7 +12,7 @@ /* Prototypes for misc stuff */ CPU_INT LoadPFileImage(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, CPU_UNINT type); -CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base, CPU_UNINT size); +CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base, CPU_UNINT size, FILE *outfp); CPU_UNINT ConvertBitToByte(CPU_BYTE *bit); CPU_UNINT GetMaskByte(CPU_BYTE *bit);

1 0

[peterw] 25432: - Bumped version for the 0.3.5b1 release. - Clarified the help a bit.
by peterw＠svn.reactos.org 12 Jan '07

12 Jan '07

Author: peterw Date: Fri Jan 12 17:06:54 2007 New Revision: 25432 URL: http://svn.reactos.org/svn/reactos?rev=25432&view=rev Log: - Bumped version for the 0.3.5b1 release. - Clarified the help a bit. Modified: trunk/tools/RosBE/ChangeLog.txt trunk/tools/RosBE/Help.cmd trunk/tools/RosBE/LICENSE.txt trunk/tools/RosBE/README.txt trunk/tools/RosBE/RosBE.cmd trunk/tools/RosBE/RosBE.nsi Modified: trunk/tools/RosBE/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/ChangeLog.txt?rev=2543… ============================================================================== --- trunk/tools/RosBE/ChangeLog.txt (original) +++ trunk/tools/RosBE/ChangeLog.txt Fri Jan 12 17:06:54 2007 @@ -1,3 +1,6 @@ +*** Janruary 12th, 2007 - RosBE 0.3.5b1 Released + +- Updated GCC 4.1.2 to a newer snapshot (20070108). - Added 'clean logs' command to clean up build logs created by RosBE. - Added help for individual commands. Modified: trunk/tools/RosBE/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Help.cmd?rev=25432&r1=… ============================================================================== --- trunk/tools/RosBE/Help.cmd (original) +++ trunk/tools/RosBE/Help.cmd Fri Jan 12 17:06:54 2007 @@ -14,8 +14,10 @@ echo makex [OPTIONS] - Same as 'make' but automatically determines the echo number of CPUs in the system and uses -j with echo the appropriate number. - echo clean - Fully clean the ReactOS source directory. - echo help - Display the available commands. + echo clean [logs] - Fully clean the ReactOS source directory or the + echo RosBE build logs. + echo help [COMMAND] - Display the available commands or help on a + echo specific command. echo basedir - Switch back to the ReactOS source directory. goto :EOF ) @@ -35,7 +37,7 @@ goto :EOF ) if "%1" == "clean" ( - echo Usage: clean [OPTION] + echo Usage: clean [logs] echo Fully clean the ReactOS source directory. echo. echo logs - Removes all build logs in the RosBE-Logs directory. Modified: trunk/tools/RosBE/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/LICENSE.txt?rev=25432&… ============================================================================== --- trunk/tools/RosBE/LICENSE.txt (original) +++ trunk/tools/RosBE/LICENSE.txt Fri Jan 12 17:06:54 2007 @@ -1,4 +1,4 @@ - ReactOS Build Environment v0.3.4 + ReactOS Build Environment v0.3.5b1 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. Modified: trunk/tools/RosBE/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/README.txt?rev=25432&r… ============================================================================== --- trunk/tools/RosBE/README.txt (original) +++ trunk/tools/RosBE/README.txt Fri Jan 12 17:06:54 2007 @@ -1,7 +1,7 @@ - ReactOS Build Environment 0.3.4 + ReactOS Build Environment 0.3.5b1 - The ReactOS Build Environment v0.3.4 contains two complete + The ReactOS Build Environment v0.3.5b1 contains two complete build environments for ReactOS one based on GCC 3.4.5 (the standard build environment), and one based on GCC 4.1.2 (for testers/developers). @@ -19,7 +19,7 @@ with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.4 contains the following +The ReactOS Build Environment v0.3.5b1 contains the following packages: gcc-core-3.4.5-20060117-1.tar.gz @@ -29,7 +29,7 @@ w32api-3.8.tar.gz mingw32-make-3.81-1.tar.gz nasm-0.98.39-win32.zip -gcc-4.1.2-20061229-Snapshot-Patched.7z +gcc-4.1.2-20070108-Snapshot-Patched.7z - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.cmd?rev=25432&r1… ============================================================================== --- trunk/tools/RosBE/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE.cmd Fri Jan 12 17:06:54 2007 @@ -84,7 +84,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment 0.3.4-3.4.5 * + echo * ReactOS Build Environment 0.3.5b1-3.4.5 * echo * * echo ******************************************************************************* echo. @@ -109,7 +109,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment 0.3.4-4.1.2-20061229-prerelease-patched * + echo * ReactOS Build Environment 0.3.5b1-4.1.2-20070108-prerelease-patched * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.nsi?rev=25432&r1… ============================================================================== --- trunk/tools/RosBE/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE.nsi Fri Jan 12 17:06:54 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment" -!define PRODUCT_VERSION "0.3.4" +!define PRODUCT_VERSION "0.3.5b1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.12" +VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.1" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.0.3.4" +VIProductVersion "0.0.3.5b1" CRCCheck force SetCompressor /FINAL /SOLID lzma

1 0

[dgorbachev] 25431: Thai language support: keyboard layout
by dgorbachev＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: dgorbachev Date: Fri Jan 12 01:44:26 2007 New Revision: 25431 URL: http://svn.reactos.org/svn/reactos?rev=25431&view=rev Log: Thai language support: keyboard layout Added: trunk/reactos/dll/keyboard/kbdth/ trunk/reactos/dll/keyboard/kbdth/kbdth.c trunk/reactos/dll/keyboard/kbdth/kbdth.def trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild trunk/reactos/dll/keyboard/kbdth/kbdth.rc Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Jan 12 01:44:26 2007 @@ -57,6 +57,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0x00000000,"kbdth.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" @@ -321,7 +323,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Jan 12 01:44:26 2007 @@ -142,6 +142,7 @@ dll\keyboard\kbdse\kbdse.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 +dll\keyboard\kbdth\kbdth.dll 1 dll\keyboard\kbduk\kbduk.dll 1 dll\keyboard\kbdur\kbdur.dll 1 dll\keyboard\kbdus\kbdus.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Fri Jan 12 01:44:26 2007 @@ -110,6 +110,7 @@ 0000041B = "Slovak (QWERTZ)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" +0000041E = "Thai (traditional)" 00000422 = "Ukrainian" [Files.KeyboardLayout] @@ -122,6 +123,7 @@ 0000040E = kbdhu.dll 00000419 = kbdru.dll 0000041D = kbdse.dll +0000041E = kbdth.dll 00000422 = kbdur.dll 00000809 = kbduk.dll 00000807 = kbdsg.dll Added: trunk/reactos/dll/keyboard/kbdth/kbdth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.c (added) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.c Fri Jan 12 01:44:26 2007 @@ -1,0 +1,384 @@ +/* + * ReactOS Thai keyboard layout (traditional) + * Copyright (C) 2007 ReactOS + * License: LGPL, see: LGPL.txt + * + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL, VK_OEM_FINISH, VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3 } /* Modifier bit order */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, 0, {'_', '%' } }, + { '1', 0, {0x0e45, '+' } }, + { '2', 0, {'/', 0x0e51} }, + { '3', 0, {'-', 0x0e52} }, + { '4', 0, {0x0e20, 0x0e53} }, + { '5', 0, {0x0e16, 0x0e54} }, + { '6', 0, {0x0e38, 0x0e39} }, + { '7', 0, {0x0e36, 0x0e3f} }, + { '8', 0, {0x0e04, 0x0e55} }, + { '9', 0, {0x0e15, 0x0e56} }, + { '0', 0, {0x0e08, 0x0e57} }, + { VK_OEM_MINUS, 0, {0x0e02, 0x0e58} }, + { VK_OEM_PLUS, 0, {0x0e0a, 0x0e59} }, + { VK_OEM_5, 0, {0x0e03, 0x0e05} }, + + { VK_OEM_4, 0, {0x0e1a, 0x0e10} }, + { VK_OEM_6, 0, {0x0e25, ',' } }, + { VK_OEM_1, 0, {0x0e27, 0x0e0b} }, + { VK_OEM_7, 0, {0x0e07, '.' } }, + { VK_OEM_COMMA, 0, {0x0e21, 0x0e12} }, + { VK_OEM_PERIOD,0, {0x0e43, 0x0e2c} }, + { VK_OEM_2, 0, {0x0e1d, 0x0e26} }, + + { VK_TAB, 0, {'\t', '\t'} }, + { VK_ADD, 0, {'+', '+' } }, + { VK_SUBTRACT, 0, {'-', '-' } }, + { VK_MULTIPLY, 0, {'*', '*' } }, + { VK_DIVIDE, 0, {'/', '/' } }, + { VK_ESCAPE, 0, {0x1b, 0x1b} }, + { VK_SPACE, 0, {' ', ' ' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_BACK, 0, {'\b', '\b', 0x7f} }, + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { 'Q', 0, {0x0e46, 0x0e50, 0x11, 0x11} }, + { 'W', 0, {0x0e44, '\"' , 0x17, 0x17} }, + { 'E', 0, {0x0e33, 0x0e0e, 0x05, 0x05} }, + { 'R', 0, {0x0e1e, 0x0e11, 0x12, 0x12} }, + { 'T', 0, {0x0e30, 0x0e18, 0x14, 0x14} }, + { 'Y', 0, {0x0e31, 0x0e4d, 0x19, 0x19} }, + { 'U', 0, {0x0e35, 0x0e4a, 0x15, 0x15} }, + { 'I', 0, {0x0e23, 0x0e13, 0x09, 0x09} }, + { 'O', 0, {0x0e19, 0x0e2f, 0x0f, 0x0f} }, + { 'P', 0, {0x0e22, 0x0e0d, 0x10, 0x10} }, + + { 'A', 0, {0x0e1f, 0x0e24, 0x01, 0x01} }, + { 'S', 0, {0x0e2b, 0x0e06, 0x13, 0x13} }, + { 'D', 0, {0x0e01, 0x0e0f, 0x04, 0x04} }, + { 'F', 0, {0x0e14, 0x0e42, 0x06, 0x06} }, + { 'G', 0, {0x0e40, 0x0e0c, 0x07, 0x07} }, + { 'H', 0, {0x0e49, 0x0e47, 0x08, 0x08} }, + { 'J', 0, {0x0e48, 0x0e4b, 0x0a, 0x0a} }, + { 'K', 0, {0x0e32, 0x0e29, 0x0b, 0x0b} }, + { 'L', 0, {0x0e2a, 0x0e28, 0x0c, 0x0c} }, + + { 'Z', 0, {0x0e1c, '(' , 0x1a, 0x1a} }, + { 'X', 0, {0x0e1b, ')' , 0x18, 0x18} }, + { 'C', 0, {0x0e41, 0x0e09, 0x03, 0x03} }, + { 'V', 0, {0x0e2d, 0x0e2e, 0x16, 0x16} }, + { 'B', 0, {0x0e34, 0x0e3a, 0x02, 0x02} }, + { 'N', 0, {0x0e37, 0x0e4c, 0x0e, 0x0e} }, + { 'M', 0, {0x0e17, '?' , 0x0d, 0x0d} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + { 0, 0, 0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +/* EOF */ Added: trunk/reactos/dll/keyboard/kbdth/kbdth.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.def (added) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.def Fri Jan 12 01:44:26 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdth.dll + +EXPORTS +KbdLayerDescriptor +;EOF Added: trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild Fri Jan 12 01:44:26 2007 @@ -1,0 +1,9 @@ +<module name="kbdth" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true"> + <importlibrary definition="kbdth.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdth.c</file> + <file>kbdth.rc</file> +</module> Added: trunk/reactos/dll/keyboard/kbdth/kbdth.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.rc (added) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.rc Fri Jan 12 01:44:26 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" +#define REACTOS_STR_INTERNAL_NAME "kbdth\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdth.dll\0" +#include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Fri Jan 12 01:44:26 2007 @@ -35,6 +35,9 @@ <directory name="kbdsk"> <xi:include href="kbdsk/kbdsk.rbuild" /> </directory> + <directory name="kbdth"> + <xi:include href="kbdth/kbdth.rbuild" /> + </directory> <directory name="kbduk"> <xi:include href="kbduk/kbduk.rbuild" /> </directory>

1 0

[cwittich] 25430: added target depmap to makefile
by cwittich＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: cwittich Date: Thu Jan 11 23:33:04 2007 New Revision: 25430 URL: http://svn.reactos.org/svn/reactos?rev=25430&view=rev Log: added target depmap to makefile Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=25430&r1=2542… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Jan 11 23:33:04 2007 @@ -432,6 +432,10 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) cb +.PHONY: depmap +depmap: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) depmap .PHONY: msvc msvc: $(RBUILD_TARGET)

1 0

[cwittich] 25429: added a dependencymap backend (it doesn't do anything yet)
by cwittich＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: cwittich Date: Thu Jan 11 23:32:20 2007 New Revision: 25429 URL: http://svn.reactos.org/svn/reactos?rev=25429&view=rev Log: added a dependencymap backend (it doesn't do anything yet) Added: trunk/reactos/tools/rbuild/backend/dependencymap/ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Thu Jan 11 23:32:20 2007 @@ -747,7 +747,7 @@ else if ( extension == ".idl" || extension == ".IDL" ) { fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)\\$file_c.h" -c -C "$(TARGET_OUTPUT_DIR)\\$file_c.c" $file\\ngcc %s -c "$(TARGET_OUTPUT_DIR)\\$file_c.c" -o "$(TARGET_OUTPUT_DIR)\\$file_c.o"\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file\\ngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() ); } else if ( extension == ".spec" || extension == ".SPEC" ) { Added: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (added) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Thu Jan 11 23:32:20 2007 @@ -1,0 +1,127 @@ +/* + * Copyright (C) 2007 Christoph von Wittich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <iostream> +#include <fstream> +#include <string> +#include <vector> + +#include <stdio.h> + +#include "dependencymap.h" +#include "../mingw/mingw.h" + +using std::string; +using std::vector; +using std::ifstream; + +#ifdef OUT +#undef OUT +#endif//OUT + + +static class DepMapFactory : public Backend::Factory +{ + public: + + DepMapFactory() : Factory("DepMap", "Dependency Map") {} + Backend *operator() (Project &project, + Configuration& configuration) + { + return new DepMapBackend(project, configuration); + } + +} factory; + + +DepMapBackend::DepMapBackend(Project &project, + Configuration& configuration) : Backend(project, configuration) +{ + +} + +void DepMapBackend::Process() +{ + string filename_depmap ( "dependencymap.xml" ); + printf ( "Creating dependecy map: %s\n", filename_depmap.c_str() ); + + m_DepMapFile = fopen ( filename_depmap.c_str(), "wb" ); + + if ( !m_DepMapFile ) + { + printf ( "Could not create file '%s'.\n", filename_depmap.c_str() ); + return; + } + + _generate_depmap ( m_DepMapFile ); + + fclose ( m_DepMapFile ); + printf ( "Done.\n" ); +} + +void +DepMapBackend::_clean_project_files ( void ) +{ + remove ( "dependencymap.xml" ); +} + +void +DepMapBackend::_generate_depmap ( FILE* OUT ) +{ + + /* add dependencies */ + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + + if ((module.type != Iso) && + (module.type != LiveIso) && + (module.type != IsoRegTest) && + (module.type != LiveIsoRegTest)) + { + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<Library*>& libs = data.libraries; + for ( size_t j = 0; j < libs.size(); j++ ) + { + //add module.name and libs[j]->name + } + } + } + } + +/* save data to file + fprintf ( OUT, "\r\n" ); +*/ +} + + +DepMapConfiguration::DepMapConfiguration ( const std::string &name ) +{ + /* nothing to do here */ +} + + Added: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h (added) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Thu Jan 11 23:32:20 2007 @@ -1,0 +1,57 @@ +/* + * Copyright (C) 2007 Christoph von Wittich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __DEPMAP_H__ +#define __DEPMAP_H__ + +#include <fstream> +#include <vector> +#include <string> + +#include "../backend.h" + +class DepMapConfiguration +{ + public: + DepMapConfiguration(const std::string &name = ""); + virtual ~DepMapConfiguration() {} + std::string name; +}; + +class DepMapBackend : public Backend +{ + public: + + DepMapBackend(Project &project, + Configuration& configuration); + virtual ~DepMapBackend() {} + + virtual void Process(); + + private: + + FILE* m_DepMapFile; + + std::vector<DepMapConfiguration*> m_configurations; + void _generate_depmap ( FILE* OUT ); + void _clean_project_files ( void ); + +}; + + +#endif // __DEPMAP_H__ + Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Thu Jan 11 23:32:20 2007 @@ -119,6 +119,23 @@ ${mkdir} $@ endif +RBUILD_DEPMAP_BASE = $(RBUILD_BACKEND_BASE_)dependencymap +RBUILD_DEPMAP_BASE_ = $(RBUILD_DEPMAP_BASE)$(SEP) +RBUILD_DEPMAP_INT = $(INTERMEDIATE_)$(RBUILD_DEPMAP_BASE) +RBUILD_DEPMAP_INT_ = $(RBUILD_DEPMAP_INT)$(SEP) +RBUILD_DEPMAP_OUT = $(OUTPUT_)$(RBUILD_DEPMAP_BASE) +RBUILD_DEPMAP_OUT_ = $(RBUILD_DEPMAP_OUT)$(SEP) + +$(RBUILD_DEPMAP_INT): | $(RBUILD_BACKEND_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_DEPMAP_OUT): | $(RBUILD_BACKEND_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP) @@ -158,6 +175,11 @@ codeblocks.cpp \ ) +RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ + dependencymap.cpp \ + ) + + RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ genguid.cpp \ msvc.cpp \ @@ -170,6 +192,7 @@ $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ + $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp RBUILD_COMMON_SOURCES = \ @@ -225,6 +248,9 @@ RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ codeblocks.h +RBUILD_BACKEND_DEPMAP_HEADERS = \ + dependencymap.h + RBUILD_BACKEND_MINGW_HEADERS = \ mingw.h \ modulehandler.h @@ -234,7 +260,8 @@ $(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) + $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ + $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) RBUILD_HEADERS = \ $(addprefix $(RBUILD_BASE_), \ @@ -403,6 +430,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

1 0

[peterw] 25428: - Oops missed this.
by peterw＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: peterw Date: Thu Jan 11 23:16:41 2007 New Revision: 25428 URL: http://svn.reactos.org/svn/reactos?rev=25428&view=rev Log: - Oops missed this. Modified: trunk/tools/RosBE/Clean.cmd Modified: trunk/tools/RosBE/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Clean.cmd?rev=25428&r1… ============================================================================== --- trunk/tools/RosBE/Clean.cmd (original) +++ trunk/tools/RosBE/Clean.cmd Thu Jan 11 23:16:41 2007 @@ -84,6 +84,7 @@ ) else ( echo There is nothing to clean. ) + goto :EOF ) if "%1" == "logs" ( ::

1 0

[peterw] 25427: - Added 'clean logs' command to clean up build logs created by RosBE. - Added help for individual commands.
by peterw＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: peterw Date: Thu Jan 11 23:07:24 2007 New Revision: 25427 URL: http://svn.reactos.org/svn/reactos?rev=25427&view=rev Log: - Added 'clean logs' command to clean up build logs created by RosBE. - Added help for individual commands. Modified: trunk/tools/RosBE/ChangeLog.txt trunk/tools/RosBE/Clean.cmd trunk/tools/RosBE/Help.cmd trunk/tools/RosBE/RosBE.mac Modified: trunk/tools/RosBE/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/ChangeLog.txt?rev=2542… ============================================================================== --- trunk/tools/RosBE/ChangeLog.txt (original) +++ trunk/tools/RosBE/ChangeLog.txt Thu Jan 11 23:07:24 2007 @@ -1,3 +1,8 @@ +- Added 'clean logs' command to clean up build logs created + by RosBE. +- Added help for individual commands. +- Fixed a bug concerning spaces in file names/paths. + *** Janruary 08th, 2007 - RosBE 0.3.4 Released - New command 'makex' which automatically determines the correct Modified: trunk/tools/RosBE/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Clean.cmd?rev=25427&r1… ============================================================================== --- trunk/tools/RosBE/Clean.cmd (original) +++ trunk/tools/RosBE/Clean.cmd Thu Jan 11 23:07:24 2007 @@ -4,82 +4,103 @@ :: Clean the ReactOS source directory. @echo off -:: -:: Check if we have something to clean, if so, clean it. -:: -if exist "%_ROSSOURCEDIR%\obj-i386\." ( - echo Cleaning ReactOS source directory... - +if "%1" == "" ( :: - : Run ReactOS's make clean. - :: - if exist "%_ROSSOURCEDIR%\makefile.auto" ( - if not "%CD%" == "%_ROSSOURCEDIR%" ( - pushd "%_ROSSOURCEDIR%" - %_MINGWMAKE% clean 1> NUL 2> NUL - popd - ) else ( - %_MINGWMAKE% clean 1> NUL 2> NUL - ) - ) - - :: - : Remove directories/makefile.auto created by the build. + : Check if we have something to clean, if so, clean it. :: if exist "%_ROSSOURCEDIR%\obj-i386\." ( - rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL + echo Cleaning ReactOS source directory... + + :: + : Run ReactOS's make clean. + :: + if exist "%_ROSSOURCEDIR%\makefile.auto" ( + if not "%CD%" == "%_ROSSOURCEDIR%" ( + pushd "%_ROSSOURCEDIR%" + %_MINGWMAKE% clean 1> NUL 2> NUL + popd + ) else ( + %_MINGWMAKE% clean 1> NUL 2> NUL + ) + ) + + :: + : Remove directories/makefile.auto created by the build. + :: + if exist "%_ROSSOURCEDIR%\obj-i386\." ( + rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL + ) + if exist "%_ROSSOURCEDIR%\output-i386\." ( + rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL + ) + if exist "%_ROSSOURCEDIR%\reactos\." ( + rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL + ) + if exist "%_ROSSOURCEDIR%\makefile.auto" ( + del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL + ) + + :: + : Now delete auto-generated/copied files not removed by make clean. + :: + del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL + + echo Done cleaning ReactOS source directory. + ) else ( + echo There is nothing to clean. ) - if exist "%_ROSSOURCEDIR%\output-i386\." ( - rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL +) +if "%1" == "logs" ( + :: + : Check if we have any logs to clean, if so, clean them. + :: + if exist "%_ROSBELOGDIR%\*.txt" ( + echo Cleaning build logs... + + del /f "%_ROSBELOGDIR%\*.txt" 1> NUL 2> NUL + + echo Done cleaning build logs. + ) else ( + echo There are no logs to clean. ) - if exist "%_ROSSOURCEDIR%\reactos\." ( - rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL - ) - if exist "%_ROSSOURCEDIR%\makefile.auto" ( - del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL - ) - - :: - : Now delete auto-generated/copied files not removed by make clean. - :: - del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL - del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL - - echo Done cleaning ReactOS source directory. -) else ( - echo There is nothing to clean. + goto :EOF ) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :EOF +) Modified: trunk/tools/RosBE/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Help.cmd?rev=25427&r1=… ============================================================================== --- trunk/tools/RosBE/Help.cmd (original) +++ trunk/tools/RosBE/Help.cmd Thu Jan 11 23:07:24 2007 @@ -5,14 +5,53 @@ :: ReactOS Build Environment. @echo off -echo. -echo Available Commands: -echo make [OPTIONS] - make, without options does a standard build of -echo ReactOS. OPTIONS are the standard ReactOS build -echo options ie. bootcd. -echo makex [OPTIONS] - Same as 'make' but automatically determines the -echo number of CPUs in the system and uses -j with -echo the appropriate number. -echo clean - Fully clean the ReactOS source directory. -echo help - Display the available commands. -echo basedir - Switch back to the ReactOS source directory. +if "%1" == "" ( + echo. + echo Available Commands: + echo make [OPTIONS] - make, without options does a standard build of + echo ReactOS. OPTIONS are the standard ReactOS build + echo options ie. bootcd. + echo makex [OPTIONS] - Same as 'make' but automatically determines the + echo number of CPUs in the system and uses -j with + echo the appropriate number. + echo clean - Fully clean the ReactOS source directory. + echo help - Display the available commands. + echo basedir - Switch back to the ReactOS source directory. + goto :EOF +) +if "%1" == "make" ( + echo Usage: make [OPTIONS] + echo make, without options does a standard build of ReactOS. OPTIONS + echo are the standard ReactOS build options ie. bootcd. + goto :EOF +) +if "%1" == "makex" ( + echo Usage: makex [OPTIONS] + echo Same as 'make' but automatically determines the number of CPUs + echo in the system and uses -j with the appropriate number. + echo NOTE: The number makex uses can be modified by editing + echo Build-Multi.cmd located in the RosBE directory, + echo instructions for doing so are contained within the file. + goto :EOF +) +if "%1" == "clean" ( + echo Usage: clean [OPTION] + echo Fully clean the ReactOS source directory. + echo. + echo logs - Removes all build logs in the RosBE-Logs directory. + goto :EOF +) +if "%1" == "help" ( + echo Usage: help [COMMAND] + echo Shows help for the specified command or lists all available commands. + goto :EOF +) +if "%1" == "basedir" ( + echo Usage: basedir + echo Switches back to the ReactOS source directory. + goto :EOF +) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :EOF +) Modified: trunk/tools/RosBE/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.mac?rev=25427&r1… ============================================================================== --- trunk/tools/RosBE/RosBE.mac (original) +++ trunk/tools/RosBE/RosBE.mac Thu Jan 11 23:07:24 2007 @@ -1,5 +1,5 @@ BASEDIR = cd /d %_ROSSOURCEDIR% -CLEAN = %ROSBEBASEDIR%\Clean.cmd -HELP = %ROSBEBASEDIR%\Help.cmd +CLEAN = %ROSBEBASEDIR%\Clean.cmd $* +HELP = %ROSBEBASEDIR%\Help.cmd $* MAKE = %ROSBEBASEDIR%\Build.cmd $* MAKEX = %ROSBEBASEDIR%\Build-Multi.cmd $*

1 0

[peterw] 25426: - Fix a couple of typos, patch by GreyGhost.
by peterw＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: peterw Date: Thu Jan 11 18:22:04 2007 New Revision: 25426 URL: http://svn.reactos.org/svn/reactos?rev=25426&view=rev Log: - Fix a couple of typos, patch by GreyGhost. Modified: trunk/reactos/base/applications/cacls/lang/en-US.rc trunk/reactos/base/applications/imagesoft/lang/en-US.rc Modified: trunk/reactos/base/applications/cacls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/en-US.rc (original) +++ trunk/reactos/base/applications/cacls/lang/en-US.rc Thu Jan 11 18:22:04 2007 @@ -24,7 +24,7 @@ C Change (write)\n\ F Full control\n\ /D user Deny specified user access.\n\ -Wildcards can be used to specify more that one file in a command.\n\ +Wildcards can be used to specify more than one file in a command.\n\ You can specify more than one user in a command.\n\n\ Abbreviations:\n\ CI - Container Inherit.\n\ Modified: trunk/reactos/base/applications/imagesoft/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/en-US.rc (original) +++ trunk/reactos/base/applications/imagesoft/lang/en-US.rc Thu Jan 11 18:22:04 2007 @@ -171,7 +171,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" - IDS_IMAGE_GREYSCALE "Greyscale (8 bit)" + IDS_IMAGE_GREYSCALE "Grayscale (8 bit)" IDS_IMAGE_PALETTE "Palette or 256 color (8 bit)" IDS_IMAGE_TRUECOLOR "True color (24 bit)"

1 0

[peterw] 25425: - Applied patch for "Invalid Sync after loading BLUE.SYS (bootCD-dbg)". - See issue http://www.reactos.org/bugzilla/show_bug.cgi?id=1953 - Patch by Dmitry G. Gorbachev (hto at mail cnt dot ru).
by peterw＠svn.reactos.org 11 Jan '07

11 Jan '07

Author: peterw Date: Thu Jan 11 17:47:50 2007 New Revision: 25425 URL: http://svn.reactos.org/svn/reactos?rev=25425&view=rev Log: - Applied patch for "Invalid Sync after loading BLUE.SYS (bootCD-dbg)". - See issue http://www.reactos.org/bugzilla/show_bug.cgi?id=1953 - Patch by Dmitry G. Gorbachev (hto at mail cnt dot ru). Modified: trunk/reactos/drivers/base/blue/blue.c Modified: trunk/reactos/drivers/base/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.c?r… ============================================================================== --- trunk/reactos/drivers/base/blue/blue.c (original) +++ trunk/reactos/drivers/base/blue/blue.c Thu Jan 11 17:47:50 2007 @@ -109,7 +109,7 @@ /* Sequencer Registers */ {0x03, 0x00, 0x03, 0x00, 0x02}, /* Misc Output Register */ - 0xE3 + 0x67 }; static const UCHAR DefaultPalette[] =

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs