Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[hpoussin] 21659: No need to write "Serenum:" at the start of each debug string
by hpoussin＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: hpoussin Date: Tue Apr 18 23:26:48 2006 New Revision: 21659 URL: http://svn.reactos.ru/svn/reactos?rev=21659&view=rev Log: No need to write "Serenum:" at the start of each debug string Modified: trunk/reactos/drivers/bus/serenum/detect.c trunk/reactos/drivers/bus/serenum/fdo.c trunk/reactos/drivers/bus/serenum/misc.c trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/detect.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/detect.… ============================================================================== --- trunk/reactos/drivers/bus/serenum/detect.c (original) +++ trunk/reactos/drivers/bus/serenum/detect.c Tue Apr 18 23:26:48 2006 @@ -13,7 +13,7 @@ #include "serenum.h" static NTSTATUS -SerenumDeviceIoControl( +DeviceIoControl( IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, @@ -39,7 +39,7 @@ &IoStatus); if (Irp == NULL) { - DPRINT("Serenum: IoBuildDeviceIoControlRequest() failed\n"); + DPRINT("IoBuildDeviceIoControlRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -47,7 +47,7 @@ if (Status == STATUS_PENDING) { - DPRINT("Serenum: Operation pending\n"); + DPRINT("Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -61,7 +61,7 @@ } static NTSTATUS -SerenumSendIrp( +SendIrp( IN PDEVICE_OBJECT DeviceObject, IN ULONG MajorFunction) { @@ -71,7 +71,7 @@ NTSTATUS Status; KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildSynchronousFsdRequest( MajorFunction, DeviceObject, @@ -82,15 +82,15 @@ &IoStatus); if (Irp == NULL) { - DPRINT("Serenum: IoBuildSynchronousFsdRequest() failed\n"); + DPRINT("IoBuildSynchronousFsdRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - DPRINT("Serenum: Operation pending\n"); + DPRINT("Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -129,7 +129,7 @@ KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); Status = ioStatus.Status; } - DPRINT("Serenum: bytes received: %lu/%lu\n", + DPRINT("Bytes received: %lu/%lu\n", ioStatus.Information, BufferSize); *FilledBytes = ioStatus.Information; return Status; @@ -149,7 +149,7 @@ PFDO_DEVICE_EXTENSION FdoDeviceExtension; NTSTATUS Status; - DPRINT("Serenum: ReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription); + DPRINT("ReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription); Status = IoCreateDevice( DeviceObject->DriverObject, @@ -210,12 +210,12 @@ } static BOOLEAN -SerenumIsValidPnpIdString( +IsValidPnpIdString( IN PUCHAR Buffer, IN ULONG BufferLength) { - /* FIXME: SerenumIsValidPnpIdString not implemented */ - DPRINT1("Serenum: SerenumIsValidPnpIdString() unimplemented\n"); + /* FIXME: IsValidPnpIdString not implemented */ + DPRINT1("IsValidPnpIdString() unimplemented\n"); return STATUS_SUCCESS; } @@ -226,7 +226,7 @@ { ULONG i; /* FIXME: ReportDetectedPnpDevice not implemented */ - DPRINT1("Serenum: ReportDetectedPnpDevice() unimplemented\n"); + DPRINT1("ReportDetectedPnpDevice() unimplemented\n"); DPRINT1(""); for (i = 0; i < BufferLength; i++) DbgPrint("%c", Buffer[i]); @@ -239,7 +239,8 @@ #define END_ID ')' static NTSTATUS -SerenumWait(ULONG milliseconds) +Wait( + IN ULONG milliseconds) { KTIMER Timer; LARGE_INTEGER DueTime; @@ -267,114 +268,114 @@ SERIAL_TIMEOUTS Timeouts; SERIALPERF_STATS PerfStats; NTSTATUS Status; - + /* Open port */ - Status = SerenumSendIrp(LowerDevice, IRP_MJ_CREATE); + Status = SendIrp(LowerDevice, IRP_MJ_CREATE); if (!NT_SUCCESS(Status)) goto ByeBye; /* 1. COM port initialization, check for device enumerate */ CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - SerenumWait(200); + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Wait(200); Size = sizeof(Msr); - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumDisconnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto DisconnectIdle; /* 2. COM port setup, 1st phase */ CHECKPOINT; BaudRate = 1200; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, 0); if (!NT_SUCCESS(Status)) goto ByeBye; Lcr.WordLength = 7; Lcr.Parity = NO_PARITY; Lcr.StopBits = STOP_BIT_1; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, &Lcr, sizeof(Lcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - SerenumWait(200); - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - SerenumWait(200); + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Wait(200); + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Wait(200); /* 3. Wait for response, 1st phase */ CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Timeouts.ReadIntervalTimeout = 0; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 200; Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, &Timeouts, sizeof(Timeouts), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer), &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if (Size != 0) goto SerenumCollectPnpComDeviceId; + if (Size != 0) goto CollectPnpComDeviceId; /* 4. COM port setup, 2nd phase */ CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Purge = SERIAL_PURGE_RXABORT | SERIAL_PURGE_RXCLEAR; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_PURGE, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_PURGE, &Purge, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; - SerenumWait(200); + Wait(200); /* 5. Wait for response, 2nd phase */ CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Status = ReadBytes(LowerDevice, Buffer, 1, &TotalBytesReceived); if (!NT_SUCCESS(Status)) goto ByeBye; - if (TotalBytesReceived != 0) goto SerenumCollectPnpComDeviceId; + if (TotalBytesReceived != 0) goto CollectPnpComDeviceId; Size = sizeof(Msr); - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle; + if ((Msr & SERIAL_DSR_STATE) == 0) goto VerifyDisconnect; else goto ConnectIdle; /* 6. Collect PnP COM device ID */ -SerenumCollectPnpComDeviceId: +CollectPnpComDeviceId: CHECKPOINT; Timeouts.ReadIntervalTimeout = 200; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 2200; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, &Timeouts, sizeof(Timeouts), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Status = ReadBytes(LowerDevice, &Buffer[TotalBytesReceived], sizeof(Buffer) - TotalBytesReceived, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; TotalBytesReceived += Size; Size = sizeof(PerfStats); - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_STATS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_STATS, NULL, 0, &PerfStats, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if (PerfStats.FrameErrorCount + PerfStats.ParityErrorCount != 0) goto SerenumConnectIdle; + if (PerfStats.FrameErrorCount + PerfStats.ParityErrorCount != 0) goto ConnectIdle; for (i = 0; i < TotalBytesReceived; i++) { if (Buffer[i] == BEGIN_ID) BufferContainsBeginId = TRUE; @@ -382,50 +383,50 @@ } if (TotalBytesReceived == 1 || BufferContainsEndId) { - if (SerenumIsValidPnpIdString(Buffer, TotalBytesReceived)) + if (IsValidPnpIdString(Buffer, TotalBytesReceived)) { Status = ReportDetectedPnpDevice(Buffer, TotalBytesReceived); goto ByeBye; } - goto SerenumConnectIdle; - } - if (!BufferContainsBeginId) goto SerenumConnectIdle; - if (!BufferContainsEndId) goto SerenumConnectIdle; + goto ConnectIdle; + } + if (!BufferContainsBeginId) goto ConnectIdle; + if (!BufferContainsEndId) goto ConnectIdle; Size = sizeof(Msr); - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, &Msr, &Size); if (!NT_SUCCESS(Status)) goto ByeBye; - if ((Msr & SERIAL_DSR_STATE) == 0) goto SerenumVerifyDisconnect; + if ((Msr & SERIAL_DSR_STATE) == 0) goto VerifyDisconnect; /* 7. Verify disconnect */ -SerenumVerifyDisconnect: - CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - SerenumWait(5000); - goto SerenumDisconnectIdle; +VerifyDisconnect: + CHECKPOINT; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Wait(5000); + goto DisconnectIdle; /* 8. Connect idle */ -SerenumConnectIdle: - CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, +ConnectIdle: + CHECKPOINT; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; BaudRate = 300; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Lcr.WordLength = 7; Lcr.Parity = NO_PARITY; Lcr.StopBits = STOP_BIT_1; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, &Lcr, sizeof(Lcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; if (TotalBytesReceived == 0) @@ -435,31 +436,31 @@ goto ByeBye; /* 9. Disconnect idle */ -SerenumDisconnectIdle: +DisconnectIdle: CHECKPOINT; /* FIXME: report to OS device removal, if it was present */ - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; BaudRate = 300; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Lcr.WordLength = 7; Lcr.Parity = NO_PARITY; Lcr.StopBits = STOP_BIT_1; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, &Lcr, sizeof(Lcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; Status = STATUS_DEVICE_NOT_CONNECTED; ByeBye: /* Close port */ - SerenumSendIrp(LowerDevice, IRP_MJ_CLOSE); - SerenumSendIrp(LowerDevice, IRP_MJ_CLEANUP); + SendIrp(LowerDevice, IRP_MJ_CLOSE); + SendIrp(LowerDevice, IRP_MJ_CLEANUP); return Status; } @@ -482,20 +483,20 @@ UNICODE_STRING CompatibleIds; NTSTATUS Status; - DPRINT("Serenum: SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", + DPRINT("SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", DeviceObject, LowerDevice); RtlZeroMemory(Buffer, sizeof(Buffer)); - + /* Open port */ - Status = SerenumSendIrp(LowerDevice, IRP_MJ_CREATE); + Status = SendIrp(LowerDevice, IRP_MJ_CREATE); if (!NT_SUCCESS(Status)) return Status; /* Reset UART */ CHECKPOINT; Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Mcr, sizeof(Mcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -503,37 +504,37 @@ CHECKPOINT; /* DLAB off */ Fcr = 0; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, &Fcr, sizeof(Fcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set serial port speed */ BaudRate = 1200; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set LCR */ LCR.WordLength = 7; LCR.Parity = NO_PARITY; LCR.StopBits = STOP_BITS_2; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, &LCR, sizeof(LCR), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Flush receive buffer */ CHECKPOINT; Command = SERIAL_PURGE_RXCLEAR; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Command, sizeof(Command), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Wait 100 ms */ - SerenumWait(100); + Wait(100); /* Enable DTR/RTS */ CHECKPOINT; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, - NULL, 0, NULL, NULL); - if (!NT_SUCCESS(Status)) goto ByeBye; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -543,7 +544,7 @@ Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 500; Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; - Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, &Timeouts, sizeof(Timeouts), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -606,10 +607,10 @@ } Status = STATUS_DEVICE_NOT_CONNECTED; - + ByeBye: /* Close port */ - SerenumSendIrp(LowerDevice, IRP_MJ_CLOSE); - SerenumSendIrp(LowerDevice, IRP_MJ_CLEANUP); + SendIrp(LowerDevice, IRP_MJ_CLOSE); + SendIrp(LowerDevice, IRP_MJ_CLEANUP); return Status; } Modified: trunk/reactos/drivers/bus/serenum/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/serenum/fdo.c (original) +++ trunk/reactos/drivers/bus/serenum/fdo.c Tue Apr 18 23:26:48 2006 @@ -19,7 +19,7 @@ PFDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("Serenum: SerenumAddDevice called. Pdo = %p\n", Pdo); + DPRINT("SerenumAddDevice called. Pdo = %p\n", Pdo); /* Create new device object */ Status = IoCreateDevice(DriverObject, @@ -31,7 +31,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("Serenum: IoCreateDevice() failed with status 0x%08lx\n", Status); + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); return Status; } DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; @@ -45,7 +45,7 @@ &DeviceExtension->SerenumInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("Serenum: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); IoDeleteDevice(Fdo); return Status; } @@ -58,7 +58,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("Serenum: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); IoDeleteDevice(Fdo); return Status; } @@ -76,7 +76,7 @@ PFDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("Serenum: SerenumFdoStartDevice() called\n"); + DPRINT("SerenumFdoStartDevice() called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(DeviceExtension->Common.PnpState == dsStopped); @@ -84,7 +84,7 @@ Status = IoSetDeviceInterfaceState(&DeviceExtension->SerenumInterfaceName, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT("Serenum: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); + DPRINT("IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); return Status; } @@ -175,7 +175,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -189,13 +189,13 @@ case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); Status = SerenumFdoQueryBusRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; } default: - DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -203,7 +203,7 @@ } default: { - DPRINT1("Serenum: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/bus/serenum/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/misc.c?… ============================================================================== --- trunk/reactos/drivers/bus/serenum/misc.c (original) +++ trunk/reactos/drivers/bus/serenum/misc.c Tue Apr 18 23:26:48 2006 @@ -114,7 +114,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Serenum: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -141,7 +141,7 @@ LowerDevice = DeviceExtension->LowerDevice; ASSERT(LowerDevice); - DPRINT("Serenum: calling lower device 0x%p [%wZ]\n", + DPRINT("Calling lower device 0x%p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); @@ -160,7 +160,7 @@ Fdo = DeviceExtension->AttachedFdo; ASSERT(Fdo); - DPRINT("Serenum: calling attached Fdo 0x%p [%wZ]\n", + DPRINT("Calling attached Fdo 0x%p [%wZ]\n", Fdo, &Fdo->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(Fdo, Irp); Modified: trunk/reactos/drivers/bus/serenum/pdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/serenum/pdo.c (original) +++ trunk/reactos/drivers/bus/serenum/pdo.c Tue Apr 18 23:26:48 2006 @@ -44,28 +44,29 @@ { case BusQueryDeviceID: { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = &DeviceExtension->DeviceId; break; } case BusQueryHardwareIDs: { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); SourceString = &DeviceExtension->HardwareIds; break; } case BusQueryCompatibleIDs: - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &DeviceExtension->CompatibleIds; break; case BusQueryInstanceID: { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = &DeviceExtension->InstanceId; break; } default: - DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + ASSERT(FALSE); return STATUS_NOT_SUPPORTED; } @@ -140,7 +141,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); Status = SerenumPdoStartDevice(DeviceObject); break; } @@ -148,22 +149,23 @@ { switch (Stack->Parameters.QueryDeviceRelations.Type) { - case RemovalRelations: + case RemovalRelations: { return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); } case TargetDeviceRelation: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); Status = SerenumPdoQueryDeviceRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; } default: { - DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); + ASSERT(FALSE); Status = STATUS_NOT_IMPLEMENTED; break; } @@ -174,7 +176,7 @@ { PDEVICE_CAPABILITIES DeviceCapabilities; ULONG i; - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; /* FIXME: capabilities can change with connected device */ @@ -200,7 +202,7 @@ } case IRP_MN_QUERY_RESOURCES: /* 0xa */ { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); /* Serial devices don't need resources, except the ones of * the serial port. This PDO is the serial device PDO, so * report no resource by not changing Information and @@ -212,7 +214,7 @@ } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: /* 0xb */ { - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); /* Serial devices don't need resources, except the ones of * the serial port. This PDO is the serial device PDO, so * report no resource by not changing Information and @@ -230,7 +232,7 @@ { PUNICODE_STRING Source; PWSTR Description; - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); Source = &((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->DeviceDescription; Description = ExAllocatePoolWithTag(PagedPool, Source->Length + sizeof(WCHAR), SERENUM_TAG); @@ -256,8 +258,9 @@ } default: { - DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", Stack->Parameters.QueryDeviceText.DeviceTextType); + ASSERT(FALSE); Status = STATUS_NOT_SUPPORTED; } } @@ -275,7 +278,7 @@ case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ { PPNP_BUS_INFORMATION BusInfo; - DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), SERENUM_TAG); if (!BusInfo) @@ -298,7 +301,8 @@ { /* We can't forward request to the lower driver, because * we are a Pdo, so we don't have lower driver... */ - DPRINT1("Serenum: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + ASSERT(FALSE); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; }

1 0

[greatlrd] 21658: wrong line break in the translations
by greatlrd＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: greatlrd Date: Tue Apr 18 23:05:05 2006 New Revision: 21658 URL: http://svn.reactos.ru/svn/reactos?rev=21658&view=rev Log: wrong line break in the translations Modified: trunk/reactos/base/setup/reactos/Nl.rc Modified: trunk/reactos/base/setup/reactos/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/reactos/Nl.rc?re… ============================================================================== --- trunk/reactos/base/setup/reactos/Nl.rc (original) +++ trunk/reactos/base/setup/reactos/Nl.rc Tue Apr 18 23:05:05 2006 @@ -6,8 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "ReactOS Setup" - IDS_TEXT "Je kunt ReactOS niet direct van deze CD instaleren!\n\n -Herstart je computer vanaf deze CD om ReactOS te kunnen instaleren." + IDS_TEXT "Je kunt ReactOS niet direct van deze CD instaleren!\n\nHerstart je computer vanaf deze CD om ReactOS te kunnen instaleren." END /* EOF */

1 0

[gedmurphy] 21657: Reduce the size a bit.
by gedmurphy＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: gedmurphy Date: Tue Apr 18 22:16:11 2006 New Revision: 21657 URL: http://svn.reactos.ru/svn/reactos?rev=21657&view=rev Log: Reduce the size a bit. Modified: trunk/reactos/base/shell/explorer/res/favorites.ico Modified: trunk/reactos/base/shell/explorer/res/favorites.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/res/fav… ============================================================================== Binary files - no diff available.

1 0

[greatlrd] 21656: [AUDIT] format this util is written from scratch, simple cmd command, and after looking through code no signs of reverse engineering were found
by greatlrd＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: greatlrd Date: Tue Apr 18 21:46:46 2006 New Revision: 21656 URL: http://svn.reactos.ru/svn/reactos?rev=21656&view=rev Log: [AUDIT] format this util is written from scratch, simple cmd command, and after looking through code no signs of reverse engineering were found Modified: trunk/reactos/base/system/format/De.rc (contents, props changed) trunk/reactos/base/system/format/En.rc (props changed) trunk/reactos/base/system/format/Fr.rc (props changed) trunk/reactos/base/system/format/Hu.rc (contents, props changed) trunk/reactos/base/system/format/Ja.rc (props changed) trunk/reactos/base/system/format/format.c (props changed) trunk/reactos/base/system/format/format.rc (props changed) trunk/reactos/base/system/format/resource.h (props changed) Modified: trunk/reactos/base/system/format/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/format/De.rc?re… ============================================================================== --- trunk/reactos/base/system/format/De.rc (original) +++ trunk/reactos/base/system/format/De.rc Tue Apr 18 21:46:46 2006 @@ -1,76 +1,76 @@ -#include "resource.h" - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ - - - - - - - - - -STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ - [Datenträger:] Legt das Laufwerk zum Formatieren fest.\n\ - -FS:file-system Legt das Dateisystem fest (z.B. FAT).\n\ - -V:label Legt den Datentraegernamen fest.\n\ - -Q Fuehre Schnellformatierung durch.\n\ - -A:size Ueberschreibe Anweisung fuer Standartblockgroesse. Es wird dringend\n\ - empfohlen, grundsaetzlich Standarteinstellungen zu verwenden!\n\ - NTFS unterstuetzt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT unterstuetzt 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS-Kompression wird fuer Blockgroessen ueber 4096 nicht\n\ - unterstuetzt.\n\ - -C Auf dem neuen Datentraeger erstellte Dateien werden\n\ - standartmaessig komprimiert.\n\n" - -STRING_COMPLETE "%lu Prozent komplett.\r" - -STRING_FORMAT_FAIL "FormatEx konnte Operation nich erfolgreich beenden.\n\n" - -STRING_NO_SUPPORT "Operation nicht unterstützt" - -STRING_FMIFS_FAIL "Kann FMIFS-Eingangspunkte nicht lokalisieren.\n\n" - -STRING_UNKNOW_ARG "Unbekanntes Argument: %S\n" - -STRING_DRIVE_PARM "Benötigter Laufwerkparameter fehlt.\n\n" - -STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten" - -STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund drücken Sie Enter wenn das Laufwerk bereit ist" - -STRING_NO_VOLUME "Kann Medium nich abfragen" - -STRING_NO_VOLUME_SIZE "Kann Mediumsgröße nich abfragen" - -STRING_FILESYSTEM "Der Typ des Dateisystems ist %S.\n" - -STRING_LABEL_NAME_EDIT "Geben Sie die aktuelle Volumebezeichnung für Datenträger %C: ein" - -STRING_ERROR_LABEL "Eine unzulässige Volumebezeichnung wurde für diesen Datenträger eingegeben.\n" - -STRING_YN_FORMAT "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? " - -STRING_YES_NO_FAQ "J/N" - -STRING_VERIFYING "Prüfen" - -STRING_FAST_FMT "Schnellformatierung" - -STRING_CREATE_FSYS "Erzeuge Dateisystem Strukturen.\n" - -STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n" - -STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n" - -STRING_ENTER_LABEL "Volumebezeichnung (11 Zeichen, Enter für keine)? " - -STRING_NO_LABEL "Konnte Datenträger nicht benennen" - -STRING_FREE_SPACE "\n%I64d bytes Speicherkapazitaet.\n%I64d bytes freier Speicher.\n" - -STRING_SERIAL_NUMBER "\nVolume Seriennummer ist %04X-%04X\n" -} +#include "resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + + + + + + + + + +STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ + [Datenträger:] Legt das Laufwerk zum Formatieren fest.\n\ + -FS:file-system Legt das Dateisystem fest (z.B. FAT).\n\ + -V:label Legt den Datentraegernamen fest.\n\ + -Q Fuehre Schnellformatierung durch.\n\ + -A:size Ueberschreibe Anweisung fuer Standartblockgroesse. Es wird dringend\n\ + empfohlen, grundsaetzlich Standarteinstellungen zu verwenden!\n\ + NTFS unterstuetzt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT unterstuetzt 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS-Kompression wird fuer Blockgroessen ueber 4096 nicht\n\ + unterstuetzt.\n\ + -C Auf dem neuen Datentraeger erstellte Dateien werden\n\ + standartmaessig komprimiert.\n\n" + +STRING_COMPLETE "%lu Prozent komplett.\r" + +STRING_FORMAT_FAIL "FormatEx konnte Operation nich erfolgreich beenden.\n\n" + +STRING_NO_SUPPORT "Operation nicht unterstützt" + +STRING_FMIFS_FAIL "Kann FMIFS-Eingangspunkte nicht lokalisieren.\n\n" + +STRING_UNKNOW_ARG "Unbekanntes Argument: %S\n" + +STRING_DRIVE_PARM "Benötigter Laufwerkparameter fehlt.\n\n" + +STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten" + +STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund drücken Sie Enter wenn das Laufwerk bereit ist" + +STRING_NO_VOLUME "Kann Medium nich abfragen" + +STRING_NO_VOLUME_SIZE "Kann Mediumsgröße nich abfragen" + +STRING_FILESYSTEM "Der Typ des Dateisystems ist %S.\n" + +STRING_LABEL_NAME_EDIT "Geben Sie die aktuelle Volumebezeichnung für Datenträger %C: ein" + +STRING_ERROR_LABEL "Eine unzulässige Volumebezeichnung wurde für diesen Datenträger eingegeben.\n" + +STRING_YN_FORMAT "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? " + +STRING_YES_NO_FAQ "J/N" + +STRING_VERIFYING "Prüfen" + +STRING_FAST_FMT "Schnellformatierung" + +STRING_CREATE_FSYS "Erzeuge Dateisystem Strukturen.\n" + +STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n" + +STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n" + +STRING_ENTER_LABEL "Volumebezeichnung (11 Zeichen, Enter für keine)? " + +STRING_NO_LABEL "Konnte Datenträger nicht benennen" + +STRING_FREE_SPACE "\n%I64d bytes Speicherkapazitaet.\n%I64d bytes freier Speicher.\n" + +STRING_SERIAL_NUMBER "\nVolume Seriennummer ist %04X-%04X\n" +} Propchange: trunk/reactos/base/system/format/De.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/format/De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/Fr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/system/format/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/format/Hu.rc?re… ============================================================================== --- trunk/reactos/base/system/format/Hu.rc (original) +++ trunk/reactos/base/system/format/Hu.rc Tue Apr 18 21:46:46 2006 @@ -1,76 +1,76 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "Használat: %S kötet: [-FS:állományrendszer] [-V:címke] [-Q] [-A:méret] [-C]\n\n\ - [kötet:] A meghajtóbetûjelet adja meg (kettõsponttal a végén).\n\ - -FS:állományrendszer Az állományrendszer típusát adja meg (pl.: FAT).\n\ - -V:címke A Kötetcímke neve.\n\ - -Q Gyorsformázást hajt végre.\n\ - -A:méret Felülbírálja az alapértelmezett szektorcsoport-\n\ - méretet. Általános használathoz az alapértelmezett\n\ - értékek ajánlottak.\n\ - Az NTFS a következõ értékeket támogatja: 512, 1024, 2048,\n\ - 4096, 8192, 16K, 32K, 64K.\n\ - A FAT a következõ értékeket támogatja: 8192, 16K, 32K, 64K,\n\ - 128K, 256K.\n\ - NTFS-tömörítés nem lehetséges 4096 bájtnál nagyobb\n\ - szektorcsoportoknál.\n\ - -C Az új köteten létrehozott állományok alapból tömörítve jönnek\n\ - létre.\n\n" - -STRING_COMPLETE "%lu százalék befejezve.\r" - -STRING_FORMAT_FAIL "A FormatEx végrehajtása sikertelenül fejezõdött be.\n\n" - -STRING_NO_SUPPORT "A Mûvelet Nem Támogatott" - -STRING_FMIFS_FAIL "Nem találtam meg az FMIFS kezdõpontját.\n\n" - -STRING_UNKNOW_ARG "Érvénytelen paraméter: %S\n" - -STRING_DRIVE_PARM "Hiányzik a meghajtó meghatározás.\n\n" - -STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" - -STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\Ha készen áll, nyomja meg az ENTER billenytût..." - -STRING_NO_VOLUME "Nem sikerült megállapítani címkét" - -STRING_NO_VOLUME_SIZE "Nem sikerült megállapítani a kötet méretét" - -STRING_FILESYSTEM "A állományrendszer típusa %S.\n" - -STRING_LABEL_NAME_EDIT "Adja meg a címkét az alábbi meghajtóhoz: %C: " - -STRING_ERROR_LABEL "Érvénytelen címkét adott meg a meghajtóhoz.\n" - -STRING_YN_FORMAT "\nFIGYELMEZTETÉS: A NEM CSERÉLHETÕ LEMEZMEGHAJTÓN (%C:) MINDEN ADAT EL FOG VESZNI.\n\ - \nFolytatja a formázást? (I/N)? " - -STRING_YES_NO_FAQ "IN" - -STRING_VERIFYING "Ellenõrzés" - -STRING_FAST_FMT "Gyorsformázás" - -STRING_CREATE_FSYS "Állományrendszer létrehozása.\n" - -STRING_FMT_COMPLETE "Formázás befejezve.\n" - -STRING_VOL_COMPRESS "A Kötet nem támogatja a tömörítést.\n" - -STRING_ENTER_LABEL "Kötetcímke (legfeljebb 11 karakter, ENTER ha nincs)? " - -STRING_NO_LABEL "A kötet nem kapott címkét" - -STRING_FREE_SPACE "\n%I64d bájt teljes lemezterület.\n%I64d bájt elérhetõ a köteten.\n" - -STRING_SERIAL_NUMBER "\nA Kötet sorozatszáma: %04X-%04X\n" -} +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Használat: %S kötet: [-FS:állományrendszer] [-V:címke] [-Q] [-A:méret] [-C]\n\n\ + [kötet:] A meghajtóbetûjelet adja meg (kettõsponttal a végén).\n\ + -FS:állományrendszer Az állományrendszer típusát adja meg (pl.: FAT).\n\ + -V:címke A Kötetcímke neve.\n\ + -Q Gyorsformázást hajt végre.\n\ + -A:méret Felülbírálja az alapértelmezett szektorcsoport-\n\ + méretet. Általános használathoz az alapértelmezett\n\ + értékek ajánlottak.\n\ + Az NTFS a következõ értékeket támogatja: 512, 1024, 2048,\n\ + 4096, 8192, 16K, 32K, 64K.\n\ + A FAT a következõ értékeket támogatja: 8192, 16K, 32K, 64K,\n\ + 128K, 256K.\n\ + NTFS-tömörítés nem lehetséges 4096 bájtnál nagyobb\n\ + szektorcsoportoknál.\n\ + -C Az új köteten létrehozott állományok alapból tömörítve jönnek\n\ + létre.\n\n" + +STRING_COMPLETE "%lu százalék befejezve.\r" + +STRING_FORMAT_FAIL "A FormatEx végrehajtása sikertelenül fejezõdött be.\n\n" + +STRING_NO_SUPPORT "A Mûvelet Nem Támogatott" + +STRING_FMIFS_FAIL "Nem találtam meg az FMIFS kezdõpontját.\n\n" + +STRING_UNKNOW_ARG "Érvénytelen paraméter: %S\n" + +STRING_DRIVE_PARM "Hiányzik a meghajtó meghatározás.\n\n" + +STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" + +STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\Ha készen áll, nyomja meg az ENTER billenytût..." + +STRING_NO_VOLUME "Nem sikerült megállapítani címkét" + +STRING_NO_VOLUME_SIZE "Nem sikerült megállapítani a kötet méretét" + +STRING_FILESYSTEM "A állományrendszer típusa %S.\n" + +STRING_LABEL_NAME_EDIT "Adja meg a címkét az alábbi meghajtóhoz: %C: " + +STRING_ERROR_LABEL "Érvénytelen címkét adott meg a meghajtóhoz.\n" + +STRING_YN_FORMAT "\nFIGYELMEZTETÉS: A NEM CSERÉLHETÕ LEMEZMEGHAJTÓN (%C:) MINDEN ADAT EL FOG VESZNI.\n\ + \nFolytatja a formázást? (I/N)? " + +STRING_YES_NO_FAQ "IN" + +STRING_VERIFYING "Ellenõrzés" + +STRING_FAST_FMT "Gyorsformázás" + +STRING_CREATE_FSYS "Állományrendszer létrehozása.\n" + +STRING_FMT_COMPLETE "Formázás befejezve.\n" + +STRING_VOL_COMPRESS "A Kötet nem támogatja a tömörítést.\n" + +STRING_ENTER_LABEL "Kötetcímke (legfeljebb 11 karakter, ENTER ha nincs)? " + +STRING_NO_LABEL "A kötet nem kapott címkét" + +STRING_FREE_SPACE "\n%I64d bájt teljes lemezterület.\n%I64d bájt elérhetõ a köteten.\n" + +STRING_SERIAL_NUMBER "\nA Kötet sorozatszáma: %04X-%04X\n" +} Propchange: trunk/reactos/base/system/format/Hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/format/Hu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/Ja.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/format.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/format.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/format/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21655: [AUDLT] Clean from wine
by greatlrd＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: greatlrd Date: Tue Apr 18 21:45:55 2006 New Revision: 21655 URL: http://svn.reactos.ru/svn/reactos?rev=21655&view=rev Log: [AUDLT] Clean from wine Modified: trunk/reactos/base/system/msiexec/msiexec.c (props changed) trunk/reactos/base/system/msiexec/version.rc (props changed) Propchange: trunk/reactos/base/system/msiexec/msiexec.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/msiexec/version.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21654: [AUDIT] tcpsvcs I am the author and can verify this code is clean
by gedmurphy＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: gedmurphy Date: Tue Apr 18 21:24:16 2006 New Revision: 21654 URL: http://svn.reactos.ru/svn/reactos?rev=21654&view=rev Log: [AUDIT] tcpsvcs I am the author and can verify this code is clean Modified: trunk/reactos/base/services/tcpsvcs/chargen.c (props changed) trunk/reactos/base/services/tcpsvcs/daytime.c (props changed) trunk/reactos/base/services/tcpsvcs/discard.c (props changed) trunk/reactos/base/services/tcpsvcs/echo.c (props changed) trunk/reactos/base/services/tcpsvcs/qotd.c (props changed) trunk/reactos/base/services/tcpsvcs/quotes (props changed) trunk/reactos/base/services/tcpsvcs/skelserver.c (props changed) trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (props changed) trunk/reactos/base/services/tcpsvcs/tcpsvcs.h (props changed) trunk/reactos/base/services/tcpsvcs/tcpsvcs.rc (props changed) Propchange: trunk/reactos/base/services/tcpsvcs/chargen.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/daytime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/discard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/echo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/qotd.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/quotes ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/skelserver.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21653: Dutch translations from the dutch translations team, cacls, getfirefox, msconfig, sndvol32, taskmgr by Maurus Cuelenaere, winemine by Maurus Cuelenaere winlogon by Eric Janssen
by greatlrd＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: greatlrd Date: Tue Apr 18 21:23:29 2006 New Revision: 21653 URL: http://svn.reactos.ru/svn/reactos?rev=21653&view=rev Log: Dutch translations from the dutch translations team, cacls, getfirefox, msconfig, sndvol32, taskmgr by Maurus Cuelenaere, winemine by Maurus Cuelenaere winlogon by Eric Janssen Added: trunk/reactos/base/applications/cacls/Nl.rc trunk/reactos/base/applications/games/winemine/Nl.rc trunk/reactos/base/applications/getfirefox/Nl.rc trunk/reactos/base/applications/screensavers/matrix.rbuild trunk/reactos/base/applications/sndvol32/Nl.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/setup/reactos/Nl.rc trunk/reactos/base/system/winlogon/Nl.rc Modified: trunk/reactos/base/applications/cacls/cacls.rc trunk/reactos/base/applications/games/winemine/winemine.rc trunk/reactos/base/applications/getfirefox/getfirefox.rc trunk/reactos/base/applications/sndvol32/sndvol32.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/system/winlogon/winlogon.rc Added: trunk/reactos/base/applications/cacls/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/cacls/Nl.… ============================================================================== --- trunk/reactos/base/applications/cacls/Nl.rc (added) +++ trunk/reactos/base/applications/cacls/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,75 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\nof bewerken\n\nCACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\ + [/P gebr:toeg [...]] [/D gebruiker [...]]\n\ + bestandsnaam ACL's weergeven.\n\ + /T ACL's wijzigen van opgegeven bestanden in\n\ + de huidige map en alle submappen.\n\ + /E ACL bewerken in plaats van vervangen.\n\ + /C Doorgaan bij toegang geweigerd.\n\ + /G gebr:toeg Opgegeven gebruiker toegangsrechten verlenen.\n\ + Toeg kan zijn: R Lezen\n\ + W Schrijven\n\ + C Wijzigen (schrijven)\n\ + F Volledig beheer\n\ + /R gebruiker Toegangsrechten van opgegeven gebruiker intrekken.\n\ + [alleen geldig met /E].\n\ + /P gebr:toeg Toegangsrechten van opgegeven gebruiker vervangen.\n\ + Toeg kan zijn: N Geen\n\ + R Lezen\n\ + W Schrijven\n\ + C Wijzigen (schrijven)\n\ + F Volledig beheer\n\ + /D gebruiker Opgegeven gebruiker toegang weigeren.\n\ +U kunt jokertekens gebruiken om meerdere bestanden op te geven in een\n\ +opdracht. U kunt meerdere gebruikers opgeven in een opdracht.\n\n\ +Afkortingen:\n\ + CI - Container Inherit.\n\ + De toegangslijst wordt door mappen overgenomen.\n\ + OI - Object Inherit.\n\ + De toegangslijst wordt door bestanden overgenomen.\n\ + IO - Inherit Only.\n\ + De toegangslijst is niet van toepassing op het huidige bestand of\n\ + de huidige map.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(speciale toegang:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} Modified: trunk/reactos/base/applications/cacls/cacls.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/cacls/cac… ============================================================================== --- trunk/reactos/base/applications/cacls/cacls.rc (original) +++ trunk/reactos/base/applications/cacls/cacls.rc Tue Apr 18 21:23:29 2006 @@ -9,4 +9,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #include "En.rc" +#include "Nl.rc" Added: trunk/reactos/base/applications/games/winemine/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/Nl.rc (added) +++ trunk/reactos/base/applications/games/winemine/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Optie's" { + MENUITEM "&Nieuw", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "Vraagteken a&ctiveren", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Beginner", IDM_BEGINNER + MENUITEM "&Gevorderde", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "Aan&passen", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "Bes&te tijd", IDM_TIMES + MENUITEM "&Over", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Beste tijd" +{ + GROUPBOX "Beste tijd", IDNONE, 10, 10, 140, 45 + LTEXT "Beginner", IDNONE, 20, 20, 40, 8 + LTEXT "Gevorderde", IDNONE, 20, 30, 40, 8 + LTEXT "Expert", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Gefeleciteerd!" +{ + LTEXT "Gelieve uw naam in te voeren", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Aangepast spel" +{ + LTEXT "Rijen", IDNONE, 5, 5, 30, 10 + LTEXT "Kolommen", IDNONE, 5, 35, 30, 10 + LTEXT "Mijnen", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Annuleren", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Over" +{ + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "onder de Wine licentie", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 +} Modified: trunk/reactos/base/applications/games/winemine/winemine.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/winemine.rc (original) +++ trunk/reactos/base/applications/games/winemine/winemine.rc Tue Apr 18 21:23:29 2006 @@ -21,8 +21,9 @@ #include <windows.h> #include "resource.h" +#include "De.rc" #include "En.rc" -#include "De.rc" +#include "Nl.rc" IDI_WINEMINE ICON MOVEABLE "rc/winemine.ico" Added: trunk/reactos/base/applications/getfirefox/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/getfirefo… ============================================================================== --- trunk/reactos/base/applications/getfirefox/Nl.rc (added) +++ trunk/reactos/base/applications/getfirefox/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/Nl.rc + * PURPOSE: Dutch resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + */ +/* + * Based on Wine dlls/shdocvw/En.rc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Bezig met downloaden van Firefox" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "Verwijder ""Get Firefox"" uit het start menu wanneer de download compleet is", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "Get Firefox" +END Modified: trunk/reactos/base/applications/getfirefox/getfirefox.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/getfirefo… ============================================================================== --- trunk/reactos/base/applications/getfirefox/getfirefox.rc (original) +++ trunk/reactos/base/applications/getfirefox/getfirefox.rc Tue Apr 18 21:23:29 2006 @@ -26,4 +26,6 @@ #include "En.rc" #include "Fr.rc" #include "Hu.rc" +#include "Nl.rc" #include "Ru.rc" + Added: trunk/reactos/base/applications/screensavers/matrix.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix.rbuild (added) +++ trunk/reactos/base/applications/screensavers/matrix.rbuild Tue Apr 18 21:23:29 2006 @@ -1,0 +1,34 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true"> + <include base="matrix">.</include> + + <linkerflag>-lstdc++</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__REACTOS__" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>winspool</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>advapi32</library> + <library>shell32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>uuid</library> + + <file>config.c</file> + <file>matrix.c</file> + <file>message.c</file> + <file>password.c</file> + <file>screensave.c</file> + <file>settings.c</file> + <file>matrix.rc</file> + + + +</module> Added: trunk/reactos/base/applications/sndvol32/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== --- trunk/reactos/base/applications/sndvol32/Nl.rc (added) +++ trunk/reactos/base/applications/sndvol32/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,43 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "O&pties" + BEGIN + MENUITEM "Eigenscha&ppen", IDC_PROPERTIES + MENUITEM "&Geavanceerde volumeregelingen", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDC_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "Help-&onderwerpen", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Volume Control" + IDS_NOMIXERDEVICES "Er zijn geen actieve mixerapparaten beschikbaar! Deze toepassing wordt nu afgesloten." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Eigenschappen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Mixerapparaat:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Volume aanpassen voor", -1, 7,25,211,77 + PUSHBUTTON "&Afspelen", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Opnemen", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "O&verig:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "De volgende volumeregelingen weergeven:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Annuleren", IDCANCEL, 168,226,50,14 +END Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.rc (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.rc Tue Apr 18 21:23:29 2006 @@ -14,10 +14,13 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico +#include "Cz.rc" +#include "De.rc" #include "En.rc" #include "Fr.rc" -#include "Cz.rc" -#include "De.rc" +#include "Hu.rc" #include "Ja.rc" +#include "Nl.rc" #include "Sv.rc" -#include "Hu.rc" + + Added: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/N… ============================================================================== --- trunk/reactos/base/applications/taskmgr/Nl.rc (added) +++ trunk/reactos/base/applications/taskmgr/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,672 @@ +///////////////////////////////////////////////////////////////////////////// +// Dutch resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuwe taak (Uitvoeren...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Taakbeheer afsluiten", ID_FILE_EXIT + END + POPUP "&Opties" + BEGIN + MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "16-&bits taken weergeven", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Beeld" + BEGIN + MENUITEM "&Nu vernieuwen", ID_VIEW_REFRESH + POPUP "Bijwerk&snelheid" + BEGIN + MENUITEM "&Hoog", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Standaard", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Laag", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Onderbroken", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "&Grote pictogrammen", ID_VIEW_LARGE + MENUITEM "&Kleine pictogrammen", ID_VIEW_SMALL + MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Kolommen selecteren...", ID_VIEW_SELECTCOLUMNS + POPUP "&Geschiedenis van CPU" + BEGIN + MENUITEM "&Eén grafiek, alle CPU's", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Eén grafiek &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Kerneltijden weergeven", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Vensters" + BEGIN + MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Mi&nimaliseren", ID_WINDOWS_MINIMIZE + MENUITEM "&Maximaliseren", ID_WINDOWS_MAXIMIZE + MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE + MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Help" + BEGIN + MENUITEM "&Help-onderwerpen", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Mi&nimaliseren", ID_WINDOWS_MINIMIZE + MENUITEM "&Maximaliseren", ID_WINDOWS_MAXIMIZE + MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE + MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Nieuwe taak (Uitvoeren...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Grote pictogrammen", ID_VIEW_LARGE + MENUITEM "&Kleine pictogrammen", ID_VIEW_SMALL + MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Activeren", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Mi&nimaliseren", ID_WINDOWS_MINIMIZE + MENUITEM "&Maximaliseren", ID_WINDOWS_MAXIMIZE + MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "Taa&k beëindigen", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Ga naar proces", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Vorig formaat", ID_RESTORE + MENUITEM "&Sluiten", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Proces beëindigen", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Process&tructuur beëindigen", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Fouten opsporen", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "P&rioriteit instellen" + BEGIN + MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Hoog", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "Hoger &dan normaal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normaal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "L&ager dan normaal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Laag", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "&Affiniteit instellen...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Bewerk debug kanalen...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Over Taak Beheer" +FONT 8, "Tahoma" +BEGIN + CONTROL "Taak Beheer v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Taak Beheer" +MENU IDR_TASKMANAGER +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Nieuwe Taak...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Activeren",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "Taa&k beëindigen",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Proces beëindigen",IDC_ENDPROCESS,171,189,69,14 + CONTROL "Processen van &alle gebruikers weergeven",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Weergave van CPU-gebruik",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Weergave van geheugengebruik",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Totalen",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Geheugengebruik (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Fysiek geheugen (kB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Kernelgeheugen (kB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Ingangen",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Processen",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totaal",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limiet",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Piek",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totaal",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Beschikbaar",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Systeemcache",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totaal",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "In wisselbestand",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Niet in wisselbestand",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "Geschiedenis van CPU gebruik",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Geschiedenis van geheugen gebruik",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Weergave van CPU-gebruik",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Weergave van geheugengebruik",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Geschiedenis van CPU gebruik",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "Geschiedenis van geheugen gebruik",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Debug kanalen" +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Sluit",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Processoraffiniteit" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Annuleren",IDCANCEL,174,133,50,14 + LTEXT "De instellingen voor processoraffiniteit bepalen welke processors voor het uitvoeren van programma's kunnen worden gebruikt.", + IDC_STATIC,5,5,220,16 + CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kolommen selecteren" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Annuleren",IDCANCEL,138,178,50,14 + LTEXT "Selecteer de kolommen die op het tabblad Processen van Taakbeheer moeten worden weergegeven.", + IDC_STATIC,7,7,181,17 + CONTROL "Pr&ocesnaam",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "&PID (proces-id)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "&CPU-gebruik",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "CPU-&tijd",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Geheugengebruik",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "Ve&rschil in geheugengebruik",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "Pie&kgeheugengebruik",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "&Wisselbestandsfouten",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "&USER-objecten",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "I/O: leesbewerkingen",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "I/O: gelezen bytes",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "S&essie-id",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "Gebruikers&naam",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Verschil in &aantal wisselfouten",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "Grootte van &virtueel geheugen",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Wissel&bare pool",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "Niet-wisse&lbare pool",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "Ba&sisprioriteit",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "Aantal &ingangen",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "Aantal t&hreads",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "G&DI-objecten",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "I/O: schrijfbewerkingen",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "I/O: geschreven bytes",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "I/O: overig",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "I/O: overige bytes",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Taak Beheer" + IDC_TASKMGR "Taak Beheer" + IDS_IDLE_PROCESS "Niet-actieve systeemprocessen" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Een nieuw programma uitvoeren" + ID_OPTIONS_ALWAYSONTOP "Taakbeheer blijft op de voorgrond, behalve als het wordt geminimaliseerd" + ID_OPTIONS_MINIMIZEONUSE "Taakbeheer wordt geminimaliseerd als een taak wordt geactiveerd" + ID_OPTIONS_HIDEWHENMINIMIZED "Taakbeheer verbergen als dit geminimaliseerd is" + ID_VIEW_REFRESH "Gegevens nu vernieuwen, ongeacht de instelling van Bijwerksnelheid" + ID_VIEW_LARGE "De taken met grote pictogrammen weergeven" + ID_VIEW_SMALL "De taken met kleine pictogrammen weergeven" + ID_VIEW_DETAILS "Gegevens van elke taak weergeven" + ID_VIEW_UPDATESPEED_HIGH "Het beeldscherm twee keer per seconde bijwerken" + ID_VIEW_UPDATESPEED_NORMAL "Het beeldscherm elke twee seconden bijwerken" + ID_VIEW_UPDATESPEED_LOW "Het beeldscherm elke vier seconden bijwerken" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Beeldscherm wordt niet automatisch bijgewerkt" + ID_WINDOWS_TILEHORIZONTALLY "Vensters onder elkaar schikken" + ID_WINDOWS_TILEVERTICALLY "Vensters naast elkaar schikken" + ID_WINDOWS_MINIMIZE "Vensters minimaliseren" + ID_WINDOWS_MAXIMIZE "Vensters maximaliseren" + ID_WINDOWS_CASCADE "Vensters diagonaal over het bureaublad schikken" + ID_WINDOWS_BRINGTOFRONT "Venster naar de voorgrond brengen, maar niet actief maken" + ID_HELP_TOPICS "Help-onderwerpen over Taakbeheer weergeven" + ID_HELP_ABOUT "Programma-informatie, versienummer en copyrightgegevens weergeven" + ID_FILE_EXIT "Taakbeheer afsluiten" + ID_OPTIONS_SHOW16BITTASKS "16-bits taken weergeven van de bijbehorende ntvdm.exe" + ID_VIEW_SELECTCOLUMNS "De kolommen selecteren die moeten worden weergegeven op de pagina Proces" + ID_VIEW_SHOWKERNELTIMES "De kerneltijden in de prestatiegrafiek weergeven" + ID_VIEW_CPUHISTORY_ONEGRAPHALL "Eén grafiek geeft het totale CPU-gebruik weer" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Elke CPU heeft zijn eigen grafiek" + ID_APPLICATION_PAGE_SWITCHTO "Venster naar de voorgrond brengen en actief maken" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Sluit de geselecteerde taken" + ID_GOTOPROCESS "Activeert het proces van de geselecteerde taak" + ID_RESTORE "Taakbeheer herstellen als dit verborgen is" + ID_PROCESS_PAGE_ENDPROCESS "Dit proces wordt van het systeem verwijderd" + ID_PROCESS_PAGE_ENDPROCESSTREE "Dit proces en alle afhankelijkheden ervan van het systeem verwijderen" + ID_PROCESS_PAGE_DEBUG "De debugger wordt voor dit proces gebruikt" + ID_PROCESS_PAGE_SETAFFINITY "Instellen op welke processors het proces uitgevoerd kan worden" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME "Het proces wordt ingesteld met de prioriteitsklasse REALTIME" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Het proces wordt ingesteld met de prioriteitsklasse HOOG" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "Proces instellen op prioriteitsklasse HOGER DAN NORMAAL" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Het proces wordt ingesteld met de prioriteitsklasse NORMAAL" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Proces instellen op prioriteitsklasse LAGER DAN NORMAAL" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Het proces wordt ingesteld met de prioriteitsklasse LAAG" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Toepassingen" + IDS_TAB_PROCESSES "Procesnaam" + IDS_TAB_PERFORMANCE "Prestaties" + IDS_TAB_TASK "Taak" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Proces Naam" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Gebruikersnaam" + IDS_TAB_SESSIONID "Sessie-ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU-tijd" + IDS_TAB_MEMUSAGE "Geheugengebruik" + IDS_TAB_PEAKMEMUSAGE "Piekgeheugengebruik" + IDS_TAB_MEMDELTA "Geheugenverschil" + IDS_TAB_PAGEFAULT "Wisselbestandsfouten" + IDS_TAB_PFDELTA "PF-verschil" + IDS_TAB_VMSIZE "VM-grootte" + IDS_TAB_PAGEDPOOL "Wisselbare pool" + IDS_TAB_NPPOOL "Niet-wisselbare pool" + IDS_TAB_BASEPRI "Basisprioriteit" + IDS_TAB_HANDLES "Ingangen" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "USER-objecten" + IDS_TAB_GDIOBJECTS "GDI-objecten" + IDS_TAB_IOREADS "I/O: leesbewerkingen" + IDS_TAB_IOWRITES "I/O: schrijfbewerkingen" + IDS_TAB_IOOTHER "I/O: overig" + IDS_TAB_IOREADBYTES "I/O: gelezen bytes" + IDS_TAB_IOWRITESBYTES "I/O: geschreven bytes" + IDS_TAB_IOOTHERBYTES "I/O: overige bytes" + IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..." + IDS_MENU_16BITTASK "16-&bits taken weergeven" + IDS_MENU_WINDOWS "&Vensters" + IDS_MENU_LARGEICONS "&Grote pictogrammen" + IDS_MENU_SMALLICONS "&Kleine pictogrammen" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&Eén grafiek, alle CPU's" + IDS_MENU_ONEGRAPHPERCPU "Eén grafiek &per CPU" + IDS_MENU_CPUHISTORY "&Geschiedenis van de CPU" + IDS_MENU_SHOWKERNELTIMES "&Kerneltijden weergeven" + IDS_CREATENEWTASK "Nieuwe taak maken" + IDS_CREATENEWTASK_DESC "Geef de naam van een programma, map of document op, of geef een Internet-adres op. Wat u opgeeft, wordt vervolgens in Windows geopend." + IDS_MSG_ACCESSPROCESSAFF "Kan procesaffiniteit niet opvragen of instellen" + IDS_MSG_PROCESSONEPRO "Het proces moet affiniteit hebben met ten minste één processor." + IDS_MSG_INVALIDOPTION "Ongeldige optie" + IDS_MSG_UNABLEDEBUGPROCESS "Kan de debugger niet gebruiken" + IDS_MSG_WARNINGDEBUG "Waarschuwing: het opsporen van fouten in dit proces kan verlies van gegevens als resultaat hebben.\nWeet u zeker dat u de debugger wilt gebruiken?" + IDS_MSG_TASKMGRWARNING "Waarschuwing van Taakbeheer" + IDS_MSG_WARNINGTERMINATING "Waarschuwing: het beëindigen van een proces kan tot\nonverwachte resultaten leiden, zoals verlies van gegevens\nof een instabiel systeem, omdat de status of de gegevens\nniet meer kunnen worden opgeslagen. Weet u zeker dat\nu het proces wilt beëindigen?" + IDS_MSG_UNABLETERMINATEPRO "Kan het proces niet beëindigen" + IDS_MSG_UNABLECHANGEPRIORITY "Kan de prioriteit niet wijzigen" + IDS_MSG_WARNINGCHANGEPRIORITY "Waarschuwing: het wijzigen van de prioriteitsklasse van dit proces\nkan ongewenste resultaten hebben, zoals een instabiel systeem. Weet u\nzeker dat u de prioriteitsklasse wilt wijzigen?" + IDS_MSG_TRAYICONCPUUSAGE "CPU-gebruik: %d%%" + IDS_STATUS_MEMUSAGE "Geheugengebruik: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU-gebruik: %3d%%" + IDS_STATUS_PROCESSES "Processen: %d" + IDS_Not_Responding "Reageert niet" + IDS_Running "Geactiveerd" +END + + +#endif +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/t… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Tue Apr 18 21:23:29 2006 @@ -202,11 +202,12 @@ } */ #include "Cz.rc" -#include "En.rc" #include "De.rc" #include "Dk.rc" +#include "En.rc" #include "Es.rc" #include "Fr.rc" +#include "Hu.rc" #include "Ja.rc" +#include "Nl.rc" #include "Sv.rc" -#include "Hu.rc" Added: trunk/reactos/base/setup/reactos/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/reactos/Nl.rc?re… ============================================================================== --- trunk/reactos/base/setup/reactos/Nl.rc (added) +++ trunk/reactos/base/setup/reactos/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,13 @@ +/* $Id$ */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "ReactOS Setup" + IDS_TEXT "Je kunt ReactOS niet direct van deze CD instaleren!\n\n +Herstart je computer vanaf deze CD om ReactOS te kunnen instaleren." +END + +/* EOF */ Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/reactos/reactos.… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Tue Apr 18 21:23:29 2006 @@ -23,6 +23,7 @@ #include "Hu.rc" #include "It.rc" #include "Ja.rc" +#include "Nl.rc" #include "Ru.rc" #include "Sv.rc" #include "Uk.rc" Added: trunk/reactos/base/system/winlogon/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/winlogon/Nl.rc?… ============================================================================== --- trunk/reactos/base/system/winlogon/Nl.rc (added) +++ trunk/reactos/base/system/winlogon/Nl.rc Tue Apr 18 21:23:29 2006 @@ -1,0 +1,45 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Eric Janssen + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Computer Afsluiten" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "U kunt nu de computer uitschakelen.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Herstart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Gebruikers Interface Fout" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "De gebruikers interface logon DLL %s kon niet worden geladen.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Neem contact op met de systeemadministrator om de DLL te vervangen, of plaats de oude DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Netwerkverbindingen voorbereiden..." + IDS_APPLYINGCOMPUTERSETTINGS "Computerinstellingen aanbrengen..." + IDS_RUNNINGSTARTUPSCRIPTS "Opstart scripts uitvoeren..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Afsluit scripts uitvoeren..." + IDS_APPLYINGYOURPERSONALSETTINGS "Persoonlijke instellingen aanbrengen..." + IDS_RUNNINGLOGOFFSCRIPTS "Uitlog scripts uitvoeren..." + IDS_RUNNINGLOGONSCRIPTS "Inlog scripts uitvoeren..." + IDS_LOADINGYOURPERSONALSETTINGS "Uw persoonlijke instelling laden..." + IDS_CLOSINGNETWORKCONNECTIONS "Netwerkverbindingen sluiten..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS is aan het afsluiten..." + IDS_PREPARETOSTANDBY "Standby wordt voorbereid..." + IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." + IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." + IDS_REACTOSISSTARTINGUP "ReactOS is aan het opstarten..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon heeft de gebruikers shell niet kunnen activeren!" +END + Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/winlogon/winlog… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc Tue Apr 18 21:23:29 2006 @@ -12,14 +12,16 @@ /* IDI_WINLOGON ICON "resources/winlogon.ico" */ -#include "En.rc" #include "Cz.rc" #include "De.rc" +#include "En.rc" #include "Es.rc" +#include "Fr.rc" +#include "Hu.rc" #include "Ja.rc" +#include "Nl.rc" #include "Pl.rc" +#include "Ru.rc" #include "Sv.rc" -#include "Hu.rc" -#include "Fr.rc" #include "Uk.rc" -#include "Ru.rc" +

1 0

[cwittich] 21652: fix ownerdraw menu for miranda (patch by Brezenbak)
by cwittich＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: cwittich Date: Tue Apr 18 21:17:08 2006 New Revision: 21652 URL: http://svn.reactos.ru/svn/reactos?rev=21652&view=rev Log: fix ownerdraw menu for miranda (patch by Brezenbak) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Apr 18 21:17:08 2006 @@ -744,15 +744,17 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { PMENU_OBJECT SubMenuObject; + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); if(!MenuItem || !MenuObject || !lpmii) { return FALSE; } - - MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); - MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); - + if( lpmii->fType & ~fTypeMask) + { + DPRINT("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); + lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE); + } if(lpmii->fMask & MIIM_BITMAP) { MenuItem->hbmpItem = lpmii->hbmpItem;

1 0

[gedmurphy] 21651: - convert the floating windows to use pointers within the main structure - allow showing and hiding of floating windows - implement a rough version of the history interface - temp draw a suggestion on how the color window could look. - insert a few menu hints - lots of half implemented of temp stuff in this commit, but committing now before the patch gets any bigger.
by gedmurphy＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: gedmurphy Date: Tue Apr 18 20:42:54 2006 New Revision: 21651 URL: http://svn.reactos.ru/svn/reactos?rev=21651&view=rev Log: - convert the floating windows to use pointers within the main structure - allow showing and hiding of floating windows - implement a rough version of the history interface - temp draw a suggestion on how the color window could look. - insert a few menu hints - lots of half implemented of temp stuff in this commit, but committing now before the patch gets any bigger. Added: trunk/reactos/base/applications/imagesoft/res/icons/color/ trunk/reactos/base/applications/imagesoft/res/icons/color/ColorLess.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/color/ColorMore.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/hist/ trunk/reactos/base/applications/imagesoft/res/icons/hist/HistBack.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/hist/HistDelete.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/hist/HistForward.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/hist/HistRedo.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/hist/HistUndo.bmp (with props) Modified: trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/En.rc Tue Apr 18 20:42:54 2006 @@ -33,8 +33,8 @@ POPUP "&View" BEGIN MENUITEM "&Tools", ID_TOOLS, CHECKED - MENUITEM "&Color", -1, CHECKED - MENUITEM "&History", -1, CHECKED + MENUITEM "&Colors", ID_COLOR, CHECKED + MENUITEM "&History", ID_HISTORY, CHECKED MENUITEM "&Status Bar", ID_STATUSBAR, CHECKED END POPUP "&Image" @@ -163,17 +163,36 @@ IDS_TOOLTIP_REDO "Redo" END + /* Hints */ STRINGTABLE DISCARDABLE BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Creates a new document." + IDS_HINT_OPEN " Opens an existing document." + IDS_HINT_CLOSE " Closes this window." + IDS_HINT_CLOSEALL " Closes all windows." + IDS_HINT_SAVE " Saves the active document." + IDS_HINT_SAVEAS " Saves the active document with a new name." + IDS_HINT_PRINTPRE " Previews the printed document." + IDS_HINT_PRINT " Prints the active document." + IDS_HINT_PROP " Shows the properties of the active image." IDS_HINT_EXIT " Exits this application." + + IDS_HINT_TOOLS " Shows or hides the tools floating window." + IDS_HINT_COLORS " Shows or hides the colors floating window." + IDS_HINT_HISTORY " Shows or hides the history floating window." + IDS_HINT_STATUS " Shows or hides the status bar." + + IDS_HINT_CASCADE " Arrange windows so they overlap." + IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." + IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." + IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." + IDS_HINT_NEXT " Activates the next window." IDS_HINT_SYS_RESTORE " Restores this window to normal size." IDS_HINT_SYS_MOVE " Moves this window." IDS_HINT_SYS_SIZE " Resizes this window." IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." - IDS_HINT_SYS_NEXT " Activates the next window." END - Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Tue Apr 18 20:42:54 2006 @@ -5,46 +5,52 @@ #define ID_TIMER 1 TBBUTTON ToolsButtons[] = { -/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* rectangle select */ - {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* move selected pixels */ - {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* lasso select */ - {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* move selection */ - {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* elipse select */ - {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* zoom */ - {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* magic wand */ - {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* text */ - {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paintbrush */ - {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* eraser */ - {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* pencil */ - {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* color picker */ - {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* clone stamp */ - {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* recolor */ - {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paint bucket */ - {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* line */ - {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* rectangle */ - {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* round rectangle */ - {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* elipse */ - {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* free form */ +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* rectangle select */ + {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* move selected pixels */ + {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* lasso select */ + {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* move selection */ + {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* elipse select */ + {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* zoom */ + {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* magic wand */ + {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* text */ + {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* paintbrush */ + {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* eraser */ + {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* pencil */ + {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* color picker */ + {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* clone stamp */ + {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* recolor */ + {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* paint bucket */ + {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* line */ + {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* rectangle */ + {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* round rectangle */ + {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* elipse */ + {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0}, /* free form */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, }; +TBBUTTON HistoryButtons[] = { + {TBICON_BACKSM, ID_BACK, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* back */ + {TBICON_UNDOSM, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {TBICON_REDOSM, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + {TBICON_FORWARDSM, ID_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* forward */ + {TBICON_DELETESM, ID_DELETE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* delete */ +}; + BOOL -ShowHideWindow(HWND hwnd) -{ - static BOOL Hidden = FALSE; - - ShowWindow(hwnd, Hidden ? SW_SHOW : SW_HIDE); - Hidden = ~Hidden; - - return Hidden; +ShowHideWindow(PFLT_WND FltInfo) +{ + ShowWindow(FltInfo->hSelf, FltInfo->bShow ? SW_HIDE : SW_SHOW); + FltInfo->bShow = ~FltInfo->bShow; + + return FltInfo->bShow; } VOID -FloatToolbarCreateToolsGui(PFLT_WND FltTools) +FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) { HWND hTb; HIMAGELIST hImageList; @@ -57,7 +63,7 @@ NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | CCS_NODIVIDER, 0, 0, 32, 200, - FltTools->hSelf, + Info->fltTools->hSelf, NULL, hInstance, NULL); @@ -77,7 +83,7 @@ 0, (LPARAM)MAKELONG(16, 16)); - hImageList = InitImageList(20, + hImageList = InitImageList(NumButtons, IDB_TOOLSRECTSEL); ImageList_Destroy((HIMAGELIST)SendMessage(hTb, @@ -98,18 +104,216 @@ VOID -FloatToolbarCreateColorsGui(PFLT_WND FltColors) -{ - - return; -} - +FloatWindowPaintColorPicker(HWND hColorPicker) +{ + HDC hdc; + RECT rect; + + InvalidateRect(hColorPicker, + NULL, + TRUE); + UpdateWindow(hColorPicker); + + hdc = GetDC(hColorPicker); + + GetClientRect(hColorPicker, + &rect); + + Ellipse(hdc, + rect.left, + rect.top, + rect.right, + rect.bottom); + + ReleaseDC(hColorPicker, + hdc); + +} VOID -FloatToolbarCreateHistoryGui(PFLT_WND FltHistory) -{ - - return; +FloatWindowPaintHueSlider(HWND hHueSlider) +{ + HDC hdc; + RECT rect; + + InvalidateRect(hHueSlider, + NULL, + TRUE); + UpdateWindow(hHueSlider); + + hdc = GetDC(hHueSlider); + + GetClientRect(hHueSlider, + &rect); + + Rectangle(hdc, + rect.left, + rect.top, + rect.right, + rect.bottom); + + ReleaseDC(hHueSlider, + hdc); + +} + + +VOID +FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info) +{ + HWND hColorPicker; + HWND hHueSlider; + HWND hMouseButton; + HWND hMore; + RECT rect; + HBITMAP hMoreBitmap; + + GetClientRect(Info->fltColors->hSelf, + &rect); + + hColorPicker = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 2, + 2, + rect.right * 0.65, + rect.bottom - 2, + Info->fltColors->hSelf, + NULL, + hInstance, + NULL); + + hHueSlider = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 145, + 35, + 25, + 135, + Info->fltColors->hSelf, + NULL, + hInstance, + NULL); + + hMouseButton = CreateWindowEx(0, + WC_COMBOBOX, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 118, 5, 75, 25, + Info->fltColors->hSelf, + NULL, + hInstance, + NULL); + //MakeFlatCombo(hMouseButton); + + /* temp, just testing */ + if (hMouseButton != NULL) + { + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); + SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); + + } + + hMore = CreateWindowEx(WS_EX_STATICEDGE, + WC_BUTTON, + NULL, + WS_CHILD | WS_VISIBLE | BS_BITMAP, + rect.right - 15, + rect.bottom - 15, + 15, 15, + Info->fltColors->hSelf, + NULL, + hInstance, + NULL); + + hMoreBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(IDB_COLORSMORE), + IMAGE_BITMAP, + 12, + 11, + LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS); + if (hMoreBitmap != NULL) + { + SendMessage(hMore, + BM_SETIMAGE, + IMAGE_BITMAP, + (LPARAM)hMoreBitmap); + } + + + /* temp functions for playing about with possible layouts */ + FloatWindowPaintHueSlider(hHueSlider); + FloatWindowPaintColorPicker(hColorPicker); + + if (hColorPicker != NULL) + { + HDC hDc = GetDC(hColorPicker); + TextOut(hDc, 8, 75, _T("Possible layout?"), 16); + ReleaseDC(hColorPicker, hDc); + } + +} + + +VOID +FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) +{ + HWND hList; + HWND hButtons; + HIMAGELIST hImageList; + INT NumButtons; + + hList = CreateWindowEx(0, + WC_LISTBOX, + NULL, + WS_CHILD | WS_VISIBLE | LBS_EXTENDEDSEL, + 0, 0, 143, 100, + Info->fltHistory->hSelf, + NULL, + hInstance, + NULL); + + NumButtons = sizeof(HistoryButtons) / sizeof(HistoryButtons[0]); + hButtons = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | CCS_NODIVIDER, + 0, 0, 0, 0, + Info->fltHistory->hSelf, + NULL, + hInstance, + NULL); + + SendMessage(hButtons, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hButtons, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(10, 10)); + + hImageList = InitImageList(NumButtons, + IDB_HISTBACK); + + ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hButtons, + TB_SETBUTTONSIZE, + 0, + MAKELONG(18, 16)); + + SendMessage(hButtons, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)HistoryButtons); } LRESULT CALLBACK @@ -118,11 +322,26 @@ WPARAM wParam, LPARAM lParam) { + PFLT_WND FltInfo; + + /* Get the window context */ + FltInfo = (PFLT_WND)GetWindowLongPtr(hwnd, + GWLP_USERDATA); + if (FltInfo == NULL && Message != WM_CREATE) + { + goto HandleDefaultMessage; + } + switch(Message) { - static BOOL bOpaque = FALSE; - case WM_CREATE: + + FltInfo = (PFLT_WND)(((LPCREATESTRUCT)lParam)->lpCreateParams); + + /*FIXME: read this from registry */ + FltInfo->bShow = TRUE; + + FltInfo->bOpaque = FALSE; SetWindowLong(hwnd, GWL_EXSTYLE, @@ -141,7 +360,7 @@ { POINT pt; - if (bOpaque != TRUE) + if (FltInfo->bOpaque != TRUE) { KillTimer(hwnd, ID_TIMER); @@ -161,7 +380,7 @@ KillTimer(hwnd, ID_TIMER); - bOpaque = FALSE; + FltInfo->bOpaque = FALSE; SetWindowLong(hwnd, GWL_EXSTYLE, @@ -182,7 +401,7 @@ case WM_NCMOUSEMOVE: case WM_MOUSEMOVE: - if (bOpaque == FALSE) + if (FltInfo->bOpaque == FALSE) { SetWindowLong(hwnd, GWL_EXSTYLE, @@ -194,7 +413,8 @@ NULL, RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); - bOpaque = TRUE; + FltInfo->bOpaque = TRUE; + MessageBox(NULL, _T("in"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); SetTimer(hwnd, ID_TIMER, 200, @@ -202,9 +422,13 @@ } break; + case WM_CLOSE: + ShowHideWindow(FltInfo); + break; + case WM_COMMAND: if (LOWORD(wParam) == IDCANCEL) - ShowHideWindow(hwnd); + ShowHideWindow(FltInfo); switch(LOWORD(wParam)) { @@ -245,12 +469,16 @@ Message, TRUE, lParam); - - case WM_CLOSE: - ShowHideWindow(hwnd); + break; + + case WM_DESTROY: + SetWindowLongPtr(hwnd, + GWLP_USERDATA, + 0); break; default: +HandleDefaultMessage: return DefWindowProc(hwnd, Message, wParam, Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Tue Apr 18 20:42:54 2006 @@ -62,6 +62,7 @@ { if (bRet != (BOOL)-1) { + //if (Msg.message == WM_SIZE) MessageBox(NULL, _T("Got it"), NULL, 0); if (!MainWndTranslateMDISysAccel(hMainWnd, &Msg)) { Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Tue Apr 18 20:42:54 2006 @@ -31,6 +31,7 @@ IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" + /* text toolbar icons */ IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" @@ -61,6 +62,16 @@ IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" +/* history window icons */ +IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" +IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" +IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" +IDB_HISTFORWARD BITMAP DISCARDABLE "res/icons/hist/HistForward.bmp" +IDB_HISTDELETE BITMAP DISCARDABLE "res/icons/hist/HistDelete.bmp" + +/* colors window icons */ +IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" +IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" /* cursors */ IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Tue Apr 18 20:42:54 2006 @@ -41,9 +41,9 @@ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ - {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ - {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ + {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED | TBSTATE_CHECKED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0 }, /* left justified */ + {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0 }, /* centered */ + {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_GROUP | TBSTYLE_CHECK, {0}, 0, 0 }, /* right justified */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ }; @@ -53,27 +53,40 @@ /* menu hints */ static const MENU_HINT MainMenuHintTable[] = { /* File Menu */ - {ID_CLOSE, IDS_HINT_SYS_CLOSE}, - {ID_EXIT, IDS_HINT_EXIT}, + {ID_BLANK, IDS_HINT_BLANK}, + {ID_NEW, IDS_HINT_NEW}, + {ID_OPEN, IDS_HINT_OPEN}, + {ID_CLOSE, IDS_HINT_CLOSE}, + {ID_CLOSEALL, IDS_HINT_CLOSEALL}, + {ID_SAVE, IDS_HINT_SAVE}, + {ID_SAVEAS, IDS_HINT_SAVEAS}, + {ID_PRINTPRE, IDS_HINT_PRINTPRE}, + {ID_PRINT, IDS_HINT_PRINT}, + {ID_PROP, IDS_HINT_PROP}, + {ID_EXIT, IDS_HINT_EXIT}, + + /* view menu */ + {ID_TOOLS, IDS_HINT_TOOLS}, + {ID_COLOR, IDS_HINT_COLORS}, + {ID_HISTORY, IDS_HINT_HISTORY}, + {ID_STATUSBAR, IDS_HINT_STATUS}, /* Window Menu */ - {ID_WINDOW_NEXT, IDS_HINT_SYS_NEXT} + {ID_WINDOW_NEXT, IDS_HINT_NEXT}, + {ID_WINDOW_CASCADE, IDS_HINT_CASCADE}, + {ID_WINDOW_TILE_HORZ, IDS_HINT_TILE_HORZ}, + {ID_WINDOW_TILE_VERT, IDS_HINT_TILE_VERT}, + {ID_WINDOW_ARRANGE, IDS_HINT_ARRANGE} }; static const MENU_HINT SystemMenuHintTable[] = { - {SC_RESTORE, IDS_HINT_SYS_RESTORE}, - {SC_MOVE, IDS_HINT_SYS_MOVE}, - {SC_SIZE, IDS_HINT_SYS_SIZE}, - {SC_MINIMIZE, IDS_HINT_SYS_MINIMIZE}, - {SC_MAXIMIZE, IDS_HINT_SYS_MAXIMIZE}, - {SC_CLOSE, IDS_HINT_SYS_CLOSE}, - {SC_NEXTWINDOW, IDS_HINT_SYS_NEXT}, -}; - -static FLT_WND FloatingWindow[NUM_FLT_WND] = { - {NULL, NULL, 0, 0, 53, 300}, /* tools */ - {NULL, NULL, 0, 0, 200, 200}, /* colors */ - {NULL, NULL, 0, 0, 150, 150} /* history */ + {SC_RESTORE, IDS_HINT_SYS_RESTORE}, + {SC_MOVE, IDS_HINT_SYS_MOVE}, + {SC_SIZE, IDS_HINT_SYS_SIZE}, + {SC_MINIMIZE, IDS_HINT_SYS_MINIMIZE}, + {SC_MAXIMIZE, IDS_HINT_SYS_MAXIMIZE}, + {SC_CLOSE, IDS_HINT_CLOSE}, + {SC_NEXTWINDOW, IDS_HINT_NEXT}, }; @@ -205,10 +218,11 @@ { case ID_TOOLBAR_TEXT: { - HWND hWndCombo; + HWND hFontType; + HWND hFontSize; /* drop combo box into container window */ - hWndCombo = CreateWindowEx(0, + hFontType = CreateWindowEx(0, WC_COMBOBOX, NULL, WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, @@ -217,18 +231,44 @@ NULL, hInstance, NULL); - if (hWndCombo != NULL) - { - SetParent(hWndCombo, + //MakeFlatCombo(hFontType); + if (hFontType != NULL) + { + SetParent(hFontType, hWndClient); if (!ToolbarInsertSpaceForControl(hWndClient, - hWndCombo, + hFontType, 0, ID_TXTFONTNAME, TRUE)) { - DestroyWindow(hWndCombo); + DestroyWindow(hFontType); + } + } + + /* drop combo box into container window */ + hFontSize = CreateWindowEx(0, + WC_COMBOBOX, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 0, 0, 40, 25, + hParent, + NULL, + hInstance, + NULL); + if (hFontSize != NULL) + { + SetParent(hFontSize, + hWndClient); + + if (!ToolbarInsertSpaceForControl(hWndClient, + hFontSize, + 0, + ID_TXTFONTSIZE, + TRUE)) + { + DestroyWindow(hFontSize); } } break; @@ -407,31 +447,38 @@ } static VOID -MainWndMoveFloatingWindows(HWND hwnd, PRECT wndOldPos) +MainWndMoveFloatingWindows(PMAIN_WND_INFO Info, + PRECT wndOldPos) { RECT wndNewPos, TbRect; INT i, xMoved, yMoved; - - if (GetWindowRect(hwnd, + PFLT_WND WndArr[NUM_FLT_WND]; + + if (GetWindowRect(Info->hSelf, &wndNewPos)) { xMoved = wndNewPos.left - wndOldPos->left; yMoved = wndNewPos.top - wndOldPos->top; + /* store the pointers in an array */ + WndArr[0] = Info->fltTools; + WndArr[1] = Info->fltColors; + WndArr[2] = Info->fltHistory; + for (i = 0; i < NUM_FLT_WND; i++) { - GetWindowRect(FloatingWindow[i].hSelf, + GetWindowRect(WndArr[i]->hSelf, &TbRect); - FloatingWindow[i].x = TbRect.left + xMoved; - FloatingWindow[i].y = TbRect.top + yMoved; - - MoveWindow(FloatingWindow[i].hSelf, - FloatingWindow[i].x, - FloatingWindow[i].y, - FloatingWindow[i].Width, - FloatingWindow[i].Height, + WndArr[i]->x = TbRect.left + xMoved; + WndArr[i]->y = TbRect.top + yMoved; + + MoveWindow(WndArr[i]->hSelf, + WndArr[i]->x, + WndArr[i]->y, + WndArr[i]->Width, + WndArr[i]->Height, TRUE); } @@ -443,36 +490,36 @@ static VOID -MainWndResetFloatingWindows(HWND hwnd) +MainWndResetFloatingWindows(PMAIN_WND_INFO Info) { RECT rect; - if (GetWindowRect(hwnd, + if (GetWindowRect(Info->hMdiClient, &rect)) { /* tools datum */ - MoveWindow(FloatingWindow[0].hSelf, + MoveWindow(Info->fltTools->hSelf, rect.left + 5, rect.top + 5, - FloatingWindow[0].Width, - FloatingWindow[0].Height, + Info->fltTools->Width, + Info->fltTools->Height, TRUE); /* colors datum */ - MoveWindow(FloatingWindow[1].hSelf, + MoveWindow(Info->fltColors->hSelf, rect.left + 5, - rect.bottom - FloatingWindow[1].Height - 5, - FloatingWindow[1].Width, - FloatingWindow[1].Height, + rect.bottom - Info->fltColors->Height - 5, + Info->fltColors->Width, + Info->fltColors->Height, TRUE); /* history datum */ - MoveWindow(FloatingWindow[2].hSelf, - rect.right - FloatingWindow[2].Width - 5, + MoveWindow(Info->fltHistory->hSelf, + rect.right - Info->fltHistory->Width - 5, rect.top + 5, - FloatingWindow[2].Width, - FloatingWindow[2].Height, + Info->fltHistory->Width, + Info->fltHistory->Height, TRUE); } } @@ -482,7 +529,26 @@ { RECT rect; UINT Res; - INT i = TOOLS; + PFLT_WND WndArr[NUM_FLT_WND]; /* temp array for looping */ + INT i; + + Info->fltTools = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(FLT_WND)); + Info->fltColors = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(FLT_WND)); + Info->fltHistory = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(FLT_WND)); + + /* set window dimensions */ + Info->fltTools->Width = 53; + Info->fltTools->Height = 300; + Info->fltColors->Width = 200; + Info->fltColors->Height = 200; + Info->fltHistory->Width = 150; + Info->fltHistory->Height = 150; if (! GetWindowRect(Info->hMdiClient, &rect)) @@ -490,61 +556,74 @@ return; } - /* tools datum */ - FloatingWindow[TOOLS].x = rect.left + 5; - FloatingWindow[TOOLS].y = rect.top + 5; - - /* colors datum */ - FloatingWindow[COLORS].x = rect.left + 5; - FloatingWindow[COLORS].y = rect.bottom - FloatingWindow[1].Height - 5; - - /* history datum */ - FloatingWindow[HISTORY].x = rect.right - FloatingWindow[2].Width - 5; - FloatingWindow[HISTORY].y = rect.top + 5; - - for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_WND; Res++, i++) - { - if (! AllocAndLoadString(&FloatingWindow[i].lpName, + /* Set window datums */ + Info->fltTools->x = rect.left + 5; + Info->fltTools->y = rect.top + 5; + + Info->fltColors->x = rect.left + 5; + Info->fltColors->y = rect.bottom - Info->fltColors->Height - 5; + + Info->fltHistory->x = rect.right - Info->fltHistory->Width - 5; + Info->fltHistory->y = rect.top + 5; + + /* save pointers into array incrementing within the loop*/ + WndArr[0] = Info->fltTools; + WndArr[1] = Info->fltColors; + WndArr[2] = Info->fltHistory; + + for (i = 0, Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_WND; Res++, i++) + { + if (! AllocAndLoadString(&WndArr[i]->lpName, hInstance, Res)) { - FloatingWindow[i].lpName = NULL; - } - - FloatingWindow[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, - TEXT("ImageSoftFloatWndClass"), - FloatingWindow[i].lpName, - WS_POPUPWINDOW | WS_DLGFRAME | WS_VISIBLE, - FloatingWindow[i].x, - FloatingWindow[i].y, - FloatingWindow[i].Width, - FloatingWindow[i].Height, - Info->hSelf, - NULL, - hInstance, - NULL); - } - - - - - if (FloatingWindow[TOOLS].hSelf != NULL) - { - FloatToolbarCreateToolsGui(&FloatingWindow[TOOLS]); - } - - if (FloatingWindow[COLORS].hSelf != NULL) - { - FloatToolbarCreateColorsGui(&FloatingWindow[COLORS]); - } - - if (FloatingWindow[HISTORY].hSelf != NULL) - { - FloatToolbarCreateHistoryGui(&FloatingWindow[HISTORY]); - } - -} - + WndArr[i]->lpName = NULL; + } + + WndArr[i]->hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, + TEXT("ImageSoftFloatWndClass"), + WndArr[i]->lpName, + WS_POPUPWINDOW | WS_DLGFRAME | WS_VISIBLE, + WndArr[i]->x, + WndArr[i]->y, + WndArr[i]->Width, + WndArr[i]->Height, + Info->hSelf, + NULL, + hInstance, + WndArr[i]); + + } + + if (Info->fltTools->hSelf != NULL) + { + FloatToolbarCreateToolsGui(Info); + } + + if (Info->fltColors->hSelf != NULL) + { + FloatToolbarCreateColorsGui(Info); + } + + if (Info->fltHistory->hSelf != NULL) + { + FloatToolbarCreateHistoryGui(Info); + } + +} + +static VOID +MainWndDestroyFloatWindows(PMAIN_WND_INFO Info) +{ + if (Info->fltTools != NULL) + HeapFree(ProcessHeap, 0, Info->fltTools); + + if (Info->fltColors != NULL) + HeapFree(ProcessHeap, 0, Info->fltTools); + + if (Info->fltHistory != NULL) + HeapFree(ProcessHeap, 0, Info->fltTools); +} @@ -753,9 +832,8 @@ CreateImageEditWindow(Info, &OpenInfo); } - - break; - } + } + break; case ID_BOLD: MessageBox(NULL, _T("Bingo"), NULL, 0); @@ -781,6 +859,60 @@ MainWndResetFloatingWindows(Info->hMdiClient); */ } + } + break; + + case ID_TOOLS: + { + HMENU hMenu = GetMenu(Info->hSelf); + + if (hMenu != NULL) + { + UINT uCheck; + + ShowHideWindow(Info->fltTools); + + uCheck = Info->fltTools->bShow ? MF_CHECKED : MF_UNCHECKED; + CheckMenuItem(hMenu, + ID_TOOLS, + uCheck); + } + } + break; + + case ID_COLOR: + { + HMENU hMenu = GetMenu(Info->hSelf); + + if (hMenu != NULL) + { + UINT uCheck; + + ShowHideWindow(Info->fltColors); + + uCheck = Info->fltColors->bShow ? MF_CHECKED : MF_UNCHECKED; + CheckMenuItem(hMenu, + ID_COLOR, + uCheck); + } + } + break; + + case ID_HISTORY: + { + HMENU hMenu = GetMenu(Info->hSelf); + + if (hMenu != NULL) + { + UINT uCheck; + + ShowHideWindow(Info->fltHistory); + + uCheck = Info->fltHistory->bShow ? MF_CHECKED : MF_UNCHECKED; + CheckMenuItem(hMenu, + ID_HISTORY, + uCheck); + } } break; @@ -841,6 +973,8 @@ DestroyMainWnd(PMAIN_WND_INFO Info) { /* FIXME - cleanup allocated resources */ + + MainWndDestroyFloatWindows(Info); } @@ -918,7 +1052,7 @@ /* reposition the floating toolbars */ if ((wParam == SIZE_MAXIMIZED) || (wParam == SIZE_RESTORED)) - MainWndResetFloatingWindows(Info->hMdiClient); + MainWndResetFloatingWindows(Info); break; } @@ -944,7 +1078,7 @@ { /* if the main window is moved, move the toolbars too */ if (bLBMouseDown) - MainWndMoveFloatingWindows(hwnd, &wndOldPos); + MainWndMoveFloatingWindows(Info, &wndOldPos); } break; @@ -997,13 +1131,13 @@ LOWORD(wParam), MainMenuHintTable, sizeof(MainMenuHintTable) / sizeof(MainMenuHintTable[0]), - IDS_READY)) + IDS_HINT_BLANK)) { MainWndMenuHint(Info, LOWORD(wParam), SystemMenuHintTable, sizeof(SystemMenuHintTable) / sizeof(SystemMenuHintTable[0]), - IDS_READY); + IDS_HINT_BLANK); } } break; Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Tue Apr 18 20:42:54 2006 @@ -49,6 +49,7 @@ /* generic definitions and forward declarations */ struct _MAIN_WND_INFO; struct _EDIT_WND_INFO; +struct _FLT_WND; typedef enum _MDI_EDITOR_TYPE { metUnknown = 0, @@ -288,8 +289,11 @@ HWND hSelf; HWND hMdiClient; HWND hStatus; - HWND hFloatTools; int nCmdShow; + + struct _FLT_WND *fltTools; + struct _FLT_WND *fltColors; + struct _FLT_WND *fltHistory; TOOLBAR_DOCKS ToolDocks; @@ -300,7 +304,7 @@ PVOID ActiveEditor; /* status flags */ - UINT InMenuLoop : 1; + BOOL InMenuLoop : 1; } MAIN_WND_INFO, *PMAIN_WND_INFO; BOOL InitMainWindowImpl(VOID); @@ -376,14 +380,17 @@ INT y; INT Width; INT Height; + BOOL bShow : 1; BOOL bOpaque; } FLT_WND, *PFLT_WND; -VOID FloatToolbarCreateToolsGui(PFLT_WND FltTools); -VOID FloatToolbarCreateColorsGui(PFLT_WND FltColors); -VOID FloatToolbarCreateHistoryGui(PFLT_WND FltHistory); +VOID FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info); +VOID FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info); +VOID FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info); BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); -BOOL ShowHideWindow(HWND hwnd); +BOOL ShowHideWindow(PFLT_WND FltInfo); + +VOID MakeFlatCombo(HWND hwndCombo); #endif /* __IMAGESOFT_PRECOMP_H */ Added: trunk/reactos/base/applications/imagesoft/res/icons/color/ColorLess.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/color/ColorLess.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/color/ColorMore.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/color/ColorMore.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistBack.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistBack.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistDelete.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistDelete.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistForward.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistForward.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistRedo.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistRedo.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistUndo.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/hist/HistUndo.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Tue Apr 18 20:42:54 2006 @@ -37,7 +37,14 @@ #define ID_EXIT 2016 #define ID_EDITCOLOURS 2017 #define ID_TOOLS 2018 -#define ID_STATUSBAR 2019 +#define ID_COLOR 2019 +#define ID_HISTORY 2020 +#define ID_STATUSBAR 2021 +#define ID_BLANK 2022 + +#define ID_BACK 2025 +#define ID_FORWARD 2026 +#define ID_DELETE 2027 /* text */ #define ID_BOLD 2030 @@ -47,6 +54,7 @@ #define ID_TXTCENTER 2034 #define ID_TXTRIGHT 2035 #define ID_TXTFONTNAME 2036 +#define ID_TXTFONTSIZE 2037 /* tools */ #define ID_CLONESTAMP 2050 @@ -81,7 +89,28 @@ #define ID_WINDOW_ARRANGE 3006 /* menu hints */ -#define IDS_HINT_EXIT 20001 +#define IDS_HINT_BLANK 20000 +#define IDS_HINT_NEW 20001 +#define IDS_HINT_OPEN 20002 +#define IDS_HINT_CLOSE 21006 +#define IDS_HINT_CLOSEALL 21007 +#define IDS_HINT_SAVE 20003 +#define IDS_HINT_SAVEAS 20004 +#define IDS_HINT_PRINT 20005 +#define IDS_HINT_PRINTPRE 20006 +#define IDS_HINT_PROP 20007 +#define IDS_HINT_EXIT 20008 + +#define IDS_HINT_TOOLS 20020 +#define IDS_HINT_COLORS 20021 +#define IDS_HINT_HISTORY 20022 +#define IDS_HINT_STATUS 20023 + +#define IDS_HINT_CASCADE 21009 +#define IDS_HINT_TILE_HORZ 21010 +#define IDS_HINT_TILE_VERT 21011 +#define IDS_HINT_ARRANGE 21012 +#define IDS_HINT_NEXT 21013 /* system menu hints */ #define IDS_HINT_SYS_RESTORE 21001 @@ -90,7 +119,6 @@ #define IDS_HINT_SYS_MINIMIZE 21004 #define IDS_HINT_SYS_MAXIMIZE 21005 #define IDS_HINT_SYS_CLOSE 21006 -#define IDS_HINT_SYS_NEXT 21007 /* Toolbar button bitmaps. @@ -136,7 +164,18 @@ #define IDB_TOOLSECLIPSE 10048 #define IDB_TOOLSFREEFORM 10049 -/* toolbar buttons */ +#define IDB_HISTBACK 10060 +#define IDB_HISTUNDO 10061 +#define IDB_HISTREDO 10062 +#define IDB_HISTFORWARD 10063 +#define IDB_HISTDELETE 10064 + +#define IDB_COLORSMORE 10080 +#define IDB_COLORSLESS 10081 + +/* TOOLBAR BITMAPS */ + +/* standard */ #define TBICON_NEW 0 #define TBICON_OPEN 1 #define TBICON_SAVE 2 @@ -147,14 +186,14 @@ #define TBICON_PASTE 7 #define TBICON_UNDO 8 #define TBICON_REDO 9 - +/* text */ #define TBICON_BOLD 0 #define TBICON_ITALIC 1 #define TBICON_ULINE 2 #define TBICON_TXTLEFT 3 #define TBICON_TXTCENTER 4 #define TBICON_TXTRIGHT 5 - +/* tools */ #define TBICON_RECTSEL 0 #define TBICON_MOVESEL 1 #define TBICON_LASOO 2 @@ -175,6 +214,13 @@ #define TBICON_ROUNDRECT 17 #define TBICON_ECLIPSE 18 #define TBICON_FREEFORM 19 +/* history */ +#define TBICON_BACKSM 0 +#define TBICON_UNDOSM 1 +#define TBICON_REDOSM 2 +#define TBICON_FORWARDSM 3 +#define TBICON_DELETESM 4 + /* tooltips */ #define IDS_TOOLTIP_NEW 6000

1 0

[greatlrd] 21650: fast cleanup in dib/dib24bpp.c, Fixing a crash bug in dib32bpp.c (typo from me), xlate XO_TABLE can resive 0xffff or 0xffff or 0xffffff or 0xffffffff as color code for table, but the table is only 256 but in color&FF, That will stop firefox crash and translate the color right.
by greatlrd＠svn.reactos.org 18 Apr '06

18 Apr '06

Author: greatlrd Date: Tue Apr 18 19:52:48 2006 New Revision: 21650 URL: http://svn.reactos.ru/svn/reactos?rev=21650&view=rev Log: fast cleanup in dib/dib24bpp.c, Fixing a crash bug in dib32bpp.c (typo from me), xlate XO_TABLE can resive 0xffff or 0xffff or 0xffffff or 0xffffffff as color code for table, but the table is only 256 but in color&FF, That will stop firefox crash and translate the color right. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c Tue Apr 18 19:52:48 2006 @@ -283,12 +283,9 @@ } } else - { - /* FIXME */ - //DPRINT1("DIB_24BPP_Bitblt: Unhandled BltInfo->XlateSourceToDest for 16 -> 16 copy\n"); - // return DIB_16BPP_BitBltSrcCopy(BltInfo); + { sx = BltInfo->SourcePoint.x; - sy = BltInfo->SourcePoint.y; + sy = BltInfo->SourcePoint.y; for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) { Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Tue Apr 18 19:52:48 2006 @@ -304,7 +304,7 @@ { Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right; BltInfo->DestRect.left < i; i--) + for (i = BltInfo->DestRect.right; BltInfo->DestRect.left <= i; i--) { *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); } Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c Tue Apr 18 19:52:48 2006 @@ -493,9 +493,10 @@ if (XlateObj->flXlate & XO_TRIVIAL) return Color; - - if (XlateObj->flXlate & XO_TABLE) - return XlateObj->pulXlate[Color]; + + if ((XlateObj->flXlate & XO_TABLE)) + return XlateObj->pulXlate[Color & 0xff]; + if (XlateObj->flXlate & XO_TO_MONO) return Color == XlateObj->pulXlate[0];

1 0

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

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 April 2006