Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[greatlrd] 25278: remove #define IMAGE_FILE_MACHINE_* from elf32.c it hack for we did miss them in the winnt.h header before, now seen few rev back we got them in right place.
by greatlrd＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: greatlrd Date: Tue Jan 2 20:01:21 2007 New Revision: 25278 URL: http://svn.reactos.org/svn/reactos?rev=25278&view=rev Log: remove #define IMAGE_FILE_MACHINE_* from elf32.c it hack for we did miss them in the winnt.h header before, now seen few rev back we got them in right place. Modified: trunk/reactos/ntoskrnl/mm/elf32.c Modified: trunk/reactos/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf32.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/mm/elf32.c (original) +++ trunk/reactos/ntoskrnl/mm/elf32.c Tue Jan 2 20:01:21 2007 @@ -10,11 +10,6 @@ #define __ELF_WORD_SIZE 32 #include "elf.inc.h" - -//#define IMAGE_FILE_MACHINE_ARM 0x01c0 // ARM little-endian -#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 -#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 // Alpha AXP, full 64-bit support -#define IMAGE_FILE_MACHINE_M32R 0x9041 // M32R little-endian extern NTSTATUS NTAPI Elf64FmtCreateSection (

1 0

[mbosma] 25277: Comment out definition of IMAGE_FILE_MACHINE_ARM to fix compilation - please fix properly.
by mbosma＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: mbosma Date: Tue Jan 2 14:43:12 2007 New Revision: 25277 URL: http://svn.reactos.org/svn/reactos?rev=25277&view=rev Log: Comment out definition of IMAGE_FILE_MACHINE_ARM to fix compilation - please fix properly. Modified: trunk/reactos/ntoskrnl/mm/elf32.c Modified: trunk/reactos/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf32.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/mm/elf32.c (original) +++ trunk/reactos/ntoskrnl/mm/elf32.c Tue Jan 2 14:43:12 2007 @@ -11,7 +11,7 @@ #define __ELF_WORD_SIZE 32 #include "elf.inc.h" -#define IMAGE_FILE_MACHINE_ARM 0x01c0 // ARM little-endian +//#define IMAGE_FILE_MACHINE_ARM 0x01c0 // ARM little-endian #define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 #define IMAGE_FILE_MACHINE_ALPHA64 0x0284 // Alpha AXP, full 64-bit support #define IMAGE_FILE_MACHINE_M32R 0x9041 // M32R little-endian

1 0

[peterw] 25276: - Add the rtltypes.h change from r25264 back and add the define for HEAP_CREATE_ENABLE_EXECUTE to winnt.h, this, I believe, is the proper fix.
by peterw＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: peterw Date: Tue Jan 2 13:25:51 2007 New Revision: 25276 URL: http://svn.reactos.org/svn/reactos?rev=25276&view=rev Log: - Add the rtltypes.h change from r25264 back and add the define for HEAP_CREATE_ENABLE_EXECUTE to winnt.h, this, I believe, is the proper fix. Modified: trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Tue Jan 2 13:25:51 2007 @@ -138,7 +138,7 @@ HEAP_CREATE_ALIGN_16 | \ HEAP_CREATE_ENABLE_TRACING | \ HEAP_CREATE_ENABLE_EXECUTE) -#ifndef __GNUC__ +#ifdef C_ASSERT C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Jan 2 13:25:51 2007 @@ -963,6 +963,7 @@ #define HEAP_DISABLE_COALESCE_ON_FREE 128 #define HEAP_CREATE_ALIGN_16 0x10000 #define HEAP_CREATE_ENABLE_TRACING 0x20000 +#define HEAP_CREATE_ENABLE_EXECUTE 0x00040000 #define HEAP_MAXIMUM_TAG 0xFFF #define HEAP_PSEUDO_TAG_FLAG 0x8000 #define HEAP_TAG_SHIFT 16

1 0

[fireball] 25275: Revert rtltypes.h change from r25264 until a proper fix is found.
by fireball＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: fireball Date: Tue Jan 2 12:53:01 2007 New Revision: 25275 URL: http://svn.reactos.org/svn/reactos?rev=25275&view=rev Log: Revert rtltypes.h change from r25264 until a proper fix is found. Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Tue Jan 2 12:53:01 2007 @@ -138,7 +138,7 @@ HEAP_CREATE_ALIGN_16 | \ HEAP_CREATE_ENABLE_TRACING | \ HEAP_CREATE_ENABLE_EXECUTE) -#ifdef C_ASSERT +#ifndef __GNUC__ C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); #endif

1 0

[arty] 25274: Removed tracking.
by arty＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: arty Date: Tue Jan 2 11:32:52 2007 New Revision: 25274 URL: http://svn.reactos.org/svn/reactos?rev=25274&view=rev Log: Removed tracking. Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ldr/lo… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/powerpc/reactos/ntoskrnl/ldr/loader.c Tue Jan 2 11:32:52 2007 @@ -112,11 +112,8 @@ PIMAGE_NT_HEADERS NtHeader; /* Initialize the module list and spinlock */ - TRACEX(&ModuleListHead); InitializeListHead(&ModuleListHead); - TRACE; KeInitializeSpinLock(&ModuleListLock); - TRACE; /* Initialize ModuleObject for NTOSKRNL */ RtlZeroMemory(&NtoskrnlModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); @@ -124,27 +121,20 @@ RtlInitUnicodeString(&NtoskrnlModuleObject.FullDllName, KERNEL_MODULE_NAME); LdrpBuildModuleBaseName(&NtoskrnlModuleObject.BaseDllName, &NtoskrnlModuleObject.FullDllName); - TRACEXY(&RtlImageNtHeader,KernelBase); NtHeader = RtlImageNtHeader((PVOID)KernelBase); - TRACE; NtoskrnlModuleObject.EntryPoint = (PVOID) ((ULONG_PTR) NtoskrnlModuleObject.DllBase + NtHeader->OptionalHeader.AddressOfEntryPoint); - TRACE; DPRINT("ModuleObject:%08x entrypoint at %x\n", &NtoskrnlModuleObject, NtoskrnlModuleObject.EntryPoint); NtoskrnlModuleObject.SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; - TRACE; InsertTailList(&ModuleListHead, &NtoskrnlModuleObject.InLoadOrderLinks); /* Initialize ModuleObject for HAL */ - TRACE; RtlZeroMemory(&HalModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); HalModuleObject.DllBase = (PVOID) LdrHalBase; - TRACE; RtlInitUnicodeString(&HalModuleObject.FullDllName, HAL_MODULE_NAME); LdrpBuildModuleBaseName(&HalModuleObject.BaseDllName, &HalModuleObject.FullDllName); - TRACEX(LdrHalBase); NtHeader = RtlImageNtHeader((PVOID)LdrHalBase); if(!NtHeader) { @@ -154,7 +144,6 @@ DPRINT("ModuleObject:%08x entrypoint at %x\n", &HalModuleObject, HalModuleObject.EntryPoint); HalModuleObject.SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; - TRACE; InsertTailList(&ModuleListHead, &HalModuleObject.InLoadOrderLinks); } @@ -377,19 +366,15 @@ { PIMAGE_DOS_HEADER PEDosHeader; - TRACE; - /* If MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; if (PEDosHeader->e_magic == IMAGE_DOS_SIGNATURE && PEDosHeader->e_lfanew != 0L) { - TRACE; return LdrPEProcessModule(ModuleLoadBase, ModuleName, ModuleObject); } - TRACE; CPRINT("Module wasn't PE\n"); return STATUS_UNSUCCESSFUL; } @@ -1077,7 +1062,6 @@ /* For ntoskrnl, we must stop after the bss section */ break; } - } return DriverBase;

1 0

[arty] 25273: Removed now unneeded-tracing, added hal address. We can see hal from here.
by arty＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: arty Date: Tue Jan 2 11:31:10 2007 New Revision: 25273 URL: http://svn.reactos.org/svn/reactos?rev=25273&view=rev Log: Removed now unneeded-tracing, added hal address. We can see hal from here. Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Tue Jan 2 11:31:10 2007 @@ -348,15 +348,11 @@ DrawNumber(BootInfo, (ULONG)BootInfo, 190, 100); /* Copy the Loader Block Data locally since Low-Memory will be wiped */ - TRACE; memcpy(&KeRosLoaderBlock, LoaderBlock, sizeof(ROS_LOADER_PARAMETER_BLOCK)); - TRACE; memcpy(&KeLoaderModules[0], (PVOID)KeRosLoaderBlock.ModsAddr, sizeof(LOADER_MODULE) * KeRosLoaderBlock.ModsCount); - TRACE; KeRosLoaderBlock.ModsAddr = (ULONG)&KeLoaderModules; - TRACE; /* Check for BIOS memory map */ KeMemoryMapRangeCount = 0; @@ -365,8 +361,6 @@ /* We have a memory map from the nice BIOS */ size = *((PULONG)(KeRosLoaderBlock.MmapAddr - sizeof(ULONG))); i = 0; - - TRACEXY(size, KeRosLoaderBlock.MmapLength); /* Map it until we run out of size */ while (i < KeRosLoaderBlock.MmapLength) @@ -394,20 +388,16 @@ KeRosLoaderBlock.MmapLength = 0; KeRosLoaderBlock.MmapAddr = (ULONG)KeMemoryMap; } - TRACE; /* Save the Base Address */ MmSystemRangeStart = (PVOID)KeRosLoaderBlock.KernelBase; - TRACEXY((ULONG)KeLoaderCommandLine, (ULONG)LoaderBlock->CommandLine); /* Set the Command Line */ strcpy(KeLoaderCommandLine, (PCHAR)LoaderBlock->CommandLine); KeRosLoaderBlock.CommandLine = (ULONG)KeLoaderCommandLine; - TRACE; /* Get the address of ntoskrnl in openfirmware memory */ StartKernelBase = KeLoaderModules[0].ModStart; - TRACE; /* Create a block for each module */ for (i = 0; i < KeRosLoaderBlock.ModsCount; i++) @@ -450,26 +440,28 @@ /* Select the proper String */ KeLoaderModules[i].String = (ULONG)KeLoaderModuleStrings[i]; } - TRACE; /* Choose last module address as the final kernel address */ MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd); - TRACE; - + +#ifndef _M_PPC /* Select the HAL Base */ HalBase = KeLoaderModules[1].ModStart; /* Choose Driver Base */ DriverBase = MmFreeLdrLastKernelAddress; LdrHalBase = (ULONG_PTR)DriverBase; - TRACE; +#else + HalBase = KeLoaderModules[1].ModStart; + DriverBase = MmFreeLdrLastKernelAddress; + LdrHalBase = KeLoaderModules[1].ModStart; +#endif /* Initialize Module Management */ LdrInitModuleManagement((PVOID)KeLoaderModules[0].ModStart); /* Load HAL.DLL with the PE Loader */ - TRACE; LdrSafePEProcessModule((PVOID)HalBase, (PVOID)DriverBase, (PVOID)KeLoaderModules[0].ModStart, @@ -484,18 +476,15 @@ // // This dirty hack fixes it, and should make symbol lookup work too. // - TRACE; HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject. DllBase)-> OptionalHeader.SizeOfImage; /* Increase the last kernel address with the size of HAL */ - TRACE; MmFreeLdrLastKernelAddress += PAGE_ROUND_UP(DriverSize); #ifdef _M_IX86 /* Now select the final beginning and ending Kernel Addresses */ - TRACE; MmFreeLdrFirstKrnlPhysAddr = KeLoaderModules[0].ModStart - KSEG0_BASE + 0x200000; MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - @@ -503,28 +492,24 @@ #endif /* Setup the IDT */ - TRACE; KeInitExceptions(); // ONCE HACK BELOW IS GONE, MOVE TO KISYSTEMSTARTUP! - TRACE; KeInitInterrupts(); // ROS HACK DEPRECATED SOON BY NEW HAL /* Load the Kernel with the PE Loader */ - TRACE; LdrSafePEProcessModule((PVOID)KeLoaderModules[0].ModStart, (PVOID)KeLoaderModules[0].ModStart, (PVOID)DriverBase, &DriverSize); /* Sets up the VDM Data */ - TRACE; +#ifdef _M_IX86 NtEarlyInitVdm(); +#endif /* Convert the loader block */ - TRACE; KiRosFrldrLpbToNtLpb(&KeRosLoaderBlock, &NtLoaderBlock); /* Do general System Startup */ - TRACE; KiSystemStartup(NtLoaderBlock); }

1 0

[greatlrd] 25272: 1. starting adding pe loader to cputointel to misc.c 2. move the loadimage stuff to own functions to misc.c 3. rewrite so loader call to brain* after it load the image. 4. setup main using the loader 5. add few more input param to main -in, -inexe, -in try autodetect type of file, -inexe try convert a PE file.
by greatlrd＠svn.reactos.org 02 Jan '07

02 Jan '07

Author: greatlrd Date: Tue Jan 2 05:21:58 2007 New Revision: 25272 URL: http://svn.reactos.org/svn/reactos?rev=25272&view=rev Log: 1. starting adding pe loader to cputointel to misc.c 2. move the loadimage stuff to own functions to misc.c 3. rewrite so loader call to brain* after it load the image. 4. setup main using the loader 5. add few more input param to main -in, -inexe, -in try autodetect type of file, -inexe try convert a PE file. Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/PPC/PPC.h trunk/rosapps/devutils/cputointel/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c trunk/rosapps/devutils/cputointel/m68k/m68k.h 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 Tue Jan 2 05:21:58 2007 @@ -14,8 +14,12 @@ int t=0; char *infile=NULL; char *outfile=NULL; + char *cpuid=NULL; + CPU_INT type=0; + printf("Usage :\n"); + printf(" need for -inbin and autodetect if it does not found a PE header \n"); printf(" -cpu m68000 : convert motorala 68000/68008 to intel asm \n"); printf(" -cpu m68010 : convert motorala 68010 to intel asm \n"); printf(" -cpu m68020 : convert motorala 68020 to intel asm \n"); @@ -23,13 +27,18 @@ printf(" -cpu m68040 : convert motorala 68040 to intel asm \n"); printf(" -cpu ppc : convert PowerPC to intel asm \n"); printf(" -cpu ARM4 : convert ARM4 to intel asm \n"); - printf("--------------------------------------------------------------\n"); + printf("------------------------------------------------------------------\n"); + printf(" for -inbin and autodetect if it does not found a PE header or do\n"); + printf(" not set at all, this options are free to use \n"); printf(".......-BaseAddress adr : the start base address only accpect \n"); printf("....... dec value"); - printf("--------------------------------------------------------------\n"); + printf("------------------------------------------------------------------\n"); + printf(" -in filename : try autodetect file type for you"); + printf(" whant convert\n"); printf(" -inBin filename : the bin file you whant convert\n"); - printf(" -OutAsm filename : the Asm file you whant create\n"); - printf("--------------------------------------------------------------\n"); + printf(" -inExe filename : the PE file you whant convert\n"); + printf(" -OutAsm filename : the Asm file you whant create\n"); + printf("------------------------------------------------------------------\n"); printf("More cpu will be added with the time or options, this is \n"); printf("version 0.0.1 of the cpu to intel converter writen by \n"); printf("Magnus Olsen (magnus(a)greatlord.com), it does not do anything \n"); @@ -41,10 +50,24 @@ for (t=1; t<7;t+=2) { + if (stricmp(argv[t],"-in")) + { + infile = argv[t+1]; + type=0; + } + if (stricmp(argv[t],"-inBin")) { infile = argv[t+1]; + type=1; } + + if (stricmp(argv[t],"-inExe")) + { + infile = argv[t+1]; + type=1; + } + if (stricmp(argv[t],"-OutAsm")) { outfile = argv[t+1]; @@ -53,30 +76,20 @@ { BaseAddress = atol(argv[t+1]); } + if (stricmp(argv[t],"-cpu")) + { + cpuid = argv[t+1]; + } - } - for (t=1;t<7;t+=2) - { - if (stricmp(argv[1],"-cpu")) - { - if (stricmp(argv[2],"m68000")) - return M68KBrain(infile, outfile, BaseAddress, 68000); - else if (stricmp(argv[2],"m68010")) - return M68KBrain(infile, outfile, BaseAddress, 68010); - else if (stricmp(argv[2],"m68020")) - return M68KBrain(infile, outfile, BaseAddress, 68020); - else if (stricmp(argv[2],"m68030")) - return M68KBrain(infile, outfile, BaseAddress, 68030); - else if (stricmp(argv[2],"m68040")) - return M68KBrain(infile, outfile, BaseAddress, 68040); - else if (stricmp(argv[2],"ppc")) - return PPCBrain(infile, outfile, BaseAddress, 0); - else if (stricmp(argv[2],"arm4")) - return ARMBrain(infile, outfile, BaseAddress, 4); - } - } - return 0; + return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type); } + + + + + + + Modified: trunk/rosapps/devutils/cputointel/PPC/PPC.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/PPC/PP… ============================================================================== --- trunk/rosapps/devutils/cputointel/PPC/PPC.h (original) +++ trunk/rosapps/devutils/cputointel/PPC/PPC.h Tue Jan 2 05:21:58 2007 @@ -1,7 +1,13 @@ #include "../misc.h" -CPU_INT PPCBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT PPCBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp); + /* here we put the prototype for the opcode api that brain need we show a example for it */ CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); 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 Tue Jan 2 05:21:58 2007 @@ -18,82 +18,20 @@ * 9 = can not read file */ -CPU_INT PPCBrain(char *infileName, char *outputfileName, - CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +CPU_INT PPCBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp) { - FILE *infp; - FILE *outfp; - CPU_BYTE *cpu_buffer; - CPU_UNINT cpu_pos = 0; CPU_UNINT cpu_oldpos; - CPU_UNINT cpu_size=0; CPU_INT cpuint; CPU_INT retcode = 0; CPU_INT retsize; - /* 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); - - /* now we start the process */ + /* now we start the process */ while (cpu_pos<cpu_size) { cpu_oldpos = cpu_pos; Modified: trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h Tue Jan 2 05:21:58 2007 @@ -1,5 +1,12 @@ #include "../misc.h" + +CPU_INT DummyBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp); /* here we put the prototype for the opcode api that brain need we show a example for it */ CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); 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 Tue Jan 2 05:21:58 2007 @@ -18,80 +18,20 @@ * 9 = can not read file */ -CPU_INT DummyBrain(char *infileName, char *outputfileName, - CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +CPU_INT DummyBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp) { - FILE *infp; - FILE *outfp; - CPU_BYTE *cpu_buffer; - CPU_UNINT cpu_pos = 0; CPU_UNINT cpu_oldpos; - CPU_UNINT cpu_size=0; CPU_INT cpuint; CPU_INT retcode = 0; CPU_INT retsize; - /* 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); /* now we start the process */ while (cpu_pos<cpu_size) 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 Tue Jan 2 05:21:58 2007 @@ -18,79 +18,17 @@ * 9 = can not read file */ -CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +CPU_INT M68KBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp) { - FILE *infp; - FILE *outfp; - CPU_BYTE *cpu_buffer; - CPU_UNINT cpu_pos = 0; CPU_UNINT cpu_oldpos; - CPU_UNINT cpu_size=0; CPU_INT cpuint; CPU_INT retcode = 0; CPU_INT retsize; - - /* 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); /* now we start the process */ while (cpu_pos<cpu_size) Modified: trunk/rosapps/devutils/cputointel/m68k/m68k.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/m68k.h (original) +++ trunk/rosapps/devutils/cputointel/m68k/m68k.h Tue Jan 2 05:21:58 2007 @@ -1,6 +1,12 @@ #include "../misc.h" -CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68KBrain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp); + CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); 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 Tue Jan 2 05:21:58 2007 @@ -1,6 +1,331 @@ + +/* only for getting the pe struct */ +#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" + + +/* 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 + *------------------------- + * type 0 : auto + * type 1 : bin + * 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 */ 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 Tue Jan 2 05:21:58 2007 @@ -8,9 +8,11 @@ /* Convert Bit index to int */ +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_UNINT ConvertBitToByte(CPU_BYTE *bit); CPU_UNINT GetMaskByte(CPU_BYTE *bit); - CPU_UNINT ConvertBitToByte32(CPU_BYTE *bit); CPU_UNINT GetMaskByte32(CPU_BYTE *bit);

1 0

[hpoussin] 25271: Fix HalXbox build
by hpoussin＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: hpoussin Date: Tue Jan 2 02:55:40 2007 New Revision: 25271 URL: http://svn.reactos.org/svn/reactos?rev=25271&view=rev Log: Fix HalXbox build Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/pci_xbox.c… ============================================================================== --- trunk/reactos/hal/halx86/xbox/pci_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/pci_xbox.c Tue Jan 2 02:55:40 2007 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/xbox/pci_xbox.c @@ -24,38 +23,40 @@ /* VARIABLES ***************************************************************/ -static ULONG (STDCALL *GenericGetPciData)(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length); -static ULONG (STDCALL *GenericSetPciData)(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length); +static ULONG (NTAPI *GenericGetPciData)(IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + OUT PUCHAR Buffer, + IN ULONG Offset, + IN ULONG Length); +static ULONG (NTAPI *GenericSetPciData)(IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PUCHAR Buffer, + IN ULONG Offset, + IN ULONG Length); /* FUNCTIONS ***************************************************************/ -static ULONG STDCALL -HalpXboxGetPciData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) +static ULONG NTAPI +HalpXboxGetPciData(IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + OUT PUCHAR Buffer, + IN ULONG Offset, + IN ULONG Length) { + ULONG BusNumber = BusHandler->BusNumber; + DPRINT("HalpXboxGetPciData() called.\n"); DPRINT(" BusNumber %lu\n", BusNumber); DPRINT(" SlotNumber %lu\n", SlotNumber); DPRINT(" Offset 0x%lx\n", Offset); DPRINT(" Length 0x%lx\n", Length); - if ((0 == BusNumber && 0 == (SlotNumber & 0x1f) && - (1 == ((SlotNumber >> 5) & 0x07) || 2 == ((SlotNumber >> 5) & 0x07))) || - (1 == BusNumber && 0 != (SlotNumber & 0x1f))) + if ((0 == BusNumber && 0 == SlotNumber.u.bits.DeviceNumber && + (1 == SlotNumber.u.bits.FunctionNumber || 2 == SlotNumber.u.bits.FunctionNumber)) || + (1 == BusNumber && 0 != SlotNumber.u.bits.DeviceNumber)) { DPRINT("Blacklisted PCI slot\n"); if (0 == Offset && 2 <= Length) @@ -66,32 +67,34 @@ return 0; } - return GenericGetPciData(BusHandler, BusNumber, SlotNumber, Buffer, Offset, Length); + return GenericGetPciData(BusHandler, RootHandler, SlotNumber, Buffer, Offset, Length); } -static ULONG STDCALL -HalpXboxSetPciData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) +static ULONG NTAPI +HalpXboxSetPciData(IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PUCHAR Buffer, + IN ULONG Offset, + IN ULONG Length) { + ULONG BusNumber = BusHandler->BusNumber; + DPRINT("HalpXboxSetPciData() called.\n"); DPRINT(" BusNumber %lu\n", BusNumber); DPRINT(" SlotNumber %lu\n", SlotNumber); DPRINT(" Offset 0x%lx\n", Offset); DPRINT(" Length 0x%lx\n", Length); - if ((0 == BusNumber && 0 == (SlotNumber & 0x1f) && - (1 == ((SlotNumber >> 5) & 0x07) || 2 == ((SlotNumber >> 5) & 0x07))) || - (1 == BusNumber && 0 != (SlotNumber & 0x1f))) + if ((0 == BusNumber && 0 == SlotNumber.u.bits.DeviceNumber && + (1 == SlotNumber.u.bits.FunctionNumber || 2 == SlotNumber.u.bits.FunctionNumber)) || + (1 == BusNumber && 0 != SlotNumber.u.bits.DeviceNumber)) { DPRINT1("Trying to set data on blacklisted PCI slot\n"); return 0; } - return GenericSetPciData(BusHandler, BusNumber, SlotNumber, Buffer, Offset, Length); + return GenericSetPciData(BusHandler, RootHandler, SlotNumber, Buffer, Offset, Length); } void

1 0

[mbosma] 25270: Set explicitly set default icon when adding item to the applications tree view. Workaround for reactos bug.
by mbosma＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: mbosma Date: Tue Jan 2 00:46:29 2007 New Revision: 25270 URL: http://svn.reactos.org/svn/reactos?rev=25270&view=rev Log: Set explicitly set default icon when adding item to the applications tree view. Workaround for reactos bug. Modified: trunk/reactos/base/applications/downloader/main.c Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Tue Jan 2 00:46:29 2007 @@ -79,9 +79,10 @@ (void)TreeView_DeleteItem(hwnd, TVI_ROOT); (void)TreeView_DeleteItem(hwnd, TVI_ROOT); // Delete twice to bypass bug in windows - Insert.item.mask = TVIF_TEXT|TVIF_PARAM; + Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE; Insert.hInsertAfter = TVI_LAST; Insert.hParent = TVI_ROOT; + Insert.item.iImage = 0; CurrentApplication = Category->Apps; @@ -124,9 +125,10 @@ SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); // Set deflaut entry for hApps - Insert.item.mask = TVIF_TEXT; + Insert.item.mask = TVIF_TEXT|TVIF_IMAGE; Insert.item.pszText = Strings[IDS_CHOOSE_CATEGORY]; Insert.item.cchTextMax = lstrlenW(Strings[IDS_CHOOSE_CATEGORY]); + Insert.item.iImage = 0; SendMessage(hApps, TVM_INSERTITEM, 0, (LPARAM)&Insert); // Create Tree Icons

1 0

[hpoussin] 25269: Move -enable-stdcall-fixup definition to .rbuild file. Other platforms may not need it.
by hpoussin＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: hpoussin Date: Tue Jan 2 00:42:27 2007 New Revision: 25269 URL: http://svn.reactos.org/svn/reactos?rev=25269&view=rev Log: Move -enable-stdcall-fixup definition to .rbuild file. Other platforms may not need it. Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=25269&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Tue Jan 2 00:42:27 2007 @@ -33,6 +33,7 @@ <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <compilerflag>-Wpointer-arith</compilerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> <include>.</include> <include>include</include> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Tue Jan 2 00:42:27 2007 @@ -422,7 +422,7 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_LFLAGS := -enable-stdcall-fixup %s\n", + fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );

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 January 2007