Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 18668: fix SetLastError value ERROR_MORE_DATA -> ERROR_INSUFFICIENT_BUFFER
by cwittich＠svn.reactos.com 21 Oct '05

21 Oct '05

fix SetLastError value ERROR_MORE_DATA -> ERROR_INSUFFICIENT_BUFFER Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-21 21:16:36 UTC (rev 18667) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-21 23:40:09 UTC (rev 18668) @@ -2153,7 +2153,7 @@ PropertyBufferSizeW, &RequiredSizeW); - if (bResult || GetLastError() == ERROR_MORE_DATA) + if (bResult || GetLastError() == ERROR_INSUFFICIENT_BUFFER) { bIsStringProperty = (RegType == REG_SZ || RegType == REG_MULTI_SZ || RegType == REG_EXPAND_SZ); @@ -2327,10 +2327,16 @@ &BufferSize); if (RequiredSize) *RequiredSize = BufferSize; - if (rc == ERROR_SUCCESS) - ret = TRUE; - else - SetLastError(rc); + switch(rc) { + case ERROR_SUCCESS: + ret = TRUE; + break; + case ERROR_MORE_DATA: + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + default: + SetLastError(rc); + } RegCloseKey(hKey); break; }

1 0

[gvg] 18667: Merge from trunk.
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Merge from trunk. Make FindWindow case insensitive. Fixes bug 919. Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-21 21:13:07 UTC (rev 18666) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-21 21:16:36 UTC (rev 18667) @@ -2274,7 +2274,7 @@ /* Do not send WM_GETTEXT messages in the kernel mode version! The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ - if((!CheckWindowName || !RtlCompareUnicodeString(WindowName, &(Child->WindowName), FALSE)) && + if((!CheckWindowName || !RtlCompareUnicodeString(WindowName, &(Child->WindowName), TRUE)) && (!ClassAtom || Child->Class->Atom == ClassAtom)) { Ret = Child->hSelf; @@ -2453,7 +2453,7 @@ The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( - &WindowName, &TopLevelWindow->WindowName, FALSE); + &WindowName, &TopLevelWindow->WindowName, TRUE); ClassMatches = !CheckClassName || ClassAtom == TopLevelWindow->Class->Atom;

1 0

[gvg] 18666: Make FindWindow case insensitive. Fixes bug 919.
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Make FindWindow case insensitive. Fixes bug 919. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-21 20:31:59 UTC (rev 18665) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-21 21:13:07 UTC (rev 18666) @@ -2274,7 +2274,7 @@ /* Do not send WM_GETTEXT messages in the kernel mode version! The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ - if((!CheckWindowName || !RtlCompareUnicodeString(WindowName, &(Child->WindowName), FALSE)) && + if((!CheckWindowName || !RtlCompareUnicodeString(WindowName, &(Child->WindowName), TRUE)) && (!ClassAtom || Child->Class->Atom == ClassAtom)) { Ret = Child->hSelf; @@ -2453,7 +2453,7 @@ The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( - &WindowName, &TopLevelWindow->WindowName, FALSE); + &WindowName, &TopLevelWindow->WindowName, TRUE); ClassMatches = !CheckClassName || ClassAtom == TopLevelWindow->Class->Atom;

1 0

[gvg] 18665: Merge from trunk.
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Merge from trunk. - Enable/disable keyboard by writing the controller command byte instead of issuing keyboard commands, the keyboard commands seem to confuse some kvm switches. - Use STATUS_IO_TIMEOUT consistently, STATUS_TIMEOUT is not an error condition - Introduce symbolic constants for controller command byte bits - Try to detect mouse early and if its not present, reset the keyboard controller. Some controllers seem to get locked up when writing to a non-present mouse. - Don't check the timeout status bit when reading from the controller. It is often wrong. - Don't treat failure to read keyboard id as a fatal error, we only read it to set KeyboardIsAT which we then don't use. Still try to detect the keyboard type, but don't fail if it doesn't work. Fixes bug 688. Thanks to Hartmut, Filip and WaxDragon for testing. Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.h Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/keyboard.c Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/mouse.c _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c --- branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-21 20:28:05 UTC (rev 18664) +++ branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-21 20:31:59 UTC (rev 18665) @@ -10,9 +10,7 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG #define NDEBUG -#endif #include <debug.h> #include "i8042prt.h" @@ -78,7 +76,7 @@ DPRINT("Read: %x (status: %x)\n", Data[0], Status); // If the data is valid (not timeout, not parity error) - if (0 == (Status & (KBD_GTO | KBD_PERR))) + if (0 == (Status & KBD_PERR)) return STATUS_SUCCESS; } return STATUS_UNSUCCESSFUL; @@ -115,7 +113,7 @@ UCHAR Ignore; while (STATUS_SUCCESS == I8042ReadData(&Ignore)) { - ; /* drop */ + DPRINT("Data flushed\n"); /* drop */ } } @@ -146,25 +144,38 @@ do { if (Port) if (!I8042Write(DevExt, I8042_DATA_PORT, Port)) - return STATUS_TIMEOUT; + { + DPRINT1("Failed to write Port\n"); + return STATUS_IO_TIMEOUT; + } if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) - return STATUS_TIMEOUT; + { + DPRINT1("Failed to write Value\n"); + return STATUS_IO_TIMEOUT; + } if (WaitForAck) { Status = I8042ReadDataWait(DevExt, &Ack); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to read Ack\n"); return Status; + } if (Ack == KBD_ACK) return STATUS_SUCCESS; if (Ack != KBD_RESEND) + { + DPRINT1("Unexpected Ack 0x%x\n", Ack); return STATUS_UNEXPECTED_IO_ERROR; + } } else { return STATUS_SUCCESS; } + DPRINT("Reiterating\n"); ResendIterations--; } while (ResendIterations); - return STATUS_TIMEOUT; + return STATUS_IO_TIMEOUT; } /* @@ -241,7 +252,7 @@ DevExt->PacketPort = 0; if (!I8042PacketWrite(DevExt)) { - Status = STATUS_TIMEOUT; + Status = STATUS_IO_TIMEOUT; DevExt->Packet.State = Idle; DevExt->PacketResult = STATUS_ABANDONED; goto startpacketdone; @@ -273,7 +284,7 @@ if (DevExt->PacketResends > DevExt->Settings.ResendIterations) { DevExt->Packet.State = Idle; DevExt->PacketComplete = TRUE; - DevExt->PacketResult = STATUS_TIMEOUT; + DevExt->PacketResult = STATUS_IO_TIMEOUT; DevExt->PacketResends = 0; return TRUE; } @@ -301,7 +312,7 @@ if (!I8042PacketWrite(DevExt)) { DevExt->Packet.State = Idle; DevExt->PacketComplete = TRUE; - DevExt->PacketResult = STATUS_TIMEOUT; + DevExt->PacketResult = STATUS_IO_TIMEOUT; return TRUE; } DevExt->Packet.CurrentByte++; @@ -519,23 +530,53 @@ I8042Flush(); - if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) - return STATUS_TIMEOUT; + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) { + DPRINT1("Writing KBD_SELF_TEST command failed\n"); + return STATUS_IO_TIMEOUT; + } // Wait longer? Counter = 3; do { Status = I8042ReadDataWait(DevExt, &Value); - } while ((Counter--) && (STATUS_TIMEOUT == Status)); + } while ((Counter--) && (STATUS_IO_TIMEOUT == Status)); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { + DPRINT1("Failed to read KBD_SELF_TEST response, status 0x%x\n", + Status); return Status; + } if (Value != 0x55) { DPRINT1("Got %x instead of 55\n", Value); return STATUS_IO_DEVICE_ERROR; } + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); + return FALSE; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value |= CCB_KBD_DISAB | CCB_MOUSE_DISAB; /* disable keyboard/mouse */ + Value &= ~(CCB_KBD_INT_ENAB | CCB_MOUSE_INT_ENAB); + /* don't enable keyboard and mouse interrupts */ + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + if (I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) { Status = I8042ReadDataWait(DevExt, &Value); @@ -563,6 +604,11 @@ return Status; } + if (DevExt->MouseExists) { + DPRINT("Aux port detected\n"); + DevExt->MouseExists = I8042DetectMouse(DevExt); + } + if (!DevExt->KeyboardExists) { DPRINT("Keyboard port not detected\n"); if (DevExt->Settings.Headless) @@ -820,4 +866,3 @@ return(STATUS_SUCCESS); } - _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.h --- branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.h 2005-10-21 20:28:05 UTC (rev 18664) +++ branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.h 2005-10-21 20:31:59 UTC (rev 18665) @@ -246,7 +246,18 @@ #define KBD_GTO 0x40 #define KBD_PERR 0x80 +/* + * Controller command byte bits + */ +#define CCB_KBD_INT_ENAB 0x01 +#define CCB_MOUSE_INT_ENAB 0x02 +#define CCB_SYSTEM_FLAG 0x04 +#define CCB_IGN_KEY_LOCK 0x08 +#define CCB_KBD_DISAB 0x10 +#define CCB_MOUSE_DISAB 0x20 +#define CCB_TRANSLATE 0x40 + /* * LED bits */ @@ -359,6 +370,7 @@ BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt); BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt); +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt); /* ps2pp.c */ VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input); _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/keyboard.c --- branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/keyboard.c 2005-10-21 20:28:05 UTC (rev 18664) +++ branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/keyboard.c 2005-10-21 20:31:59 UTC (rev 18665) @@ -11,13 +11,11 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG +#include "i8042prt.h" + #define NDEBUG -#endif #include <debug.h> -#include "i8042prt.h" - /* GLOBALS *******************************************************************/ static UCHAR TypematicTable[] = { @@ -559,34 +557,73 @@ * some really old broken keyboard controllers which I hope won't be * necessary. * - * Anyway, disabling the keyboard helps the detection and it also - * clears the keyboard buffer and sets defaults which is what we - * want. + * We change the command byte, sending KBD_ENABLE/DISABLE seems to confuse + * some kvm switches. */ BOOLEAN STDCALL I8042KeyboardEnable(PDEVICE_EXTENSION DevExt) { - DPRINT("Enabling keyboard\n"); - if (STATUS_SUCCESS != I8042SynchWritePort(DevExt, - 0, - KBD_ENABLE, - TRUE)) { - DPRINT("Can't enable keyboard\n"); + UCHAR Value; + NTSTATUS Status; + + DPRINT("Enable keyboard\n"); + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); return FALSE; } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value &= ~CCB_KBD_DISAB; // don't disable keyboard + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + return TRUE; } static BOOLEAN STDCALL I8042KeyboardDefaultsAndDisable(PDEVICE_EXTENSION DevExt) { + UCHAR Value; + NTSTATUS Status; + DPRINT("Disabling keyboard\n"); - if (STATUS_SUCCESS != I8042SynchWritePort(DevExt, - 0, - KBD_DISABLE, - TRUE)) { - DPRINT("Can't disable keyboard\n"); + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); return FALSE; } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value |= CCB_KBD_DISAB; // disable keyboard + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + return TRUE; } @@ -608,8 +645,8 @@ return FALSE; } - Value &= ~(0x10); // don't disable keyboard - Value |= 0x01; // enable keyboard interrupts + Value &= ~CCB_KBD_DISAB; // don't disable keyboard + Value |= CCB_KBD_INT_ENAB; // enable keyboard interrupts if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { DPRINT1("Can't set i8042 mode\n"); @@ -628,6 +665,7 @@ { NTSTATUS Status; UCHAR Value; + UCHAR Value2; ULONG RetryCount = 10; DPRINT("Detecting keyboard\n"); @@ -635,12 +673,15 @@ I8042KeyboardDefaultsAndDisable(DevExt); do { + I8042Flush(); Status = I8042SynchWritePort(DevExt, 0, KBD_GET_ID, TRUE); - } while (STATUS_TIMEOUT == Status && RetryCount--); + } while (STATUS_IO_TIMEOUT == Status && RetryCount--); if (!NT_SUCCESS(Status)) { DPRINT1("Can't write GET_ID (%x)\n", Status); - return FALSE; + /* Could be an AT keyboard */ + DevExt->KeyboardIsAT = TRUE; + goto detectsetleds; } Status = I8042ReadDataWait(DevExt, &Value); @@ -658,17 +699,17 @@ return FALSE; } - DPRINT("Keyboard ID: %x", Value); - - Status = I8042ReadDataWait(DevExt, &Value); + Status = I8042ReadDataWait(DevExt, &Value2); if (!NT_SUCCESS(Status)) { DPRINT("Partial ID\n"); return FALSE; } - DPRINT ("%x\n", Value); + DPRINT("Keyboard ID: 0x%x 0x%x\n", Value, Value2); detectsetleds: + I8042Flush(); /* Flush any bytes left over from GET_ID */ + Status = I8042SynchWritePort(DevExt, 0, KBD_SET_LEDS, TRUE); if (!NT_SUCCESS(Status)) { DPRINT("Can't write SET_LEDS (%x)\n", Status); _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/mouse.c --- branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/mouse.c 2005-10-21 20:28:05 UTC (rev 18664) +++ branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/mouse.c 2005-10-21 20:31:59 UTC (rev 18665) @@ -11,13 +11,11 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG +#include "i8042prt.h" + #define NDEBUG -#endif #include <debug.h> -#include "i8042prt.h" - /* * These functions are callbacks for filter driver custom interrupt * service routines. @@ -897,3 +895,54 @@ return TRUE; } + +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt) +{ + BOOLEAN Ok = TRUE; + NTSTATUS Status; + UCHAR Value; + UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 }; + unsigned ReplyByte; + + if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) || + ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF)) + { + DPRINT1("Failed to write reset command to mouse\n"); + Ok = FALSE; + } + + for (ReplyByte = 0; + ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; + ReplyByte++) + { + Status = I8042ReadDataWait(DevExt, &Value); + if (! NT_SUCCESS(Status)) + { + DPRINT1("No ACK after mouse reset, status 0x%08x\n", + Status); + Ok = FALSE; + } + else if (Value != ExpectedReply[ReplyByte]) + { + DPRINT1("Unexpected reply: 0x%02x (expected 0x%02x)\n", + Value, ExpectedReply[ReplyByte]); + Ok = FALSE; + } + } + + if (! Ok) + { + /* There is probably no mouse present. On some systems, + the probe locks the entire keyboard controller. Let's + try to get access to the keyboard again by sending a + reset */ + I8042Flush(); + I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST); + I8042ReadDataWait(DevExt, &Value); + I8042Flush(); + } + + DPRINT("Mouse %sdetected\n", Ok ? "" : "not "); + + return Ok; +}

1 0

[gvg] 18664: - Enable/disable keyboard by writing the controller command byte instead of
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

- Enable/disable keyboard by writing the controller command byte instead of issuing keyboard commands, the keyboard commands seem to confuse some kvm switches. - Use STATUS_IO_TIMEOUT consistently, STATUS_TIMEOUT is not an error condition - Introduce symbolic constants for controller command byte bits - Try to detect mouse early and if its not present, reset the keyboard controller. Some controllers seem to get locked up when writing to a non-present mouse. - Don't check the timeout status bit when reading from the controller. It is often wrong. - Don't treat failure to read keyboard id as a fatal error, we only read it to set KeyboardIsAT which we then don't use. Still try to detect the keyboard type, but don't fail if it doesn't work. Fixes bug 688. Thanks to Hartmut, Filip and WaxDragon for testing. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-21 19:45:28 UTC (rev 18663) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-21 20:28:05 UTC (rev 18664) @@ -10,9 +10,7 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG #define NDEBUG -#endif #include <debug.h> #include "i8042prt.h" @@ -78,7 +76,7 @@ DPRINT("Read: %x (status: %x)\n", Data[0], Status); // If the data is valid (not timeout, not parity error) - if (0 == (Status & (KBD_GTO | KBD_PERR))) + if (0 == (Status & KBD_PERR)) return STATUS_SUCCESS; } return STATUS_UNSUCCESSFUL; @@ -115,7 +113,7 @@ UCHAR Ignore; while (STATUS_SUCCESS == I8042ReadData(&Ignore)) { - ; /* drop */ + DPRINT("Data flushed\n"); /* drop */ } } @@ -146,25 +144,38 @@ do { if (Port) if (!I8042Write(DevExt, I8042_DATA_PORT, Port)) - return STATUS_TIMEOUT; + { + DPRINT1("Failed to write Port\n"); + return STATUS_IO_TIMEOUT; + } if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) - return STATUS_TIMEOUT; + { + DPRINT1("Failed to write Value\n"); + return STATUS_IO_TIMEOUT; + } if (WaitForAck) { Status = I8042ReadDataWait(DevExt, &Ack); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to read Ack\n"); return Status; + } if (Ack == KBD_ACK) return STATUS_SUCCESS; if (Ack != KBD_RESEND) + { + DPRINT1("Unexpected Ack 0x%x\n", Ack); return STATUS_UNEXPECTED_IO_ERROR; + } } else { return STATUS_SUCCESS; } + DPRINT("Reiterating\n"); ResendIterations--; } while (ResendIterations); - return STATUS_TIMEOUT; + return STATUS_IO_TIMEOUT; } /* @@ -241,7 +252,7 @@ DevExt->PacketPort = 0; if (!I8042PacketWrite(DevExt)) { - Status = STATUS_TIMEOUT; + Status = STATUS_IO_TIMEOUT; DevExt->Packet.State = Idle; DevExt->PacketResult = STATUS_ABANDONED; goto startpacketdone; @@ -273,7 +284,7 @@ if (DevExt->PacketResends > DevExt->Settings.ResendIterations) { DevExt->Packet.State = Idle; DevExt->PacketComplete = TRUE; - DevExt->PacketResult = STATUS_TIMEOUT; + DevExt->PacketResult = STATUS_IO_TIMEOUT; DevExt->PacketResends = 0; return TRUE; } @@ -301,7 +312,7 @@ if (!I8042PacketWrite(DevExt)) { DevExt->Packet.State = Idle; DevExt->PacketComplete = TRUE; - DevExt->PacketResult = STATUS_TIMEOUT; + DevExt->PacketResult = STATUS_IO_TIMEOUT; return TRUE; } DevExt->Packet.CurrentByte++; @@ -519,23 +530,53 @@ I8042Flush(); - if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) - return STATUS_TIMEOUT; + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) { + DPRINT1("Writing KBD_SELF_TEST command failed\n"); + return STATUS_IO_TIMEOUT; + } // Wait longer? Counter = 3; do { Status = I8042ReadDataWait(DevExt, &Value); - } while ((Counter--) && (STATUS_TIMEOUT == Status)); + } while ((Counter--) && (STATUS_IO_TIMEOUT == Status)); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { + DPRINT1("Failed to read KBD_SELF_TEST response, status 0x%x\n", + Status); return Status; + } if (Value != 0x55) { DPRINT1("Got %x instead of 55\n", Value); return STATUS_IO_DEVICE_ERROR; } + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); + return FALSE; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value |= CCB_KBD_DISAB | CCB_MOUSE_DISAB; /* disable keyboard/mouse */ + Value &= ~(CCB_KBD_INT_ENAB | CCB_MOUSE_INT_ENAB); + /* don't enable keyboard and mouse interrupts */ + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + if (I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) { Status = I8042ReadDataWait(DevExt, &Value); @@ -563,6 +604,11 @@ return Status; } + if (DevExt->MouseExists) { + DPRINT("Aux port detected\n"); + DevExt->MouseExists = I8042DetectMouse(DevExt); + } + if (!DevExt->KeyboardExists) { DPRINT("Keyboard port not detected\n"); if (DevExt->Settings.Headless) @@ -820,4 +866,3 @@ return(STATUS_SUCCESS); } - _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-10-21 19:45:28 UTC (rev 18663) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-10-21 20:28:05 UTC (rev 18664) @@ -246,7 +246,18 @@ #define KBD_GTO 0x40 #define KBD_PERR 0x80 +/* + * Controller command byte bits + */ +#define CCB_KBD_INT_ENAB 0x01 +#define CCB_MOUSE_INT_ENAB 0x02 +#define CCB_SYSTEM_FLAG 0x04 +#define CCB_IGN_KEY_LOCK 0x08 +#define CCB_KBD_DISAB 0x10 +#define CCB_MOUSE_DISAB 0x20 +#define CCB_TRANSLATE 0x40 + /* * LED bits */ @@ -359,6 +370,7 @@ BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt); BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt); +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt); /* ps2pp.c */ VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input); _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-10-21 19:45:28 UTC (rev 18663) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-10-21 20:28:05 UTC (rev 18664) @@ -11,13 +11,11 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG +#include "i8042prt.h" + #define NDEBUG -#endif #include <debug.h> -#include "i8042prt.h" - /* GLOBALS *******************************************************************/ static UCHAR TypematicTable[] = { @@ -559,34 +557,73 @@ * some really old broken keyboard controllers which I hope won't be * necessary. * - * Anyway, disabling the keyboard helps the detection and it also - * clears the keyboard buffer and sets defaults which is what we - * want. + * We change the command byte, sending KBD_ENABLE/DISABLE seems to confuse + * some kvm switches. */ BOOLEAN STDCALL I8042KeyboardEnable(PDEVICE_EXTENSION DevExt) { - DPRINT("Enabling keyboard\n"); - if (STATUS_SUCCESS != I8042SynchWritePort(DevExt, - 0, - KBD_ENABLE, - TRUE)) { - DPRINT("Can't enable keyboard\n"); + UCHAR Value; + NTSTATUS Status; + + DPRINT("Enable keyboard\n"); + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); return FALSE; } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value &= ~CCB_KBD_DISAB; // don't disable keyboard + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + return TRUE; } static BOOLEAN STDCALL I8042KeyboardDefaultsAndDisable(PDEVICE_EXTENSION DevExt) { + UCHAR Value; + NTSTATUS Status; + DPRINT("Disabling keyboard\n"); - if (STATUS_SUCCESS != I8042SynchWritePort(DevExt, - 0, - KBD_DISABLE, - TRUE)) { - DPRINT("Can't disable keyboard\n"); + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); return FALSE; } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return FALSE; + } + + Value |= CCB_KBD_DISAB; // disable keyboard + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return FALSE; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return FALSE; + } + return TRUE; } @@ -608,8 +645,8 @@ return FALSE; } - Value &= ~(0x10); // don't disable keyboard - Value |= 0x01; // enable keyboard interrupts + Value &= ~CCB_KBD_DISAB; // don't disable keyboard + Value |= CCB_KBD_INT_ENAB; // enable keyboard interrupts if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { DPRINT1("Can't set i8042 mode\n"); @@ -628,6 +665,7 @@ { NTSTATUS Status; UCHAR Value; + UCHAR Value2; ULONG RetryCount = 10; DPRINT("Detecting keyboard\n"); @@ -635,12 +673,15 @@ I8042KeyboardDefaultsAndDisable(DevExt); do { + I8042Flush(); Status = I8042SynchWritePort(DevExt, 0, KBD_GET_ID, TRUE); - } while (STATUS_TIMEOUT == Status && RetryCount--); + } while (STATUS_IO_TIMEOUT == Status && RetryCount--); if (!NT_SUCCESS(Status)) { DPRINT1("Can't write GET_ID (%x)\n", Status); - return FALSE; + /* Could be an AT keyboard */ + DevExt->KeyboardIsAT = TRUE; + goto detectsetleds; } Status = I8042ReadDataWait(DevExt, &Value); @@ -658,17 +699,17 @@ return FALSE; } - DPRINT("Keyboard ID: %x", Value); - - Status = I8042ReadDataWait(DevExt, &Value); + Status = I8042ReadDataWait(DevExt, &Value2); if (!NT_SUCCESS(Status)) { DPRINT("Partial ID\n"); return FALSE; } - DPRINT ("%x\n", Value); + DPRINT("Keyboard ID: 0x%x 0x%x\n", Value, Value2); detectsetleds: + I8042Flush(); /* Flush any bytes left over from GET_ID */ + Status = I8042SynchWritePort(DevExt, 0, KBD_SET_LEDS, TRUE); if (!NT_SUCCESS(Status)) { DPRINT("Can't write SET_LEDS (%x)\n", Status); _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-10-21 19:45:28 UTC (rev 18663) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-10-21 20:28:05 UTC (rev 18664) @@ -11,13 +11,11 @@ /* INCLUDES ****************************************************************/ -#ifndef NDEBUG +#include "i8042prt.h" + #define NDEBUG -#endif #include <debug.h> -#include "i8042prt.h" - /* * These functions are callbacks for filter driver custom interrupt * service routines. @@ -897,3 +895,54 @@ return TRUE; } + +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt) +{ + BOOLEAN Ok = TRUE; + NTSTATUS Status; + UCHAR Value; + UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 }; + unsigned ReplyByte; + + if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) || + ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF)) + { + DPRINT1("Failed to write reset command to mouse\n"); + Ok = FALSE; + } + + for (ReplyByte = 0; + ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; + ReplyByte++) + { + Status = I8042ReadDataWait(DevExt, &Value); + if (! NT_SUCCESS(Status)) + { + DPRINT1("No ACK after mouse reset, status 0x%08x\n", + Status); + Ok = FALSE; + } + else if (Value != ExpectedReply[ReplyByte]) + { + DPRINT1("Unexpected reply: 0x%02x (expected 0x%02x)\n", + Value, ExpectedReply[ReplyByte]); + Ok = FALSE; + } + } + + if (! Ok) + { + /* There is probably no mouse present. On some systems, + the probe locks the entire keyboard controller. Let's + try to get access to the keyboard again by sending a + reset */ + I8042Flush(); + I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST); + I8042ReadDataWait(DevExt, &Value); + I8042Flush(); + } + + DPRINT("Mouse %sdetected\n", Ok ? "" : "not "); + + return Ok; +}

1 0

[gvg] 18663: Revert r18662, trunk and branch already diverged
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Revert r18662, trunk and branch already diverged Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,85 +1,85 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "PozadÝ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP,7,139,173,71 LTEXT "Vyberte obrßzek, kter² chcete pou×Ýt jako pozadÝ:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "UmÝstýnÝ:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "UmÝstýnÝ:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spo°iÞ obrazovky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 176 LTEXT "Seznam spo°iÞ¨:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&P°idat",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&P°idat",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP + PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 164, 43, 12 CONTROL "P°i obnovenÝ po×adovat &heslo.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - LTEXT "&?ekat:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&?ekat:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY,5, 186, 238, 35 LTEXT "Pro mo×nosti napßjenÝ monitoru klepnýta na tlaÞÝtko Mo×nosti napßjenÝ.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vzhled" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 110,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "NastavenÝ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Displej:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 + LTEXT "&Displej:",1820,3,140,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Velikost obrazovky",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 - LTEXT "MÚný",1815,9,130,15,8,NOT WS_GROUP - LTEXT "VÝce",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&PoÞet barev",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,170,58,17 + LTEXT "MÚný",1815,9,170,15,8,NOT WS_GROUP + LTEXT "VÝce",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&PoÞet barev",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,165,56,14 + 131,188,103,9 + PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE Property changes on: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc ___________________________________________________________________ Name: svn:eol-style - native _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,86 +1,80 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Hintergrundbild:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,135,56,14 - PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,155,56,14 - LTEXT "Ausrichtung:",IDC_STATIC,186,98,43,8 - COMBOBOX IDC_PLACEMENT_COMBO,186,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildschrimschoner" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Darstellung" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Einstellungen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Anzeige:",1820,3,100,30,8 - LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 32,130,60,17 - LTEXT "Niedrig",1815,9,130,25,8,NOT WS_GROUP - LTEXT "Hoch",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Farbqualitõt",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Anzeige" - IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." - - IDS_NONE "(Keine)" - IDS_CENTER "Zentriert" - IDS_STRETCH "Gestreckt" - IDS_TILE "Nebeneinander" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "16 Farben" - IDS_COLOR_8BIT "256 Farben" - IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_24BIT "True Color (24 Bit)" - IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" -END +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,139,173,71 + LTEXT "Hintergrundbild:", + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,175,56,14 + PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,195,56,14 + LTEXT "Ausrichtung:",IDC_STATIC,186,138,43,8 + COMBOBOX IDC_PLACEMENT_COMBO,186,148,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bildschrimschoner" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 110,112,8 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Darstellung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 110,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Anzeige:",1820,3,140,30,8 + LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 32,170,60,17 + LTEXT "Niedrig",1815,9,170,25,8,NOT WS_GROUP + LTEXT "Hoch",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Farbqualitõt",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,205,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Anzeige" + IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." + + IDS_NONE "(Keine)" + IDS_CENTER "Zentriert" + IDS_STRETCH "Gestreckt" + IDS_TILE "Nebeneinander" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Farben" + IDS_COLOR_8BIT "256 Farben" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,5 +1,4 @@ #include <windows.h> -#include <commctrl.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -16,8 +15,7 @@ #include "en.rc" #include "cz.rc" #include "de.rc" -#include "es.rc" -#include "Ja.rc" #include "nl.rc" #include "pl.rc" #include "sv.rc" +#include "es.rc" _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,85 +1,85 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP,7,139,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Placement:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Placement:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screen Saver" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 176 LTEXT "List of Screensavers:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&Add",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP + PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 164, 43, 12 CONTROL "On Resume, &Password Protect.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - LTEXT "&Wait:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Wait:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 110,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Screen area",1818,3,120,115,43 + LTEXT "&Display:",1820,3,140,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Screen area",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 - LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP - LTEXT "More",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colors",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,170,58,17 + LTEXT "Less",1815,9,170,15,8,NOT WS_GROUP + LTEXT "More",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 + 131,188,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE @@ -102,9 +102,3 @@ IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" -END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,111 +1,111 @@ -/* - * desk (Spanish resources) - * - * Copyright 2005 Patricio MartÝnez Ros - * - */ - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Escritorio" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Fondo:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Posici¾n",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Protector de pantalla" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - - LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&A±adir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - - PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 124, 56, 12,WS_GROUP - PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 124, 43, 12 - - CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - - LTEXT "&Esperar:",IDC_STATIC,13, 110, 31, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,44, 108, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,62, 108, 12, 12 - LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 110, 161, 9 - - GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 - LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Apariencia" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 89,181,10 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configuraci¾n" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Monitor",1820,3,100,30,8 - LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "Resoluci¾n de &pantalla",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 - LTEXT "Menos",1815,8,130,21,8,NOT WS_GROUP - LTEXT "Mßs",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Calidad de color",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Pantalla" - IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." - - IDS_NONE "(Ninguno)" - IDS_CENTER "Centrada" - IDS_STRETCH "Expandida" - IDS_TILE "En mosaico" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "Muy baja (4 bits)" - IDS_COLOR_8BIT "Baja (8 bits)" - IDS_COLOR_16BIT "Media (16 bits)" - IDS_COLOR_24BIT "Alta (24 bits)" - IDS_COLOR_32BIT "La mßs alta (32 bits)" - IDS_PIXEL "%lu por %lu pÝxeles" -END +/* + * desk (Spanish resources) + * + * Copyright 2005 Patricio MartÝnez Ros + * + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Escritorio" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,139,173,71 + LTEXT "Fondo:", + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Posici¾n",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Protector de pantalla" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + + LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&A±adir",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + + PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 164, 56, 12,WS_GROUP + PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 164, 43, 12 + + CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + + LTEXT "&Esperar:",IDC_STATIC,13, 150, 31, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,44, 148, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,62, 148, 12, 12 + LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 150, 161, 9 + + GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Apariencia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, + 109,181,10 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuraci¾n" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Monitor",1820,3,140,30,8 + LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "Resoluci¾n de &pantalla",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,170,58,17 + LTEXT "Menos",1815,8,170,21,8,NOT WS_GROUP + LTEXT "Mßs",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Calidad de color",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,205,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Pantalla" + IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." + + IDS_NONE "(Ninguno)" + IDS_CENTER "Centrada" + IDS_STRETCH "Expandida" + IDS_TILE "En mosaico" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "Muy baja (4 bits)" + IDS_COLOR_8BIT "Baja (8 bits)" + IDS_COLOR_16BIT "Media (16 bits)" + IDS_COLOR_24BIT "Alta (24 bits)" + IDS_COLOR_32BIT "La mßs alta (32 bits)" + IDS_PIXEL "%lu por %lu pÝxeles" +END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,85 +1,85 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP,7,139,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "&Weergave:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "&Weergave:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 176 LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Toevoegen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&Toevoegen",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP + PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 164, 43, 12 CONTROL "&Beveiligd met wachtwoord.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - LTEXT "W&acht:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "W&acht:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minuten.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "minuten.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 90,112,8 + 110,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instellingen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Scherm:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Screen area",1818,3,120,115,43 + LTEXT "&Scherm:",1820,3,140,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Screen area",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 - LTEXT "Minder",1815,9,130,15,8,NOT WS_GROUP - LTEXT "Meer",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Kleuren",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,170,58,17 + LTEXT "Minder",1815,9,170,15,8,NOT WS_GROUP + LTEXT "Meer",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Kleuren",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14 + 131,188,103,9 + PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,86 +1,86 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-07) LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP,7,139,173,71 LTEXT "Wybierz obraz do u?ycia jako tapeta pulpitu:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Po?o?enie:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Po?o?enie:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygaszacz ekranu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 176 LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Dodaj",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&Dodaj",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP + PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12 CONTROL "Po wznowieniu wy£wietl &ekran powitalny.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 141, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - LTEXT "&Czekaj:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Czekaj:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY,5, 186, 238, 35 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaµ ustawienia zasilania dla monitora.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygl?d" FONT 8, "MS Shell Dlg" BEGIN LTEXT "To miejsce pozosta?o celowo puste",IDC_STATIC,66, - 90,112,8 + 110,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ekran:",1820,3,100,30,8 - LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,120,115,43 + LTEXT "&Ekran:",1820,3,140,30,8 + LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 - LTEXT "Mniej",1815,9,130,15,8,NOT WS_GROUP - LTEXT "WiÛcej",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Jako£µ kolor¾w",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,170,58,17 + LTEXT "Mniej",1815,9,170,15,8,NOT WS_GROUP + LTEXT "WiÛcej",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Jako£µ kolor¾w",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 - PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14 + 131,188,103,9 + PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc 2005-10-21 19:33:16 UTC (rev 18662) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc 2005-10-21 19:45:28 UTC (rev 18663) @@ -1,107 +1,107 @@ -/* Swedish resources by David Nordenberg - Updated 2005-07-09 by Andreas Bjerkeholt */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bakgrund" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Võlj en bild du vill ha som skrivbordsunderlõgg:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Blõddra...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Fõrg...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Placering:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Skõrmslõckare" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - - LTEXT "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Lõgg till",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - - PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 124, 48, 12,WS_GROUP - PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 124, 48, 12 - - CONTROL "&Krõv l÷senord f÷r att Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - - LTEXT "&Võnta:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 111, 147, 9 [truncated at 1000 lines; 164 more skipped]

1 0

[gvg] 18662: Merge from trunk: Make desktop properties fit in 640x480 desktop
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Merge from trunk: Make desktop properties fit in 640x480 desktop Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,85 +1,85 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "PozadÝ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Vyberte obrßzek, kter² chcete pou×Ýt jako pozadÝ:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "UmÝstýnÝ:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "UmÝstýnÝ:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spo°iÞ obrazovky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Seznam spo°iÞ¨:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&P°idat",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&P°idat",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "P°i obnovenÝ po×adovat &heslo.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&?ekat:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&?ekat:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Pro mo×nosti napßjenÝ monitoru klepnýta na tlaÞÝtko Mo×nosti napßjenÝ.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vzhled" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "NastavenÝ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Displej:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Velikost obrazovky",1818,3,160,115,43 + LTEXT "&Displej:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "MÚný",1815,9,170,15,8,NOT WS_GROUP - LTEXT "VÝce",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&PoÞet barev",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "MÚný",1815,9,130,15,8,NOT WS_GROUP + LTEXT "VÝce",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&PoÞet barev",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE Property changes on: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,80 +1,86 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Hintergrundbild:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,175,56,14 - PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,195,56,14 - LTEXT "Ausrichtung:",IDC_STATIC,186,138,43,8 - COMBOBOX IDC_PLACEMENT_COMBO,186,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildschrimschoner" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Darstellung" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Einstellungen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Anzeige:",1820,3,140,30,8 - LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 32,170,60,17 - LTEXT "Niedrig",1815,9,170,25,8,NOT WS_GROUP - LTEXT "Hoch",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Farbqualitõt",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,205,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Anzeige" - IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." - - IDS_NONE "(Keine)" - IDS_CENTER "Zentriert" - IDS_STRETCH "Gestreckt" - IDS_TILE "Nebeneinander" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "16 Farben" - IDS_COLOR_8BIT "256 Farben" - IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_24BIT "True Color (24 Bit)" - IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" -END +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "Hintergrundbild:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,135,56,14 + PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,155,56,14 + LTEXT "Ausrichtung:",IDC_STATIC,186,98,43,8 + COMBOBOX IDC_PLACEMENT_COMBO,186,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bildschrimschoner" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 90,112,8 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Darstellung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 90,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Anzeige:",1820,3,100,30,8 + LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 32,130,60,17 + LTEXT "Niedrig",1815,9,130,25,8,NOT WS_GROUP + LTEXT "Hoch",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Farbqualitõt",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Anzeige" + IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." + + IDS_NONE "(Keine)" + IDS_CENTER "Zentriert" + IDS_STRETCH "Gestreckt" + IDS_TILE "Nebeneinander" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Farben" + IDS_COLOR_8BIT "256 Farben" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,4 +1,5 @@ #include <windows.h> +#include <commctrl.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -15,7 +16,8 @@ #include "en.rc" #include "cz.rc" #include "de.rc" +#include "es.rc" +#include "Ja.rc" #include "nl.rc" #include "pl.rc" #include "sv.rc" -#include "es.rc" _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,85 +1,85 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Placement:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Placement:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screen Saver" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "List of Screensavers:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Add",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "On Resume, &Password Protect.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Wait:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Wait:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Screen area",1818,3,160,115,43 + LTEXT "&Display:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Less",1815,9,170,15,8,NOT WS_GROUP - LTEXT "More",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colors",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP + LTEXT "More",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE @@ -102,3 +102,9 @@ IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,111 +1,111 @@ -/* - * desk (Spanish resources) - * - * Copyright 2005 Patricio MartÝnez Ros - * - */ - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Escritorio" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Fondo:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Posici¾n",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Protector de pantalla" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 176 - - LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&A±adir",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - - PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 164, 56, 12,WS_GROUP - PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 164, 43, 12 - - CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - - LTEXT "&Esperar:",IDC_STATIC,13, 150, 31, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,44, 148, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,62, 148, 12, 12 - LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 150, 161, 9 - - GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 - LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Apariencia" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 109,181,10 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configuraci¾n" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Monitor",1820,3,140,30,8 - LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "Resoluci¾n de &pantalla",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Menos",1815,8,170,21,8,NOT WS_GROUP - LTEXT "Mßs",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Calidad de color",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,205,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Pantalla" - IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." - - IDS_NONE "(Ninguno)" - IDS_CENTER "Centrada" - IDS_STRETCH "Expandida" - IDS_TILE "En mosaico" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "Muy baja (4 bits)" - IDS_COLOR_8BIT "Baja (8 bits)" - IDS_COLOR_16BIT "Media (16 bits)" - IDS_COLOR_24BIT "Alta (24 bits)" - IDS_COLOR_32BIT "La mßs alta (32 bits)" - IDS_PIXEL "%lu por %lu pÝxeles" -END +/* + * desk (Spanish resources) + * + * Copyright 2005 Patricio MartÝnez Ros + * + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Escritorio" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "Fondo:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Posici¾n",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Protector de pantalla" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&A±adir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + + PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 124, 56, 12,WS_GROUP + PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 124, 43, 12 + + CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "&Esperar:",IDC_STATIC,13, 110, 31, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,44, 108, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,62, 108, 12, 12 + LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 110, 161, 9 + + GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Apariencia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, + 89,181,10 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuraci¾n" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Monitor",1820,3,100,30,8 + LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "Resoluci¾n de &pantalla",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "Menos",1815,8,130,21,8,NOT WS_GROUP + LTEXT "Mßs",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Calidad de color",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Pantalla" + IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." + + IDS_NONE "(Ninguno)" + IDS_CENTER "Centrada" + IDS_STRETCH "Expandida" + IDS_TILE "En mosaico" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "Muy baja (4 bits)" + IDS_COLOR_8BIT "Baja (8 bits)" + IDS_COLOR_16BIT "Media (16 bits)" + IDS_COLOR_24BIT "Alta (24 bits)" + IDS_COLOR_32BIT "La mßs alta (32 bits)" + IDS_PIXEL "%lu por %lu pÝxeles" +END _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,85 +1,85 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "&Weergave:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "&Weergave:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Toevoegen",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Toevoegen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "&Beveiligd met wachtwoord.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "W&acht:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "W&acht:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minuten.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "minuten.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instellingen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Scherm:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Screen area",1818,3,160,115,43 + LTEXT "&Scherm:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Minder",1815,9,170,15,8,NOT WS_GROUP - LTEXT "Meer",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Kleuren",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Minder",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Meer",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Kleuren",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,86 +1,86 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-07) LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Wybierz obraz do u?ycia jako tapeta pulpitu:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Po?o?enie:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Po?o?enie:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygaszacz ekranu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Dodaj",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Dodaj",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "Po wznowieniu wy£wietl &ekran powitalny.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 141, 119, 18 - LTEXT "&Czekaj:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Czekaj:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaµ ustawienia zasilania dla monitora.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygl?d" FONT 8, "MS Shell Dlg" BEGIN LTEXT "To miejsce pozosta?o celowo puste",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ekran:",1820,3,140,30,8 - LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,160,115,43 + LTEXT "&Ekran:",1820,3,100,30,8 + LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Mniej",1815,9,170,15,8,NOT WS_GROUP - LTEXT "WiÛcej",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Jako£µ kolor¾w",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Mniej",1815,9,130,15,8,NOT WS_GROUP + LTEXT "WiÛcej",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Jako£µ kolor¾w",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE _____ Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc --- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc 2005-10-21 19:30:56 UTC (rev 18661) +++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc 2005-10-21 19:33:16 UTC (rev 18662) @@ -1,107 +1,107 @@ -/* Swedish resources by David Nordenberg - Updated 2005-07-09 by Andreas Bjerkeholt */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bakgrund" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Võlj en bild du vill ha som skrivbordsunderlõgg:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Blõddra...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Fõrg...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Placering:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Skõrmslõckare" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 176 - - LTEXT "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Lõgg till",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 - - PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 164, 48, 12,WS_GROUP - PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 164, 48, 12 - - CONTROL "&Krõv l÷senord f÷r att Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - - LTEXT "&Võnta:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 151, 147, 9 [truncated at 1000 lines; 164 more skipped]

1 0

[gvg] 18661: Make desktop properties fit in 640x480 desktop. Fixes bug 903.
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Make desktop properties fit in 640x480 desktop. Fixes bug 903. Modified: trunk/reactos/lib/cpl/desk/en.rc _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-10-21 19:29:18 UTC (rev 18660) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-10-21 19:30:56 UTC (rev 18661) @@ -1,85 +1,85 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Placement:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Placement:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screen Saver" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "List of Screensavers:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 189,47,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 190,47,39,10 PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "On Resume, &Password Protect.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Wait:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Wait:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 + GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Screen area",1818,3,160,115,43 + LTEXT "&Display:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Less",1815,9,170,15,8,NOT WS_GROUP - LTEXT "More",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colors",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP + LTEXT "More",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE

1 0

[gvg] 18660: Make desktop properties fit in 640x480 desktop
by gvg＠svn.reactos.com 21 Oct '05

21 Oct '05

Make desktop properties fit in 640x480 desktop Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc Modified: trunk/reactos/lib/cpl/desk/es.rc Modified: trunk/reactos/lib/cpl/desk/nl.rc Modified: trunk/reactos/lib/cpl/desk/pl.rc Modified: trunk/reactos/lib/cpl/desk/sv.rc _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,85 +1,85 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "PozadÝ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Vyberte obrßzek, kter² chcete pou×Ýt jako pozadÝ:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "UmÝstýnÝ:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "UmÝstýnÝ:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spo°iÞ obrazovky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Seznam spo°iÞ¨:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 189,47,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 190,47,39,10 PUSHBUTTON "&P°idat",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "P°i obnovenÝ po×adovat &heslo.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&?ekat:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&?ekat:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5, 186, 238, 35 + GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Pro mo×nosti napßjenÝ monitoru klepnýta na tlaÞÝtko Mo×nosti napßjenÝ.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vzhled" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "NastavenÝ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Displej:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Velikost obrazovky",1818,3,160,115,43 + LTEXT "&Displej:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "MÚný",1815,9,170,15,8,NOT WS_GROUP - LTEXT "VÝce",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&PoÞet barev",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "MÚný",1815,9,130,15,8,NOT WS_GROUP + LTEXT "VÝce",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&PoÞet barev",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "R&ozÜÝ°enÚ nastavenÝ...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,86 +1,86 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Hintergrundbild:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,175,56,14 - PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,195,56,14 - LTEXT "Ausrichtung:",IDC_STATIC,186,138,43,8 - COMBOBOX IDC_PLACEMENT_COMBO,186,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildschrimschoner" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Darstellung" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Einstellungen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Anzeige:",1820,3,140,30,8 - LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 32,170,60,17 - LTEXT "Niedrig",1815,9,170,25,8,NOT WS_GROUP - LTEXT "Hoch",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Farbqualitõt",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,205,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Anzeige" - IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." - - IDS_NONE "(Keine)" - IDS_CENTER "Zentriert" - IDS_STRETCH "Gestreckt" - IDS_TILE "Nebeneinander" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "16 Farben" - IDS_COLOR_8BIT "256 Farben" - IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_24BIT "True Color (24 Bit)" - IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" - IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" -END +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "Hintergrundbild:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,135,56,14 + PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,155,56,14 + LTEXT "Ausrichtung:",IDC_STATIC,186,98,43,8 + COMBOBOX IDC_PLACEMENT_COMBO,186,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bildschrimschoner" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 90,112,8 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Darstellung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 90,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Anzeige:",1820,3,100,30,8 + LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 32,130,60,17 + LTEXT "Niedrig",1815,9,130,25,8,NOT WS_GROUP + LTEXT "Hoch",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Farbqualitõt",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Anzeige" + IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." + + IDS_NONE "(Keine)" + IDS_CENTER "Zentriert" + IDS_STRETCH "Gestreckt" + IDS_TILE "Nebeneinander" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Farben" + IDS_COLOR_8BIT "256 Farben" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -13,9 +13,9 @@ IDC_DESK_ICON ICON "resources/applet.ico" +#include "en.rc" #include "cz.rc" #include "de.rc" -#include "en.rc" #include "es.rc" #include "Ja.rc" #include "nl.rc" _____ Modified: trunk/reactos/lib/cpl/desk/es.rc --- trunk/reactos/lib/cpl/desk/es.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/es.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,111 +1,111 @@ -/* - * desk (Spanish resources) - * - * Copyright 2005 Patricio MartÝnez Ros - * - */ - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Escritorio" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Fondo:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Posici¾n",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Protector de pantalla" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 176 - - LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&A±adir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - - PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 164, 56, 12,WS_GROUP - PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 164, 43, 12 - - CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - - LTEXT "&Esperar:",IDC_STATIC,13, 150, 31, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,44, 148, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,62, 148, 12, 12 - LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 150, 161, 9 - - GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 - LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Apariencia" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 109,181,10 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configuraci¾n" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Monitor",1820,3,140,30,8 - LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "Resoluci¾n de &pantalla",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Menos",1815,8,170,21,8,NOT WS_GROUP - LTEXT "Mßs",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Calidad de color",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,205,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Pantalla" - IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." - - IDS_NONE "(Ninguno)" - IDS_CENTER "Centrada" - IDS_STRETCH "Expandida" - IDS_TILE "En mosaico" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "Muy baja (4 bits)" - IDS_COLOR_8BIT "Baja (8 bits)" - IDS_COLOR_16BIT "Media (16 bits)" - IDS_COLOR_24BIT "Alta (24 bits)" - IDS_COLOR_32BIT "La mßs alta (32 bits)" - IDS_PIXEL "%lu por %lu pÝxeles" -END +/* + * desk (Spanish resources) + * + * Copyright 2005 Patricio MartÝnez Ros + * + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Escritorio" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "Fondo:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Posici¾n",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Protector de pantalla" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 108, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&A±adir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + + PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 124, 56, 12,WS_GROUP + PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 124, 43, 12 + + CONTROL "Protecci¾n con &password.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "&Esperar:",IDC_STATIC,13, 110, 31, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,44, 108, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,62, 108, 12, 12 + LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 110, 161, 9 + + GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Apariencia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, + 89,181,10 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuraci¾n" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Monitor",1820,3,100,30,8 + LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "Resoluci¾n de &pantalla",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "Menos",1815,8,130,21,8,NOT WS_GROUP + LTEXT "Mßs",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Calidad de color",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Pantalla" + IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." + + IDS_NONE "(Ninguno)" + IDS_CENTER "Centrada" + IDS_STRETCH "Expandida" + IDS_TILE "En mosaico" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "Muy baja (4 bits)" + IDS_COLOR_8BIT "Baja (8 bits)" + IDS_COLOR_16BIT "Media (16 bits)" + IDS_COLOR_24BIT "Alta (24 bits)" + IDS_COLOR_32BIT "La mßs alta (32 bits)" + IDS_PIXEL "%lu por %lu pÝxeles" +END _____ Modified: trunk/reactos/lib/cpl/desk/nl.rc --- trunk/reactos/lib/cpl/desk/nl.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/nl.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,85 +1,85 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "&Weergave:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "&Weergave:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 189,47,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 190,47,39,10 PUSHBUTTON "&Toevoegen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "&Beveiligd met wachtwoord.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "W&acht:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "W&acht:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minuten.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "minuten.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 + GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instellingen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Scherm:",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Screen area",1818,3,160,115,43 + LTEXT "&Scherm:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Minder",1815,9,170,15,8,NOT WS_GROUP - LTEXT "Meer",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Kleuren",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Minder",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Meer",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Kleuren",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE _____ Modified: trunk/reactos/lib/cpl/desk/pl.rc --- trunk/reactos/lib/cpl/desk/pl.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/pl.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,86 +1,86 @@ // Polish language resource file (Sebastian Gasiorek, 2005-07-07) LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP,7,99,173,71 LTEXT "Wybierz obraz do u?ycia jako tapeta pulpitu:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Po?o?enie:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Po?o?enie:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygaszacz ekranu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 190,47,39,10 PUSHBUTTON "&Dodaj",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP - PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12 + PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "Po wznowieniu wy£wietl &ekran powitalny.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 141, 119, 18 - LTEXT "&Czekaj:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Czekaj:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 151, 147, 9 + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 186, 238, 35 + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaµ ustawienia zasilania dla monitora.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygl?d" FONT 8, "MS Shell Dlg" BEGIN LTEXT "To miejsce pozosta?o celowo puste",IDC_STATIC,66, - 110,112,8 + 90,112,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ekran:",1820,3,140,30,8 - LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,160,115,43 + LTEXT "&Ekran:",1820,3,100,30,8 + LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Mniej",1815,9,170,15,8,NOT WS_GROUP - LTEXT "WiÛcej",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Jako£µ kolor¾w",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + 30,130,58,17 + LTEXT "Mniej",1815,9,130,15,8,NOT WS_GROUP + LTEXT "WiÛcej",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Jako£µ kolor¾w",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,205,56,14 + 131,148,103,9 + PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14 END STRINGTABLE _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-10-21 18:26:07 UTC (rev 18659) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-10-21 19:29:18 UTC (rev 18660) @@ -1,107 +1,107 @@ -/* Swedish resources by David Nordenberg - Updated 2005-07-09 by Andreas Bjerkeholt */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bakgrund" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Võlj en bild du vill ha som skrivbordsunderlõgg:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Blõddra...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Fõrg...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Placering:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP -END - -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Skõrmslõckare" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 176 - - LTEXT "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 171, 109 - PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Lõgg till",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - - PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 164, 48, 12,WS_GROUP - PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 164, 48, 12 - - CONTROL "&Krõv l÷senord f÷r att Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 - - LTEXT "&Võnta:",IDC_STATIC,13, 150, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 149, 12, 12 - LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 151, 147, 9 - - GROUPBOX "&Energisparfunktioner f÷r din bildskõrm",IDC_SCREENS_DUMMY2,5, 186, 238, 35 - LTEXT "F÷r att õndra energisparfunktionerna f÷r din bildskõrm,\nklicka pÕ Instõllningar.", - IDC_STATIC,16, 199, 155, 19 - PUSHBUTTON "Ins&tõllningar",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 -END - -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Utseende" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Det hõr utrymmet har avsiktligt\nlõmnats tomt",IDC_STATIC,66, - 110,112,20 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instõllningar" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Bild:",1820,3,140,30,8 - LTEXT "<ingen>",IDC_SETTINGS_DEVICE,9,149,224,8 - GROUPBOX "&Bildyta",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 - LTEXT "Lõgre",1815,9,170,19,8,NOT WS_GROUP - LTEXT "H÷gre",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Fõrger",1817,125,160,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 - PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,205,56,14 -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Bildskõrm" - IDS_CPLDESCRIPTION "?ndrar skrivbordsunderlõgg och skõrmslõckare." - - IDS_NONE "(Ingen)" - IDS_CENTER "Centrera" - IDS_STRETCH "Strõck ut" - IDS_TILE "Stapla" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COLOR_4BIT "16 fõrger" - IDS_COLOR_8BIT "256 fõrger" - IDS_COLOR_16BIT "65 536 fõrger (16 Bit)" - IDS_COLOR_24BIT "16,7 miljoner fõrger (24 Bit)" - IDS_COLOR_32BIT "16,7 miljoner fõrger (32 Bit)" - IDS_PIXEL "%lux%lu Pixlar" -END +/* Swedish resources by David Nordenberg + Updated 2005-07-09 by Andreas Bjerkeholt */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bakgrund" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "Võlj en bild du vill ha som skrivbordsunderlõgg:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Blõddra...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Fõrg...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Placering:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skõrmslõckare" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Lõgg till",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + + PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 124, 48, 12,WS_GROUP + PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 124, 48, 12 + + CONTROL "&Krõv l÷senord f÷r att Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "&Võnta:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 111, 147, 9 + + GROUPBOX "&Energisparfunktioner f÷r din bildskõrm",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "F÷r att õndra energisparfunktionerna f÷r din bildskõrm,\nklicka pÕ Instõllningar.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "Ins&tõllningar",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Utseende" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Det hõr utrymmet har avsiktligt\nlõmnats tomt",IDC_STATIC,66, + 90,112,20 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instõllningar" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Bild:",1820,3,100,30,8 + LTEXT "<ingen>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Bildyta",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "Lõgre",1815,9,130,19,8,NOT WS_GROUP + LTEXT "H÷gre",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Fõrger",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,138,103,9 + PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + [truncated at 1000 lines; 20 more skipped]

1 0

[hbirr] 18659: - Merge r17753:18655 from trunk.
by hbirr＠svn.reactos.com 21 Oct '05

21 Oct '05

- Merge r17753:18655 from trunk. Modified: branches/cache_manager_rewrite/reactos/CREDITS Modified: branches/cache_manager_rewrite/reactos/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin/ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/getopt.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/various.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/cmds.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/cmdtab.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/domacro.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp_var.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/main.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/prototypes.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.rc Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.xm l Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/resource.h Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/trace.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/trace.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/ping.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.xml Added: branches/cache_manager_rewrite/reactos/apps/utils/net/tcpsvcs/ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/testlist.c Added: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/text.c Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/En.rc Added: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Ja.rc Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/fdebug.rc Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/ha rdware.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/i3 86disk.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/i3 86vid.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/pc video.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/cache/cache. c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base .xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mach ine.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/rtl. h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/ui.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/binh ive.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/load er.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/rtl/stdlib.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/acpi.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/dispatcher/dsuti ls.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/executer/ammutex .c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/executer/amresop .c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/misc.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c [truncated at 100 lines; 1414 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/CREDITS --- branches/cache_manager_rewrite/reactos/CREDITS 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/CREDITS 2005-10-21 18:26:07 UTC (rev 18659) @@ -4,7 +4,7 @@ Robert Bergkvist <fragdance(a)hotmail.com> Hartmut Birr <hartmut.birr(a)gmx.de> Aleksey Bragin <aleksey(a)studiocerebral.com> -Richard Campbell <eek2121(a)comcast.net> +Richard Campbell <betam4x(a)gmail.com> Gunnar Andre' Dalsnes <hardon(a)online.no> Arindam Das Boudewijn Dekker <ariadne(a)xs4all.nl> _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-10-21 18:26:07 UTC (rev 18659) @@ -321,6 +321,26 @@ $(ECHO_WMC) $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) +.PHONY: msvc6 +msvc6: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc + +.PHONY: msvc7 +msvc7: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc + +.PHONY: msvc71 +msvc71: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc + +.PHONY: msvc8 +msvc8: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc + .PHONY: makefile_auto_clean makefile_auto_clean: -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) _____ Copied: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin (from rev 18400, trunk/reactos/apps/utils/dumprecbin) Property changes on: branches/cache_manager_rewrite/reactos/apps/utils/dumprecbin ___________________________________________________________________ Name: svn:ignore + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,4 +1,23 @@ -/* +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS arp utility * FILE: apps/utils/net/arp/arp.c @@ -9,7 +28,6 @@ * */ -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -19,27 +37,102 @@ #include <winsock2.h> #include <iphlpapi.h> - +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#define _UNICODE + /* * Globals - */ + */ const char SEPERATOR = '-'; - - - +int _CRT_glob = 0; // stop * from listing dir files in arp -d * + + /* * function declerations - */ + */ +DWORD DoFormatMessage(DWORD ErrorCode); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); -INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); VOID Usage(VOID); - - - + + /* + * convert error code into meaningful message + */ +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + /* double brackets to silence the assignment warning message */ + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + + + +/* * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) +{ + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) + { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return EXIT_SUCCESS; +} + + +/* + * * Takes optional parameters of an internet address and interface address. * Retrieve all entries in the ARP cache. If an internet address is * specified, display the ARP entry relating to that address. If an @@ -59,136 +152,99 @@ DWORD dwSize = 0; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; - + /* Return required buffer size */ GetIpNetTable(NULL, &ulSize, 0); - + /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - + /* get Arp address table */ - if (pIpNetTable != NULL) { + if (pIpNetTable != NULL) GetIpNetTable(pIpNetTable, &ulSize, TRUE); - } else { + else + { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - /* check there are entries in the table */ - if (pIpNetTable->dwNumEntries == 0) { + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) + { _tprintf(_T("No ARP entires found\n")); free(pIpNetTable); - return -1; + exit(EXIT_FAILURE); } - - - + + + /* try doing this in the way it's done above, it's clearer */ /* Retrieve the interface-to-ip address mapping - * table to get the IP address for adapter */ + * table to get the IP address for adapter */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - - - for (k=0; k < pIpAddrTable->dwNumEntries; k++) { - if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { - //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) + { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) + { + //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; pszIpAddr = inet_ntoa(inaddr2); strcpy(szIntIpAddr, pszIpAddr); } - } - - + } + + /* print header, including interface IP address and index number */ _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); _tprintf(_T(" Internet Address Physical Address Type\n")); - + /* go through all ARP entries */ - for (i=0; i < pIpNetTable->dwNumEntries; i++) { - + for (i=0; i < pIpNetTable->dwNumEntries; i++) + { + /* if the user has supplied their own internet addesss * * only print the arp entry which matches that */ - if (pszInetAddr) { - inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; pszIpAddr = inet_ntoa(inaddr); - + /* check if it matches, print it */ - if (strcmp(pszIpAddr, pszInetAddr) == 0) { + if (strcmp(pszIpAddr, pszInetAddr) == 0) PrintEntries(&pIpNetTable->table[i]); - } - } else { + } + else /* if an address is not supplied, print all entries */ PrintEntries(&pIpNetTable->table[i]); - } - } - + free(pIpNetTable); free(pIpAddrTable); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an ARP entry and prints the IP address, - * the MAC address and the entry type to screen - * - */ -INT PrintEntries(PMIB_IPNETROW pIpAddRow) -{ - IN_ADDR inaddr; - TCHAR cMacAddr[20]; - - /* print IP addresses */ - inaddr.S_un.S_addr = pIpAddRow->dwAddr; - _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); //error checking - - /* print MAC address */ - _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), - pIpAddRow->bPhysAddr[0], - pIpAddRow->bPhysAddr[1], - pIpAddRow->bPhysAddr[2], - pIpAddRow->bPhysAddr[3], - pIpAddRow->bPhysAddr[4], - pIpAddRow->bPhysAddr[5]); - _tprintf(_T("%-22s"), cMacAddr); - - /* print cache type */ - switch (pIpAddRow->dwType) { - case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); - break; - case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); - break; - case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); - break; - case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); - break; - } - return 0; -} - - - -/* - * * Takes an internet address, a MAC address and an optional interface * address as arguments and checks their validity. - * Fill out an MIB_IPNETROW structure and insert the data into the + * Fill out an MIB_IPNETROW structure and insert the data into the * ARP cache as a static entry. * */ @@ -196,73 +252,101 @@ { PMIB_IPNETROW pAddHost; PMIB_IPADDRTABLE pIpAddrTable; - DWORD dwIpAddr; + PMIB_IPNETTABLE pIpNetTable; + DWORD dwIpAddr = 0; DWORD dwSize = 0; + ULONG ulSize = 0; INT iRet, i, val; TCHAR c; - + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); - return -1; + exit(EXIT_FAILURE); } - + /* check MAC address */ - if (strlen(pszEthAddr) != 17) { + if (strlen(pszEthAddr) != 17) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } - for (i=0; i<17; i++) { - if (pszEthAddr[i] == SEPERATOR) { + for (i=0; i<17; i++) + { + if (pszEthAddr[i] == SEPERATOR) continue; - } - if (!isxdigit(pszEthAddr[i])) { + + if (!isxdigit(pszEthAddr[i])) + { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - return -1; + exit(EXIT_FAILURE); } } - + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); + return -1; + } + + /* reserve memory on heap and zero */ pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); - - - - - /* set dwIndex field to the index of a local IP address to + + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); - } else { - /* map the IP to the index */ + else + { + /* map the IP to the index */ pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); GetIpAddrTable(pIpAddrTable, &dwSize, 0); - + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); - pAddHost->dwIndex = 4; + //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex); + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pAddHost->dwIndex = pIpNetTable->table[0].dwIndex; free(pIpAddrTable); } - + /* Set MAC address to 6 bytes (typical) */ pAddHost->dwPhysAddrLen = 6; - - + + /* Encode bPhysAddr into correct byte array */ - for (i=0; i<6; i++) { + for (i=0; i<6; i++) + { val =0; c = toupper(pszEthAddr[i*3]); c = c - (isdigit(c) ? '0' : ('A' - 10)); @@ -272,103 +356,155 @@ c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; pAddHost->bPhysAddr[i] = val; - } - - + + /* copy converted IP address */ pAddHost->dwAddr = dwIpAddr; - - + + /* set type to static */ pAddHost->dwType = MIB_IPNET_TYPE_STATIC; - - + + /* Add the ARP entry */ - if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry addition failed: %d\n"), iRet); - return -1; + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pAddHost); + exit(EXIT_FAILURE); } - + free(pAddHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + /* * - * Takes an internet address and an optional interface address as + * Takes an internet address and an optional interface address as * arguments and checks their validity. - * Add the interface number and IP to an MIB_IPNETROW structure - * and remove the entrty from the ARP cache. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entry from the ARP cache. * */ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { PMIB_IPNETROW pDelHost; PMIB_IPADDRTABLE pIpAddrTable; - DWORD dwIpAddr; + PMIB_IPNETTABLE pIpNetTable; + ULONG ulSize = 0; + DWORD dwIpAddr = 0; DWORD dwSize = 0; - INT iret; - + INT iRet; + BOOL bFlushTable = FALSE; + /* error checking */ - + /* check IP address */ - if (pszInetAddr != NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + if (pszInetAddr != NULL) + { + /* if wildcard is given, set flag to delete all hosts */ + if (strncmp(pszInetAddr, "*", 1) == 0) + bFlushTable = TRUE; + else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - return -1; + exit(EXIT_FAILURE); } - } else { + } + else + { Usage(); + exit(EXIT_FAILURE); + } + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + /* get Arp address table */ + if (pIpNetTable != NULL) + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + else + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); return -1; } - - + + pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); - /* set dwIndex field to the index of a local IP address to + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ - if (pszIfAddr) { + if (pszIfAddr) sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); - } else { + else + { /* map the IP to the index */ - if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { + if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - } - if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iret); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("error: %d\n"), WSAGetLastError()); } - pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex; - } - - /* copy converted IP address */ - pDelHost->dwAddr = dwIpAddr; - + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; + } + + if (bFlushTable == TRUE) + { + /* delete arp cache */ + if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) + { + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + return EXIT_FAILURE; + } + else + { + free(pIpAddrTable); + free(pDelHost); + return EXIT_SUCCESS; + } + } + else + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + /* Add the ARP entry */ - if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { - _tprintf(_T("The ARP entry deletion failed: %d\n"), iret); - return -1; + if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) + { + + DoFormatMessage(iRet); + free(pIpAddrTable); + free(pDelHost); + exit(EXIT_FAILURE); } - + free(pIpAddrTable); free(pDelHost); - - return 0; + + return EXIT_SUCCESS; } - - - + + + /* * * print program usage to screen * - */ + */ VOID Usage(VOID) { _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" @@ -401,10 +537,10 @@ " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" " > arp -a .... Displays the arp table.\n\n")); } - - - -/* + + + +/* * * Program entry. * Parse command line and call the required function @@ -412,35 +548,37 @@ */ INT main(int argc, char* argv[]) { - const char N[] = "-N"; - - if ((argc < 2) || (argc > 5)) + if ((argc < 2) || (argc > 5)) { Usage(); - return FALSE; + return EXIT_FAILURE; } - - - if (argv[1][0] == '-') { - switch (argv[1][1]) { - /* FIX ME */ - /* need better control for -a, as -N might not be arg 4 */ - case 'a': if (argc == 2) + + if (argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'a': /* fall through */ + case 'g': + if (argc == 2) DisplayArpEntries(NULL, NULL); else if (argc == 3) DisplayArpEntries(argv[2], NULL); - else if ((argc == 5) && ((strcmp(argv[3], N)) == 0)) + else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) + DisplayArpEntries(NULL, argv[3]); + else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) DisplayArpEntries(argv[2], argv[4]); else Usage(); + return EXIT_FAILURE; break; - case 'g': break; case 'd': if (argc == 3) Deletehost(argv[2], NULL); else if (argc == 4) Deletehost(argv[2], argv[3]); else Usage(); + return EXIT_FAILURE; break; case 's': if (argc == 4) Addhost(argv[2], argv[3], NULL); @@ -448,15 +586,17 @@ Addhost(argv[2], argv[3], argv[4]); else Usage(); + return EXIT_FAILURE; break; default: Usage(); - return -1; + return EXIT_FAILURE; } - } else { + } + else Usage(); - return -1; - } - - return 0; -} + + return EXIT_SUCCESS; +} /* +warning: suggest parentheses around assignment used as truth value +warning: char format, void arg (arg 2)*/ _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,53 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#include <stdio.h> -#include <stdarg.h> -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <tchar.h> -#include "trace.h" - - -#ifdef _DEBUG - -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; - -void _DebugBreak(void) -{ - DebugBreak(); -} - -void Trace(TCHAR* lpszFormat, ...) -{ - va_list args; - int nBuf; - TCHAR szBuffer[512]; - - va_start(args, lpszFormat); - nBuf = _vsntprintf(szBuffer, sizeof(szBuffer)/sizeof(TCHAR), lpszFormat, args); - OutputDebugString(szBuffer); - // was there an error? was the expanded string too long? - //ASSERT(nBuf >= 0); - va_end(args); -} - -void Assert(void* assert, TCHAR* file, int line, void* msg) -{ - if (msg == NULL) { - printf("ASSERT -- %s occured on line %u of file %s.\n", - assert, line, file); - } else { - printf("ASSERT -- %s occured on line %u of file %s: Message = %s.\n", - assert, line, file, msg); - } -} - -#else - -void Trace(TCHAR* lpszFormat, ...) { }; -void Assert(void* assert, TCHAR* file, int line, void* msg) { }; - -#endif //_DEBUG -/////////////////////////////////////////////////////////////////////// ////// _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/trace.h 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Diagnostic Trace -// -#ifndef __TRACE_H__ -#define __TRACE_H__ - -#ifdef _DEBUG - -#ifdef _X86_ -#define BreakPoint() _asm { int 3h } -#else -#define BreakPoint() _DebugBreak() -#endif - -#ifndef ASSERT -#define ASSERT(exp) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, NULL); \ - BreakPoint(); \ - } \ -} \ - -#define ASSERTMSG(exp, msg) \ -{ \ - if (!(exp)) { \ - Assert(#exp, __FILE__, __LINE__, msg); \ - BreakPoint(); \ - } \ -} -#endif - -//===================================================================== ======== -// MACRO: TRACE() -//===================================================================== ======== - -#define TRACE Trace - - -#else // _DEBUG - -//===================================================================== ======== -// Define away MACRO's ASSERT() and TRACE() in non debug builds -//===================================================================== ======== - -#ifndef ASSERT -#define ASSERT(exp) -#define ASSERTMSG(exp, msg) -#endif - -#define TRACE 0 ? (void)0 : Trace - -#endif // !_DEBUG - - -void Assert(void* assert, TCHAR* file, int line, void* msg); -void Trace(TCHAR* lpszFormat, ...); - - -#endif // __TRACE_H__ -/////////////////////////////////////////////////////////////////////// ////// _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml --- branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-10-21 18:26:07 UTC (rev 18659) @@ -1,30 +1,30 @@ <directory name="arp"> - <xi:include href="arp/arp.xml" /> + <xi:include href="arp/arp.xml" /> </directory> <directory name="finger"> - <xi:include href="finger/finger.xml" /> + <xi:include href="finger/finger.xml" /> </directory> <directory name="ftp"> - <xi:include href="ftp/ftp.xml" /> + <xi:include href="ftp/ftp.xml" /> </directory> <directory name="ipconfig"> - <xi:include href="ipconfig/ipconfig.xml" /> + <xi:include href="ipconfig/ipconfig.xml" /> </directory> <directory name="netstat"> - <xi:include href="netstat/netstat.xml" /> + <xi:include href="netstat/netstat.xml" /> </directory> <directory name="ping"> - <xi:include href="ping/ping.xml" /> + <xi:include href="ping/ping.xml" /> </directory> <directory name="route"> - <xi:include href="route/route.xml" /> + <xi:include href="route/route.xml" /> </directory> <directory name="telnet"> - <xi:include href="telnet/telnet.xml" /> + <xi:include href="telnet/telnet.xml" /> </directory> <directory name="tracert"> - <xi:include href="tracert/tracert.xml" /> + <xi:include href="tracert/tracert.xml" /> </directory> <directory name="whois"> - <xi:include href="whois/whois.xml" /> + <xi:include href="whois/whois.xml" /> </directory> _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c 2005-10-21 17:16:46 UTC (rev 18658) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c 2005-10-21 18:26:07 UTC (rev 18659) @@ -74,7 +74,6 @@ [truncated at 1000 lines; 179644 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs