Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[martinf] 29931: disable PHP search in Doxy docu, enable caller graphs and extract all
by martinf＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: martinf Date: Sun Oct 28 19:21:06 2007 New Revision: 29931 URL: http://svn.reactos.org/svn/reactos?rev=29931&view=rev Log: disable PHP search in Doxy docu, enable caller graphs and extract all Modified: trunk/reactos/base/shell/explorer/Doxyfile Modified: trunk/reactos/base/shell/explorer/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/Doxyfi… ============================================================================== --- trunk/reactos/base/shell/explorer/Doxyfile (original) +++ trunk/reactos/base/shell/explorer/Doxyfile Sun Oct 28 19:21:06 2007 @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "ROS Explorer " +PROJECT_NAME = "ROS Explorer" PROJECT_NUMBER = OUTPUT_DIRECTORY = doxy-doc CREATE_SUBDIRS = NO @@ -37,7 +37,7 @@ #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -EXTRACT_ALL = NO +EXTRACT_ALL = YES EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES @@ -72,7 +72,7 @@ WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -223,7 +223,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES -CALLER_GRAPH = NO +CALLER_GRAPH = YES GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png @@ -238,4 +238,4 @@ #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- -SEARCHENGINE = YES +SEARCHENGINE = NO

1 0

[martinf] 29930: disable PHP search in Doxy docu
by martinf＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: martinf Date: Sun Oct 28 19:19:37 2007 New Revision: 29930 URL: http://svn.reactos.org/svn/reactos?rev=29930&view=rev Log: disable PHP search in Doxy docu Modified: trunk/rosapps/winefile/Doxyfile Modified: trunk/rosapps/winefile/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Doxyfile?rev=2993… ============================================================================== --- trunk/rosapps/winefile/Doxyfile (original) +++ trunk/rosapps/winefile/Doxyfile Sun Oct 28 19:19:37 2007 @@ -72,7 +72,7 @@ WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text " WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -216,7 +216,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES -CALLER_GRAPH = NO +CALLER_GRAPH = YES GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png @@ -231,4 +231,4 @@ #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- -SEARCHENGINE = YES +SEARCHENGINE = NO

1 0

[gbrunmar] 29929: Made each service have its own pipe name as done in Windows
by gbrunmar＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: gbrunmar Date: Sun Oct 28 17:13:03 2007 New Revision: 29929 URL: http://svn.reactos.org/svn/reactos?rev=29929&view=rev Log: Made each service have its own pipe name as done in Windows Modified: trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Sun Oct 28 17:13:03 2007 @@ -6,6 +6,7 @@ * COPYRIGHT: Copyright 2002-2006 Eric Kohl * Copyright 2006 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * Gregor Brunmar <gregor.brunmar(a)home.se> * */ @@ -692,9 +693,11 @@ STARTUPINFOW StartupInfo; UNICODE_STRING ImagePath; ULONG Type; + DWORD ServiceCurrent = 0; BOOL Result; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; + WCHAR NtControlPipeName[MAX_PATH + 1]; RtlInitUnicodeString(&ImagePath, NULL); @@ -723,8 +726,45 @@ DPRINT("ImagePath: '%S'\n", ImagePath.Buffer); DPRINT("Type: %lx\n", Type); - /* Create '\\.\pipe\net\NtControlPipe' instance */ - Service->ControlPipeHandle = CreateNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", + /* Get the service number */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L""; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &ServiceCurrent; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceCurrent", + QueryTable, + NULL, + NULL); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* TODO: Create registry entry with correct write access */ + } + else if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + else + { + ServiceCurrent++; + } + + Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"ServiceCurrent", L"", REG_DWORD, &ServiceCurrent, sizeof(ServiceCurrent)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ + swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent); + Service->ControlPipeHandle = CreateNamedPipeW(NtControlPipeName, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 100, @@ -732,7 +772,7 @@ 4, 30000, NULL); - DPRINT("CreateNamedPipeW() done\n"); + DPRINT1("CreateNamedPipeW(%S) done\n", NtControlPipeName); if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { DPRINT1("Failed to create control pipe!\n"); Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Sun Oct 28 17:13:03 2007 @@ -5,6 +5,7 @@ * PURPOSE: Service control manager functions * COPYRIGHT: Copyright 1999 Emanuele Aliberti * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * Gregor Brunmar <gregor.brunmar(a)home.se> * */ @@ -197,14 +198,40 @@ { DWORD dwBytesWritten; DWORD dwState; - - if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) - { - DPRINT1("WaitNamedPipe() failed (Error %lu)\n", GetLastError()); + DWORD dwServiceCurrent = 0; + NTSTATUS Status; + WCHAR NtControlPipeName[MAX_PATH + 1]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + /* Get the service number and create the named pipe */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L""; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &dwServiceCurrent; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceCurrent", + QueryTable, + NULL, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", dwServiceCurrent); + + if (!WaitNamedPipeW(NtControlPipeName, 15000)) + { + DPRINT1("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } - *hPipe = CreateFileW(L"\\\\.\\pipe\\net\\NtControlPipe", + *hPipe = CreateFileW(NtControlPipeName, GENERIC_READ | GENERIC_WRITE, 0, NULL,

1 0

[arty] 29928: Fix memory map to kernel mode. Allow prep serial in kdcom (and stop clobbering the data miss handler). Clean up boot mapping a bit. Silence some boot time spam. Enable not present page handler (yes, this routing actually works). Scan physical memory on the (virtually 100%) chance that open firmware will somehow have a buggy implementation of the memory object, or we're on prep hardware. Initialize syscall trap early, so we can do DbgPrint.
by arty＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: arty Date: Sun Oct 28 15:31:10 2007 New Revision: 29928 URL: http://svn.reactos.org/svn/reactos?rev=29928&view=rev Log: Fix memory map to kernel mode. Allow prep serial in kdcom (and stop clobbering the data miss handler). Clean up boot mapping a bit. Silence some boot time spam. Enable not present page handler (yes, this routing actually works). Scan physical memory on the (virtually 100%) chance that open firmware will somehow have a buggy implementation of the memory object, or we're on prep hardware. Initialize syscall trap early, so we can do DbgPrint. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c Sun Oct 28 15:31:10 2007 @@ -22,7 +22,9 @@ #define NDEBUG #include <debug.h> + #undef DbgPrint +#define DbgPrint printf extern PVOID KernelMemory; @@ -96,13 +98,11 @@ BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - KSEG0_BASE + (ULONG)KernelMemory); } - DbgPrint("Exports: RtlImageDirectoryEntryToData\n"); ExportDir = (PIMAGE_EXPORT_DIRECTORY) RtlImageDirectoryEntryToData(BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &ExportDirSize); - DbgPrint("RtlImageDirectoryEntryToData done\n"); if (!ExportDir) { DbgPrint("LdrPEGetExportByName(): no export directory!\n"); @@ -202,7 +202,6 @@ if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) { - DbgPrint("Forward: %s\n", (PCHAR)Function); Function = LdrPEFixupForward((PCHAR)Function); if (Function == NULL) { @@ -323,16 +322,12 @@ PLOADER_MODULE ImportedModule; ULONG Size; - printf("Fixing up %x (%s)\n", DllBase, DllName); - /* Process each import module */ - DbgPrint("FixupImports: RtlImageDirectoryEntryToData\n"); ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); - DbgPrint("RtlImageDirectoryEntryToData done\n"); while (ImportModuleDirectory && ImportModuleDirectory->Name) { /* Check to make sure that import lib is kernel */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Oct 28 15:31:10 2007 @@ -301,6 +301,9 @@ } } +ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, + ULONG MaxMemoryMapSize ); + /* * Get memory the proper openfirmware way */ @@ -319,7 +322,7 @@ printf("Returned data: %d\n", returned); if( returned == -1 ) { printf("getprop /memory[@reg] failed\n"); - return 0; + return PpcPrepGetMemoryMap( BiosMemoryMap, MaxMemoryMapSize ); } for( i = 0; i < returned; i++ ) { @@ -328,7 +331,7 @@ printf("\n"); for( i = 0; i < returned / 2; i++ ) { - BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/; + BiosMemoryMap[slots].Type = BiosMemoryUsable; BiosMemoryMap[slots].BaseAddress = memdata[i*2]; BiosMemoryMap[slots].Length = memdata[i*2+1]; printf("MemoryMap[%d] = (%x:%x)\n", Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Oct 28 15:31:10 2007 @@ -123,18 +123,59 @@ while(1); } +typedef struct _ppc_map_set_t { + int mapsize; + int usecount; + ppc_map_info_t *info; +} ppc_map_set_t; + VOID NTAPI +FrLdrAddPageMapping(ppc_map_set_t *set, int proc, paddr_t phys, vaddr_t virt) +{ + int j; + paddr_t page = ROUND_DOWN(phys, (1<<PFN_SHIFT)); + if (virt == 0) + virt = page; + else + virt = ROUND_DOWN(virt, (1<<PFN_SHIFT)); + + for( j = 0; j < set->usecount; j++ ) + { + if(set->info[j].addr == page) return; + } + + if (!set->mapsize) + { + set->mapsize = 0x80; + set->info = MmAllocateMemory(0x80 * sizeof(*set->info)); + } + else if (set->mapsize <= set->usecount) + { + ppc_map_info_t *newinfo = MmAllocateMemory(set->mapsize * 2 * sizeof(*set->info)); + memcpy(newinfo, set->info, set->mapsize * sizeof(*set->info)); + MmFreeMemory(set->info); + set->info = newinfo; + set->mapsize *= 2; + } + + set->info[set->usecount].flags = MMU_ALL_RW; + set->info[set->usecount].proc = proc; + set->info[set->usecount].addr = virt; + set->info[set->usecount].phys = page; + set->usecount++; +} + +VOID +NTAPI FrLdrStartup(ULONG Magic) { - ULONG_PTR i, j, page, count; + ULONG_PTR i, tmp; PCHAR ModHeader; boot_infos_t *LocalBootInfo = &BootInfo; LocalBootInfo->dispFont = (font_char *)&LocalBootInfo[1]; LoaderBlock.ArchExtra = (ULONG)LocalBootInfo; - ppc_map_info_t *info = MmAllocateMemory(0x80 * sizeof(*info)); - - printf("FrLdrStartup(KernelEntry = %x)\n", KernelEntryPoint); + ppc_map_set_t memmap = { }; for(i = 0; i < LoaderBlock.ModsCount; i++) { @@ -145,85 +186,52 @@ (PCHAR)reactos_modules[i].String); } - printf("PpcInitializeMmu\n"); + /* We don't use long longs, but longs for the addresses in the + * ADDRESS_RANGE structure. Swap the quad halves of our memory + * map. + */ + for( i = 0; + i < reactos_memory_map_descriptor_size / sizeof(reactos_memory_map[0]); + i++ ) + { + tmp = reactos_memory_map[i].base_addr_high; + reactos_memory_map[i].base_addr_high = reactos_memory_map[i].base_addr_low; + reactos_memory_map[i].base_addr_low = tmp; + tmp = reactos_memory_map[i].length_high; + reactos_memory_map[i].length_high = reactos_memory_map[i].length_low; + reactos_memory_map[i].length_low = tmp; + } + PpcInitializeMmu(0); - printf("PpcInitializeMmu done\n"); /* We'll use vsid 1 for freeldr (expendable) */ MmuAllocVsid(1, 0xff); - printf("(1)\n"); MmuSetVsid(0, 8, 1); - printf("(2)\n"); MmuAllocVsid(0, 0xff00); - printf("(3)\n"); MmuSetVsid(8, 16, 0); - printf("(4)\n"); - - printf("MmuSetTrapHandler\n"); - MmuSetTrapHandler(3, MmuPageMiss); - MmuSetTrapHandler(4, MmuPageMiss); - printf("MmuSetTrapHandler done\n"); - - info = MmAllocateMemory((KernelMemorySize >> PAGE_SHIFT) * sizeof(*info)); - printf("page info at %x\n", info); /* Map kernel space 0x80000000 ... */ - for( i = (ULONG)KernelMemory, page = 0; + for( i = (ULONG)KernelMemory; i < (ULONG)KernelMemory + KernelMemorySize; - i += (1<<PFN_SHIFT), page++ ) { - info[page].proc = 0; - info[page].addr = KernelBase + (page << PAGE_SHIFT); - info[page].phys = i; //PpcVirt2phys(i, 1); - info[page].flags = MMU_ALL_RW; - } - - printf("Adding page info (%d pages)\n", page); - MmuMapPage(info, page); - printf("Adding page info (%d pages) ... done\n", page); + i += (1<<PFN_SHIFT) ) { + + FrLdrAddPageMapping(&memmap, 0, i, KernelBase + i - (ULONG)KernelMemory); + } /* Map module name strings */ - for( count = 0, i = 0; i < LoaderBlock.ModsCount; i++ ) - { - printf("Checking string %s\n", reactos_modules[i].String); - page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); - for( j = 0; j < count; j++ ) - { - if(info[j].addr == page) break; - } - if( j != count ) - { - printf("Mapping page %x containing string %s\n", - page, reactos_modules[i].String); - info[count].flags = MMU_ALL_RW; - info[count].proc = 1; - info[count].addr = page; - info[count].phys = page; // PpcVirt2phys(page, 0); - count++; - } - } - - page = ROUND_DOWN((vaddr_t)&LoaderBlock, (1 << PAGE_SHIFT)); - for( j = 0; j < count; j++ ) - { - if(info[j].addr == page) break; - } - - if( j != count ) - { - info[count].flags = MMU_ALL_RW; - info[count].proc = 1; - info[count].addr = page; - info[count].phys = page; // PpcVirt2phys(page, 0); - count++; - } - printf("Mapping module name strings\n"); - MmuMapPage(info, count); - printf("Module name strings mapped\n"); - - printf("MmuTurnOn(KernelEntry = %x)\n", KernelEntryPoint); + for( i = 0; i < LoaderBlock.ModsCount; i++ ) + { + FrLdrAddPageMapping(&memmap, 1, (ULONG)reactos_modules[i].String, 0); + } + + /* Map memory zones */ + FrLdrAddPageMapping(&memmap, 1, (vaddr_t)&reactos_memory_map_descriptor_size, 0); + FrLdrAddPageMapping(&memmap, 1, (vaddr_t)&LoaderBlock, 0); + + MmuMapPage(memmap.info, memmap.usecount); + MmuTurnOn((KernelEntryFn)KernelEntryPoint, (void*)&LoaderBlock); - printf("MAED OF FALE!!1\n"); /* Nothing more */ while(1); @@ -393,7 +401,7 @@ MemLoadAddr = (PCHAR)NextModuleBase; ModuleData = &reactos_modules[LoaderBlock.ModsCount]; - printf("Loading file (elf at %x)\n", KernelAddr); + //printf("Loading file (elf at %x)\n", KernelAddr); /* Load the first 1024 bytes of the kernel image so we can read the PE header */ if (!FsReadFile(KernelImage, sizeof(ehdr), NULL, &ehdr)) { @@ -413,8 +421,6 @@ /* Read section headers */ FsSetFilePointer(KernelImage, ehdr.e_shoff); FsReadFile(KernelImage, shsize * shnum, NULL, sptr); - - printf("Loaded section headers\n"); /* Now we'll get the PE Header */ for( i = 0; i < shnum; i++ ) @@ -429,12 +435,14 @@ FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr); ImageHeader = (PIMAGE_DOS_HEADER)MemLoadAddr; NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)MemLoadAddr + SWAPD(ImageHeader->e_lfanew)); +#if 0 printf("NtHeader at %x\n", SWAPD(ImageHeader->e_lfanew)); printf("SectionAlignment %x\n", SWAPD(NtHeader->OptionalHeader.SectionAlignment)); SectionAddr = ROUND_UP (shdr->sh_size, SWAPD(NtHeader->OptionalHeader.SectionAlignment)); printf("Header ends at %x\n", SectionAddr); +#endif break; } } @@ -444,10 +452,12 @@ printf("No peheader section encountered :-(\n"); return 0; } +#if 0 else { printf("DOS SIG: %s\n", (PCHAR)MemLoadAddr); } +#endif /* Save the Image Base */ NtHeader->OptionalHeader.ImageBase = SWAPD(KernelAddr); @@ -455,8 +465,6 @@ /* Load the file image */ Section = COFF_FIRST_SECTION(NtHeader); SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); - - printf("Section headers at %x\n", Section); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) @@ -603,11 +611,13 @@ ModuleData->ModEnd = NextModuleBase; ModuleData->String = (ULONG)MmAllocateMemory(strlen(ImageName)+1); strcpy((PCHAR)ModuleData->String, ImageName); +#if 0 printf("Module %s (%x-%x) next at %x\n", ModuleData->String, ModuleData->ModStart, ModuleData->ModEnd, NextModuleBase); +#endif LoaderBlock.ModsCount++; /* Return Success */ @@ -640,7 +650,6 @@ /* Allocate kernel memory */ KernelMemory = MmAllocateMemory(KernelMemorySize); - printf("Kernel Memory @%x\n", (int)KernelMemory); return FrLdrMapModule(KernelImage, "ntoskrnl.exe", KernelMemory, KernelBase); } @@ -679,11 +688,6 @@ ModuleData->ModStart = NextModuleBase; ModuleData->ModEnd = NextModuleBase + LocalModuleSize; - printf("Module size %x len %x name %s\n", - ModuleData->ModStart, - ModuleData->ModEnd - ModuleData->ModStart, - ModuleName); - /* Save name */ strcpy(NameBuffer, ModuleName); ModuleData->String = (ULONG_PTR)NameBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Sun Oct 28 15:31:10 2007 @@ -71,10 +71,36 @@ ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { - // xxx fixme - BiosMemoryMap[0].Type = 1; - BiosMemoryMap[0].BaseAddress = 0xe80000; - BiosMemoryMap[0].Length = (64 * 1024 * 1024) - BiosMemoryMap[0].BaseAddress; + // Probe memory + paddr_t physAddr; + register int oldStore = 0, newStore = 0, change = 0, oldmsr; + + __asm__("mfmsr %0\n" : "=r" (oldmsr)); + change = oldmsr & 0x6fff; + __asm__("mtmsr %0\n" : : "r" (change)); + + // Find the last ram address in physical space ... this bypasses mapping + // but could run into non-ram objects right above ram. Usually systems + // aren't designed like that though. + for (physAddr = 0x30000, change = newStore; + (physAddr < 0x80000000) && (change == newStore); + physAddr += 1 << 12) + { + oldStore = GetPhys(physAddr); + newStore = (physAddr & 0x1000) ? 0x55aa55aa : 0xaa55aa55; + SetPhys(physAddr, newStore); + change = GetPhys(physAddr); + SetPhys(physAddr, oldStore); + } + // Back off by one page + physAddr -= 0x1000; + BiosMemoryMap[0].BaseAddress = 0x30000; // End of ppcmmu + BiosMemoryMap[0].Type = BiosMemoryUsable; + BiosMemoryMap[0].Length = physAddr - BiosMemoryMap[0].BaseAddress; + + __asm__("mtmsr %0\n" : : "r" (oldmsr)); + + printf("Actual RAM: %d Mb\n", physAddr >> 20); PpcInitializeMmu(BiosMemoryMap[0].BaseAddress + BiosMemoryMap[0].Length); return 1; } Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Sun Oct 28 15:31:10 2007 @@ -84,8 +84,13 @@ extern char reactos_kernel_cmdline[255]; // Command line passed to kernel extern LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel extern char reactos_module_strings[64][256]; // Array to hold module names -extern unsigned long reactos_memory_map_descriptor_size; -extern memory_map_t reactos_memory_map[32]; // Memory map +typedef struct _reactos_mem_data { + unsigned long memory_map_descriptor_size; + memory_map_t memory_map[32]; // Memory map +} reactos_mem_data_t; +extern reactos_mem_data_t reactos_mem_data; +#define reactos_memory_map_descriptor_size reactos_mem_data.memory_map_descriptor_size +#define reactos_memory_map reactos_mem_data.memory_map VOID FASTCALL FrLdrSetupPae(ULONG Magic); VOID FASTCALL FrLdrSetupPageDirectory(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sun Oct 28 15:31:10 2007 @@ -29,8 +29,9 @@ char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names -unsigned long reactos_memory_map_descriptor_size; -memory_map_t reactos_memory_map[32]; // Memory map +// Make this a single struct to guarantee that these elements are nearby in +// memory. +reactos_mem_data_t reactos_mem_data; ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information char reactos_arc_strings[32][256]; unsigned long reactos_disk_count = 0; @@ -409,7 +410,7 @@ if (rc != ERROR_SUCCESS) OrderList[0] = 0; /* enumerate all drivers */ - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { + for (TagIndex = 1; TagIndex <= SWAPD(OrderList[0]); TagIndex++) { Index = 0; @@ -603,10 +604,13 @@ LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { +#ifdef _M_IX86 ULONG i; +#endif LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 +#ifdef _M_IX86 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) { if (BiosMemoryUsable == reactos_memory_map[i].type && @@ -625,6 +629,7 @@ LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; } } +#endif } /* @@ -761,10 +766,13 @@ LoadBase = FrLdrLoadImage(szKernelName, 5, 1); if (!LoadBase) return; + printf("Kernel loaded at %x\n", LoadBase); + /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; + KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); + KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); + printf("KernelEntryPoint is %x (base %x)\n", KernelEntryPoint, KernelBase); LoaderBlock.KernelBase = KernelBase; /* @@ -836,14 +844,18 @@ /* * Load boot drivers */ + printf("FrLdrLoadBootDrivers\n"); FrLdrLoadBootDrivers(szBootPath, 40); + printf("FrLdrLoadBootDrivers end\n"); //UiUnInitialize("Booting ReactOS..."); /* * Now boot the kernel */ DiskStopFloppyMotor(); + printf("MachVideoPrepareForReactOS\n"); MachVideoPrepareForReactOS(FALSE); + printf("FrLdrStartup\n"); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Sun Oct 28 15:31:10 2007 @@ -29,8 +29,7 @@ char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names -unsigned long reactos_memory_map_descriptor_size; -memory_map_t reactos_memory_map[32]; // Memory map +reactos_mem_data_t reactos_mem_data; char szBootPath[256]; char szHalName[256]; CHAR SystemRoot[255]; Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Sun Oct 28 15:31:10 2007 @@ -294,8 +294,12 @@ ULONG Unknown2 ) { +#ifdef _M_IX86 ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - PUCHAR ComPortBase; +#elif defined(_M_PPC) + ULONG BaseArray[5] = {0, 0x800003f8}; +#endif + PUCHAR ComPortBase; char buffer[80]; ULONG divisor; UCHAR lcr; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 28 15:31:10 2007 @@ -1181,6 +1181,10 @@ } VOID +NTAPI +KiSetupSyscallHandler(); + +VOID FASTCALL KiRosPrepareForSystemStartup(IN ULONG Dummy, IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) @@ -1206,6 +1210,10 @@ TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); #endif +#if defined(_M_PPC) + KiSetupSyscallHandler(); +#endif + /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeRosLoaderBlock-> Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c Sun Oct 28 15:31:10 2007 @@ -226,7 +226,7 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Cpu; - ppc_map_info_t info[3]; + ppc_map_info_t info[4]; PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; @@ -259,7 +259,11 @@ info[2].proc = 2; info[2].addr = (vaddr_t)KI_USER_SHARED_DATA; info[2].flags = MMU_KRW_UR; - MmuMapPage(info, 3); + info[3].phys = 0; + info[3].proc = 2; + info[3].addr = (vaddr_t)KIP0PCRADDRESS; + info[3].flags = MMU_KRW_UR; + MmuMapPage(info, 4); } /* Skip initial setup if this isn't the Boot CPU */ Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/pfault.c Sun Oct 28 15:31:10 2007 @@ -17,6 +17,11 @@ /* EXTERNS *******************************************************************/ +NTSTATUS +NTAPI +MmNotPresentFault(KPROCESSOR_MODE Mode, + ULONG_PTR Address, + BOOLEAN FromMdl); extern ULONG KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2); /* FUNCTIONS *****************************************************************/ @@ -61,8 +66,7 @@ } else { - KeBugCheck(0); - //Status = MmNotPresentFault(Mode, (PVOID)VirtualAddr, FALSE, TrapInfo); + Status = MmNotPresentFault(Mode, VirtualAddr, FALSE); } if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_powerpc.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk Sun Oct 28 15:31:10 2007 @@ -50,20 +50,8 @@ { *(.rsrc) } - .rela.text : + .rela : { - *(.rela.text) - } - .rela.data : - { - *(.rela.data) - } - .rela.rodata : - { - *(.rela.rodata) - } - .rela.got2 : - { - *(.rela.got2) + *(.rela.*) } }

1 0

[mpiulachs] 29927: Fix/Update the medatada element based on Colin's suggestions (part 1)
by mpiulachs＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: mpiulachs Date: Sun Oct 28 03:12:20 2007 New Revision: 29927 URL: http://svn.reactos.org/svn/reactos?rev=29927&view=rev Log: Fix/Update the medatada element based on Colin's suggestions (part 1) Modified: branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp Sun Oct 28 03:12:20 2007 @@ -111,7 +111,7 @@ fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n", module.output->relative_path.c_str () ); fprintf ( m_VReportFile, "\t\t<version>%s</version>\r\n", module.metadata->version.c_str () ); fprintf ( m_VReportFile, "\t\t<date>%s</date>\r\n", module.metadata->date.c_str () ); - fprintf ( m_VReportFile, "\t\t<owner>%s</owner>\r\n", module.metadata->owner.c_str () ); + fprintf ( m_VReportFile, "\t\t<license>%s</license>\r\n", module.metadata->license.c_str () ); fprintf ( m_VReportFile, "\t</component>\r\n" ); } } Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sun Oct 28 03:12:20 2007 @@ -1795,12 +1795,12 @@ else version = ""; - /* The module copyright */ - att = _node.GetAttribute ( "copyright", false ); + /* The module license */ + att = _node.GetAttribute ( "license", false ); if (att != NULL) - copyright = att->value; - else - copyright = ""; + license = att->value; + else + license = ""; att = _node.GetAttribute ( "url", false ); if (att != NULL) @@ -1814,13 +1814,6 @@ date = att->value; else date = "?"; - - /* When was this module updated */ - att = _node.GetAttribute ( "owner", false ); - if (att != NULL) - owner = att->value; - else - owner = "ReactOS"; } Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Oct 28 03:12:20 2007 @@ -572,10 +572,9 @@ std::string name; std::string description; std::string version; - std::string copyright; + std::string license; std::string url; std::string date; - std::string owner; Metadata ( const XMLElement& _node, const Module& _module );

1 0

[tkreuzer] 29926: user32: - implement User32InitializeImmEntryTable() stub - implement _assert() to remove reference to msvcrt.dll todo: remove references to advapi32 and imm32. user32 should only link to ntdll, kernel32 and gdi32. The goal is to make it at least load on windows.
by tkreuzer＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: tkreuzer Date: Sun Oct 28 02:37:08 2007 New Revision: 29926 URL: http://svn.reactos.org/svn/reactos?rev=29926&view=rev Log: user32: - implement User32InitializeImmEntryTable() stub - implement _assert() to remove reference to msvcrt.dll todo: remove references to advapi32 and imm32. user32 should only link to ntdll, kernel32 and gdi32. The goal is to make it at least load on windows. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Sun Oct 28 02:37:08 2007 @@ -779,3 +779,14 @@ UNIMPLEMENTED; return FALSE; } + + +/* + * @unimplemented + */ +DWORD STDCALL User32InitializeImmEntryTable(PVOID p) +{ + UNIMPLEMENTED; + return 0; +} + Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Sun Oct 28 02:37:08 2007 @@ -709,7 +709,7 @@ UpdateLayeredWindow@36 UpdatePerUserSystemParameters@8 UpdateWindow@4 -;User32InitializeImmEntryTable +User32InitializeImmEntryTable UserClientDllInitialize=DllMain@12 UserHandleGrantAccess@12 ;UserLpkPSMTextOut Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Sun Oct 28 02:37:08 2007 @@ -33,6 +33,14 @@ #include <wine/debug.h> /* FUNCTIONS *****************************************************************/ + +void _assert(const char *msg, const char *file, int line) +{ + /* Assertion failed at foo.c line 45: x<y */ + DbgPrint("Assertion failed at %s line %d: %s\n", file, line, msg); + ExitProcess(3); + for(;;); /* eliminate warning by mingw */ +} /* * @implemented

1 0

[cfinck] 29925: Import the new code for showing floating point values with the correct decimal separator from shell32. sysdm.cpl now shows the processor speed and RAM size values with the correct decimal separator based on the current locale.
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sun Oct 28 01:37:32 2007 New Revision: 29925 URL: http://svn.reactos.org/svn/reactos?rev=29925&view=rev Log: Import the new code for showing floating point values with the correct decimal separator from shell32. sysdm.cpl now shows the processor speed and RAM size values with the correct decimal separator based on the current locale. Modified: trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sun Oct 28 01:37:32 2007 @@ -198,12 +198,32 @@ return Ret; } -static VOID +static VOID +MakeFloatValueString(double* dFloatValue, + LPTSTR szOutput, + LPTSTR szAppend) +{ + TCHAR szDecimalSeparator[4]; + + // Get the decimal separator for the current locale + if( GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(TCHAR)) > 0) + { + UCHAR uDecimals; + UINT uIntegral; + + // Show the value with two decimals + uIntegral = (UINT)*dFloatValue; + uDecimals = (UCHAR)((UINT)(*dFloatValue * 100) - uIntegral * 100); + + wsprintf(szOutput, _T("%u%s%02u %s"), uIntegral, szDecimalSeparator, uDecimals, szAppend); + } +} + +static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) - { TCHAR szBuf[64]; DWORD BufSize = sizeof(DWORD); @@ -228,12 +248,12 @@ { if (ppi.CurrentMhz < 1000) { - _stprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); + wsprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); } else { double flt = ppi.CurrentMhz / 1000.0; - _stprintf(szBuf, _T("%.2f GHz"), flt); + MakeFloatValueString(&flt, szBuf, _T("GHz")); } SetDlgItemText(hwnd, @@ -289,29 +309,28 @@ { TCHAR szStr[32]; double dTotalPhys; - UINT i = 0; - static const UINT uStrId[] = { - IDS_MEGABYTE, - IDS_GIGABYTE, - IDS_TERABYTE, - IDS_PETABYTE - }; if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) { - /* We're dealing with GBs or more */ + UINT i = 0; + static const UINT uStrId[] = { + IDS_GIGABYTE, + IDS_TERABYTE, + IDS_PETABYTE + }; + + // We're dealing with GBs or more MemStat.ullTotalPhys /= 1024 * 1024; - i++; if (MemStat.ullTotalPhys > 1024 * 1024) { - /* We're dealing with TBs or more */ + // We're dealing with TBs or more MemStat.ullTotalPhys /= 1024; i++; if (MemStat.ullTotalPhys > 1024 * 1024) { - /* We're dealing with PBs or more */ + // We're dealing with PBs or more MemStat.ullTotalPhys /= 1024; i++; @@ -322,22 +341,18 @@ } else dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + + LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(TCHAR)); + MakeFloatValueString(&dTotalPhys, Buf, szStr); } else { - /* We're daling with MBs */ - dTotalPhys = (double)MemStat.ullTotalPhys / 1024 / 1024; - } - - if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) - { - if( _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr) ) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); - } - } + // We're dealing with MBs, don't show any decimals + LoadString(hApplet, IDS_MEGABYTE, szStr, sizeof(szStr) / sizeof(TCHAR)); + wsprintf(Buf, _T("%u %s"), (UINT)MemStat.ullTotalPhys / 1024 / 1024, szStr); + } + + SetDlgItemText(hwnd, CurMachineLine, Buf); } }

1 0

[cfinck] 29924: - Implement a new ShellAbout dialog, which looks more like the Windows one. Uses the ReactOS Logo bitmap from base/setup/welcome/res. The "Authors" button in the dialog currently highlights a redrawing bug in ReactOS (tracked in bug 2769). - Define default strings in include/reactos/version.rc, which shouldn't be overwritten by applications. These strings can later be used i.e. in resource files like it's done in shell32 now.
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sun Oct 28 01:02:34 2007 New Revision: 29924 URL: http://svn.reactos.org/svn/reactos?rev=29924&view=rev Log: - Implement a new ShellAbout dialog, which looks more like the Windows one. Uses the ReactOS Logo bitmap from base/setup/welcome/res. The "Authors" button in the dialog currently highlights a redrawing bug in ReactOS (tracked in bug 2769). - Define default strings in include/reactos/version.rc, which shouldn't be overwritten by applications. These strings can later be used i.e. in resource files like it's done in shell32 now. Added: trunk/reactos/dll/win32/shell32/res/bitmaps/ trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp - copied unchanged from r29776, trunk/reactos/base/setup/welcome/res/title.bmp Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shell32_main.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/include/reactos/version.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_r… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc…

1 0

[janderwald] 29923: - fix a bug
by janderwald＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: janderwald Date: Sun Oct 28 00:48:45 2007 New Revision: 29923 URL: http://svn.reactos.org/svn/reactos?rev=29923&view=rev Log: - fix a bug Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Sun Oct 28 00:48:45 2007 @@ -1,7 +1,7 @@ /* - * IContextMenu for items in the shellview + * Open With Context Menu extension * - * Copyright 1998, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> + * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -161,7 +161,7 @@ wcscpy(szBuffer, szChoose); } - mii.dwItemData = (LPWSTR)szBuffer; + mii.dwTypeData = (LPWSTR)szBuffer; if (InsertMenuItemW(hMenu, 0, TRUE, &mii)) count++;

1 0

[mpiulachs] 29922: Update shell32 spanish localization
by mpiulachs＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: mpiulachs Date: Sun Oct 28 00:31:25 2007 New Revision: 29922 URL: http://svn.reactos.org/svn/reactos?rev=29922&view=rev Log: Update shell32 spanish localization Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Oct 28 00:31:25 2007 @@ -155,7 +155,7 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Accesso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE @@ -220,7 +220,7 @@ SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Versión" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "File version: ", 14000, 10, 10, 45, 10 @@ -242,23 +242,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Tipo:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "Espacio ocupado:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "Espacio libre:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "Capacidad:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 @@ -272,7 +272,7 @@ DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" +CAPTION "Herramientas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 @@ -295,7 +295,7 @@ RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" +CAPTION "Ejecutar como" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 @@ -316,7 +316,7 @@ BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Propiedades de la papelera de reciclaje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 @@ -340,15 +340,15 @@ IDS_SHV_COLUMN7 "Tamaño disponible" IDS_SHV_COLUMN8 "Nombre" IDS_SHV_COLUMN9 "Comentarios" - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN10 "Propietario" + IDS_SHV_COLUMN11 "Groupo" + IDS_SHV_COLUMN_DELFROM "Ubicación original" + IDS_SHV_COLUMN_DELDATE "Fecha de eliminación" /* special folders */ IDS_DESKTOP "Escritorio" IDS_MYCOMPUTER "Mi PC" - IDS_RECYCLEBIN_FOLDER_NAME "Trash" + IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje" /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" @@ -378,9 +378,9 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "¿Desea simular un reinicio de Windows?" + IDS_RESTART_PROMPT "¿Desea reiniciar el equipo?" IDS_SHUTDOWN_TITLE "Apagar" - IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión ReactOS?" + IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" @@ -410,9 +410,9 @@ IDS_COMMON_PICTURES "Documentos\\Mis imágenes" IDS_COMMON_VIDEO "Documentos\\Mis vídeos" IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." -END + IDS_DRIVE_NETWORK "Unidad de red" + IDS_OPEN_WITH "Abrir con" + IDS_OPEN_WITH_CHOOSE "Elegir programa..." +END

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007