Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 27153: Do not create a new device node if we already know the PDO
by hpoussin＠svn.reactos.org 12 Jun '07

12 Jun '07

Author: hpoussin Date: Tue Jun 12 12:38:32 2007 New Revision: 27153 URL: http://svn.reactos.org/svn/reactos?rev=27153&view=rev Log: Do not create a new device node if we already know the PDO Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Jun 12 12:38:32 2007 @@ -135,7 +135,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reference driver object, status=0x%08x\n", Status); + DPRINT("Failed to reference driver object, status=0x%08x\n", Status); return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Tue Jun 12 12:38:32 2007 @@ -694,7 +694,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; + DeviceNode = IopGetDeviceNode(DeviceObject); switch (Operation) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Jun 12 12:38:32 2007 @@ -2574,6 +2574,11 @@ */ for (i = 0; i < DeviceRelations->Count; i++) { + if (IopGetDeviceNode(DeviceRelations->Objects[i]) != NULL) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + continue; + } Status = IopCreateDeviceNode( DeviceNode, DeviceRelations->Objects[i],

1 0

[arty] 27152: Working syscall. Should be good for both usermode and kernel mode.
by arty＠svn.reactos.org 12 Jun '07

12 Jun '07

Author: arty Date: Tue Jun 12 12:03:54 2007 New Revision: 27152 URL: http://svn.reactos.org/svn/reactos?rev=27152&view=rev Log: Working syscall. Should be good for both usermode and kernel mode. Modified: branches/powerpc/reactos/lib/rtl/powerpc/debug.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Modified: branches/powerpc/reactos/lib/rtl/powerpc/debug.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/powerpc… ============================================================================== --- branches/powerpc/reactos/lib/rtl/powerpc/debug.c (original) +++ branches/powerpc/reactos/lib/rtl/powerpc/debug.c Tue Jun 12 12:03:54 2007 @@ -15,14 +15,14 @@ (ULONG Service, const void *Buffer, ULONG Length, PVOID Arg1, PVOID Arg2) { NTSTATUS Result; - __asm__("mr 3,%1\n\t" - "mr 4,%2\n\t" - "mr 5,%3\n\t" - "mr 6,%4\n\t" - "mr 7,%5\n\t" - "mr 8,%6\n\t" + __asm__("mr 3,%2\n\t" + "mr 4,%3\n\t" + "mr 5,%4\n\t" + "mr 6,%5\n\t" + "mr 7,%6\n\t" + "mr 8,%1\n\t" "sc\n\t" - "mr %0,3\n\t" : + "mr %0,3\n\t" : "=r" (Result) : "r" (0x10000), "r" (Service), Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c Tue Jun 12 12:03:54 2007 @@ -40,56 +40,14 @@ ".globl syscall_end\n\t" ".globl KiSystemService\n\t" "syscall_start:\n\t" - "mtsprg1 1\n\t" - "lis 1,_kernel_trap_stack_top@ha\n\t" - "addi 1,1,_kernel_trap_stack_top@l\n\t" + "mr 2,1\n\t" + "lis 1,KiSystemService1@ha\n\t" + "addi 1,1,KiSystemService1@l\n\t" + "mfsrr0 0\n\t" + "mtsrr0 1\n\t" + "lis 1,_kernel_trap_stack@ha\n\t" + "addi 1,1,_kernel_trap_stack@l\n\t" "subi 1,1,0x100\n\t" - "stw 0,0(1)\n\t" - "mfsprg1 0\n\t" /* 10 */ - "stw 0,4(1)\n\t" - "stw 2,8(1)\n\t" - "stw 3,12(1)\n\t" - "stw 4,16(1)\n\t" /* 20 */ - "stw 5,20(1)\n\t" - "stw 6,24(1)\n\t" - "stw 7,28(1)\n\t" - "stw 8,32(1)\n\t" /* 30 */ - "stw 9,36(1)\n\t" - "stw 10,40(1)\n\t" - "stw 11,44(1)\n\t" - "stw 12,48(1)\n\t" /* 40 */ - "stw 13,52(1)\n\t" - "stw 14,56(1)\n\t" - "stw 15,60(1)\n\t" - "stw 16,64(1)\n\t" /* 50 */ - "stw 17,68(1)\n\t" - "stw 18,72(1)\n\t" - "stw 19,76(1)\n\t" - "stw 20,80(1)\n\t" /* 60 */ - "stw 21,84(1)\n\t" - "stw 22,88(1)\n\t" - "stw 23,92(1)\n\t" - "stw 24,96(1)\n\t" /* 70 */ - "stw 25,100(1)\n\t" - "stw 26,104(1)\n\t" - "stw 27,108(1)\n\t" - "stw 28,112(1)\n\t" /* 80 */ - "stw 29,116(1)\n\t" - "stw 30,120(1)\n\t" - "stw 31,124(1)\n\t" - "mflr 0\n\t" /* 90 */ - "stw 0,128(1)\n\t" - "mfctr 0\n\t" - "stw 0,132(1)\n\t" - "mfsrr0 0\n\t" /* a0 */ - "stw 0,136(1)\n\t" - "mfsrr1 0\n\t" - "stw 0,140(1)\n\t" - "mfdsisr 0\n\t" /* b0 */ - "stw 0,144(1)\n\t" - "lis 3,KiSystemService@ha\n\t" /* b8 */ - "addi 3,3,KiSystemService@l\n\t" /* bc */ - "mtsrr0 3\n\t" "rfi\n\t" "syscall_end:\n\t" ".space 4"); Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Tue Jun 12 12:03:54 2007 @@ -749,16 +749,93 @@ return Return; } +ULONG +NTAPI +KdpServiceDispatcher(ULONG Service, PCHAR Buffer, ULONG Length); + +__asm__(".globl KiSystemService\n\t" + ".globl KiSystemService1\n\t" + ".globl kiss_proceed\n\t" + ".globl kiss_end\n" + "KiSystemService1:\n\t" + "stw 2,4(1)\n\t" // r1 + "stw 3,12(1)\n\t" + "stw 4,16(1)\n\t" + "stw 5,20(1)\n\t" + "stw 6,24(1)\n\t" + "stw 7,28(1)\n\t" + "stw 8,32(1)\n\t" + "stw 9,36(1)\n\t" + "stw 10,40(1)\n\t" + "stw 11,44(1)\n\t" + "stw 12,48(1)\n\t" + "stw 13,52(1)\n\t" + "stw 14,56(1)\n\t" + "stw 15,60(1)\n\t" + "stw 16,64(1)\n\t" + "stw 17,68(1)\n\t" + "stw 18,72(1)\n\t" + "stw 19,76(1)\n\t" + "stw 20,80(1)\n\t" + "stw 21,84(1)\n\t" + "stw 22,88(1)\n\t" + "stw 23,92(1)\n\t" + "stw 24,96(1)\n\t" + "stw 25,100(1)\n\t" + "stw 26,104(1)\n\t" + "stw 27,108(1)\n\t" + "stw 28,112(1)\n\t" + "stw 29,116(1)\n\t" + "stw 30,120(1)\n\t" + "stw 31,124(1)\n\t" + /* This save is important */ + "stw 0,140(1)\n\t" // srr0 + "mflr 0\n\t" + "stw 0,128(1)\n\t" + "mfctr 0\n\t" + "stw 0,136(1)\n\t" + "mfsrr1 0\n\t" + "stw 0,144(1)\n\t" + "mfdsisr 0\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" + "lis 3,KiSystemService@ha\n\t" + "addi 3,3,KiSystemService@l\n\t" + "mtctr 3\n\t" + "mr 3,1\n\t" + "subi 1,1,0x100\n\t" + "bctrl\n\t" + "addi 1,1,0x100\n\t" + /* Return from kernel */ + "lwz 3,12(1)\n\t" /* Result */ + "lwz 0,128(1)\n\t" + "mtlr 0\n\t" + "lwz 0,140(1)\n\t" + "mtsrr0 0\n\t" + "lwz 0,144(1)\n\t" + "mtsrr1 0\n\t" + "lwz 1,4(1)\n" /* Stack */ + "rfi\n"); + VOID NTAPI -KiSystemService() +KiSystemService(ppc_trap_frame_t *trap_frame) { SetPhysByte(0x800003f8, 'S'); SetPhysByte(0x800003f8, 'C'); SetPhysByte(0x800003f8, '!'); SetPhysByte(0x800003f8, '\r'); SetPhysByte(0x800003f8, '\n'); - while(1); + switch(trap_frame->gpr[8]) + { + case 0x10000: /* DebugService */ + trap_frame->gpr[3] = KdpServiceDispatcher + (trap_frame->gpr[3], + (PCHAR)trap_frame->gpr[4], + trap_frame->gpr[5]); + break; + } } /* EOF */

1 0

[fireball] 27151: Massive changes to the driver loading / device creation logic (as a result of collaborative work with Herve): - Really reuse the driver's object, instead of always failing in "IopGetDriverObject()". Fix driver's object creation accordingly in NtLoadDriver() and IopActionInitChildServices(). - Move InvalidateRelations to a later stage, when it really should happen (previously it just delayed the boot process but couldn't load any driver since boot device was inaccessible and reu
by fireball＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: fireball Date: Tue Jun 12 02:02:55 2007 New Revision: 27151 URL: http://svn.reactos.org/svn/reactos?rev=27151&view=rev Log: Massive changes to the driver loading / device creation logic (as a result of collaborative work with Herve): - Really reuse the driver's object, instead of always failing in "IopGetDriverObject()". Fix driver's object creation accordingly in NtLoadDriver() and IopActionInitChildServices(). - Move InvalidateRelations to a later stage, when it really should happen (previously it just delayed the boot process but couldn't load any driver since boot device was inaccessible and reusing drivers loaded by the bootloader was not possible). - Minor bugfixes in various places related to these changes. - Add DPRINTs for easier debugging and failure tracking (silent failure is the worst enemy of a developer). Results: - VMWare video driver regression is gone. - "New device found" wizard appears in the 3rd stage like in "old good times". - Network drivers hang somewhere, so a hack is added to temporarily disable installation of pcnet.sys. Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Tue Jun 12 02:02:55 2007 @@ -18,7 +18,7 @@ %AMDMfg% = AMDMfg [AMDMfg] -%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 +;%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 ;----------------------------- PCNET DRIVER ----------------------------- Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Jun 12 02:02:55 2007 @@ -125,7 +125,7 @@ /* Open driver object */ Status = ObReferenceObjectByName( &DriverName, - OBJ_OPENIF | OBJ_KERNEL_HANDLE, /* Attributes */ + OBJ_OPENIF | OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, /* Attributes */ NULL, /* PassedAccessState */ 0, /* DesiredAccess */ IoDriverObjectType, @@ -134,9 +134,14 @@ (PVOID*)&Object); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference driver object, status=0x%08x\n", Status); return Status; + } *DriverObject = Object; + + DPRINT("Driver Object: %p\n", Object); return STATUS_SUCCESS; } @@ -498,7 +503,10 @@ &ServiceName, FALSE); if (!NT_SUCCESS(Status)) + { + DPRINT1("IopGetDriverObject() returned status 0x%08x!\n", Status); continue; + } } Status = IopInitializeDevice(DeviceNode, DriverObject); @@ -772,6 +780,7 @@ /* * Initialize the driver */ + DeviceNode->Flags |= DN_DRIVER_LOADED; Status = IopInitializeDriverModule(DeviceNode, LdrEntry, &DeviceNode->ServiceName, FALSE, &DriverObject); @@ -813,6 +822,8 @@ LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; UNICODE_STRING DriverName; + + DPRINT("IopInitializeBootDrivers()"); /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); @@ -874,6 +885,7 @@ /* Make sure we didn't load this driver already */ if (!(LdrEntry->Flags & LDRP_ENTRY_INSERTED)) { + DPRINT("Initializing bootdriver %wZ\n", &LdrEntry->BaseDllName); /* Initialize it */ IopInitializeBuiltinDriver(LdrEntry); } @@ -1233,7 +1245,7 @@ DriverObject->DriverSize = SizeOfImage; /* Finally, call its init function */ - DPRINT("RegistryKey: %wZ\n", RegistryKey); + DPRINT("RegistryKey: %wZ\n", RegistryPath); DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); Status = (*InitializationFunction)(DriverObject, RegistryPath); if (!NT_SUCCESS(Status)) @@ -1584,42 +1596,55 @@ goto ReleaseCapturedString; } - /* - * Load the driver module - */ - - Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); + if (!NT_SUCCESS(Status)) { - DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; - } - - /* - * Set a service name for the device node - */ - - RtlCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer); - - /* - * Initialize the driver module - */ - - Status = IopInitializeDriverModule( - DeviceNode, - ModuleObject, - &DeviceNode->ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), - &DriverObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + /* + * Load the driver module + */ + + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) + { + DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); + IopFreeDeviceNode(DeviceNode); + goto ReleaseCapturedString; + } + + /* + * Set a service name for the device node + */ + + RtlCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer); + + /* + * Initialize the driver module if it's loaded for the first time + */ + if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + Status = IopInitializeDriverModule( + DeviceNode, + ModuleObject, + &DeviceNode->ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), + &DriverObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + IopFreeDeviceNode(DeviceNode); + goto ReleaseCapturedString; + } + } } IopInitializeDevice(DeviceNode, DriverObject); 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 Jun 12 02:02:55 2007 @@ -497,19 +497,19 @@ /* Initialize PnP manager */ PnpInit(); + /* Create the group driver list */ + IoCreateDriverList(); + + /* Load boot start drivers */ + IopInitializeBootDrivers(); + + /* Call back drivers that asked for */ + IopReinitializeBootDrivers(); + /* Initialize PnP root relations */ IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> PhysicalDeviceObject, BusRelations); - - /* Create the group driver list */ - IoCreateDriverList(); - - /* Load boot start drivers */ - IopInitializeBootDrivers(); - - /* Call back drivers that asked for */ - IopReinitializeBootDrivers(); /* Create ARC names for boot devices */ IopCreateArcNames(LoaderBlock); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Jun 12 02:02:55 2007 @@ -865,6 +865,7 @@ Status = PnpRootCreateDevice(ServiceName, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { + DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status); ExFreePool(Node); return Status; } @@ -2369,29 +2370,44 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + FALSE); + + if (!NT_SUCCESS(Status)) + { + /* Driver is not initialized, try to load it */ Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { + /* STATUS_IMAGE_ALREADY_LOADED means this driver + was loaded by the bootloader */ if (Status != STATUS_IMAGE_ALREADY_LOADED) { + /* Initialize the driver */ DeviceNode->Flags |= DN_DRIVER_LOADED; Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); } else { - /* get existing DriverObject pointer */ - Status = IopGetDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - FALSE); + Status = STATUS_SUCCESS; } + } + } + + /* Driver is loaded and initialized at this point */ if (NT_SUCCESS(Status)) { /* Attach lower level filter drivers. */ IopAttachFilterDrivers(DeviceNode, TRUE); /* Initialize the function driver for the device node */ Status = IopInitializeDevice(DeviceNode, DriverObject); + if (NT_SUCCESS(Status)) { /* Attach upper level filter drivers. */ @@ -2401,7 +2417,6 @@ Status = IopStartDevice(DeviceNode); } } - } else { /*

1 0

[hpoussin] 27150: Always complete the IRP_MJ_PNP irp, even if we don't recognize the minor function
by hpoussin＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: hpoussin Date: Tue Jun 12 01:26:51 2007 New Revision: 27150 URL: http://svn.reactos.org/svn/reactos?rev=27150&view=rev Log: Always complete the IRP_MJ_PNP irp, even if we don't recognize the minor function Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Tue Jun 12 01:26:51 2007 @@ -483,7 +483,8 @@ break; default: - return Irp->IoStatus.Status; + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); break; }

1 0

[fireball] 27149: - hpoussin: If minor function is not recognized, you must not change the Irp->IoStatus.Status field.
by fireball＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: fireball Date: Tue Jun 12 01:20:25 2007 New Revision: 27149 URL: http://svn.reactos.org/svn/reactos?rev=27149&view=rev Log: - hpoussin: If minor function is not recognized, you must not change the Irp->IoStatus.Status field. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Tue Jun 12 01:20:25 2007 @@ -483,7 +483,7 @@ break; default: - return STATUS_NOT_IMPLEMENTED; + return Irp->IoStatus.Status; break; }

1 0

[tkreuzer] 27148: - use LOGFONTW structure from GetFontResourceInfo for face name - use LF_FULLFACESIZE - some cleanup
by tkreuzer＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: tkreuzer Date: Tue Jun 12 00:38:55 2007 New Revision: 27148 URL: http://svn.reactos.org/svn/reactos?rev=27148&view=rev Log: - use LOGFONTW structure from GetFontResourceInfo for face name - use LF_FULLFACESIZE - some cleanup Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=271… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Tue Jun 12 00:38:55 2007 @@ -35,7 +35,7 @@ typedef struct { int nPageHeight; - WCHAR szTypeFaceName[MAX_TYPEFACENAME]; + WCHAR szTypeFaceName[LF_FULLFACESIZE]; WCHAR szFormat[MAX_FORMAT]; WCHAR szString[MAX_STRING]; @@ -81,9 +81,8 @@ HFONT hOldFont; TEXTMETRIC tm; int i, y; - const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; WCHAR szSize[5]; - WCHAR szCaption[MAX_TYPEFACENAME + 20]; + WCHAR szCaption[LF_FULLFACESIZE + 20]; /* This is the location on the DC where we draw */ y = -nYPos; @@ -132,7 +131,7 @@ GetTextMetrics(hDC, &tm); y += tm.tmHeight + 1; SelectObject(hDC, pData->hSizeFont); - swprintf(szSize, L"%d", nSizes[i]); + swprintf(szSize, L"%d", pData->nSizes[i]); TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize)); } SelectObject(hDC, hOldFont); @@ -152,7 +151,7 @@ /* Set the new type face name */ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, (WCHAR*)lParam); /* Create the new fonts */ hDC = GetDC(hwnd); @@ -217,7 +216,7 @@ Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; - const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + const int nSizes[MAX_SIZES] = {12, 18, 24, 36, 48, 60, 72}; int i; /* Create data structure */ Modified: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=271… ============================================================================== --- trunk/rosapps/fontview/display.h (original) +++ trunk/rosapps/fontview/display.h Tue Jun 12 00:38:55 2007 @@ -7,9 +7,7 @@ /* Size restrictions */ #define MAX_STRING 100 -#define MAX_TYPEFACENAME 32 #define MAX_FORMAT 20 - #define MAX_SIZES 7 extern const WCHAR g_szFontDisplayClassName[]; Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=27… ============================================================================== --- trunk/rosapps/fontview/fontview.c (original) +++ trunk/rosapps/fontview/fontview.c Tue Jun 12 00:38:55 2007 @@ -23,11 +23,13 @@ #include "fontview.h" HINSTANCE g_hInstance; -WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; +WCHAR g_szTypeFaceName[LF_FULLFACESIZE]; +LOGFONTW g_LogFontW; + static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; /* Tye definition for the GetFontResourceInfo function */ -typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPWSTR, DWORD); +typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPVOID, DWORD); DWORD FormatString( @@ -117,6 +119,13 @@ /* Get the font name */ dwSize = sizeof(g_szTypeFaceName); if (!GetFontResourceInfoW(argv[1], &dwSize, g_szTypeFaceName, 1)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + dwSize = sizeof(LOGFONTW); + if (!GetFontResourceInfoW(argv[1], &dwSize, &g_LogFontW, 2)) { ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); return -1; @@ -206,7 +215,7 @@ SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); /* Init the display window with the font name */ - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFontW.lfFaceName); ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */ @@ -303,15 +312,15 @@ } break; - case WM_DESTROY: - PostQuitMessage (0); /* send a WM_QUIT to the message queue */ - break; - - default: /* for messages that we don't deal with */ - return DefWindowProcW(hwnd, message, wParam, lParam); - } - - return 0; + case WM_DESTROY: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + default: /* for messages that we don't deal with */ + return DefWindowProcW(hwnd, message, wParam, lParam); + } + + return 0; } /* EOF */

1 0

[weiden] 27147: Fix syntax error
by weiden＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: weiden Date: Mon Jun 11 22:14:14 2007 New Revision: 27147 URL: http://svn.reactos.org/svn/reactos?rev=27147&view=rev Log: Fix syntax error Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Mon Jun 11 22:14:14 2007 @@ -44,7 +44,7 @@ MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynchroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "Fermer &la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED */ + MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "Libér&er l'ordinateur de la station", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Éteindre...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END

1 0

[fireball] 27146: - Remove a call to TREEVIEW_Update() which causes an infinite loop on ReactOS. Now it should be possible to use treeview controls (such as regedit's left pane) without major problems.
by fireball＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: fireball Date: Mon Jun 11 21:57:07 2007 New Revision: 27146 URL: http://svn.reactos.org/svn/reactos?rev=27146&view=rev Log: - Remove a call to TREEVIEW_Update() which causes an infinite loop on ReactOS. Now it should be possible to use treeview controls (such as regedit's left pane) without major problems. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Jun 11 21:57:07 2007 @@ -137,3 +137,16 @@ return 0; } +Index: treeview.c +=================================================================== +--- treeview.c (revision 27134) ++++ treeview.c (working copy) +@@ -2839,8 +2839,6 @@ + } + } + +- TREEVIEW_UpdateScrollBars(infoPtr); +- + if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) + infoPtr->cdmode = + TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Mon Jun 11 21:57:07 2007 @@ -2839,8 +2839,6 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect);

1 0

[dgorbachev] 27145: Update Polish translation. Bug #2298.
by dgorbachev＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: dgorbachev Date: Mon Jun 11 19:57:16 2007 New Revision: 27145 URL: http://svn.reactos.org/svn/reactos?rev=27145&view=rev Log: Update Polish translation. Bug #2298. Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Pl.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Pl.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_Pl.rc Mon Jun 11 19:57:16 2007 @@ -5,8 +5,10 @@ CAPTION "Zabezpieczenia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&W³aciciel:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Dodaj...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "U&suñ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX

1 0

[dgorbachev] 27144: Translations: - Dutch by Joost de Meij (dreamsmsn *at* gmail *dot* com). Bug #2296. - French by Pierre Schweitzer. Bug #2297. - Polish by Olaf Siejka. Bug #2298.
by dgorbachev＠svn.reactos.org 11 Jun '07

11 Jun '07

Author: dgorbachev Date: Mon Jun 11 19:56:42 2007 New Revision: 27144 URL: http://svn.reactos.org/svn/reactos?rev=27144&view=rev Log: Translations: - Dutch by Joost de Meij (dreamsmsn *at* gmail *dot* com). Bug #2296. - French by Pierre Schweitzer. Bug #2297. - Polish by Olaf Siejka. Bug #2298. Added: trunk/reactos/base/applications/wordpad/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Modified: trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/lang/nl-NL.rc trunk/reactos/base/setup/welcome/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/shell/explorer/explorer-nl.rc Added: trunk/reactos/base/applications/wordpad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/wordpad/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,169 @@ +LANGUAGE LANG_DUTCH, SUBLANG_DUTCH + +IDR_MAINMENU MENU +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw...", ID_NEW + MENUITEM "&Openen...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Sluiten\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Alles s&luiten", ID_CLOSEALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "O&pslaan", ID_SAVE, GRAYED + MENUITEM "Op&slaan Als...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&fdrukvoorbeeld", ID_PRINTPRE, GRAYED + MENUITEM "Af&drukken...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pa&gina-instelling...", ID_PAGESETUP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Afsluiten\tAlt+F4", ID_EXIT + END + POPUP "Be&werken" + BEGIN + MENUITEM "&Ongedaan maken", ID_UNDO, GRAYED + MENUITEM "&Herhalen", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "K&nippen", ID_CUT, GRAYED + MENUITEM "&Kopieren", ID_COPY, GRAYED + MENUITEM "&Plakken", ID_PASTE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Se&lectie wissen", -1, GRAYED + MENUITEM "&Alles selecteren", ID_SELALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Zoeken...\tCtrl+F",-1, GRAYED + MENUITEM "Vo&lgende zoeken", -1, GRAYED + MENUITEM "Ve&rvangen\tCtrl+H", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Object Eigenschappen",-1, GRAYED + MENUITEM "Object", -1, GRAYED + END + POPUP "Beel&d" + BEGIN + MENUITEM "&Werkbalk", -1, CHECKED + MENUITEM "Werkbalk opmaa&k", -1, CHECKED + MENUITEM "&Liniaal", -1, CHECKED + MENUITEM "&Statusbalk", ID_STATUSBAR, CHECKED + END + POPUP "&Invoegen" + BEGIN + MENUITEM "&Datum en tijd...",-1, GRAYED + MENUITEM "&Object...", -1, GRAYED + END + POPUP "Opmaa&k" + BEGIN + MENUITEM "&Lettertype...", -1 GRAYED + MENUITEM "&Opsommingsteken", -1, GRAYED + MENUITEM "&Alinea...", -1, GRAYED + MENUITEM "&Tabs...", -1, GRAYED + END + POPUP "&Venster" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "&Horizontaal schikken", ID_WINDOW_TILE_HORZ + MENUITEM "&Verticaal schikken", ID_WINDOW_TILE_VERT + MENUITEM "&Pictogrammen schikken", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Vo&lgende\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Help" + BEGIN + MENUITEM "&Info...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_NEWDOCSEL DIALOGEX 6,6,159,67 +CAPTION "Nieuw" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + LTEXT "Nieuw documenttype:", IDC_STATIC, 4, 3, 72, 9 + LISTBOX IDC_LIST, 4, 16, 104, 46, WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 112, 16, 44, 13 + PUSHBUTTON "&Annuleren", IDCANCEL, 112, 33, 44, 13 +END + + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "WordPad Info" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "OK", IDOK, 65, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 40, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_DEFAULT_NAME "Document %1!u!" + IDS_READY " Ready." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DOC_TYPE_RICH_TEXT "Rich Text Document" + IDS_DOC_TYPE_UNICODE_TEXT "Text Document" + IDS_DOC_TYPE_TEXT "Unicode Text Document" +END + + + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nieuw" + IDS_TOOLTIP_OPEN "Openen" + IDS_TOOLTIP_SAVE "Opslaan" + IDS_TOOLTIP_PRINTPRE "Afdrukvoorbeeld" + IDS_TOOLTIP_PRINT "Afdrukken" + IDS_TOOLTIP_CUT "Knippen" + IDS_TOOLTIP_COPY "Kopieren" + IDS_TOOLTIP_PASTE "Plakken" + IDS_TOOLTIP_UNDO "Ongedaan maken" + IDS_TOOLTIP_REDO "Herhalen" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Een nieuw document maken." + IDS_HINT_OPEN " Een bestaand document openen." + IDS_HINT_CLOSE " Sluit actief venster af." + IDS_HINT_CLOSEALL " Sluit alle vensters af." + IDS_HINT_SAVE " Het actieve document opslaan." + IDS_HINT_SAVEAS " Het actieve document opslaan onder een nieuwe naam." + IDS_HINT_PRINT " Het actieve document afdrukken." + IDS_HINT_PRINTPRE " Volledige pagina's weergeven." + IDS_HINT_PAGESETUP " Instellingen van de pagina-indeling wijzigen." + IDS_HINT_EXIT " De toepassing afsluiten." + + IDS_HINT_CASCADE " Vensters schikken zodat ze overlappen." + IDS_HINT_TILE_HORZ " Vensters schikken zodat ze niet overlappen." + IDS_HINT_TILE_VERT " Vensters schikken zodat ze niet overlappen." + IDS_HINT_ARRANGE " Iconen aan de onderkant van dit venster schikken." + IDS_HINT_NEXT " Het volgende venster activeren." + + IDS_HINT_SYS_RESTORE " Vorig formaat van dit venster." + IDS_HINT_SYS_MOVE " Verplaats dit venster." + IDS_HINT_SYS_SIZE " Wijzig het vermaak van dit venster." + IDS_HINT_SYS_MINIMIZE " Dit venster minimaliseren." + IDS_HINT_SYS_MAXIMIZE " Dit venster maximaliseren." +END + Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc Mon Jun 11 19:56:42 2007 @@ -7,7 +7,8 @@ #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" -#include "lang/nb-NO.rc" #include "lang/th-TH.rc" #include "lang/zh-CN.rc" Modified: trunk/reactos/base/setup/reactos/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/nl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/nl-NL.rc (original) +++ trunk/reactos/base/setup/reactos/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -6,7 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TEXT "Je kunt ReactOS niet direct van deze CD instaleren!\n\nHerstart je computer vanaf deze CD om ReactOS te kunnen instaleren." + IDS_TEXT "U kunt ReactOS niet direct vanaf deze CD installeren!\n\nHerstart uw computer vanaf deze CD om ReactOS te installeren." END /* EOF */ Modified: trunk/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/nl… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/nl-NL.rc (original) +++ trunk/reactos/base/setup/welcome/lang/nl-NL.rc Mon Jun 11 19:56:42 2007 @@ -8,7 +8,7 @@ IDS_APPTITLE "ReactOS - Welkom" IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Welkom bij het React Operation System.\n\nKlik links op een onderwerp." -// IDS_CHECKTEXT "Gaat terug naar dit scherm" +// IDS_CHECKTEXT "Ga terug naar dit scherm" // IDS_CLOSETEXT "Afsluiten" END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Mon Jun 11 19:56:42 2007 @@ -14,3 +14,5 @@ IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/pl-PL.rc" Added: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,59 @@ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Véroui&ller la barre de tâhces", ID_LOCKTASKBAR + MENUITEM "P&ropriétés", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programmes", IDM_PROGRAMS + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "F&avoris", IDM_FAVORITES + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Documents", IDM_DOCUMENTS + BEGIN + MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Paramètre&s", IDM_SETTINGS + BEGIN + MENUITEM "Panneau de &contrôle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Sécurité...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "Co&nnexions au réseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "Barre de &tâches et menu démarrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&Chercher", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "Exécuter...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Fermer &la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Déconnecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED */ + MENUITEM "Libér&er l'ordinateur de la station", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Éteindre...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Démarrer" + IDS_PROPERTIES "P&ropriétés" + IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" + IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs" +END Added: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Mon Jun 11 19:56:42 2007 @@ -1,0 +1,61 @@ +//Polish translation by Olaf Siejka (caemyr(a)gmail.com) June, 2007 + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zablokuj Pasek zadañ", ID_LOCKTASKBAR + MENUITEM "&W³aciwoci", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programy", IDM_PROGRAMS + BEGIN + MENUITEM "(Pusty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Ulubione", IDM_FAVORITES + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Dokumenty", IDM_DOCUMENTS + BEGIN + MENUITEM "(Pusty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Us&tawienia", IDM_SETTINGS + BEGIN + MENUITEM "P&anel Sterowania", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "Za&bezpieczenia...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "P&o³¹æzenia sieciowe", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "P&asek zadañ i Menu Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&Szukaj", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchronizuj", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Wyloguj %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Roz³¹cz...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Wydokuj &Komputer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Zamnij system...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Start" + IDS_PROPERTIES "W³a&ciwoci" + IDS_OPEN_ALL_USERS "&Otworz - Wszyscy u¿ytkownicy" + IDS_EXPLORE_ALL_USERS "&Eksploruj - Wszyscy u¿ytkownicy" +END Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc Mon Jun 11 19:56:42 2007 @@ -42,7 +42,7 @@ MENUITEM "&Zijbalk", ID_VIEW_SIDE_BAR MENUITEM "&Statusbalk", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Verversen\tF5", ID_REFRESH + MENUITEM "&Vernieuwen\tF5", ID_REFRESH MENUITEM "V&olledig Scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "SDI", ID_VIEW_SDI END @@ -82,7 +82,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "Volumeregelingen Openen", ID_TRAY_VOLUME + MENUITEM "Volumeregeling openen", ID_TRAY_VOLUME MENUITEM "Eigenschappen van audio aanpassen", ID_VOLUME_PROPERTIES END END @@ -90,11 +90,11 @@ IDM_NOTIFYAREA MENU DISCARDABLE BEGIN POPUP "" - BEGIN - MENUITEM "&Verborgen pictogrammen weergeven", ID_SHOW_HIDDEN_ICONS + BEGIN + MENUITEM "&Verborgen Pictogrammen weergeven", ID_SHOW_HIDDEN_ICONS MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Datum/Tijd Aanpassen", ID_CONFIG_TIME + MENUITEM "&Meldingen aanpassen...", ID_CONFIG_NOTIFYAREA + MENUITEM "Datum/Tijd aanpassen", ID_CONFIG_TIME MENUITEM SEPARATOR MENUITEM "&Over Explorer...", ID_ABOUT_EXPLORER END @@ -114,7 +114,7 @@ MENUITEM "&Zijbalk", ID_VIEW_SIDE_BAR, GRAYED MENUITEM "&Statusbalk", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Verversen\tF5", ID_REFRESH + MENUITEM "&Vernieuwen\tF5", ID_REFRESH MENUITEM "V&olledig Scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END @@ -350,7 +350,7 @@ IDS_DESKTOP_NUM "Desktop %d" IDS_VOLUME "Volume" IDS_ITEMS_CUR "Huidige items" - IDS_ITEMS_CONFIGURED "configuratie" + IDS_ITEMS_CONFIGURED "Configuratie" IDS_ITEMS_VISIBLE "Zichtbaar" IDS_ITEMS_HIDDEN "Verborgen" IDS_NOTIFY_SHOW "Weergeven" @@ -370,13 +370,13 @@ IDS_SETTINGS_MENU "Instellingen" IDS_CONTROL_PANEL "Configuratiescherm" IDS_PRINTERS "Printers" - IDS_BROWSE "Browse Files" + IDS_BROWSE "Bestanden Verkennen" IDS_SEARCH_PRG "Zoek Programma..." IDS_ALL_USERS "Alle Gebruikers\\" IDS_SEARCH "Zoeken" - IDS_ABOUT_EXPLORER "&About Explorer..." + IDS_ABOUT_EXPLORER "&Over Explorer..." IDS_LAUNCH_MANY_PROGRAMS - "U heeft meer dan één programma geselecteerd.\nWeet u zeker dat u ze allemaal wilt laden?" + "U heeft meer dan één programma geselecteerd.\nWeet u zeker dat u ze allemaal wilt starten?" IDS_DESKTOPBAR_SETTINGS "Bureaublad instellingen" IDS_DESKTOP "Bureaublad" IDS_TASKBAR "Taakbalk"

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