Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 28852: - Use real NT KPCR address (0xFFDFF000). - Remove all hacked KPCR_BASE definitions. - Make FreeLDR give address of PageDirectoryStart/End addresses. This was being ignored/incorrect until now and the page directory could've gotten overwritten. - Properly setup the HAL PDE, instead of having different PDEs for KUSER_SHARED_DATA, KPCR and ACPI I/O. - Do not over-write shared user data with ACPI I/O anymore. This was probably a bad idea. - Do not mark almost a meg of space as KPCR
by fireball＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: fireball Date: Tue Sep 4 22:19:59 2007 New Revision: 28852 URL: http://svn.reactos.org/svn/reactos?rev=28852&view=rev Log: - Use real NT KPCR address (0xFFDFF000). - Remove all hacked KPCR_BASE definitions. - Make FreeLDR give address of PageDirectoryStart/End addresses. This was being ignored/incorrect until now and the page directory could've gotten overwritten. - Properly setup the HAL PDE, instead of having different PDEs for KUSER_SHARED_DATA, KPCR and ACPI I/O. - Do not over-write shared user data with ACPI I/O anymore. This was probably a bad idea. - Do not mark almost a meg of space as KPCR_USERD_SHARED data anymore, and don't mess up the CPU TLB anymore. - Give a dedicated page to KUSER_SHARED_DATA (Page 2, physical address 0x2000) right after the KPCR, isntead of a random address that probably ended up overwritten later during the OS's lifetime. - Fix FS selector in the GDT. - Remove hack in Trap Fault Handler. - Add a little hack to allow mapping Page 2 into user-space even though it's marked as used, this is for the Shared User Data page. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ob/obinit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Tue Sep 4 22:19:59 2007 @@ -175,20 +175,10 @@ PageDir->Pde[HyperspacePageTableIndex].Write = 1; PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); - /* Set up the Apic PDE */ - PageDir->Pde[ApicPageTableIndex].Valid = 1; - PageDir->Pde[ApicPageTableIndex].Write = 1; - PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); - - /* Set up the KPCR PDE */ - PageDir->Pde[KpcrPageTableIndex].Valid = 1; - PageDir->Pde[KpcrPageTableIndex].Write = 1; - PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable); - - /* Set up the KUSER PDE */ - PageDir->Pde[KuserPageTableIndex].Valid = 1; - PageDir->Pde[KuserPageTableIndex].Write = 1; - PageDir->Pde[KuserPageTableIndex].PageFrameNumber = PaPtrToPfn(kuser_pagetable); + /* Set up the HAL PDE */ + PageDir->Pde[HalPageTableIndex].Valid = 1; + PageDir->Pde[HalPageTableIndex].Write = 1; + PageDir->Pde[HalPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); /* Set up Low Memory PTEs */ PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; @@ -209,35 +199,28 @@ PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); } - /* Set up APIC PTEs */ + /* Setup APIC Base */ PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; PageDir->Pde[0].Valid = 1; PageDir->Pde[0].Write = 1; PageDir->Pde[0].CacheDisable = 1; PageDir->Pde[0].WriteThrough = 1; - PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); + PageDir->Pde[0].PageFrameNumber = PaToPfn(HAL_BASE); PageDir->Pde[0x200].Valid = 1; PageDir->Pde[0x200].Write = 1; PageDir->Pde[0x200].CacheDisable = 1; PageDir->Pde[0x200].WriteThrough = 1; - PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); - - /* Set up KPCR PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].PageFrameNumber = 1; - - /* Setup KUSER PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kuser_pagetable; - for (i = 0; i < 1024; i++) - { - /* SEetup each entry */ - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].Owner = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(KI_USER_SHARED_DATA + i * PAGE_SIZE); - } + PageDir->Pde[0x200].PageFrameNumber = PaToPfn(HAL_BASE + KERNEL_BASE_PHYS); + + /* Setup KUSER_SHARED_DATA Base */ + PageDir->Pde[0x1F0].Valid = 1; + PageDir->Pde[0x1F0].Write = 1; + PageDir->Pde[0x1F0].PageFrameNumber = 2; + + /* Setup KPCR Base*/ + PageDir->Pde[0x1FF].Valid = 1; + PageDir->Pde[0x1FF].Write = 1; + PageDir->Pde[0x1FF].PageFrameNumber = 1; } PLOADER_MODULE 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 Tue Sep 4 22:19:59 2007 @@ -40,16 +40,12 @@ #define STARTUP_BASE 0xC0000000 #define HYPERSPACE_BASE 0xC0400000 -#define HYPERSPACE_PAE_BASE 0xC0800000 -#define APIC_BASE 0xFEC00000 -#define KPCR_BASE 0xFF000000 +#define HAL_BASE 0xFFC00000 #define LowMemPageTableIndex 0 #define StartupPageTableIndex (STARTUP_BASE >> 22) #define HyperspacePageTableIndex (HYPERSPACE_BASE >> 22) -#define KpcrPageTableIndex (KPCR_BASE >> 22) -#define ApicPageTableIndex (APIC_BASE >> 22) -#define KuserPageTableIndex (KI_USER_SHARED_DATA >> 22) +#define HalPageTableIndex (HAL_BASE >> 22) typedef struct _PAGE_DIRECTORY_X86 { 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 Tue Sep 4 22:19:59 2007 @@ -22,6 +22,9 @@ #include <freeldr.h> #include <debug.h> +extern ULONG PageDirectoryStart; +extern ULONG PageDirectoryEnd; + ROS_LOADER_PARAMETER_BLOCK LoaderBlock; 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 @@ -592,6 +595,8 @@ * Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Tue Sep 4 22:19:59 2007 @@ -4,9 +4,6 @@ #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H - -/* Temporary hack */ -#define KPCR_BASE 0xFF000000 #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Sep 4 22:19:59 2007 @@ -227,11 +227,7 @@ #define ZwCurrentProcess() NtCurrentProcess() #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) #define ZwCurrentThread() NtCurrentThread() -#ifdef _REACTOS_ -#define KIP0PCRADDRESS 0xff000000 -#else #define KIP0PCRADDRESS 0xffdff000 -#endif #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2885… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Tue Sep 4 22:19:59 2007 @@ -29,7 +29,7 @@ #ifdef CONFIG_SMP #define PCR fs: #else -#define PCR ds:[0xFF000000] +#define PCR ds:[0xFFDFF000] #endif #endif @@ -613,3 +613,4 @@ + Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Tue Sep 4 22:19:59 2007 @@ -904,7 +904,7 @@ } CurrentTime.QuadPart = KeQueryInterruptTime(); - Prcb = ((PKPCR)KPCR_BASE)->Prcb; + Prcb = KeGetPcr()->Prcb; for (i = 0; i < KeNumberProcessors; i++) { Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime @@ -1196,7 +1196,7 @@ ti = KeQueryTimeIncrement(); - Prcb = ((PKPCR)KPCR_BASE)->Prcb; + Prcb = KeGetPcr()->Prcb; for (i = 0; i < KeNumberProcessors; i++) { //sii->ContextSwitches = Prcb->KeContextSwitches; Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Tue Sep 4 22:19:59 2007 @@ -60,7 +60,6 @@ #define NR_SECTION_PAGE_ENTRIES 1024 #define TEB_BASE 0x7FFDE000 -#define KPCR_BASE 0xFF000000 /* Although Microsoft says this isn't hardcoded anymore, they won't be able to change it. Stuff depends on it */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Tue Sep 4 22:19:59 2007 @@ -149,7 +149,7 @@ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ - Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); /* Set the Large IRP List */ 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 Tue Sep 4 22:19:59 2007 @@ -471,8 +471,8 @@ Status = KiRosAllocateArcDescriptor(0, 1, MemoryFirmwarePermanent); if (Status != STATUS_SUCCESS) return Status; - /* Build an entry for the KPCR (which we put in page 1) */ - Status = KiRosAllocateArcDescriptor(1, 2, LoaderMemoryData); + /* Build an entry for the KPCR and KUSER_SHARED_DATA */ + Status = KiRosAllocateArcDescriptor(1, 3, LoaderMemoryData); if (Status != STATUS_SUCCESS) return Status; /* Build an entry for the PDE and return the status */ @@ -882,8 +882,8 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; - MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; + MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; + MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Tue Sep 4 22:19:59 2007 @@ -38,7 +38,7 @@ {0xffff, 0x0000, {{0x00, 0xfb, 0xcf, 0x00}}}, /* KGDT_R3_CODE */ {0xffff, 0x0000, {{0x00, 0xf3, 0xcf, 0x00}}}, /* KGDT_R3_DATA*/ {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_TSS */ - {0x0fff, 0x0000, {{0x00, 0x93, 0xc0, 0xff}}}, /* KGDT_R0_PCR */ + {0x0001, 0xf000, {{0xdf, 0x93, 0xc0, 0xff}}}, /* KGDT_R0_PCR */ {0x0fff, 0x0000, {{0x00, 0xf3, 0x40, 0x00}}}, /* KGDT_R3_TEB */ {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_UNUSED */ {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_LDT */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Tue Sep 4 22:19:59 2007 @@ -428,7 +428,7 @@ if (j == 0) { /* - * Page zero is reserved + * Page zero is reserved for the IVT */ MmPageArray[0].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[0].Flags.Consumer = MC_NPPOOL; @@ -443,6 +443,19 @@ /* * Page one is reserved for the initial KPCR + */ + MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[1].Flags.Consumer = MC_NPPOOL; + MmPageArray[1].Flags.Zero = 0; + MmPageArray[1].ReferenceCount = 0; + InsertTailList(&BiosPageListHead, + &MmPageArray[1].ListEntry); + MmStats.NrReservedPages++; + } + else if (j == 2) + { + /* + * Page two is reserved for the KUSER_SHARED_DATA */ MmPageArray[1].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[1].Flags.Consumer = MC_NPPOOL; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Tue Sep 4 22:19:59 2007 @@ -1925,8 +1925,16 @@ { if (!MmIsUsablePage(Pages[i])) { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); + /* Is this an attempt to map KUSER_SHARED_DATA? */ + if ((Address == (PVOID)0x7FFE0000) && (PageCount == 1) && (Pages[0] == 2)) + { + // allow + } + else + { + DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); + } } } Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=28852… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Tue Sep 4 22:19:59 2007 @@ -192,17 +192,6 @@ { CPRINT("Page fault at high IRQL was %d, address %x\n", KeGetCurrentIrql(), Address); return(STATUS_UNSUCCESSFUL); - } - if (PsGetCurrentProcess() == NULL) - { - /* Allow this! It lets us page alloc much earlier! It won't be needed - * after my init patch anyways - */ - DPRINT("No current process\n"); - if (Address < (ULONG_PTR)MmSystemRangeStart) - { - return(STATUS_ACCESS_VIOLATION); - } } /* Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Tue Sep 4 22:19:59 2007 @@ -77,10 +77,8 @@ { PVOID BaseAddress; ULONG Length; - //ULONG ParamLength = KernelLength; NTSTATUS Status; PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Pfn; PMEMORY_AREA MArea; DPRINT("MmInitVirtualMemory(%x, %x)\n",LastKernelAddress, KernelLength); @@ -112,7 +110,7 @@ */ MiInitPageDirectoryMap(); - BaseAddress = (PVOID)KPCR_BASE; + BaseAddress = (PVOID)KIP0PCRADDRESS; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, @@ -158,91 +156,6 @@ 0, BoundaryAddressMultiple); -#if 0 - DPRINT1("LD Vars: %lx %lx %lx %lx %lx %lx. Last: %lx\n", - &_image_base__, - &_text_start__, - &_text_end__, - &_init_start__, - &_init_end__, - &_bss_end__, - LastKernelAddress); - BaseAddress = (PVOID)&_image_base__; - DPRINT1("Non-LD Vars: %lx %lx %lx %lx %lx %lx. Last: %lx\n", - 0, - 0, - 0, - 0, - 0, - 0, - LastKernelAddress); - Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - (ULONG_PTR)&_image_base__; - ParamLength = ParamLength - Length; - - /* - * No need to lock the address space at this point since no - * other threads are running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ASSERT(BaseAddress == (PVOID)&_init_start__); - Length = PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ParamLength = ParamLength - Length; - - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - Length = PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - ParamLength = ParamLength - Length; - DPRINT("Length %x\n",Length); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - DPRINT("BaseAddress %x\n",BaseAddress); - - /* - * No need to lock the address space at this point since we are - * the only thread running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)); - Length = LastKernelAddress - (ULONG_PTR)BaseAddress; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); -#endif - BaseAddress = MiNonPagedPoolStart; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, @@ -281,18 +194,7 @@ TRUE, 0, BoundaryAddressMultiple); - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pfn); - MmSharedDataPagePhysicalAddress.QuadPart = Pfn << PAGE_SHIFT; - Status = MmCreateVirtualMapping(NULL, - (PVOID)KI_USER_SHARED_DATA, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } + MmSharedDataPagePhysicalAddress.QuadPart = 2 << PAGE_SHIFT; RtlZeroMemory(BaseAddress, Length); /* Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Tue Sep 4 22:19:59 2007 @@ -67,7 +67,7 @@ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ - Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; /* Set the OBJECT_CREATE_INFORMATION List */ Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCiLookasideList.L;

1 0

[cfinck] 28851: Silence two warnings in cmlib. This makes the livecd part compiling warning-free on 32-bit systems. On 64-bit hosts, we still need to squash out this __cdecl warning.
by cfinck＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cfinck Date: Tue Sep 4 20:05:44 2007 New Revision: 28851 URL: http://svn.reactos.org/svn/reactos?rev=28851&view=rev Log: Silence two warnings in cmlib. This makes the livecd part compiling warning-free on 32-bit systems. On 64-bit hosts, we still need to squash out this __cdecl warning. Modified: trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Tue Sep 4 20:05:44 2007 @@ -156,8 +156,8 @@ if (ChunkSize < sizeof(HBASE_BLOCK) || !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) { - DPRINT1("Registry is corrupt: ChunkSize %d < sizeof(HBASE_BLOCK) %d, " - "or HvpVerifyHiveHeader() failed\n", ChunkSize, sizeof(HBASE_BLOCK)); + DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " + "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); return STATUS_REGISTRY_CORRUPT; }

1 0

[jimtabor] 28850: Moved code. Finding out when changing ownership, it will require the deallocation and allocation of old and new dcattr.
by jimtabor＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: jimtabor Date: Tue Sep 4 19:59:21 2007 New Revision: 28850 URL: http://svn.reactos.org/svn/reactos?rev=28850&view=rev Log: Moved code. Finding out when changing ownership, it will require the deallocation and allocation of old and new dcattr. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Sep 4 19:59:21 2007 @@ -144,8 +144,9 @@ HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); -VOID FASTCALL DC_FreeDC(HDC DCToFree); -VOID FASTCALL DC_FreeDcAttr(HDC); +VOID FASTCALL DC_FreeDC(HDC); +VOID FASTCALL DC_AllocateDcAttr(HDC, PEPROCESS); +VOID FASTCALL DC_FreeDcAttr(HDC, PEPROCESS); BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody); HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Sep 4 19:59:21 2007 @@ -1304,55 +1304,55 @@ /* FIXME - newdc can be NULL!!!! Don't assert here!!! */ ASSERT( newdc ); - newdc->w.flags = dc->w.flags | DC_SAVED; - newdc->Dc_Attr.hpen = dc->Dc_Attr.hpen; - newdc->Dc_Attr.hbrush = dc->Dc_Attr.hbrush; - newdc->Dc_Attr.hlfntNew = dc->Dc_Attr.hlfntNew; - newdc->w.hBitmap = dc->w.hBitmap; - newdc->w.hFirstBitmap = dc->w.hFirstBitmap; + newdc->w.flags = dc->w.flags | DC_SAVED; + newdc->Dc_Attr.hpen = dc->Dc_Attr.hpen; + newdc->Dc_Attr.hbrush = dc->Dc_Attr.hbrush; + newdc->Dc_Attr.hlfntNew = dc->Dc_Attr.hlfntNew; + newdc->w.hBitmap = dc->w.hBitmap; + newdc->w.hFirstBitmap = dc->w.hFirstBitmap; #if 0 - newdc->w.hDevice = dc->w.hDevice; + newdc->w.hDevice = dc->w.hDevice; #endif - newdc->PalIndexed = dc->PalIndexed; - newdc->w.hPalette = dc->w.hPalette; - newdc->w.totalExtent = dc->w.totalExtent; - newdc->w.bitsPerPixel = dc->w.bitsPerPixel; - newdc->Dc_Attr.jROP2 = dc->Dc_Attr.jROP2; - newdc->Dc_Attr.jFillMode = dc->Dc_Attr.jFillMode; + newdc->PalIndexed = dc->PalIndexed; + newdc->w.hPalette = dc->w.hPalette; + newdc->w.totalExtent = dc->w.totalExtent; + newdc->w.bitsPerPixel = dc->w.bitsPerPixel; + newdc->Dc_Attr.jROP2 = dc->Dc_Attr.jROP2; + newdc->Dc_Attr.jFillMode = dc->Dc_Attr.jFillMode; newdc->Dc_Attr.jStretchBltMode = dc->Dc_Attr.jStretchBltMode; - newdc->Dc_Attr.lRelAbs = dc->Dc_Attr.lRelAbs; - newdc->Dc_Attr.jBkMode = dc->Dc_Attr.jBkMode; - newdc->Dc_Attr.crBackgroundClr = dc->Dc_Attr.crBackgroundClr; - newdc->Dc_Attr.crForegroundClr = dc->Dc_Attr.crForegroundClr; - newdc->Dc_Attr.ptlBrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x; - newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; + newdc->Dc_Attr.lRelAbs = dc->Dc_Attr.lRelAbs; + newdc->Dc_Attr.jBkMode = dc->Dc_Attr.jBkMode; + newdc->Dc_Attr.crBackgroundClr = dc->Dc_Attr.crBackgroundClr; + newdc->Dc_Attr.crForegroundClr = dc->Dc_Attr.crForegroundClr; + newdc->Dc_Attr.ptlBrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x; + newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign; newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra; - newdc->Dc_Attr.cBreak = dc->Dc_Attr.cBreak; + newdc->Dc_Attr.cBreak = dc->Dc_Attr.cBreak; newdc->Dc_Attr.lBreakExtra = dc->Dc_Attr.lBreakExtra; newdc->Dc_Attr.iMapMode = dc->Dc_Attr.iMapMode; newdc->Dc_Attr.iGraphicsMode = dc->Dc_Attr.iGraphicsMode; #if 0 /* Apparently, the DC origin is not changed by [GS]etDCState */ - newdc->w.DCOrgX = dc->w.DCOrgX; - newdc->w.DCOrgY = dc->w.DCOrgY; + newdc->w.DCOrgX = dc->w.DCOrgX; + newdc->w.DCOrgY = dc->w.DCOrgY; #endif - newdc->Dc_Attr.ptlCurrent.x = dc->Dc_Attr.ptlCurrent.x; - newdc->Dc_Attr.ptlCurrent.y = dc->Dc_Attr.ptlCurrent.y; - newdc->w.ArcDirection = dc->w.ArcDirection; - newdc->w.xformWorld2Wnd = dc->w.xformWorld2Wnd; - newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; - newdc->w.xformVport2World = dc->w.xformVport2World; - newdc->w.vport2WorldValid = dc->w.vport2WorldValid; + newdc->Dc_Attr.ptlCurrent.x = dc->Dc_Attr.ptlCurrent.x; + newdc->Dc_Attr.ptlCurrent.y = dc->Dc_Attr.ptlCurrent.y; + newdc->w.ArcDirection = dc->w.ArcDirection; + newdc->w.xformWorld2Wnd = dc->w.xformWorld2Wnd; + newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; + newdc->w.xformVport2World = dc->w.xformVport2World; + newdc->w.vport2WorldValid = dc->w.vport2WorldValid; DCU_UpdateUserXForms(newdc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); - newdc->Dc_Attr.ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; - newdc->Dc_Attr.ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; - newdc->Dc_Attr.szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; - newdc->Dc_Attr.szlWindowExt.cy = dc->Dc_Attr.szlWindowExt.cy; - newdc->Dc_Attr.ptlViewportOrg.x = dc->Dc_Attr.ptlViewportOrg.x; - newdc->Dc_Attr.ptlViewportOrg.y = dc->Dc_Attr.ptlViewportOrg.y; - newdc->Dc_Attr.szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; - newdc->Dc_Attr.szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; + newdc->Dc_Attr.ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; + newdc->Dc_Attr.ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; + newdc->Dc_Attr.szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; + newdc->Dc_Attr.szlWindowExt.cy = dc->Dc_Attr.szlWindowExt.cy; + newdc->Dc_Attr.ptlViewportOrg.x = dc->Dc_Attr.ptlViewportOrg.x; + newdc->Dc_Attr.ptlViewportOrg.y = dc->Dc_Attr.ptlViewportOrg.y; + newdc->Dc_Attr.szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; + newdc->Dc_Attr.szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; newdc->hSelf = hnewdc; newdc->saveLevel = 0; @@ -1391,53 +1391,53 @@ { if ( dcs->w.flags & DC_SAVED ) { - dc->w.flags = dcs->w.flags & ~DC_SAVED; - - dc->w.hFirstBitmap = dcs->w.hFirstBitmap; + dc->w.flags = dcs->w.flags & ~DC_SAVED; + + dc->w.hFirstBitmap = dcs->w.hFirstBitmap; #if 0 - dc->w.hDevice = dcs->w.hDevice; + dc->w.hDevice = dcs->w.hDevice; #endif - dc->w.totalExtent = dcs->w.totalExtent; - dc->Dc_Attr.jROP2 = dcs->Dc_Attr.jROP2; - dc->Dc_Attr.jFillMode = dcs->Dc_Attr.jFillMode; + dc->w.totalExtent = dcs->w.totalExtent; + dc->Dc_Attr.jROP2 = dcs->Dc_Attr.jROP2; + dc->Dc_Attr.jFillMode = dcs->Dc_Attr.jFillMode; dc->Dc_Attr.jStretchBltMode = dcs->Dc_Attr.jStretchBltMode; - dc->Dc_Attr.lRelAbs = dcs->Dc_Attr.lRelAbs; - dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; - dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; - dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; - dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x; - dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; + dc->Dc_Attr.lRelAbs = dcs->Dc_Attr.lRelAbs; + dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; + dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; + dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; + dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x; + dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; - dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; + dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; dc->Dc_Attr.lBreakExtra = dcs->Dc_Attr.lBreakExtra; dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; #if 0 /* Apparently, the DC origin is not changed by [GS]etDCState */ - dc->w.DCOrgX = dcs->w.DCOrgX; - dc->w.DCOrgY = dcs->w.DCOrgY; + dc->w.DCOrgX = dcs->w.DCOrgX; + dc->w.DCOrgY = dcs->w.DCOrgY; #endif - dc->Dc_Attr.ptlCurrent.x = dcs->Dc_Attr.ptlCurrent.x; - dc->Dc_Attr.ptlCurrent.y = dcs->Dc_Attr.ptlCurrent.y; - dc->w.ArcDirection = dcs->w.ArcDirection; - - dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; - dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; - dc->w.xformVport2World = dcs->w.xformVport2World; - dc->w.vport2WorldValid = dcs->w.vport2WorldValid; + dc->Dc_Attr.ptlCurrent.x = dcs->Dc_Attr.ptlCurrent.x; + dc->Dc_Attr.ptlCurrent.y = dcs->Dc_Attr.ptlCurrent.y; + dc->w.ArcDirection = dcs->w.ArcDirection; + + dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; + dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; + dc->w.xformVport2World = dcs->w.xformVport2World; + dc->w.vport2WorldValid = dcs->w.vport2WorldValid; DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); - dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; - dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; - dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; - dc->Dc_Attr.szlWindowExt.cy = dcs->Dc_Attr.szlWindowExt.cy; - dc->Dc_Attr.ptlViewportOrg.x = dcs->Dc_Attr.ptlViewportOrg.x; - dc->Dc_Attr.ptlViewportOrg.y = dcs->Dc_Attr.ptlViewportOrg.y; - dc->Dc_Attr.szlViewportExt.cx = dcs->Dc_Attr.szlViewportExt.cx; - dc->Dc_Attr.szlViewportExt.cy = dcs->Dc_Attr.szlViewportExt.cy; - dc->PalIndexed = dcs->PalIndexed; + dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; + dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; + dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; + dc->Dc_Attr.szlWindowExt.cy = dcs->Dc_Attr.szlWindowExt.cy; + dc->Dc_Attr.ptlViewportOrg.x = dcs->Dc_Attr.ptlViewportOrg.x; + dc->Dc_Attr.ptlViewportOrg.y = dcs->Dc_Attr.ptlViewportOrg.y; + dc->Dc_Attr.szlViewportExt.cx = dcs->Dc_Attr.szlViewportExt.cx; + dc->Dc_Attr.szlViewportExt.cy = dcs->Dc_Attr.szlViewportExt.cy; + dc->PalIndexed = dcs->PalIndexed; if (!(dc->w.flags & DC_MEMORY)) { @@ -1952,6 +1952,7 @@ if (!PATH_AssignGdiPath (&dcs->w.path, &dc->w.path)) { NtGdiDeleteObjectApp (hdcs); + return 0; } #endif @@ -2367,41 +2368,11 @@ } return NULL; } -//#if 0 - PVOID NewMem = NULL; - ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE it will allocate that size - NTSTATUS Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &NewMem, - 0, - &MemSize, - MEM_COMMIT|MEM_RESERVE, - PAGE_READWRITE); - KeEnterCriticalRegion(); - { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - - if (NT_SUCCESS(Status)) - { - RtlZeroMemory(NewMem, MemSize); - Entry->UserData = NewMem; - DPRINT("DC_ATTR allocated! 0x%x\n",NewMem); - } - else - { - DPRINT("DC_ATTR not allocated!\n"); - } - } - KeLeaveCriticalRegion(); -//#endif + + DC_AllocateDcAttr(hDC, NULL); + NewDC = DC_LockDc(hDC); /* FIXME - Handle NewDC == NULL! */ -//#if 0 - if(NewMem) - { - NewDC->pDc_Attr = NewMem; // Store pointer - } -//#endif if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); @@ -2481,8 +2452,57 @@ VOID FASTCALL -DC_FreeDcAttr(HDC DCToFree) -{ +DC_AllocateDcAttr(HDC hDC, PEPROCESS Owner) +{ +//#if 0 + PVOID NewMem = NULL; + HANDLE Pid = NtCurrentProcess(); + ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE it will allocate that size + + if(Owner) Pid = PsGetProcessId(Owner); + NTSTATUS Status = ZwAllocateVirtualMemory(Pid, + &NewMem, + 0, + &MemSize, + MEM_COMMIT|MEM_RESERVE, + PAGE_READWRITE); + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + + if (NT_SUCCESS(Status)) + { + RtlZeroMemory(NewMem, MemSize); + Entry->UserData = NewMem; + DPRINT("DC_ATTR allocated! 0x%x\n",NewMem); + } + else + { + DPRINT("DC_ATTR not allocated!\n"); + } + } + KeLeaveCriticalRegion(); + PDC pDC = DC_LockDc(hDC); + if(NewMem) + { + pDC->pDc_Attr = NewMem; // Store pointer + } + DC_UnlockDc(pDC); +//#endif +} + +VOID +FASTCALL +DC_FreeDcAttr(HDC DCToFree, PEPROCESS Owner) +{ + HANDLE Pid = NtCurrentProcess(); + PDC pDC = DC_LockDc(DCToFree); + if (pDC->pDc_Attr == &pDC->Dc_Attr) return; // Internal DC object! + pDC->pDc_Attr = NULL; + DC_UnlockDc(pDC); + if(Owner) Pid = PsGetProcessId(Owner); + KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); @@ -2490,10 +2510,10 @@ if(Entry->UserData) { ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE; - NTSTATUS Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &Entry->UserData, - &MemSize, - MEM_DECOMMIT); + NTSTATUS Status = ZwFreeVirtualMemory(Pid, + &Entry->UserData, + &MemSize, + MEM_DECOMMIT); if (NT_SUCCESS(Status)) { DPRINT("DC_FreeDC DC_ATTR 0x%x\n", Entry->UserData); @@ -2508,7 +2528,7 @@ DC_FreeDC(HDC DCToFree) { //#if 0 - DC_FreeDcAttr(DCToFree); + DC_FreeDcAttr(DCToFree, NULL); //#endif if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) { @@ -2587,6 +2607,7 @@ { PDC DC; +// DC_FreeDcAttr(hDC, NULL); GDIOBJ_SetOwnership(GdiHandleTable, hDC, Owner); DC = DC_LockDc(hDC); if (NULL != DC) @@ -2605,6 +2626,7 @@ } DC_UnlockDc(DC); } +// DC_AllocateDcAttr(hDC, Owner); } BOOL FASTCALL

1 0

[cwittich] 28849: forgot to commit this file
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 18:50:11 2007 New Revision: 28849 URL: http://svn.reactos.org/svn/reactos?rev=28849&view=rev Log: forgot to commit this file Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Tue Sep 4 18:50:11 2007 @@ -1,4 +1,7 @@ <group> +<directory name="dbgprint"> + <xi:include href="dbgprint/dbgprint.rbuild" /> +</directory> <directory name="find"> <xi:include href="find/find.rbuild" /> </directory>

1 0

[cwittich] 28848: changed path to dbgprint.exe
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 18:47:47 2007 New Revision: 28848 URL: http://svn.reactos.org/svn/reactos?rev=28848&view=rev Log: changed path to dbgprint.exe Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Tue Sep 4 18:47:47 2007 @@ -2197,7 +2197,7 @@ szPath[length] = '\\'; length++; } - strcpy(&szPath[length], "bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); + strcpy(&szPath[length], "system32\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); fwrite(szPath, 1, strlen(szPath) + 1, file); strcpy(&szPath[length], "system32\\shutdown.exe -s"); fwrite(szPath, 1, strlen(szPath) + 1, file);

1 0

[dreimer] 28847: Bug 2528: Few updates to Italian rc files (devotip@tiscali.it) except access.cpl, which was not diffed to HEAD.
by dreimer＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: dreimer Date: Tue Sep 4 18:41:22 2007 New Revision: 28847 URL: http://svn.reactos.org/svn/reactos?rev=28847&view=rev Log: Bug 2528: Few updates to Italian rc files (devotip(a)tiscali.it) except access.cpl, which was not diffed to HEAD. Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -15,7 +15,7 @@ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "Options" +CAPTION "Opzioni" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Carte", -1, 7, 7, 65, 40 @@ -30,7 +30,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Scegli il retro delle carte" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -39,7 +39,7 @@ CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + PUSHBUTTON "Annulla", IDCANCEL, 162, 77, 54, 13 END @@ -50,7 +50,7 @@ IDS_SOL_NAME "Solitario" IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0." IDS_SOL_QUIT "Chiudere la partita in corso?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_WIN "Congratulazioni, hai vinto!!" END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -21,27 +21,27 @@ IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Salva schermo" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Salva schermo",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "&Impostazioni",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Anteprima",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Attesa",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", + LTEXT "minuti", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Chiedere la &password al ripristino.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + GROUPBOX "&Funzioni di risparmio energetico del monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Per regolare le impostazioni premere Alimentazione.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Alim&entazione...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,46 +51,46 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Schema dei colori", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Avanzato", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Advanced Appearance" +CAPTION "Avanzato" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element:", 8, 5, 160, 50, 9 + LTEXT "Elemento:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Dimensione", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "&Primo colore:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "&Secondo colore:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Carattere:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Dimensione del carattere:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "Colore:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP - AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "G", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -150,36 +150,36 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Finestra non attiva" + IDS_ACTWIN "Finestra attiva" + IDS_WINTEXT "Finestra di testo" + IDS_MESSBOX "Messaggi" + IDS_MESSTEXT "Testo dei messaggi" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_2 "Titolo di una finestra non attiva" + IDS_ELEMENT_3 "Bordo di una finestra non attiva" + IDS_ELEMENT_4 "Titolo di una finestra attiva" + IDS_ELEMENT_5 "Bordo di una finestra non attiva" IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_7 "Elementi evidenziati" + IDS_ELEMENT_8 "Finestre" + IDS_ELEMENT_9 "Barre di scorrimento" + IDS_ELEMENT_10 "Oggetti 3d" + IDS_ELEMENT_11 "Titolo della palette" + IDS_ELEMENT_12 "Titolo dei simboli" + IDS_ELEMENT_13 "Barra del titolo" + IDS_ELEMENT_14 "Elementi dei menu disattivati" + IDS_ELEMENT_15 "Dialogo" + IDS_ELEMENT_16 "Controlli della barra di scorrimento" + IDS_ELEMENT_17 "Sfondo della applicazione" + IDS_ELEMENT_18 "Barra del titolo piccola" + IDS_ELEMENT_19 "Distanza tr i simboli (orizzontale)" + IDS_ELEMENT_20 "Distanza tr i simboli (verticale)" + IDS_ELEMENT_21 "Informazioni rapide" + IDS_ELEMENT_22 "Simbolo" END Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -164,10 +164,10 @@ IDS_HAND "Seleziona collegamento" IDS_NONE "(Nessuna)" IDS_SYSTEM_SCHEME "(Schema di sistema)" - IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" - IDS_BROWSE_TITLE "Browse" - IDS_REMOVE_TITLE "Confirm Scheme Removal" - IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" - IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" - IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" + IDS_BROWSE_FILTER "Cursori (*.ani, *.cur)\0*.ani;*.cur\0Cursori animati (*.ani)\0*.ani\0Cursor statici (*.cur)\0*.cur\0Tutti i file\0*.*\0\0" + IDS_BROWSE_TITLE "Sfoglia" + IDS_REMOVE_TITLE "Conferma la rimozione dello schema" + IDS_REMOVE_TEXT "Confermate di voler rimuovere lo schema dei cursori '%s'?" + IDS_OVERWRITE_TITLE "Sovrascrittura dello schema dei cursori" + IDS_OVERWRITE_TEXT "Il nome dello schema dei cursori è già in uso. Confermate di voler sovrascrivere lo schema dei cursori?" END Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc Tue Sep 4 18:41:22 2007 @@ -33,12 +33,12 @@ PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 - LTEXT "&Pogram events:",-1,8,118,150,17 + LTEXT "&Program events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE LTEXT "&Sounds:",-1,8,194,80,17 COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + PUSHBUTTON "&Browse...", -1, 188,205,50,15 END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -103,3 +103,4 @@ END + Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -7,38 +7,38 @@ BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",-1,40,10,194,36 - GROUPBOX "Device volume", -1, 7,30,230,100 + GROUPBOX "Volume del dispositivo", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 - LTEXT "Low",-1,62,66,30,17 - LTEXT "High",-1,195,66,30,17 + LTEXT "Basso",-1,62,66,30,17 + LTEXT "Alto",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 - PUSHBUTTON "Ad&vanced...", -1, 150,105,75,15 - GROUPBOX "Speaker settings", -1, 7,140,230,80 + CHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + PUSHBUTTON "&Avanzate...", -1, 150,105,75,15 + GROUPBOX "Impostazione altoparlanti", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 - LTEXT "Use the settings below to change individual speaker volume and other settings.",-1,70,155,150,36 - PUSHBUTTON "&Speaker Volume...", -1, 70,195,75,15 - PUSHBUTTON "A&dvanced...", -1, 150,195,75,15 + LTEXT "Usare le impostazioni seguenti per modificare per i singoli altoparlanti il volume ed altre impostazioni.",-1,70,155,150,36 + PUSHBUTTON "Volume...", -1, 70,195,75,15 + PUSHBUTTON "A&vanzate...", -1, 150,195,75,15 END IDD_SOUNDS DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sounds" +CAPTION "Suoni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 - LTEXT "Sound s&cheme:",-1,8,42,150,17 + LTEXT "Uno schema dei suoni è un insieme di suoni legati agli eventi in Reactos e nei programmi. Potete selezionare uno schema esistente o salvarne uno che avete modificato.",-1,8,7,230,40 + LTEXT "S&chema dei suoni:",-1,8,42,150,17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST - PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 - PUSHBUTTON "&Delete", -1, 188,70,50,15 - LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 - LTEXT "&Pogram events:",-1,8,118,150,17 + PUSHBUTTON "&Salva come...", -1, 134,70,50,15 + PUSHBUTTON "&Cancella", -1, 188,70,50,15 + LTEXT "Per cambiare i suoni, cliccare un evento nella lista seguente e poi scegliere il suono da usare. Potete salvare le modifiche in un nuovo schema di suoni.",-1,8,90,230,40 + LTEXT "&Eventi:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 + LTEXT "&Suoni:",-1,8,194,80,17 COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + PUSHBUTTON "&Sfoglia...", -1, 188,205,50,15 END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -46,45 +46,45 @@ CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7,7,230,60 + GROUPBOX "Riproduzione suoni", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Default device:",-1,50,20,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,20,80,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", -1, 85,47,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,47,70,15 - GROUPBOX "Sound recording", -1, 7,75,230,60 + PUSHBUTTON "Ava&zate...", -1, 160,47,70,15 + GROUPBOX "Registrazione dei suoni", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&efault device:",-1,50,88,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,88,80,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", -1, 85,115,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,115,70,15 - GROUPBOX "MIDI music playback", -1, 7,145,230,60 + PUSHBUTTON "Avaza&te...", -1, 160,115,70,15 + GROUPBOX "Riproduzione musica MIDI", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 - LTEXT "De&fault device:",-1,50,158,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,158,80,17 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Volu&me...", -1, 85,185,70,15 - PUSHBUTTON "A&bout...", -1, 160,185,70,15 - CHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + PUSHBUTTON "Informazioni su...", -1, 160,185,70,15 + CHECKBOX "&Usa solo dispositivi preimpostati", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 END IDD_VOICE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Voice" +CAPTION "Voce" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.",-1,8,7,230,40 - GROUPBOX "Voice playback", -1, 7,37,230,60 + LTEXT "Queste impostazioni controllano il volume e le impostazioni avanzate della riproduzione e della registrazione vocale per il dispositivo selezionato.",-1,8,7,230,40 + GROUPBOX "Riproduzione vocale", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "&Default device:",-1,50,50,80,17 + LTEXT "D&ispositivo preimpostato:",-1,50,50,80,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", -1, 85,77,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,77,70,15 - GROUPBOX "Voice recording", -1, 7,105,230,60 + PUSHBUTTON "&Avanzate...", -1, 160,77,70,15 + GROUPBOX "Registrazione vocale", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "D&efault device:",-1,50,118,80,17 + LTEXT "&Dispositivo preimpostato:",-1,50,118,80,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", -1, 85,145,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,145,70,15 + PUSHBUTTON "Ava&nzate...", -1, 160,145,70,15 PUSHBUTTON "&Test hardware...", -1, 160,175,70,15 END @@ -102,3 +102,4 @@ END + Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -167,10 +167,10 @@ IDS_TIMEOUT8 "Dopo 25 minuti" IDS_TIMEOUT9 "Dopo 30 minuti" IDS_TIMEOUT10 "Dopo 45 minuti" - IDS_TIMEOUT11 "Dopo 1 hour" - IDS_TIMEOUT12 "Dopo 2 hours" - IDS_TIMEOUT13 "Dopo 3 hours" - IDS_TIMEOUT14 "Dopo 4 hours" - IDS_TIMEOUT15 "Dopo 5 hours" + IDS_TIMEOUT11 "Dopo 1 ora" + IDS_TIMEOUT12 "Dopo 2 ore" + IDS_TIMEOUT13 "Dopo 3 ore" + IDS_TIMEOUT14 "Dopo 4 ore" + IDS_TIMEOUT15 "Dopo 5 ore" IDS_TIMEOUT16 "Mai" END Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/it-IT.rc Tue Sep 4 18:41:22 2007 @@ -20,7 +20,7 @@ IDC_STATIC,120,21,195,16 LTEXT "Selezionare Successivo per continuare.",IDC_STATIC,120,169,195,17 LTEXT "DISPOSITIVO SCONOSCIUTO",IDC_DEVICE,134,36,164,11 - LTEXT "ATTENZIONE! INSTALLARE UN DISPOSITIVO PERSONALIZZATO PUÒ BLOCCARE IL COMPUTER O IMPEDIRNE L'AVVIO!",IDC_STATIC,120,59,195,16 + LTEXT "ATTENZIONE! INSTALLARE UN DISPOSITIVO PERSONALIZZATO PUÒ BLOCCARE IL COMPUTER O IMPEDIRNE L'AVVIO!",IDC_STATIC,120,59,195,24 CONTROL "Installa il driver automaticamente",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Installa il driver da una posizione specifica",IDC_RADIO_MANUAL, @@ -36,7 +36,7 @@ LTEXT "L'installazione è fallita",IDC_FINISHTITLE,120,8,195,24 LTEXT "Impossibile installare il dispositivo perché il driver non è stato trovato.", IDC_STATIC,120,40,195,19 - LTEXT "Selezionare Indietro se si ha un disco di driver o si conosce il percorso per trovare il driver.", + LTEXT "Selezionare Indietro se si ha un disco con il driver o si conosce il percorso dove trovarlo.", IDC_STATIC,120,98,181,24 CONTROL "Non mostrare più questo dialogo",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 @@ -63,7 +63,7 @@ BS_AUTORADIOBUTTON,27,11,239,13 CONTROL "Scegli il driver manualmente",IDC_RADIO_CHOOSE,"Button", BS_AUTORADIOBUTTON,27,98,171,12 - CONTROL "Cerca in supporti rimuovibili",IDC_CHECK_MEDIA,"Button", + CONTROL "Cerca nei supporti rimuovibili",IDC_CHECK_MEDIA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 CONTROL "Includi questo percorso",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,54,162,10 @@ -116,3 +116,5 @@ LTEXT "DISPOSITIVO SCONOSCIUTO",IDC_DEVICE,148,53,147,12 END + +

1 0

[cwittich] 28846: add dbgprint to bootcd until a better solution is found
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 18:39:53 2007 New Revision: 28846 URL: http://svn.reactos.org/svn/reactos?rev=28846&view=rev Log: add dbgprint to bootcd until a better solution is found Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Sep 4 18:39:53 2007 @@ -33,6 +33,7 @@ base\applications\cacls\cacls.exe 1 base\applications\calc\calc.exe 1 base\applications\charmap\charmap.exe 1 +base\applications\cmdutils\dbgprint\dbgprint.exe 1 base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\control\control.exe 1

1 0

[cwittich] 28845: re-add dbgprint - now as win32 module
by cwittich＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cwittich Date: Tue Sep 4 18:28:29 2007 New Revision: 28845 URL: http://svn.reactos.org/svn/reactos?rev=28845&view=rev Log: re-add dbgprint - now as win32 module Added: trunk/reactos/base/applications/cmdutils/dbgprint/ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c (with props) trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild Added: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c (added) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Tue Sep 4 18:28:29 2007 @@ -1,0 +1,58 @@ +/* $Id: dbgprint.c 24720 2006-11-11 16:07:35Z janderwald $ + * + * PROJECT: ReactOS DbgPrint Utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/dbgprint/dbgprint.c + * PURPOSE: outputs a text via DbgPrint API + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include <windows.h> +#include <tchar.h> +#include <debug.h> + +int _tmain(int argc, TCHAR ** argv) +{ + TCHAR * buf; + int bufsize; + int i; + int offset; + + bufsize = 0; + for(i = 1; i < argc; i++) + { + bufsize += _tcslen(argv[i]) + 1; + } + + if (!bufsize) + { + return -1; + } + + buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); + if (!buf) + { + return -1; + } + + offset = 0; + for(i = 1; i < argc; i++) + { + int length = _tcslen(argv[i]); + _tcsncpy(&buf[offset], argv[i], length); + offset += length; + if (i + 1 < argc) + { + buf[offset] = _T(' '); + } + else + { + buf[offset] = _T('\n'); + buf[offset+1] = _T('\0'); + } + offset++; + } + DbgPrint(buf); + HeapFree(GetProcessHeap(), 0, buf); + return 0; +} Propchange: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild Tue Sep 4 18:28:29 2007 @@ -1,0 +1,8 @@ +<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>ntdll</library> + <file>dbgprint.c</file> +</module>

1 0

[cfinck] 28844: Correctly define LONG_PTR, ULONG_PTR and SIZE_T in "typedefs_host.h". This should silence many warnings and might fix the Live-CD build problems of our 64-bit Buildslave.
by cfinck＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: cfinck Date: Tue Sep 4 18:12:27 2007 New Revision: 28844 URL: http://svn.reactos.org/svn/reactos?rev=28844&view=rev Log: Correctly define LONG_PTR, ULONG_PTR and SIZE_T in "typedefs_host.h". This should silence many warnings and might fix the Live-CD build problems of our 64-bit Buildslave. Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Tue Sep 4 18:12:27 2007 @@ -52,7 +52,6 @@ typedef void VOID, *PVOID, *HANDLE; typedef HANDLE HKEY, *PHKEY; -typedef long unsigned int SIZE_T, *PSIZE_T; typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; typedef char CHAR, *PCHAR, *PSTR; typedef const char CCHAR; @@ -65,8 +64,9 @@ typedef unsigned long long ULONGLONG; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; -typedef int W64 LONG_PTR, *PLONG_PTR; -typedef unsigned int W64 ULONG_PTR, *PULONG_PTR; +typedef long int W64 LONG_PTR, *PLONG_PTR; +typedef long unsigned int W64 ULONG_PTR, *PULONG_PTR; +typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef wchar_t WCHAR, *PWCHAR, *PWSTR, *LPWSTR; typedef const wchar_t *PCWSTR, *LPCWSTR; typedef int NTSTATUS; Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c (original) +++ trunk/reactos/tools/mkhive/reginf.c Tue Sep 4 18:12:27 2007 @@ -181,7 +181,7 @@ { CHAR EmptyStr = (CHAR)0; ULONG Type; - SIZE_T Size; + ULONG Size; LONG Error; if (Flags & FLG_ADDREG_DELVAL) /* deletion */

1 0

[janderwald] 28843: - remove dbgprint from tools - dbgprint needs to be win32 application and must be moved
by janderwald＠svn.reactos.org 04 Sep '07

04 Sep '07

Author: janderwald Date: Tue Sep 4 18:05:35 2007 New Revision: 28843 URL: http://svn.reactos.org/svn/reactos?rev=28843&view=rev Log: - remove dbgprint from tools - dbgprint needs to be win32 application and must be moved Removed: trunk/reactos/tools/dbgprint/ Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=28843&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Tue Sep 4 18:05:35 2007 @@ -49,7 +49,6 @@ include tools/buildno/buildno.mak include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak -include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak include tools/ofw_interface/ofw_interface.mak include tools/mkhive/mkhive.mak

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