Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[fireball] 27787: - Add an OLPC-specific pci-hack: some of its "PCI" devices are in fact not accessible via usual pci configuration space read/write mechanism, so a simulation should be done. The olpcpci.c file is taken from OLPC's dev.laptop.org tree, and modified by me. - USB driver now finds the EHCI controller, but still some problems.
by fireball＠svn.reactos.org 23 Jul '07

23 Jul '07

Author: fireball Date: Mon Jul 23 17:43:57 2007 New Revision: 27787 URL: http://svn.reactos.org/svn/reactos?rev=27787&view=rev Log: - Add an OLPC-specific pci-hack: some of its "PCI" devices are in fact not accessible via usual pci configuration space read/write mechanism, so a simulation should be done. The olpcpci.c file is taken from OLPC's dev.laptop.org tree, and modified by me. - USB driver now finds the EHCI controller, but still some problems. Added: branches/olpc/hal/halx86/generic/olpcpci.c (with props) Modified: branches/olpc/hal/halx86/generic/generic.rbuild branches/olpc/hal/halx86/generic/pci.c Modified: branches/olpc/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/generic… ============================================================================== --- branches/olpc/hal/halx86/generic/generic.rbuild (original) +++ branches/olpc/hal/halx86/generic/generic.rbuild Mon Jul 23 17:43:57 2007 @@ -10,6 +10,7 @@ <file>dma.c</file> <file>drive.c</file> <file>misc.c</file> + <file>olpcpci.c</file> <file>pci.c</file> <file>portio.c</file> <file>profil.c</file> Added: branches/olpc/hal/halx86/generic/olpcpci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/olpcpci… ============================================================================== --- branches/olpc/hal/halx86/generic/olpcpci.c (added) +++ branches/olpc/hal/halx86/generic/olpcpci.c Mon Jul 23 17:43:57 2007 @@ -1,0 +1,294 @@ +/* + * olpcpci.c - Low-level PCI config space access for OLPC systems + * without the VSA PCI virtualization software. + * + * The AMD Geode chipset (GX2 processor, cs5536 I/O companion device) + * has some I/O functions (display, southbridge, sound, USB HCIs, etc) + * that more or less behave like PCI devices, but the hardware doesn't + * directly implement the PCI configuration space headers. AMD provides + * "VSA" (Virtual System Architecture) software that emulates PCI config + * space for these devices, by trapping I/O accesses to PCI config register + * (CF8/CFC) and running some code in System Management Mode interrupt state. + * On the OLPC platform, we don't want to use that VSA code because + * (a) it slows down suspend/resume, and (b) recompiling it requires special + * compilers that are hard to get. So instead of letting the complex VSA + * code simulate the PCI config registers for the on-chip devices, we + * just simulate them the easy way, by inserting the code into the + * pci_write_config and pci_read_config path. Most of the config registers + * are read-only anyway, so the bulk of the simulation is just table lookup. + */ + +//#include <linux/pci.h> +//#include <linux/init.h> +//#include <asm/olpc.h> +//#include <asm/geode.h> +//#include "pci.h" + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +static int is_lx = FALSE; //FIXME: Support LX too! + +#define PCI_SLOT(dev, fn) ((((fn) & 0x7) << 5) | ((dev) & 0x1F)) + +/* + * In the tables below, the first two line (8 longwords) are the + * size masks that are used when the higher level PCI code determines + * the size of the region by writing ~0 to a base address register + * and reading back the result. + * + * The following lines are the values that are read during normal + * PCI config access cycles, i.e. not after just having written + * ~0 to a base address register. + */ + +static const ULONG lxnb_hdr[] = { /* dev 1 function 0 - devfn = 8 */ + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x281022 , 0x2200005 , 0x6000021 , 0x80f808 , /* AMD Vendor ID */ + 0x0 , 0x0 , 0x0 , 0x0 , /* No virtual registers, hence no BAR for them */ + 0x0 , 0x0 , 0x0 , 0x28100b , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG gxnb_hdr[] = { /* dev 1 function 0 - devfn = 8 */ + 0xfffffffd , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x28100b , 0x2200005 , 0x6000021 , 0x80f808 , /* NSC Vendor ID */ + 0xac1d , 0x0 , 0x0 , 0x0 , /* I/O BAR - base of virtual registers */ + 0x0 , 0x0 , 0x0 , 0x28100b , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG lxfb_hdr[] = { /* dev 1 function 1 - devfn = 9 */ + 0xff800008 , 0xffffc000 , 0xffffc000 , 0xffffc000 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x20811022 , 0x2200003 , 0x3000000 , 0x0 , /* AMD Vendor ID */ + 0xfd000000 , 0xfe000000 , 0xfe004000 , 0xfe008000 , /* FB, GP, VG, DF */ + 0xfe00c000 , 0x0 , 0x0 , 0x30100b , /* VIP */ + 0x0 , 0x0 , 0x0 , 0x10e , /* INTA, IRQ14 for graphics accel */ + 0x0 , 0x0 , 0x0 , 0x0 , + 0x3d0 , 0x3c0 , 0xa0000 , 0x0 , /* VG IO, VG IO, EGA FB, MONO FB */ + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG gxfb_hdr[] = { /* dev 1 function 1 - devfn = 9 */ + 0xff800008 , 0xffffc000 , 0xffffc000 , 0xffffc000 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x30100b , 0x2200003 , 0x3000000 , 0x0 , /* NSC Vendor ID */ + 0xfd000000 , 0xfe000000 , 0xfe004000 , 0xfe008000 , /* FB, GP, VG, DF */ + 0x0 , 0x0 , 0x0 , 0x30100b , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x3d0 , 0x3c0 , 0xa0000 , 0x0 , /* VG IO, VG IO, EGA FB, MONO FB */ + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG aes_hdr[] = { /* dev 1 function 2 - devfn = 0xa */ + 0xffffc000 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x20821022 , 0x2a00006 , 0x10100000 , 0x8 , /* NSC Vendor ID */ + 0xfe010000 , 0x0 , 0x0 , 0x0 , /* AES registers */ + 0x0 , 0x0 , 0x0 , 0x20821022 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , +}; + + +static const ULONG isa_hdr[] = { /* dev f function 0 - devfn = 78 */ + 0xfffffff9 , 0xffffff01 , 0xffffffc1 , 0xffffffe1 , + 0xffffff81 , 0xffffffc1 , 0x0 , 0x0 , + + 0x20901022 , 0x2a00049 , 0x6010003 , 0x802000 , + 0x18b1 , 0x1001 , 0x1801 , 0x1881 , /* SMB-8 GPIO-256 MFGPT-64 IRQ-32 */ + 0x1401 , 0x1841 , 0x0 , 0x20901022 , /* PMS-128 ACPI-64 */ + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0xaa5b , /* interrupt steering */ + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG ac97_hdr[] = { /* dev f function 3 - devfn = 7b */ + 0xffffff81 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x20931022 , 0x2a00041 , 0x4010001 , 0x0 , + 0x1481 , 0x0 , 0x0 , 0x0 , /* I/O BAR-128 */ + 0x0 , 0x0 , 0x0 , 0x20931022 , + 0x0 , 0x0 , 0x0 , 0x205 , /* IntB , IRQ5 */ + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG ohci_hdr[] = { /* dev f function 4 - devfn = 7c */ + 0xfffff000 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x20941022 , 0x2300006 , 0xc031002 , 0x0 , + 0xfe01a000 , 0x0 , 0x0 , 0x0 , /* MEMBAR-1000 */ + 0x0 , 0x0 , 0x0 , 0x20941022 , + 0x0 , 0x40 , 0x0 , 0x40a , /* CapPtr INT-D, IRQ A */ + 0xc8020001 , 0x0 , 0x0 , 0x0 , /* Capabilities - 40 is R/O, 44 is mask 8103 (power control) */ + 0x0 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , +}; + +static const ULONG ehci_hdr[] = { /* dev f function 5 - devfn = 7d */ + 0xfffff000 , 0x0 , 0x0 , 0x0 , + 0x0 , 0x0 , 0x0 , 0x0 , + + 0x20951022 , 0x2300006 , 0xc032002 , 0x0 , + 0xfe01b000 , 0x0 , 0x0 , 0x0 , /* MEMBAR-1000 */ + 0x0 , 0x0 , 0x0 , 0x20951022 , + 0x0 , 0x40 , 0x0 , 0x40a , /* CapPtr INT-D, IRQ A */ + 0xc8020001 , 0x0 , 0x0 , 0x0 , /* Capabilities - 40 is R/O, 44 is mask 8103 (power control) */ +#if 0 + 0x1 , 0x40080000 , 0x0 , 0x0 , /* EECP - see section 2.1.7 of EHCI spec */ +#endif + 0x01000001 , 0x00000000 , 0x0 , 0x0 , /* EECP - see section 2.1.7 of EHCI spec */ + 0x2020 , 0x0 , 0x0 , 0x0 , /* (EHCI page 8) 60 SBRN (R/O), 61 FLADJ (R/W), PORTWAKECAP */ +}; + +static ULONG ff_loc = ~0; +static ULONG zero_loc = 0; + +static int bar_probing = 0; /* Set after a write of ~0 to a BAR */ + +static ULONG *hdr_addr(const ULONG *hdr, int reg) +{ + ULONG addr; + + /* + * This is a little bit tricky. The header maps consist of + * 0x20 bytes of size masks, followed by 0x70 bytes of header data. + * In the normal case, when not probing a BAR's size, we want + * to access the header data, so we add 0x20 to the reg offset, + * thus skipping the size mask area. + * In the BAR probing case, we want to access the size mask for + * the BAR, so we subtract 0x10 (the config header offset for + * BAR0), and don't skip the size mask area. + */ + + addr = (ULONG)hdr + reg + (bar_probing ? -0x10 : 0x20); + + if ( ((ULONG)addr - (ULONG)hdr) >= 0x90 ) + { + DPRINT1("WARNING: out of bounds access: 0x%x, bar_probing %d, offset 0x%x\n", + (ULONG)addr - (ULONG)hdr, bar_probing, reg); + } + + bar_probing = 0; + return (ULONG *)addr; +} + +VOID NTAPI +pci_olpc_read(ULONG bus, PCI_SLOT_NUMBER devfn, ULONG reg, ULONG len, PUCHAR value) +{ + ULONG *addr; + + /* + * No device has config registers past 0x70, so we save table space + * by not storing entries for the nonexistent registers + */ + if (reg >= 0x70) + { + addr = &zero_loc; + } + else + { + if (devfn.u.bits.DeviceNumber == 1) + { + switch (devfn.u.bits.FunctionNumber) + { + case 0 /* 0x8*/: + addr = hdr_addr(is_lx ? lxnb_hdr : gxnb_hdr, reg); + break; + case 1 /*0x9*/: + addr = hdr_addr(is_lx ? lxfb_hdr : gxfb_hdr, reg); + break; + case 2 /* 0xa*/: + addr = is_lx ? hdr_addr(aes_hdr, reg) : &ff_loc; + break; + default: + addr = &ff_loc; + break; + } + } + else + if (devfn.u.bits.DeviceNumber == 0xF) + { + switch (devfn.u.bits.FunctionNumber) + { + case 0 /*0x78*/: + addr = hdr_addr(isa_hdr, reg); + break; + case 3 /*0x7b*/: + addr = hdr_addr(ac97_hdr, reg); + break; + case 4 /*0x7c*/: + addr = hdr_addr(ohci_hdr, reg); + break; + case 5 /*0x7d*/: + addr = hdr_addr(ehci_hdr, reg); + break; + default: + addr = &zero_loc; + break; + } + } + else + { + addr = &ff_loc; + } + } + + ASSERT(len == 1 || len == 2 || len == 4) + RtlCopyMemory(value, addr, len); +} + +VOID NTAPI +pci_olpc_write(ULONG bus, PCI_SLOT_NUMBER devfn, ULONG reg, ULONG len, PUCHAR value) +{ + /* XXX we may want to extend this to simulate EHCI power management */ + + /* + * Mostly we just discard writes, but if the write is a size probe + * (i.e. writing ~0 to a BAR), we remember it and arrange to return + * the appropriate size mask on the next read. This is cheating + * to some extent, because it depends on the fact that the next + * access after such a write will always be a read to the same BAR. + */ + + if ((reg >= 0x10) && (reg < 0x2c)) { + /* Write is to a BAR */ + if (*(PULONG)value == ~0) + bar_probing = 1; + } else { + /* + * No warning on writes to ROM BAR, CMD, LATENCY_TIMER, + * CACHE_LINE_SIZE, or PM registers. + */ + if ((reg != 0x30) && (reg != 0x04) && (reg != 0x0d) && + (reg != 0x0c) && (reg != 0x44)) + DbgPrint("OLPC PCI: Config write to devfn %x reg %x value %x\n", devfn, reg, *value); + } +} Propchange: branches/olpc/hal/halx86/generic/olpcpci.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/olpc/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/pci.c?r… ============================================================================== --- branches/olpc/hal/halx86/generic/pci.c (original) +++ branches/olpc/hal/halx86/generic/pci.c Mon Jul 23 17:43:57 2007 @@ -18,6 +18,10 @@ ULONG HalpMinPciBus, HalpMaxPciBus; KSPIN_LOCK HalpPCIConfigLock; PCI_CONFIG_HANDLER PCIConfigHandler; + +#define NB_SLOT 0x1 /* Northbridge - GX chip - Device 1 */ +#define SB_SLOT 0xf /* Southbridge - CS5536 chip - Device F */ +#define OLPC_SIMULATED(bus, devfn) ( ( (bus) == 0 ) && ( (devfn.u.bits.DeviceNumber == NB_SLOT) || (devfn.u.bits.DeviceNumber == SB_SLOT) ) ) /* PCI Operation Matrix */ UCHAR PCIDeref[4][4] = @@ -107,6 +111,10 @@ NULL }; +VOID NTAPI pci_olpc_read(ULONG bus, PCI_SLOT_NUMBER devfn, ULONG reg, ULONG len, PUCHAR value); +VOID NTAPI pci_olpc_write(ULONG bus, PCI_SLOT_NUMBER devfn, ULONG reg, ULONG len, PUCHAR value); + + /* TYPE 1 FUNCTIONS **********************************************************/ VOID @@ -234,11 +242,26 @@ /* Find out the type of read/write we need to do */ i = PCIDeref[Offset % sizeof(ULONG)][Length % sizeof(ULONG)]; - /* Do the read/write and return the number of bytes */ - i = ConfigIO[i]((PPCIPBUSDATA)BusHandler->BusData, - State, - Buffer, - Offset); + if (OLPC_SIMULATED(BusHandler->BusNumber, Slot)) + { + /* Convert 0->ulong, 1->char, 2->short */ + if (i == 0) + i = 4; + + /* FIXME: Not really a good way to know if it's read or write... */ + if (ConfigIO == PCIConfigHandler.ConfigRead) + pci_olpc_read(BusHandler->BusNumber, Slot, Offset, i, (PUCHAR)Buffer); + else + pci_olpc_write(BusHandler->BusNumber, Slot, Offset, i, (PUCHAR)Buffer); + } + else + { + /* Do the read/write and return the number of bytes */ + i = ConfigIO[i]((PPCIPBUSDATA)BusHandler->BusData, + State, + Buffer, + Offset); + } /* Increment the buffer position and offset, and decrease the length */ Offset += i;

1 0

[cfinck] 27786: - Get rid of an unneeded variable in GetSystemInformation - Minor changes to the GetProcNameString function - Fix unselecting the license text. EM_SETSEL only works after the edit control has been drawn, so we cannot send this message in the WM_INITDIALOG message handler. Instead we use PostMessage now. See KB96674 for more details. - Downloaded the latest GPL 2.0 text from the GNU website and use that as the "gpl.txt" now. Now we don't have these annoying "box" characters in the
by cfinck＠svn.reactos.org 23 Jul '07

23 Jul '07

Author: cfinck Date: Mon Jul 23 15:48:55 2007 New Revision: 27786 URL: http://svn.reactos.org/svn/reactos?rev=27786&view=rev Log: - Get rid of an unneeded variable in GetSystemInformation - Minor changes to the GetProcNameString function - Fix unselecting the license text. EM_SETSEL only works after the edit control has been drawn, so we cannot send this message in the WM_INITDIALOG message handler. Instead we use PostMessage now. See KB96674 for more details. - Downloaded the latest GPL 2.0 text from the GNU website and use that as the "gpl.txt" now. Now we don't have these annoying "box" characters in the license dialog box anymore. Modified: trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/licence.c trunk/reactos/dll/cpl/sysdm/resources/gpl.txt Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Mon Jul 23 15:48:55 2007 @@ -193,11 +193,9 @@ HeapFree(GetProcessHeap(), 0, lpBuf); - - return Ret; - } - - return 0; + } + + return Ret; } static VOID @@ -251,7 +249,6 @@ TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); MEMORYSTATUSEX MemStat; TCHAR Buf[32]; - INT Ret = 0; INT CurMachineLine = IDC_MACHINELINE1; @@ -266,22 +263,21 @@ KEY_READ, &hKey) == ERROR_SUCCESS) { - SetRegTextData(hwnd, - hKey, - _T("VendorIdentifier"), + SetRegTextData(hwnd, + hKey, + _T("VendorIdentifier"), CurMachineLine); CurMachineLine++; - Ret = SetProcNameString(hwnd, - hKey, - _T("ProcessorNameString"), - CurMachineLine, - CurMachineLine+1); - CurMachineLine += Ret; + CurMachineLine += SetProcNameString(hwnd, + hKey, + _T("ProcessorNameString"), + CurMachineLine, + CurMachineLine + 1); - SetProcSpeed(hwnd, - hKey, - _T("~MHz"), + SetProcSpeed(hwnd, + hKey, + _T("~MHz"), CurMachineLine); CurMachineLine++; } @@ -316,7 +312,6 @@ if (MemStat.ullTotalPhys > 1024 * 1024) { /* We're dealing with PBs or more */ - MemStat.ullTotalPhys /= 1024; i++; @@ -336,15 +331,13 @@ if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) { - Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); - } - } - - if (Ret) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); + if( _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr) ) + { + SetDlgItemText(hwnd, + CurMachineLine, + Buf); + } + } } } Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c Mon Jul 23 15:48:55 2007 @@ -55,11 +55,10 @@ IDC_LICENCEEDIT, LicenseText); - SendDlgItemMessage(hDlg, - IDC_LICENCEEDIT, - EM_SETSEL, - -1, - 0); + PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), + EM_SETSEL, + -1, + 0); return TRUE; } Modified: trunk/reactos/dll/cpl/sysdm/resources/gpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/gp… ============================================================================== Binary files - no diff available.

1 0

[cfinck] 27785: [FORMATTING] Use a consistent indentation (TABs) for all parts of sysdm.cpl No code changes
by cfinck＠svn.reactos.org 23 Jul '07

23 Jul '07

Author: cfinck Date: Mon Jul 23 14:26:55 2007 New Revision: 27785 URL: http://svn.reactos.org/svn/reactos?rev=27785&view=rev Log: [FORMATTING] Use a consistent indentation (TABs) for all parts of sysdm.cpl No code changes Modified: trunk/reactos/dll/cpl/sysdm/advanced.c trunk/reactos/dll/cpl/sysdm/environment.c trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/hardware.c trunk/reactos/dll/cpl/sysdm/licence.c trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/cpl/sysdm/sysdm.c trunk/reactos/dll/cpl/sysdm/userprofile.c trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c Mon Jul 23 14:26:55 2007 @@ -15,72 +15,71 @@ /* Property page dialog callback */ INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { - case WM_INITDIALOG: - break; + switch (uMsg) + { + case WM_INITDIALOG: + break; - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case IDC_PERFOR: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_VIRTMEM), - hwndDlg, - (DLGPROC)VirtMemDlgProc); - } - break; + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_PERFOR: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_VIRTMEM), + hwndDlg, + (DLGPROC)VirtMemDlgProc); + } + break; - case IDC_USERPROFILE: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_USERPROFILE), - hwndDlg, - (DLGPROC)UserProfileDlgProc); - } - break; + case IDC_USERPROFILE: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_USERPROFILE), + hwndDlg, + (DLGPROC)UserProfileDlgProc); + } + break; - case IDC_STAREC: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_STARTUPRECOVERY), - hwndDlg, - (DLGPROC)StartRecDlgProc); - } - break; + case IDC_STAREC: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_STARTUPRECOVERY), + hwndDlg, + (DLGPROC)StartRecDlgProc); + } + break; - case IDC_ENVVAR: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), - hwndDlg, - (DLGPROC)EnvironmentDlgProc); - } - break; + case IDC_ENVVAR: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), + hwndDlg, + (DLGPROC)EnvironmentDlgProc); + } + break; - case IDC_ERRORREPORT: - { - ShellExecute(NULL, - _T("open"), - BugLink, - NULL, - NULL, - SW_SHOWNORMAL); - } - break; + case IDC_ERRORREPORT: + { + ShellExecute(NULL, + _T("open"), + BugLink, + NULL, + NULL, + SW_SHOWNORMAL); + } + break; + } + } - } - } - break; - - } - return FALSE; + break; + } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Mon Jul 23 14:26:55 2007 @@ -12,11 +12,10 @@ typedef struct _VARIABLE_DATA { - LPTSTR lpName; - LPTSTR lpRawValue; - LPTSTR lpCookedValue; + LPTSTR lpName; + LPTSTR lpRawValue; + LPTSTR lpCookedValue; } VARIABLE_DATA, *PVARIABLE_DATA; - INT_PTR CALLBACK @@ -25,573 +24,574 @@ WPARAM wParam, LPARAM lParam) { - PVARIABLE_DATA VarData; - DWORD dwNameLength; - DWORD dwValueLength; - - VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); - - switch (uMsg) - { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)lParam); - VarData = (PVARIABLE_DATA)lParam; - - if (VarData->lpName != NULL) - { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName); - } - - if (VarData->lpRawValue != NULL) - { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue); - } - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); - dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); - if (dwNameLength != 0 && dwValueLength != 0) - { - if (VarData->lpName == NULL) - { - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpName) < dwNameLength) - { - GlobalFree(VarData->lpName); - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); - - if (VarData->lpRawValue == NULL) - { - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpRawValue) < dwValueLength) - { - GlobalFree(VarData->lpRawValue); - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); - - if (_tcschr(VarData->lpRawValue, _T('%'))) - { - if (VarData->lpCookedValue == NULL) - { - VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); - } - - ExpandEnvironmentStrings(VarData->lpRawValue, - VarData->lpCookedValue, - 2 * MAX_PATH); - } - else if (VarData->lpCookedValue) - { - GlobalFree(VarData->lpCookedValue); - } - } - EndDialog(hwndDlg, 1); - return TRUE; - - case IDCANCEL: - EndDialog(hwndDlg, 0); - return TRUE; - } - break; - } - - return FALSE; + PVARIABLE_DATA VarData; + DWORD dwNameLength; + DWORD dwValueLength; + + VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)lParam); + VarData = (PVARIABLE_DATA)lParam; + + if (VarData->lpName != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName); + } + + if (VarData->lpRawValue != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue); + } + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); + dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); + if (dwNameLength != 0 && dwValueLength != 0) + { + if (VarData->lpName == NULL) + { + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + } + else if (_tcslen(VarData->lpName) < dwNameLength) + { + GlobalFree(VarData->lpName); + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); + + if (VarData->lpRawValue == NULL) + { + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + } + else if (_tcslen(VarData->lpRawValue) < dwValueLength) + { + GlobalFree(VarData->lpRawValue); + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); + + if (_tcschr(VarData->lpRawValue, _T('%'))) + { + if (VarData->lpCookedValue == NULL) + { + VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); + } + + ExpandEnvironmentStrings(VarData->lpRawValue, + VarData->lpCookedValue, + 2 * MAX_PATH); + } + else if (VarData->lpCookedValue) + { + GlobalFree(VarData->lpCookedValue); + } + } + EndDialog(hwndDlg, 1); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + } + + return FALSE; } static VOID SetEnvironmentVariables(HWND hwndListView, - HKEY hRootKey, - LPTSTR lpSubKeyName) -{ - HKEY hKey; - DWORD dwValues; - DWORD dwMaxValueNameLength; - DWORD dwMaxValueDataLength; - DWORD i; - LPTSTR lpName; - LPTSTR lpData; - LPTSTR lpExpandData = NULL; - DWORD dwNameLength; - DWORD dwDataLength; - DWORD dwType; - PVARIABLE_DATA VarData; - - LV_ITEM lvi; - int iItem; - - if (RegOpenKeyEx(hRootKey, - lpSubKeyName, - 0, - KEY_READ, - &hKey)) - return; - - if (RegQueryInfoKey(hKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL)) - { - RegCloseKey(hKey); - return; - } - - lpName = GlobalAlloc(GPTR, (dwMaxValueNameLength + 1) * sizeof(TCHAR)); - if (lpName == NULL) - { - RegCloseKey(hKey); - return; - } - - lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR)); - if (lpData == NULL) - { - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - for (i = 0; i < dwValues; i++) - { - dwNameLength = dwMaxValueNameLength + 1; - dwDataLength = dwMaxValueDataLength + 1; - if (RegEnumValue(hKey, - i, - lpName, - &dwNameLength, - NULL, - &dwType, - (LPBYTE)lpData, - &dwDataLength)) - { - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); - - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpName, lpName); - - VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpRawValue, lpData); - - if (dwType == REG_EXPAND_SZ) - { - lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); - if (lpExpandData == NULL) - { - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - ExpandEnvironmentStrings(lpData, - lpExpandData, - 2 * MAX_PATH); - - VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpCookedValue, lpExpandData); - GlobalFree(lpExpandData); - } - - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; - lvi.state = (i == 0) ? LVIS_SELECTED : 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); + HKEY hRootKey, + LPTSTR lpSubKeyName) +{ + HKEY hKey; + DWORD dwValues; + DWORD dwMaxValueNameLength; + DWORD dwMaxValueDataLength; + DWORD i; + LPTSTR lpName; + LPTSTR lpData; + LPTSTR lpExpandData = NULL; + DWORD dwNameLength; + DWORD dwDataLength; + DWORD dwType; + PVARIABLE_DATA VarData; + + LV_ITEM lvi; + int iItem; + + if (RegOpenKeyEx(hRootKey, + lpSubKeyName, + 0, + KEY_READ, + &hKey)) + return; + + if (RegQueryInfoKey(hKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL)) + { + RegCloseKey(hKey); + return; + } + + lpName = GlobalAlloc(GPTR, (dwMaxValueNameLength + 1) * sizeof(TCHAR)); + if (lpName == NULL) + { + RegCloseKey(hKey); + return; + } + + lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR)); + if (lpData == NULL) + { + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + + for (i = 0; i < dwValues; i++) + { + dwNameLength = dwMaxValueNameLength + 1; + dwDataLength = dwMaxValueDataLength + 1; + + if (RegEnumValue(hKey, + i, + lpName, + &dwNameLength, + NULL, + &dwType, + (LPBYTE)lpData, + &dwDataLength)) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpName, lpName); + + VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpRawValue, lpData); + + if (dwType == REG_EXPAND_SZ) + { + lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); + if (lpExpandData == NULL) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + + ExpandEnvironmentStrings(lpData, + lpExpandData, + 2 * MAX_PATH); + + VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, lpExpandData); + GlobalFree(lpExpandData); + } + + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + lvi.lParam = (LPARAM)VarData; + lvi.pszText = VarData->lpName; + lvi.state = (i == 0) ? LVIS_SELECTED : 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); } static VOID SetListViewColumns(HWND hwndListView) { - RECT rect; - LV_COLUMN column; - TCHAR szStr[32]; - - GetClientRect(hwndListView, &rect); - - memset(&column, 0x00, sizeof(column)); - column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; - column.fmt=LVCFMT_LEFT; - column.cx = (INT)((rect.right - rect.left) * 0.32); - column.iSubItem = 0; - LoadString(hApplet, IDS_VARIABLE, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 0, &column); - - column.cx = (INT)((rect.right - rect.left) * 0.63); - column.iSubItem = 1; - LoadString(hApplet, IDS_VALUE, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 1, &column); + RECT rect; + LV_COLUMN column; + TCHAR szStr[32]; + + GetClientRect(hwndListView, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt=LVCFMT_LEFT; + column.cx = (INT)((rect.right - rect.left) * 0.32); + column.iSubItem = 0; + LoadString(hApplet, IDS_VARIABLE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 0, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.63); + column.iSubItem = 1; + LoadString(hApplet, IDS_VALUE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 1, &column); } static VOID OnInitDialog(HWND hwndDlg) { - HWND hwndListView; - - /* Set user environment variables */ - hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); - - SetListViewColumns(hwndListView); - - SetEnvironmentVariables(hwndListView, - HKEY_CURRENT_USER, - _T("Environment")); - - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - (void)ListView_Update(hwndListView,0); - - - /* Set system environment variables */ - hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - - SetListViewColumns(hwndListView); - - SetEnvironmentVariables(hwndListView, - HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); - - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - (void)ListView_Update(hwndListView,0); + HWND hwndListView; + + /* Set user environment variables */ + hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); + + SetListViewColumns(hwndListView); + + SetEnvironmentVariables(hwndListView, + HKEY_CURRENT_USER, + _T("Environment")); + + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); + + + /* Set system environment variables */ + hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + SetListViewColumns(hwndListView); + + SetEnvironmentVariables(hwndListView, + HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); + + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); } VOID OnNewVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); - - if (!DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), - hwndDlg, - (DLGPROC) EditVariableDlgProc, - (LPARAM)VarData) > 0) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - } - - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; - lvi.state = 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + if (!DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_EDIT_VARIABLE), + hwndDlg, + (DLGPROC) EditVariableDlgProc, + (LPARAM)VarData) > 0) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); + } + + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + lvi.lParam = (LPARAM)VarData; + lvi.pszText = VarData->lpName; + lvi.state = 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); } VOID OnEditVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - iItem = ListView_GetSelectionMark(hwndListView); - if (iItem != -1) - { - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - - if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), - hwndDlg, - (DLGPROC) EditVariableDlgProc, - (LPARAM)VarData) > 0) - { - ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - } - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + iItem = ListView_GetSelectionMark(hwndListView); + if (iItem != -1) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_EDIT_VARIABLE), + hwndDlg, + (DLGPROC) EditVariableDlgProc, + (LPARAM)VarData) > 0) + { + ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); + ListView_SetItemText(hwndListView, iItem, 1, + (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + } + } } VOID OnDeleteVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - iItem = ListView_GetSelectionMark(hwndListView); - if (iItem != -1) - { - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - lvi.lParam = 0; - } - } - - (void)ListView_DeleteItem(hwndListView, iItem); - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + iItem = ListView_GetSelectionMark(hwndListView); + if (iItem != -1) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); + lvi.lParam = 0; + } + } + + (void)ListView_DeleteItem(hwndListView, iItem); + } } VOID ReleaseListViewItems(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - int nItemCount; - LV_ITEM lvi; - int i; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - memset(&lvi, 0x00, sizeof(lvi)); - - nItemCount = ListView_GetItemCount(hwndListView); - for (i = 0; i < nItemCount; i++) - { - lvi.mask = LVIF_PARAM; - lvi.iItem = i; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - lvi.lParam = 0; - } - } - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + int nItemCount; + LV_ITEM lvi; + int i; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + memset(&lvi, 0x00, sizeof(lvi)); + + nItemCount = ListView_GetItemCount(hwndListView); + for (i = 0; i < nItemCount; i++) + { + lvi.mask = LVIF_PARAM; + lvi.iItem = i; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); + lvi.lParam = 0; + } + } + } } VOID SetAllVars(HWND hwndDlg, - INT iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - INT iItem; - HKEY hk; - DWORD Type = 0; - - memset(&lvi, 0x00, sizeof(lvi)); - - /* Get the handle to the list box with all system vars in it */ - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - /* first item is 0 */ - iItem = 0; - /* set up struct to retreive item */ - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - /* Open or create the key */ - if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), - (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_READ, - NULL, - &hk, - NULL)) - { - return; - } - - /* loop through all system variables */ - while(ListView_GetItem(hwndListView, &lvi)) - { - /* Get the data in each item */ - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - /* Get the type */ - RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); - - /* Set the new value */ - if (RegSetValueEx(hk, - VarData->lpName, - 0, - Type, - (LPBYTE) VarData->lpRawValue, - (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? - { - RegCloseKey(hk); - return; - } - } - /* Fill struct for next item */ - lvi.mask = LVIF_PARAM; - lvi.iItem = ++iItem; - } - - RegCloseKey(hk); + INT iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + INT iItem; + HKEY hk; + DWORD Type = 0; + + memset(&lvi, 0x00, sizeof(lvi)); + + /* Get the handle to the list box with all system vars in it */ + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + /* first item is 0 */ + iItem = 0; + /* set up struct to retreive item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + /* Open or create the key */ + if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), + (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_READ, + NULL, + &hk, + NULL)) + { + return; + } + + /* loop through all system variables */ + while(ListView_GetItem(hwndListView, &lvi)) + { + /* Get the data in each item */ + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + /* Get the type */ + RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); + + /* Set the new value */ + if (RegSetValueEx(hk, + VarData->lpName, + 0, + Type, + (LPBYTE) VarData->lpRawValue, + (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? + { + RegCloseKey(hk); + return; + } + } + /* Fill struct for next item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = ++iItem; + } + + RegCloseKey(hk); } /* Environment dialog procedure */ INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - OnInitDialog(hwndDlg); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_USER_VARIABLE_NEW: - OnNewVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_USER_VARIABLE_EDIT: - OnEditVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_USER_VARIABLE_DELETE: - OnDeleteVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_NEW: - OnNewVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_EDIT: - OnEditVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_DELETE: - OnDeleteVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDOK: - SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); - SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - - case IDCANCEL: - ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); - ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - EndDialog(hwndDlg, 0); - return TRUE; - } - break; - - case WM_NOTIFY: - { - NMHDR *phdr; - - phdr = (NMHDR*)lParam; - switch(phdr->code) - { - case NM_DBLCLK: - { - if (phdr->idFrom == IDC_USER_VARIABLE_LIST || - phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) - { - OnEditVariable(hwndDlg, (INT)phdr->idFrom); - return TRUE; - } - } - } - } - break; - } - - return FALSE; + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnInitDialog(hwndDlg); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_USER_VARIABLE_NEW: + OnNewVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_USER_VARIABLE_EDIT: + OnEditVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_USER_VARIABLE_DELETE: + OnDeleteVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_NEW: + OnNewVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_EDIT: + OnEditVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_DELETE: + OnDeleteVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDOK: + SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); + SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + case IDCANCEL: + ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); + ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + + case WM_NOTIFY: + { + NMHDR *phdr; + + phdr = (NMHDR*)lParam; + switch(phdr->code) + { + case NM_DBLCLK: + { + if (phdr->idFrom == IDC_USER_VARIABLE_LIST || + phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) + { + OnEditVariable(hwndDlg, (INT)phdr->idFrom); + return TRUE; + } + } + } + } + break; + } + + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Mon Jul 23 14:26:55 2007 @@ -14,60 +14,60 @@ typedef struct _IMGINFO { - HBITMAP hBitmap; - INT cxSource; - INT cySource; + HBITMAP hBitmap; + INT cxSource; + INT cySource; } IMGINFO, *PIMGINFO; void ShowLastWin32Error(HWND hWndOwner) { - LPTSTR lpMsg; - DWORD LastError; - - LastError = GetLastError(); - - if((LastError == 0) || - !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - LastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsg, - 0, - NULL)) - { - return; - } - - MessageBox(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); - - LocalFree((LPVOID)lpMsg); + LPTSTR lpMsg; + DWORD LastError; + + LastError = GetLastError(); + + if((LastError == 0) || + !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + LastError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsg, + 0, + NULL)) + { + return; + } + + MessageBox(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); + + LocalFree((LPVOID)lpMsg); } static VOID InitImageInfo(PIMGINFO ImgInfo) { - BITMAP bitmap; - - ZeroMemory(ImgInfo, sizeof(*ImgInfo)); - - ImgInfo->hBitmap = LoadImage(hApplet, - MAKEINTRESOURCE(IDB_ROSBMP), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - - if (ImgInfo->hBitmap != NULL) - { - GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); - - ImgInfo->cxSource = bitmap.bmWidth; - ImgInfo->cySource = bitmap.bmHeight; - } + BITMAP bitmap; + + ZeroMemory(ImgInfo, sizeof(*ImgInfo)); + + ImgInfo->hBitmap = LoadImage(hApplet, + MAKEINTRESOURCE(IDB_ROSBMP), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + + if (ImgInfo->hBitmap != NULL) + { + GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + + ImgInfo->cxSource = bitmap.bmWidth; + ImgInfo->cySource = bitmap.bmHeight; + } } @@ -77,38 +77,38 @@ LPTSTR Value, UINT uID) { - LPTSTR lpBuf = NULL; - DWORD BufSize = 0; - DWORD Type; - - if (RegQueryValueEx(hKey, - Value, - NULL, - &Type, - NULL, - &BufSize) == ERROR_SUCCESS) - { - lpBuf = HeapAlloc(GetProcessHeap(), - 0, - BufSize); - if (!lpBuf) return; - - if (RegQueryValueEx(hKey, - Value, - NULL, - &Type, - (PBYTE)lpBuf, - &BufSize) == ERROR_SUCCESS) - { - SetDlgItemText(hwnd, - uID, - lpBuf); - } - - HeapFree(GetProcessHeap(), - 0, - lpBuf); - } + LPTSTR lpBuf = NULL; + DWORD BufSize = 0; + DWORD Type; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + NULL, + &BufSize) == ERROR_SUCCESS) + { + lpBuf = HeapAlloc(GetProcessHeap(), + 0, + BufSize); + if (!lpBuf) return; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)lpBuf, + &BufSize) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, + uID, + lpBuf); + } + + HeapFree(GetProcessHeap(), + 0, + lpBuf); + } } static INT @@ -207,145 +207,145 @@ UINT uID) { - TCHAR szBuf[64]; - DWORD BufSize = sizeof(DWORD); - DWORD Type = REG_SZ; - PROCESSOR_POWER_INFORMATION ppi; - - ZeroMemory(&ppi, - sizeof(ppi)); - - if ((CallNtPowerInformation(ProcessorInformation, - NULL, - 0, - (PVOID)&ppi, - sizeof(ppi)) == STATUS_SUCCESS && - ppi.CurrentMhz != 0) || - RegQueryValueEx(hKey, - Value, - NULL, - &Type, - (PBYTE)&ppi.CurrentMhz, - &BufSize) == ERROR_SUCCESS) - { - if (ppi.CurrentMhz < 1000) - { - _stprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); - } - else - { - double flt = ppi.CurrentMhz / 1000.0; - _stprintf(szBuf, _T("%.2f GHz"), flt); - } - - SetDlgItemText(hwnd, - uID, - szBuf); - } + TCHAR szBuf[64]; + DWORD BufSize = sizeof(DWORD); + DWORD Type = REG_SZ; + PROCESSOR_POWER_INFORMATION ppi; + + ZeroMemory(&ppi, + sizeof(ppi)); + + if ((CallNtPowerInformation(ProcessorInformation, + NULL, + 0, + (PVOID)&ppi, + sizeof(ppi)) == STATUS_SUCCESS && + ppi.CurrentMhz != 0) || + RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)&ppi.CurrentMhz, + &BufSize) == ERROR_SUCCESS) + { + if (ppi.CurrentMhz < 1000) + { + _stprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); + } + else + { + double flt = ppi.CurrentMhz / 1000.0; + _stprintf(szBuf, _T("%.2f GHz"), flt); + } + + SetDlgItemText(hwnd, + uID, + szBuf); + } } static VOID GetSystemInformation(HWND hwnd) { - HKEY hKey; - TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); - MEMORYSTATUSEX MemStat; - TCHAR Buf[32]; - INT Ret = 0; - INT CurMachineLine = IDC_MACHINELINE1; - - - /* Get Processor information * - * although undocumented, this information is being pulled - * directly out of the registry instead of via setupapi as it - * contains all the info we need, and should remain static - */ - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - ProcKey, - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) - { - SetRegTextData(hwnd, - hKey, - _T("VendorIdentifier"), - CurMachineLine); - CurMachineLine++; - - Ret = SetProcNameString(hwnd, - hKey, - _T("ProcessorNameString"), - CurMachineLine, - CurMachineLine+1); - CurMachineLine += Ret; - - SetProcSpeed(hwnd, - hKey, - _T("~MHz"), - CurMachineLine); - CurMachineLine++; - } - - - /* Get total physical RAM */ - MemStat.dwLength = sizeof(MemStat); - if (GlobalMemoryStatusEx(&MemStat)) - { - TCHAR szStr[32]; - double dTotalPhys; - UINT i = 0; - static const UINT uStrId[] = { - IDS_MEGABYTE, - IDS_GIGABYTE, - IDS_TERABYTE, - IDS_PETABYTE - }; - - if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) - { - /* We're dealing with GBs or more */ - MemStat.ullTotalPhys /= 1024 * 1024; - i++; - - if (MemStat.ullTotalPhys > 1024 * 1024) - { - /* We're dealing with TBs or more */ - MemStat.ullTotalPhys /= 1024; - i++; - - if (MemStat.ullTotalPhys > 1024 * 1024) - { - /* We're dealing with PBs or more */ - - MemStat.ullTotalPhys /= 1024; - i++; - - dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - } - else - dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - } - else - dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - } - else - { - /* We're daling with MBs */ - dTotalPhys = (double)MemStat.ullTotalPhys / 1024 / 1024; - } - - if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) - { - Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); - } - } - - if (Ret) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); - } + HKEY hKey; + TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); + MEMORYSTATUSEX MemStat; + TCHAR Buf[32]; + INT Ret = 0; + INT CurMachineLine = IDC_MACHINELINE1; + + + /* Get Processor information * + * although undocumented, this information is being pulled + * directly out of the registry instead of via setupapi as it + * contains all the info we need, and should remain static + */ + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + ProcKey, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + SetRegTextData(hwnd, + hKey, + _T("VendorIdentifier"), + CurMachineLine); + CurMachineLine++; + + Ret = SetProcNameString(hwnd, + hKey, + _T("ProcessorNameString"), + CurMachineLine, + CurMachineLine+1); + CurMachineLine += Ret; + + SetProcSpeed(hwnd, + hKey, + _T("~MHz"), + CurMachineLine); + CurMachineLine++; + } + + + /* Get total physical RAM */ + MemStat.dwLength = sizeof(MemStat); + if (GlobalMemoryStatusEx(&MemStat)) + { + TCHAR szStr[32]; + double dTotalPhys; + UINT i = 0; + static const UINT uStrId[] = { + IDS_MEGABYTE, + IDS_GIGABYTE, + IDS_TERABYTE, + IDS_PETABYTE + }; + + if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) + { + /* We're dealing with GBs or more */ + MemStat.ullTotalPhys /= 1024 * 1024; + i++; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + /* We're dealing with TBs or more */ + MemStat.ullTotalPhys /= 1024; + i++; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + /* We're dealing with PBs or more */ + + MemStat.ullTotalPhys /= 1024; + i++; + + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } + else + { + /* We're daling with MBs */ + dTotalPhys = (double)MemStat.ullTotalPhys / 1024 / 1024; + } + + if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) + { + Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); + } + } + + if (Ret) + { + SetDlgItemText(hwnd, + CurMachineLine, + Buf); + } } @@ -356,89 +356,84 @@ WPARAM wParam, LPARAM lParam) { - static IMGINFO ImgInfo; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - - switch(uMsg) - { - case WM_INITDIALOG: - { - InitImageInfo(&ImgInfo); - GetSystemInformation(hwndDlg); - } - break; - - case WM_COMMAND: - { - if (LOWORD(wParam) == IDC_LICENCE) - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_LICENCE), - hwndDlg, - LicenceDlgProc); - - return TRUE; - } - } - break; - - case WM_DRAWITEM: - { - LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - if(lpDrawItem->CtlID == IDC_ROSIMG) - { - HDC hdcMem; - LONG left; - - /* position image in centre of dialog */ - left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; - - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - if (hdcMem != NULL) - { - SelectObject(hdcMem, ImgInfo.hBitmap); - BitBlt(lpDrawItem->hDC, - left, - lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, - 0, - 0, - SRCCOPY); - DeleteDC(hdcMem); - } - } - return TRUE; - } - - case WM_NOTIFY: - { - NMHDR *nmhdr = (NMHDR *)lParam; - - if (nmhdr->idFrom == IDC_ROSHOMEPAGE_LINK && nmhdr->code == NM_CLICK) - { - PNMLINK nml = (PNMLINK)nmhdr; - - ShellExecuteW(hwndDlg, - L"open", - nml->item.szUrl, - NULL, - NULL, - SW_SHOWNORMAL); - } - break; - } - - } - - return FALSE; -} - - - - - + static IMGINFO ImgInfo; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + { + InitImageInfo(&ImgInfo); + GetSystemInformation(hwndDlg); + } + break; + + case WM_COMMAND: + { + if (LOWORD(wParam) == IDC_LICENCE) + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_LICENCE), + hwndDlg, + LicenceDlgProc); + + return TRUE; + } + } + break; + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + if(lpDrawItem->CtlID == IDC_ROSIMG) + { + HDC hdcMem; + LONG left; + + /* position image in centre of dialog */ + left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, ImgInfo.hBitmap); + BitBlt(lpDrawItem->hDC, + left, + lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, + 0, + 0, + SRCCOPY); + DeleteDC(hdcMem); + } + } + return TRUE; + } + + case WM_NOTIFY: + { + NMHDR *nmhdr = (NMHDR *)lParam; + + if (nmhdr->idFrom == IDC_ROSHOMEPAGE_LINK && nmhdr->code == NM_CLICK) + { + PNMLINK nml = (PNMLINK)nmhdr; + + ShellExecuteW(hwndDlg, + L"open", + nml->item.szUrl, + NULL, + NULL, + SW_SHOWNORMAL); + } + break; + } + + } + + return FALSE; +} Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c Mon Jul 23 14:26:55 2007 @@ -12,77 +12,76 @@ /* Property page dialog callback */ static INT_PTR CALLBACK RenameProfDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - { - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) + { + case WM_INITDIALOG: + { + MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); + } + break; - case WM_COMMAND: - { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; - } - } - break; - } - return FALSE; + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + } + break; + } + return FALSE; } /* Property page dialog callback */ INT_PTR CALLBACK HardProfDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - { - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) + { + case WM_INITDIALOG: + { + MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); + } + break; - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_HRDPROFRENAME: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_RENAMEPROFILE), - hwndDlg, - (DLGPROC)RenameProfDlgProc); - } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_HRDPROFRENAME: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_RENAMEPROFILE), + hwndDlg, + (DLGPROC)RenameProfDlgProc); + } - case IDOK: - case IDCANCEL: - { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; - } - } - - } - break; - } - return FALSE; + case IDOK: + case IDCANCEL: + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + } + } + break; + } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardware.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardware.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardware.c Mon Jul 23 14:26:55 2007 @@ -16,72 +16,71 @@ { /* hack for ROS to start our devmgmt until we have mmc */ #ifdef __REACTOS__ - return ((INT)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32); + return ((INT)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32); #else - HMODULE hDll; - PDEVMGREXEC DevMgrExec; - BOOL Ret; + HMODULE hDll; + PDEVMGREXEC DevMgrExec; + BOOL Ret; - hDll = LoadLibrary(_TEXT("devmgr.dll")); - if(!hDll) - return FALSE; + hDll = LoadLibrary(_TEXT("devmgr.dll")); + if(!hDll) + return FALSE; - DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"); - if(!DevMgrExec) - { - FreeLibrary(hDll); - return FALSE; - } + DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"); + if(!DevMgrExec) + { + FreeLibrary(hDll); + return FALSE; + } - /* run the Device Manager */ - Ret = DevMgrExec(hWndParent, hApplet, NULL /* ??? */, SW_SHOW); - FreeLibrary(hDll); - return Ret; + /* run the Device Manager */ + Ret = DevMgrExec(hWndParent, hApplet, NULL /* ??? */, SW_SHOW); + FreeLibrary(hDll); + return Ret; #endif /* __REACTOS__ */ } /* Property page dialog callback */ INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam); - switch(uMsg) - { - case WM_INITDIALOG: - break; + switch(uMsg) + { + case WM_INITDIALOG: + break; - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case IDC_HARDWARE_DEVICE_MANAGER: - { - if(!LaunchDeviceManager(hwndDlg)) - { - /* FIXME */ - } + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_HARDWARE_DEVICE_MANAGER: + { + if(!LaunchDeviceManager(hwndDlg)) + { + /* FIXME */ + } - return TRUE; - } + return TRUE; + } - case IDC_HARDWARE_PROFILE: - { - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_HARDWAREPROFILES), - hwndDlg, - (DLGPROC)HardProfDlgProc); + case IDC_HARDWARE_PROFILE: + { + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_HARDWAREPROFILES), + hwndDlg, + (DLGPROC)HardProfDlgProc); - return TRUE; - } - } - } - break; - } + return TRUE; + } + } + } + break; + } - return FALSE; + return FALSE; } - Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c Mon Jul 23 14:26:55 2007 @@ -12,70 +12,70 @@ INT_PTR CALLBACK LicenceDlgProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) + UINT message, + WPARAM wParam, + LPARAM lParam) { - HRSRC hResInfo; - HGLOBAL hResMem; - WCHAR *LicenseText; - static HICON hIcon; + HRSRC hResInfo; + HGLOBAL hResMem; + WCHAR *LicenseText; + static HICON hIcon; - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam); - switch (message) - { - case WM_INITDIALOG: - { - hIcon = LoadImage(hApplet, - MAKEINTRESOURCE(IDI_CPLSYSTEM), - IMAGE_ICON, - 16, - 16, - 0); + switch (message) + { + case WM_INITDIALOG: + { + hIcon = LoadImage(hApplet, + MAKEINTRESOURCE(IDI_CPLSYSTEM), + IMAGE_ICON, + 16, + 16, + 0); - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); - /* load license from resource */ - if(!(hResInfo = FindResource(hApplet, - MAKEINTRESOURCE(RC_LICENSE), - MAKEINTRESOURCE(RTDATA))) || - !(hResMem = LoadResource(hApplet, hResInfo)) || - !(LicenseText = LockResource(hResMem))) - { - ShowLastWin32Error(hDlg); - break; - } + /* load license from resource */ + if(!(hResInfo = FindResource(hApplet, + MAKEINTRESOURCE(RC_LICENSE), + MAKEINTRESOURCE(RTDATA))) || + !(hResMem = LoadResource(hApplet, hResInfo)) || + !(LicenseText = LockResource(hResMem))) + { + ShowLastWin32Error(hDlg); + break; + } - /* insert the license into the edit control (unicode!) */ - SetDlgItemText(hDlg, - IDC_LICENCEEDIT, - LicenseText); + /* insert the license into the edit control (unicode!) */ + SetDlgItemText(hDlg, + IDC_LICENCEEDIT, + LicenseText); - SendDlgItemMessage(hDlg, - IDC_LICENCEEDIT, - EM_SETSEL, - -1, - 0); + SendDlgItemMessage(hDlg, + IDC_LICENCEEDIT, + EM_SETSEL, + -1, + 0); - return TRUE; - } + return TRUE; + } - case WM_COMMAND: - { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - DestroyIcon(hIcon); - EndDialog(hDlg, - LOWORD(wParam)); - return TRUE; - } - } - break; - } + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + DestroyIcon(hIcon); + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + } + break; + } - return FALSE; + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Mon Jul 23 14:26:55 2007 @@ -29,9 +29,9 @@ /* Property page dialog callback */ INT_PTR CALLBACK StartRecDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { TCHAR *szSystemDrive; TCHAR szDefaultOS[MAX_PATH]; @@ -40,7 +40,7 @@ int iTimeout; UNREFERENCED_PARAMETER(lParam); - + switch(uMsg) { case WM_INITDIALOG: @@ -89,7 +89,7 @@ HeapFree(GetProcessHeap(), 0, szSystemDrive); } } - + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); /* load settings from freeldr.ini */ @@ -143,6 +143,6 @@ } } break; - } - return FALSE; + } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Mon Jul 23 14:26:55 2007 @@ -15,7 +15,7 @@ /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; #define MAX_SYSTEM_PAGES 32 @@ -23,39 +23,39 @@ static BOOL CALLBACK PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) { - PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; - if (ppsh != NULL && ppsh->nPages < MAX_SYSTEM_PAGES) - { - ppsh->phpage[ppsh->nPages++] = hpage; - return TRUE; - } - - return FALSE; + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_SYSTEM_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } + + return FALSE; } static BOOL InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) { - HPROPSHEETPAGE hPage; - PROPSHEETPAGE psp; - - if (ppsh->nPages < MAX_SYSTEM_PAGES) - { - ZeroMemory(&psp, sizeof(psp)); - psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_DEFAULT; - psp.hInstance = hApplet; - psp.pszTemplate = MAKEINTRESOURCE(idDlg); - psp.pfnDlgProc = DlgProc; - - hPage = CreatePropertySheetPage(&psp); - if (hPage != NULL) - { - return PropSheetAddPage(hPage, (LPARAM)ppsh); - } - } - - return FALSE; + HPROPSHEETPAGE hPage; + PROPSHEETPAGE psp; + + if (ppsh->nPages < MAX_SYSTEM_PAGES) + { + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(idDlg); + psp.pfnDlgProc = DlgProc; + + hPage = CreatePropertySheetPage(&psp); + if (hPage != NULL) + { + return PropSheetAddPage(hPage, (LPARAM)ppsh); + } + } + + return FALSE; } typedef HPROPSHEETPAGE (WINAPI *PCreateNetIDPropertyPage)(VOID); @@ -63,87 +63,87 @@ static HMODULE AddNetIdPage(PROPSHEETHEADER *ppsh) { - HPROPSHEETPAGE hPage; - HMODULE hMod; - PCreateNetIDPropertyPage pCreateNetIdPage; - - hMod = LoadLibrary(TEXT("netid.dll")); - if (hMod != NULL) - { - pCreateNetIdPage = (PCreateNetIDPropertyPage)GetProcAddress(hMod, - "CreateNetIDPropertyPage"); - if (pCreateNetIdPage != NULL) - { - hPage = pCreateNetIdPage(); - if (hPage == NULL) - goto Fail; - - if (!PropSheetAddPage(hPage, (LPARAM)ppsh)) - { - DestroyPropertySheetPage(hPage); - goto Fail; - } - } - else - { + HPROPSHEETPAGE hPage; + HMODULE hMod; + PCreateNetIDPropertyPage pCreateNetIdPage; + + hMod = LoadLibrary(TEXT("netid.dll")); + if (hMod != NULL) + { + pCreateNetIdPage = (PCreateNetIDPropertyPage)GetProcAddress(hMod, + "CreateNetIDPropertyPage"); + if (pCreateNetIdPage != NULL) + { + hPage = pCreateNetIdPage(); + if (hPage == NULL) + goto Fail; + + if (!PropSheetAddPage(hPage, (LPARAM)ppsh)) + { + DestroyPropertySheetPage(hPage); + goto Fail; + } + } + else + { Fail: - FreeLibrary(hMod); - hMod = NULL; - } - } - - return hMod; + FreeLibrary(hMod); + hMod = NULL; + } + } + + return hMod; } /* First Applet */ LONG CALLBACK SystemApplet(VOID) { - HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; - PROPSHEETHEADER psh; - HMODULE hNetIdDll; - HPSXA hpsxa = NULL; - LONG Ret; - static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; - - if (!InitCommonControlsEx(&icc)) - return 0; - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); - psh.nPages = 0; - psh.nStartPage = 0; - psh.phpage = hpsp; - psh.pfnCallback = NULL; - - InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); - hNetIdDll = AddNetIdPage(&psh); - InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); - - /* Load additional pages provided by shell extensions */ - hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); - if (hpsxa != NULL) - { - SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); - } - - Ret = (LONG)(PropertySheet(&psh) != -1); - - if (hpsxa != NULL) - { - SHDestroyPropSheetExtArray(hpsxa); - } - - if (hNetIdDll != NULL) - FreeLibrary(hNetIdDll); - - return Ret; + HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; + PROPSHEETHEADER psh; + HMODULE hNetIdDll; + HPSXA hpsxa = NULL; + LONG Ret; + static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; + + if (!InitCommonControlsEx(&icc)) + return 0; + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); + psh.nPages = 0; + psh.nStartPage = 0; + psh.phpage = hpsp; + psh.pfnCallback = NULL; + + InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + hNetIdDll = AddNetIdPage(&psh); + InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + } + + Ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + { + SHDestroyPropSheetExtArray(hpsxa); + } + + if (hNetIdDll != NULL) + FreeLibrary(hNetIdDll); + + return Ret; } /* Control Panel Callback */ @@ -154,35 +154,35 @@ LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl); - - switch(uMsg) - { - case CPL_INIT: - { - return TRUE; - } - case CPL_GETCOUNT: - { - return NUM_APPLETS; - } - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - } - case CPL_DBLCLK: - { - Applets[i].AppletProc(); - break; - } - } - return FALSE; + int i = (int)lParam1; + UNREFERENCED_PARAMETER(hwndCPl); + + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + } + case CPL_DBLCLK: + { + Applets[i].AppletProc(); + break; + } + } + return FALSE; } @@ -192,14 +192,13 @@ DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; -} - + UNREFERENCED_PARAMETER(lpvReserved); + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c Mon Jul 23 14:26:55 2007 @@ -13,48 +13,48 @@ /* Property page dialog callback */ INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - { - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + switch(uMsg) + { + case WM_INITDIALOG: + { + MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); + } + break; - case WM_COMMAND: - { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; - } - } - break; + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + } + break; - case WM_NOTIFY: - { - NMHDR *nmhdr = (NMHDR *)lParam; + case WM_NOTIFY: + { + NMHDR *nmhdr = (NMHDR *)lParam; - if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) - { - ShellExecute(hwndDlg, - TEXT("open"), - TEXT("rundll32.exe"), - TEXT("shell32.dll, Control_RunDLL nusrmgr.cpl"), - NULL, - SW_SHOWNORMAL); - } - break; - } - } - return FALSE; + if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) + { + ShellExecute(hwndDlg, + TEXT("open"), + TEXT("rundll32.exe"), + TEXT("shell32.dll, Control_RunDLL nusrmgr.cpl"), + NULL, + SW_SHOWNORMAL); + } + break; + } + } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Mon Jul 23 14:26:55 2007 @@ -14,351 +14,350 @@ static BOOL ReadPageFileSettings(PVIRTMEM pVirtMem) { - HKEY hkey = NULL; - DWORD dwType; - DWORD dwDataSize; - BOOL bRet = FALSE; - - if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, - lpKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_QUERY_VALUE, - NULL, - &hkey, - NULL) == ERROR_SUCCESS) - { - if(RegQueryValueEx(hkey, - _T("PagingFiles"), - NULL, - &dwType, - NULL, - &dwDataSize) == ERROR_SUCCESS) + HKEY hkey = NULL; + DWORD dwType; + DWORD dwDataSize; + BOOL bRet = FALSE; + + if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, + lpKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_QUERY_VALUE, + NULL, + &hkey, + NULL) == ERROR_SUCCESS) + { + if(RegQueryValueEx(hkey, + _T("PagingFiles"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) { - pVirtMem->szPagingFiles = (LPTSTR)HeapAlloc(GetProcessHeap(), - 0, - dwDataSize); - if (pVirtMem->szPagingFiles != NULL) - { - ZeroMemory(pVirtMem->szPagingFiles, - dwDataSize); - if(RegQueryValueEx(hkey, - _T("PagingFiles"), - NULL, - &dwType, - (PBYTE)pVirtMem->szPagingFiles, - &dwDataSize) == ERROR_SUCCESS) - { - bRet = TRUE; - } - } - - } - } - - if (!bRet) - ShowLastWin32Error(pVirtMem->hSelf); - - if (hkey != NULL) - RegCloseKey(hkey); - - return bRet; + pVirtMem->szPagingFiles = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + dwDataSize); + if (pVirtMem->szPagingFiles != NULL) + { + ZeroMemory(pVirtMem->szPagingFiles, + dwDataSize); + if(RegQueryValueEx(hkey, + _T("PagingFiles"), + NULL, + &dwType, + (PBYTE)pVirtMem->szPagingFiles, + &dwDataSize) == ERROR_SUCCESS) + { + bRet = TRUE; + } + } + } + } + + if (!bRet) + ShowLastWin32Error(pVirtMem->hSelf); + + if (hkey != NULL) + RegCloseKey(hkey); + + return bRet; } static INT GetPageFileSizes(LPTSTR lpPageFiles) { - while (*lpPageFiles != _T('\0')) - { - if (*lpPageFiles == _T(' ')) - { - lpPageFiles++; - return (INT)_ttoi(lpPageFiles); - } - - lpPageFiles++; - } - - return -1; + while (*lpPageFiles != _T('\0')) + { + if (*lpPageFiles == _T(' ')) + { + lpPageFiles++; + return (INT)_ttoi(lpPageFiles); + } + + lpPageFiles++; + } + + return -1; } static VOID ParseMemSettings(PVIRTMEM pVirtMem) { - TCHAR szDrives[1024]; // all drives - LPTSTR DrivePtr = szDrives; - TCHAR szDrive[MAX_PATH]; // single drive - TCHAR szVolume[MAX_PATH]; - INT InitialSize = 0; - INT MaxSize = 0; - INT DriveLen; - INT PgCnt = 0; - - DriveLen = GetLogicalDriveStrings(1023, - szDrives); - - while (DriveLen != 0) - { - LVITEM Item; - INT Len; - - Len = lstrlen(DrivePtr) + 1; - DriveLen -= Len; - - DrivePtr = _tcsupr(DrivePtr); - - /* copy the 'X:' portion */ - lstrcpyn(szDrive, DrivePtr, 3); - - if(GetDriveType(DrivePtr) == DRIVE_FIXED) - { - /* does drive match the one in the registry ? */ - if(!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) - { - /* FIXME: we only check the first available pagefile in the reg */ - InitialSize = GetPageFileSizes(pVirtMem->szPagingFiles); - MaxSize = GetPageFileSizes(pVirtMem->szPagingFiles); - - pVirtMem->Pagefile[PgCnt].InitialValue = InitialSize; - pVirtMem->Pagefile[PgCnt].MaxValue = MaxSize; - pVirtMem->Pagefile[PgCnt].bUsed = TRUE; - lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); - } - else - { - pVirtMem->Pagefile[PgCnt].InitialValue = 0; - pVirtMem->Pagefile[PgCnt].MaxValue = 0; - pVirtMem->Pagefile[PgCnt].bUsed = FALSE; - lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); - } - - /* fill out the listview */ - ZeroMemory(&Item, sizeof(Item)); - Item.mask = LVIF_TEXT; - Item.iItem = ListView_GetItemCount(pVirtMem->hListView); - Item.pszText = szDrive; - (void)ListView_InsertItem(pVirtMem->hListView, &Item); - - /* set a volume label if there is one */ - if (GetVolumeInformation(DrivePtr, - szVolume, - 255, - NULL, - NULL, - NULL, - NULL, - 0)) - { - if (szVolume[0] != _T('\0')) - { - TCHAR szVol[MAX_PATH + 2]; - - _stprintf(szVol, _T("[%s]"), szVolume); - - Item.iSubItem = 1; - Item.pszText = szVol; - (void)ListView_InsertItem(pVirtMem->hListView, &Item); - } - } - - if ((InitialSize != 0) || (MaxSize != 0)) - { - TCHAR szSize[64]; - - _stprintf(szSize, _T("%i - %i"), InitialSize, MaxSize); - - Item.iSubItem = 2; - Item.pszText = szSize; - (void)ListView_InsertItem(pVirtMem->hListView, &Item); - } - - PgCnt++; - } - - DrivePtr += Len; - } - - pVirtMem->Count = PgCnt; + TCHAR szDrives[1024]; // all drives + LPTSTR DrivePtr = szDrives; + TCHAR szDrive[MAX_PATH]; // single drive + TCHAR szVolume[MAX_PATH]; + INT InitialSize = 0; + INT MaxSize = 0; + INT DriveLen; + INT PgCnt = 0; + + DriveLen = GetLogicalDriveStrings(1023, + szDrives); + + while (DriveLen != 0) + { + LVITEM Item; + INT Len; + + Len = lstrlen(DrivePtr) + 1; + DriveLen -= Len; + + DrivePtr = _tcsupr(DrivePtr); + + /* copy the 'X:' portion */ + lstrcpyn(szDrive, DrivePtr, 3); + + if(GetDriveType(DrivePtr) == DRIVE_FIXED) + { + /* does drive match the one in the registry ? */ + if(!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) + { + /* FIXME: we only check the first available pagefile in the reg */ + InitialSize = GetPageFileSizes(pVirtMem->szPagingFiles); + MaxSize = GetPageFileSizes(pVirtMem->szPagingFiles); + + pVirtMem->Pagefile[PgCnt].InitialValue = InitialSize; + pVirtMem->Pagefile[PgCnt].MaxValue = MaxSize; + pVirtMem->Pagefile[PgCnt].bUsed = TRUE; + lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); + } + else + { + pVirtMem->Pagefile[PgCnt].InitialValue = 0; + pVirtMem->Pagefile[PgCnt].MaxValue = 0; + pVirtMem->Pagefile[PgCnt].bUsed = FALSE; + lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); + } + + /* fill out the listview */ + ZeroMemory(&Item, sizeof(Item)); + Item.mask = LVIF_TEXT; + Item.iItem = ListView_GetItemCount(pVirtMem->hListView); + Item.pszText = szDrive; + (void)ListView_InsertItem(pVirtMem->hListView, &Item); + + /* set a volume label if there is one */ + if (GetVolumeInformation(DrivePtr, + szVolume, + 255, + NULL, + NULL, + NULL, + NULL, + 0)) + { + if (szVolume[0] != _T('\0')) + { + TCHAR szVol[MAX_PATH + 2]; + + _stprintf(szVol, _T("[%s]"), szVolume); + + Item.iSubItem = 1; + Item.pszText = szVol; + (void)ListView_InsertItem(pVirtMem->hListView, &Item); + } + } + + if ((InitialSize != 0) || (MaxSize != 0)) + { + TCHAR szSize[64]; + + _stprintf(szSize, _T("%i - %i"), InitialSize, MaxSize); + + Item.iSubItem = 2; + Item.pszText = szSize; + (void)ListView_InsertItem(pVirtMem->hListView, &Item); + } + + PgCnt++; + } + + DrivePtr += Len; + } + + pVirtMem->Count = PgCnt; } static VOID WritePageFileSettings(PVIRTMEM pVirtMem) { - HKEY hk = NULL; - TCHAR szPagingFiles[2048]; - INT i; - INT nPos = 0; - BOOL bErr = TRUE; - - for(i = 0; i < pVirtMem->Count; ++i) - { - if(pVirtMem->Pagefile[i].bUsed) - { - TCHAR szText[256]; - - _stprintf(szText, _T("%s\\pagefile.sys %i %i"), - pVirtMem->Pagefile[i].szDrive, - pVirtMem->Pagefile[i].InitialValue, - pVirtMem->Pagefile[i].MaxValue); - - /* Add it to our overall registry string */ - lstrcat(szPagingFiles + nPos, szText); - - /* Record the position where the next string will start */ - nPos += (INT)lstrlen(szText) + 1; - - /* add another NULL for REG_MULTI_SZ */ - szPagingFiles[nPos] = _T('\0'); - nPos++; - } - } - - if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, - lpKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hk, - NULL) == ERROR_SUCCESS) - { - if (RegSetValueEx(hk, - _T("PagingFiles"), - 0, - REG_MULTI_SZ, - (LPBYTE) szPagingFiles, - (DWORD) nPos * sizeof(TCHAR))) - { - bErr = FALSE; - } - - RegCloseKey(hk); - } - - if (bErr) - ShowLastWin32Error(pVirtMem->hSelf); + HKEY hk = NULL; + TCHAR szPagingFiles[2048]; + INT i; + INT nPos = 0; + BOOL bErr = TRUE; + + for(i = 0; i < pVirtMem->Count; ++i) + { + if(pVirtMem->Pagefile[i].bUsed) + { + TCHAR szText[256]; + + _stprintf(szText, _T("%s\\pagefile.sys %i %i"), + pVirtMem->Pagefile[i].szDrive, + pVirtMem->Pagefile[i].InitialValue, + pVirtMem->Pagefile[i].MaxValue); + + /* Add it to our overall registry string */ + lstrcat(szPagingFiles + nPos, szText); + + /* Record the position where the next string will start */ + nPos += (INT)lstrlen(szText) + 1; + + /* add another NULL for REG_MULTI_SZ */ + szPagingFiles[nPos] = _T('\0'); + nPos++; + } + } + + if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, + lpKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hk, + NULL) == ERROR_SUCCESS) + { + if (RegSetValueEx(hk, + _T("PagingFiles"), + 0, + REG_MULTI_SZ, + (LPBYTE) szPagingFiles, + (DWORD) nPos * sizeof(TCHAR))) + { + bErr = FALSE; + } + + RegCloseKey(hk); + } + + if (bErr) + ShowLastWin32Error(pVirtMem->hSelf); } static VOID SetListViewColumns(HWND hwndListView) { - RECT rect; - LV_COLUMN lvc; - - GetClientRect(hwndListView, &rect); - - (void)ListView_SetExtendedListViewStyle(hwndListView, - LVS_EX_FULLROWSELECT); - - ZeroMemory(&lvc, sizeof(lvc)); - lvc.mask = LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; - lvc.fmt = LVCFMT_LEFT; - - lvc.cx = (INT)((rect.right - rect.left) * 0.1); - lvc.iSubItem = 0; - (void)ListView_InsertColumn(hwndListView, 0, &lvc); - - lvc.cx = (INT)((rect.right - rect.left) * 0.3); - lvc.iSubItem = 1; - (void)ListView_InsertColumn(hwndListView, 1, &lvc); - - lvc.cx = (INT)((rect.right - rect.left) * 0.6); - lvc.iSubItem = 2; - (void)ListView_InsertColumn(hwndListView, 2, &lvc); + RECT rect; + LV_COLUMN lvc; + + GetClientRect(hwndListView, &rect); + + (void)ListView_SetExtendedListViewStyle(hwndListView, + LVS_EX_FULLROWSELECT); + + ZeroMemory(&lvc, sizeof(lvc)); + lvc.mask = LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; + lvc.fmt = LVCFMT_LEFT; + + lvc.cx = (INT)((rect.right - rect.left) * 0.1); + lvc.iSubItem = 0; + (void)ListView_InsertColumn(hwndListView, 0, &lvc); + + lvc.cx = (INT)((rect.right - rect.left) * 0.3); + lvc.iSubItem = 1; + (void)ListView_InsertColumn(hwndListView, 1, &lvc); + + lvc.cx = (INT)((rect.right - rect.left) * 0.6); + lvc.iSubItem = 2; + (void)ListView_InsertColumn(hwndListView, 2, &lvc); } static VOID OnNoPagingFile(PVIRTMEM pVirtMem) { - /* Disable the page file custom size boxes */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); + /* Disable the page file custom size boxes */ + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); } static VOID OnSysManSize(PVIRTMEM pVirtMem) { - /* Disable the page file custom size boxes */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); + /* Disable the page file custom size boxes */ + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); } static VOID OnCustom(PVIRTMEM pVirtMem) { - /* Enable the page file custom size boxes */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); + /* Enable the page file custom size boxes */ + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); } static VOID OnSet(PVIRTMEM pVirtMem) { - INT Index; - - pVirtMem->bSave = TRUE; - - Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, - IDC_PAGEFILELIST, - LB_GETCURSEL, - 0, - 0); - - if(Index < pVirtMem->Count) - { - TCHAR szText[255]; - - /* check if custom settings are checked */ - if(SendDlgItemMessage(pVirtMem->hSelf, - IDC_CUSTOM, - BM_GETCHECK, - 0, - 0) == BST_CHECKED) - { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_INITIALSIZE, - WM_GETTEXT, - 254, - (LPARAM)szText); - pVirtMem->Pagefile[Index].InitialValue = _ttoi(szText); - - SendDlgItemMessage(pVirtMem->hSelf, - IDC_MAXSIZE, - WM_GETTEXT, - 254, - (LPARAM)szText); - pVirtMem->Pagefile[Index].MaxValue = _ttoi(szText); - } - else - { - /* set sizes to 0 */ - pVirtMem->Pagefile[Index].InitialValue = pVirtMem->Pagefile[Index].MaxValue = 0; - - // check to see if this drive is used for a paging file - if (SendDlgItemMessage(pVirtMem->hSelf, - IDC_NOPAGEFILE, - BM_GETCHECK, - 0, - 0) == BST_UNCHECKED) - { - pVirtMem->Pagefile[Index].bUsed = TRUE; - } - else - { - pVirtMem->Pagefile[Index].bUsed = FALSE; - } - } - } + INT Index; + + pVirtMem->bSave = TRUE; + + Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, + IDC_PAGEFILELIST, + LB_GETCURSEL, + 0, + 0); + + if(Index < pVirtMem->Count) + { + TCHAR szText[255]; + + /* check if custom settings are checked */ + if(SendDlgItemMessage(pVirtMem->hSelf, + IDC_CUSTOM, + BM_GETCHECK, + 0, + 0) == BST_CHECKED) + { + SendDlgItemMessage(pVirtMem->hSelf, + IDC_INITIALSIZE, + WM_GETTEXT, + 254, + (LPARAM)szText); + pVirtMem->Pagefile[Index].InitialValue = _ttoi(szText); + + SendDlgItemMessage(pVirtMem->hSelf, + IDC_MAXSIZE, + WM_GETTEXT, + 254, + (LPARAM)szText); + pVirtMem->Pagefile[Index].MaxValue = _ttoi(szText); + } + else + { + /* set sizes to 0 */ + pVirtMem->Pagefile[Index].InitialValue = pVirtMem->Pagefile[Index].MaxValue = 0; + + // check to see if this drive is used for a paging file + if (SendDlgItemMessage(pVirtMem->hSelf, + IDC_NOPAGEFILE, + BM_GETCHECK, + 0, + 0) == BST_UNCHECKED) + { + pVirtMem->Pagefile[Index].bUsed = TRUE; + } + else + { + pVirtMem->Pagefile[Index].bUsed = FALSE; + } + } + } } @@ -366,135 +365,135 @@ OnSelChange(PVIRTMEM pVirtMem, LPNMLISTVIEW pnmv) { - TCHAR szCustVals[255]; - INT Index; - - UNREFERENCED_PARAMETER(pnmv); - - Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, - IDC_PAGEFILELIST, - LB_GETCURSEL, - 0, - 0); - - if(Index < pVirtMem->Count) - { - - if(pVirtMem->Pagefile[Index].InitialValue != 0 && - pVirtMem->Pagefile[Index].MaxValue != 0) - { - /* enable and fill the custom values */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); - - _itot(pVirtMem->Pagefile[Index].InitialValue , szCustVals, 10); - SendDlgItemMessage(pVirtMem->hSelf, - IDC_INITIALSIZE, - WM_SETTEXT, - 0, - (LPARAM)szCustVals); - - _itot(pVirtMem->Pagefile[Index].MaxValue, szCustVals, 10); - SendDlgItemMessage(pVirtMem->hSelf, - IDC_MAXSIZE, - WM_SETTEXT, - 0, - (LPARAM)szCustVals); - - SendDlgItemMessage(pVirtMem->hSelf, - IDC_CUSTOM, - BM_SETCHECK, - 1, - 0); - } - else - { - /* It's not a custom value */ - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); - EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); - - /* is it system managed */ - if(pVirtMem->Pagefile[Index].bUsed) - { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_SYSMANSIZE, - BM_SETCHECK, - 1, - 0); - } - else - { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_NOPAGEFILE, - BM_SETCHECK, - 1, - 0); - } - } - } - - return TRUE; + TCHAR szCustVals[255]; + INT Index; + + UNREFERENCED_PARAMETER(pnmv); + + Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, + IDC_PAGEFILELIST, + LB_GETCURSEL, + 0, + 0); + + if(Index < pVirtMem->Count) + { + + if(pVirtMem->Pagefile[Index].InitialValue != 0 && + pVirtMem->Pagefile[Index].MaxValue != 0) + { + /* enable and fill the custom values */ + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); + + _itot(pVirtMem->Pagefile[Index].InitialValue , szCustVals, 10); + SendDlgItemMessage(pVirtMem->hSelf, + IDC_INITIALSIZE, + WM_SETTEXT, + 0, + (LPARAM)szCustVals); + + _itot(pVirtMem->Pagefile[Index].MaxValue, szCustVals, 10); + SendDlgItemMessage(pVirtMem->hSelf, + IDC_MAXSIZE, + WM_SETTEXT, + 0, + (LPARAM)szCustVals); + + SendDlgItemMessage(pVirtMem->hSelf, + IDC_CUSTOM, + BM_SETCHECK, + 1, + 0); + } + else + { + /* It's not a custom value */ + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); + + /* is it system managed */ + if(pVirtMem->Pagefile[Index].bUsed) + { + SendDlgItemMessage(pVirtMem->hSelf, + IDC_SYSMANSIZE, + BM_SETCHECK, + 1, + 0); + } + else + { + SendDlgItemMessage(pVirtMem->hSelf, + IDC_NOPAGEFILE, + BM_SETCHECK, + 1, + 0); + } + } + } + + return TRUE; } static VOID OnOk(PVIRTMEM pVirtMem) { - if(pVirtMem->bSave == TRUE) - { - WritePageFileSettings(pVirtMem); - } - - if (pVirtMem->szPagingFiles) - HeapFree(GetProcessHeap(), - 0, - pVirtMem->szPagingFiles); - - HeapFree(GetProcessHeap(), - 0, - pVirtMem); + if(pVirtMem->bSave == TRUE) + { + WritePageFileSettings(pVirtMem); + } + + if (pVirtMem->szPagingFiles) + HeapFree(GetProcessHeap(), + 0, + pVirtMem->szPagingFiles); + + HeapFree(GetProcessHeap(), + 0, + pVirtMem); } static VOID OnCancel(PVIRTMEM pVirtMem) { - if (pVirtMem->szPagingFiles) - HeapFree(GetProcessHeap(), - 0, - pVirtMem->szPagingFiles); - - HeapFree(GetProcessHeap(), - 0, - pVirtMem); + if (pVirtMem->szPagingFiles) + HeapFree(GetProcessHeap(), + 0, + pVirtMem->szPagingFiles); + + HeapFree(GetProcessHeap(), + 0, + pVirtMem); } static PVIRTMEM OnInitDialog(HWND hwnd) { - PVIRTMEM pVirtMem = (PVIRTMEM)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(VIRTMEM)); - if (pVirtMem == NULL) - { - EndDialog(hwnd, 0); - } - - pVirtMem->hSelf = hwnd; - pVirtMem->hListView = GetDlgItem(hwnd, IDC_PAGEFILELIST); - pVirtMem->bSave = FALSE; - - SetListViewColumns(pVirtMem->hListView); - - /* Load the pagefile systems from the reg */ - if (ReadPageFileSettings(pVirtMem)) - { - /* Parse our settings and set up dialog */ - ParseMemSettings(pVirtMem); - } - - return pVirtMem; + PVIRTMEM pVirtMem = (PVIRTMEM)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(VIRTMEM)); + if (pVirtMem == NULL) + { + EndDialog(hwnd, 0); + } + + pVirtMem->hSelf = hwnd; + pVirtMem->hListView = GetDlgItem(hwnd, IDC_PAGEFILELIST); + pVirtMem->bSave = FALSE; + + SetListViewColumns(pVirtMem->hListView); + + /* Load the pagefile systems from the reg */ + if (ReadPageFileSettings(pVirtMem)) + { + /* Parse our settings and set up dialog */ + ParseMemSettings(pVirtMem); + } + + return pVirtMem; } @@ -504,67 +503,66 @@ WPARAM wParam, LPARAM lParam) { - /* there can only be one instance of this dialog */ - static PVIRTMEM pVirtMem = NULL; - - UNREFERENCED_PARAMETER(lParam); - - switch (uMsg) - { - case WM_INITDIALOG: - pVirtMem = OnInitDialog(hwndDlg); - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDCANCEL: - OnCancel(pVirtMem); - EndDialog(hwndDlg, 0); - return TRUE; - - case IDOK: - OnOk(pVirtMem); - EndDialog(hwndDlg, 0); - return TRUE; - - case IDC_NOPAGEFILE: - OnNoPagingFile(pVirtMem); - return TRUE; - - case IDC_SYSMANSIZE: - OnSysManSize(pVirtMem); - return TRUE; - - case IDC_CUSTOM: - OnCustom(pVirtMem); - return TRUE; - - case IDC_SET: - OnSet(pVirtMem); - return TRUE; - } - } - break; - - case WM_NOTIFY: - { - LPNMHDR pnmhdr = (LPNMHDR)lParam; - - switch (pnmhdr->code) - { - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - - OnSelChange(pVirtMem, pnmv); - - } - } - } - break; - } - - return FALSE; -} + /* there can only be one instance of this dialog */ + static PVIRTMEM pVirtMem = NULL; + + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + pVirtMem = OnInitDialog(hwndDlg); + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDCANCEL: + OnCancel(pVirtMem); + EndDialog(hwndDlg, 0); + return TRUE; + + case IDOK: + OnOk(pVirtMem); + EndDialog(hwndDlg, 0); + return TRUE; + + case IDC_NOPAGEFILE: + OnNoPagingFile(pVirtMem); + return TRUE; + + case IDC_SYSMANSIZE: + OnSysManSize(pVirtMem); + return TRUE; + + case IDC_CUSTOM: + OnCustom(pVirtMem); + return TRUE; + + case IDC_SET: + OnSet(pVirtMem); + return TRUE; + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmhdr = (LPNMHDR)lParam; + + switch (pnmhdr->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + + OnSelChange(pVirtMem, pnmv); + } + } + } + break; + } + + return FALSE; +}

1 0

[cfinck] 27784: Show a right title for the last setup page (Patch by Cameron Gutman, aicommander AT gmail DOT com) I also fixed that in the german translation, other translation still need to be fixed. See issue #2206 for more details.
by cfinck＠svn.reactos.org 23 Jul '07

23 Jul '07

Author: cfinck Date: Mon Jul 23 12:05:08 2007 New Revision: 27784 URL: http://svn.reactos.org/svn/reactos?rev=27784&view=rev Log: Show a right title for the last setup page (Patch by Cameron Gutman, aicommander AT gmail DOT com) I also fixed that in the german translation, other translation still need to be fixed. See issue #2206 for more details. Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Mon Jul 23 12:05:08 2007 @@ -184,8 +184,8 @@ IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." IDS_DATETIMETITLE "Datum und Uhrzeit" IDS_DATETIMESUBTITLE "Setzen Sie das korrekte Datum und Uhrzeit für ihren Computer." - IDS_PROCESSTITLE "Prozess-Seitentitel" - IDS_PROCESSSUBTITLE "Prozess-Seitenuntertitel" + IDS_PROCESSTITLE "Registriere Komponenten" + IDS_PROCESSSUBTITLE "Bitte warten..." END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Mon Jul 23 12:05:08 2007 @@ -185,8 +185,8 @@ IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Process page title" - IDS_PROCESSSUBTITLE "Process page subtitle" + IDS_PROCESSTITLE "Registering Components" + IDS_PROCESSSUBTITLE "Please wait..." END STRINGTABLE

1 0

[greatlrd] 27783: fixing intl are on english here is the issue, either it is gcc bugs being tricked for wrc (I do not think it is this case) or it is a bug in windres for some rc syntax. I think it is this issue, only way to workaround this bug are move en-us.rc to top of the langues list so it comes the frist langues for select
by greatlrd＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: greatlrd Date: Mon Jul 23 01:26:38 2007 New Revision: 27783 URL: http://svn.reactos.org/svn/reactos?rev=27783&view=rev Log: fixing intl are on english here is the issue, either it is gcc bugs being tricked for wrc (I do not think it is this case) or it is a bug in windres for some rc syntax. I think it is this issue, only way to workaround this bug are move en-us.rc to top of the langues list so it comes the frist langues for select Modified: trunk/reactos/dll/cpl/intl/intl.rc Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Mon Jul 23 01:26:38 2007 @@ -2,6 +2,8 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel\0" @@ -20,10 +22,9 @@ * files. Note that you can and may override resources which also have * a neutral version. This is to get localized bitmaps for example. */ - +#include "lang/en-US.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc"

1 0

[janderwald] 27782: - make sysreg working on linux
by janderwald＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: janderwald Date: Mon Jul 23 00:41:51 2007 New Revision: 27782 URL: http://svn.reactos.org/svn/reactos?rev=27782&view=rev Log: - make sysreg working on linux Modified: trunk/reactos/tools/sysreg/data_source.h trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/txtmode.cfg trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/data_source.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/data_source.h… ============================================================================== --- trunk/reactos/tools/sysreg/data_source.h (original) +++ trunk/reactos/tools/sysreg/data_source.h Mon Jul 23 00:41:51 2007 @@ -33,6 +33,8 @@ virtual bool closeSource() = 0; virtual bool readSource(std::vector<string> & vect) = 0; + + virtual bool isSourceOpen() = 0; }; // end of class DataSource Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Jul 23 00:41:51 2007 @@ -31,6 +31,11 @@ } + bool NamedPipeReader::isSourceOpen() + { + return true; + } + //--------------------------------------------------------------------------------------- bool NamedPipeReader::openSource(const string & PipeCmd) Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Mon Jul 23 00:41:51 2007 @@ -105,7 +105,7 @@ /// Description: returns true if the pipe has reached end of file. The caller should call /// closePipe if this function returns true - bool isEof(); + virtual bool isSourceOpen(); protected: //--------------------------------------------------------------------------------------- Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Mon Jul 23 00:41:51 2007 @@ -36,7 +36,9 @@ cerr << "PipeReader::openPipe> pipe already open" << endl; return false; } - // + + cerr << "cmd>" << PipeCmd << endl; + m_File = popen(PipeCmd.c_str(), "r"); //AccessMode.c_str()); if (m_File) { @@ -72,7 +74,7 @@ //--------------------------------------------------------------------------------------- - bool PipeReader::isEof() + bool PipeReader::isSourceOpen() { return feof(m_File); } Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h Mon Jul 23 00:41:51 2007 @@ -61,7 +61,7 @@ /// w ... allows writing to the pipe /// @return bool - bool openSource(const string & PipeCmd); + virtual bool openSource(const string & PipeCmd); //--------------------------------------------------------------------------------------- /// @@ -71,7 +71,7 @@ /// /// @return bool - bool closeSource(); + virtual bool closeSource(); //--------------------------------------------------------------------------------------- /// @@ -92,7 +92,7 @@ /// Description: returns true if the pipe has reached end of file. The caller should call /// closePipe if this function returns true - bool isEof(); + virtual bool isSourceOpen(); protected: FILE * m_File; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Jul 23 00:41:51 2007 @@ -44,20 +44,21 @@ using std::ofstream; #endif - string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); - string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); - string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); - string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH"); - string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); - string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); - string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); - string RosBootTest::ROS_LOG_FILE = _T("ROS_LOG_FILE"); - string RosBootTest::ROS_SYM_DIR = _T("ROS_SYM_DIR"); + string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); + string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); + string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH"); + string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); + string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); + string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); + string RosBootTest::ROS_LOG_FILE = _T("ROS_LOG_FILE"); + string RosBootTest::ROS_SYM_DIR = _T("ROS_SYM_DIR"); string RosBootTest::ROS_DELAY_READ = _T("ROS_DELAY_READ"); string RosBootTest::ROS_SYSREG_CHECKPOINT = _T("SYSREG_CHECKPOINT:"); string RosBootTest::ROS_CRITICAL_IMAGE = _T("ROS_CRITICAL_IMAGE"); string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL"); - string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); + string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); + string RosBootTest::ROS_BOOT_CMD = _T("ROS_BOOT_CMD"); //--------------------------------------------------------------------------------------- RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) @@ -102,10 +103,18 @@ string::size_type pos; bool bootfromcd = false; - + bool bootcmdprovided = false; if (m_CDImage != _T("") ) { bootfromcd = true; + } + + if (m_BootCmd != _T("") ) + { + /// + /// boot cmd is provided already + /// + bootcmdprovided = true; } #ifdef __LINUX__ @@ -129,6 +138,7 @@ return false; } string qemuimgdir = qemupath; + m_HDDImage = _T("ros.img"); #ifdef __LINUX___ qemuimgdir += _T("qemu-img"); #else @@ -138,33 +148,92 @@ /// FIXME /// call qemu-img to create the tool /// - cerr << "Creating HDD Image ..." << endl; - } - - if (m_MaxMem == "") - { - // default to 64M - m_MaxMem = "64"; - } - if (bootfromcd) - { - m_BootCmd = m_EmuPath + _T(" -serial pipe:qemu -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage; - } - else - { - m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial pipe:sysreg"); - } - - if (m_KillEmulator == _T("yes")) - { + cerr << "Creating HDD Image ..." << qemuimgdir << endl; + } + + if (!bootcmdprovided) + { + if (m_MaxMem == "") + { + // default to 64M + m_MaxMem = "64"; + } + string pipe; #ifdef __LINUX__ - m_BootCmd += _T(" -pidfile pid.txt"); + pipe = _T("stdio"); + m_Src = _T(""); +#else + pipe = _T("pipe:qemu"); + m_Src = _T("\\\\.\\pipe\\qemu"); +#endif + + + if (bootfromcd) + { + m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage; + } + else + { + m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe; + } + + if (m_KillEmulator == _T("yes")) + { +#ifdef __LINUX__ + m_BootCmd += _T(" -pidfile pid.txt"); #endif - } - else - { - m_BootCmd += _T(" -no-reboot "); - } + } + else + { + m_BootCmd += _T(" -no-reboot "); + } + } + else + { + string::size_type pos = m_BootCmd.find(_T("-serial")); + if (pos != string::npos) + { + string pipe = m_BootCmd.substr(pos + 7, m_BootCmd.size() - pos -7); + pos = pipe.find(_T("pipe:")); + if (pos == 0) + { +#ifdef __LINUX__ + cerr << "Error: popen doesnot support reading from pipe" << endl; + return false; +#else + pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); + pos = pipe.find(_T(" ")); + if (pos != string::npos) + { + m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); + } + else + { + m_Src = _T("\\\\.\\pipe\\" + pipe; + } +#endif + } + else + { + pos = pipe.find(_T("stdio")); + if (pos == 0) + { +#ifdef __LINUX__ + m_Src = m_BootCmd; +#else + cerr << "Error: sysreg doesnot support reading stdio" << endl; + return false; +#endif + + } + + + } + + } + + + } cerr << "Opening Data Source:" << m_BootCmd << endl; @@ -174,8 +243,6 @@ m_Src = m_BootCmd; #else m_DataSource = new NamedPipeReader(); - m_Src = _T("\\\\.\\pipe\\qemu"); - if (!executeBootCmd()) { cerr << "Error: failed to launch emulator with: " << m_BootCmd << endl; @@ -217,9 +284,26 @@ conf_parser.getStringValue (RosBootTest::ROS_CRITICAL_IMAGE, m_CriticalImage); conf_parser.getStringValue (RosBootTest::ROS_EMU_KILL, m_KillEmulator); conf_parser.getStringValue (RosBootTest::ROS_EMU_MEM, m_MaxMem); + conf_parser.getStringValue (RosBootTest::ROS_BOOT_CMD, m_BootCmd); return true; } +//--------------------------------------------------------------------------------------- + void RosBootTest::cleanup() + { + m_DataSource->closeSource(); + if (m_KillEmulator == "yes") + { + OsSupport::sleep(3 * CLOCKS_PER_SEC); + if (m_Pid) + { + OsSupport::terminateProcess (m_Pid); + } + } + delete m_DataSource; + + } + //--------------------------------------------------------------------------------------- bool RosBootTest::execute(ConfigParser &conf_parser) { @@ -252,28 +336,24 @@ cerr << "Error: ROS_EMU_TYPE value is not supported:" << m_EmuType << "=" << EMU_TYPE_QEMU << endl; return false; } - +#ifndef __LINUX__ OsSupport::sleep(500); - +#endif + + assert(m_DataSource != 0); if (!m_DataSource->openSource(m_Src)) { cerr << "Error: failed to open data source with " << m_Src << endl; - return false; - } - - OsSupport::sleep(3000); - + cleanup(); + return false; + } + +#ifndef __LINUX__ + OsSupport::sleep(3000); //FIXME +#endif bool ret = analyzeDebugData(); - - m_DataSource->closeSource(); - if (m_KillEmulator == "yes") - { - OsSupport::sleep(3 * CLOCKS_PER_SEC); - if (m_Pid) - { - OsSupport::terminateProcess (m_Pid); - } - } + cleanup(); + return ret; } //--------------------------------------------------------------------------------------- Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Jul 23 00:41:51 2007 @@ -35,21 +35,21 @@ { public: - static string ROS_EMU_TYPE; - static string EMU_TYPE_QEMU; - static string EMU_TYPE_VMWARE; - static string ROS_EMU_PATH; - static string ROS_HDD_IMAGE; - static string ROS_CD_IMAGE; - static string ROS_MAX_TIME; - static string ROS_LOG_FILE; - static string ROS_SYM_DIR; - static string ROS_DELAY_READ; - static string ROS_SYSREG_CHECKPOINT; - static string ROS_CRITICAL_IMAGE; - static string ROS_EMU_KILL; - static string ROS_EMU_MEM; - + static string ROS_EMU_TYPE; + static string EMU_TYPE_QEMU; + static string EMU_TYPE_VMWARE; + static string ROS_EMU_PATH; + static string ROS_HDD_IMAGE; + static string ROS_CD_IMAGE; + static string ROS_MAX_TIME; + static string ROS_LOG_FILE; + static string ROS_SYM_DIR; + static string ROS_DELAY_READ; + static string ROS_SYSREG_CHECKPOINT; + static string ROS_CRITICAL_IMAGE; + static string ROS_EMU_KILL; + static string ROS_EMU_MEM; + static string ROS_BOOT_CMD; //--------------------------------------------------------------------------------------- /// @@ -92,7 +92,7 @@ bool readConfigurationValues(ConfigParser & conf_parser); bool configureQemu(); bool configureVmWare(); - + void cleanup(); //--------------------------------------------------------------------------------------- /// /// dumpCheckpoints Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Mon Jul 23 00:41:51 2007 @@ -10,8 +10,8 @@ ; ; This variable sets the path to the emulator ; -;ROS_EMU_PATH=/usr/bin/qemu -ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH=/usr/bin/qemu +;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe ; ROS_HDD_IMAGE @@ -19,8 +19,8 @@ ; The hdd image to use for running the emulator. If this variable is not ; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found - -ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd +ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd +;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd ; ROS_CD_IMAGE ; @@ -28,8 +28,8 @@ ; an ReactOS unattended installation disk. If this variable is not set, SysReg lets the emulator boot ; from harddisk. ; - -ROS_CD_IMAGE=E:\reactos\qemu\Reactos.iso +ROS_CD_IMAGE=~/reactos/qemu/bootcd.iso +;ROS_CD_IMAGE=E:\reactos\qemu\Reactos.iso ;------------------------------------------------------------------------------------------- ; Additional Options @@ -92,4 +92,11 @@ ; ; ROS_EMU_MEM=64 +; ROS_BOOT_CMD +; +; Sysreg normally builds the boot command from ROS_EMU_PATH and ROS_CD_IMAGE etc... If you want to override +; all settings set this value +; +; ROS_BOOT_CMD=/usr/bin/qemu -serial stdio -m 64 -hda ~/reactos/qemu/ReactOS.hd -boot d -cdrom ~/reactos/qemu/bootcd.iso +; -no-reboot Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Mon Jul 23 00:41:51 2007 @@ -33,6 +33,7 @@ #define _fgetts fgets #define _tgetenv getenv #define _tmain main + #define _tcstol strtol #endif typedef std::basic_string<TCHAR> string;

1 0

[cfinck] 27781: - Bugfix: As szBuf was not null-terminated after the _tcscpy, the Processor Name String could have been wrapped wrong (ie. when it contained more spaces after character 30) - Use a consistent indentation in SetProcNameString
by cfinck＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: cfinck Date: Sun Jul 22 23:31:29 2007 New Revision: 27781 URL: http://svn.reactos.org/svn/reactos?rev=27781&view=rev Log: - Bugfix: As szBuf was not null-terminated after the _tcscpy, the Processor Name String could have been wrapped wrong (ie. when it contained more spaces after character 30) - Use a consistent indentation in SetProcNameString Modified: trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sun Jul 22 23:31:29 2007 @@ -5,7 +5,7 @@ * PURPOSE: General System Information * COPYRIGHT: Copyright Thomas Weidenmueller <w3seek(a)reactos.org> * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> - * Copyright 2006 Colin Finck <mail(a)colinfinck.de> + * Copyright 2006-2007 Colin Finck <mail(a)colinfinck.de> * */ @@ -118,83 +118,86 @@ UINT uID1, UINT uID2) { - LPTSTR lpBuf = NULL; - DWORD BufSize = 0; - DWORD Type; - INT Ret = 0; - TCHAR szBuf[31]; - TCHAR* szLastSpace; - INT LastSpace = 0; - - if (RegQueryValueEx(hKey, - Value, - NULL, - &Type, - NULL, - &BufSize) == ERROR_SUCCESS) - { - lpBuf = HeapAlloc(GetProcessHeap(), - 0, - BufSize); - if (!lpBuf) return 0; - - if (RegQueryValueEx(hKey, - Value, - NULL, - &Type, - (PBYTE)lpBuf, - &BufSize) == ERROR_SUCCESS) - { - if(BufSize > ((30 + 1) * sizeof(TCHAR))) - { - /* Wrap the Processor Name String like XP does: * - * - Take the first 30 characters and look for the last space. * - * Then wrap the string after this space. * - * - If no space is found, wrap the string after character 30. * - * * - * For example the Processor Name String of a Pentium 4 is right-aligned. * - * With this wrapping the first line looks centered. */ - - _tcsncpy(szBuf, lpBuf, 30); - szLastSpace = _tcsrchr(szBuf, ' '); - - if(szLastSpace == 0) - LastSpace = 30; - else - LastSpace = (szLastSpace - szBuf); - - _tcsncpy(szBuf, lpBuf, LastSpace); - szBuf[LastSpace] = 0; - - SetDlgItemText(hwnd, - uID1, - szBuf); - - SetDlgItemText(hwnd, - uID2, - lpBuf+LastSpace+1); - - /* Return the number of used lines */ - Ret = 2; - } - else - { - SetDlgItemText(hwnd, - uID1, - lpBuf); - - Ret = 1; - } - } - - HeapFree(GetProcessHeap(), - 0, - lpBuf); - - return Ret; - } - - return 0; + LPTSTR lpBuf = NULL; + DWORD BufSize = 0; + DWORD Type; + INT Ret = 0; + TCHAR szBuf[31]; + TCHAR* szLastSpace; + INT LastSpace = 0; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + NULL, + &BufSize) == ERROR_SUCCESS) + { + lpBuf = HeapAlloc(GetProcessHeap(), + 0, + BufSize); + if (!lpBuf) return 0; + + if (RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)lpBuf, + &BufSize) == ERROR_SUCCESS) + { + if(BufSize > ((30 + 1) * sizeof(TCHAR))) + { + /* Wrap the Processor Name String like XP does: * + * - Take the first 30 characters and look for the last space. * + * Then wrap the string after this space. * + * - If no space is found, wrap the string after character 30. * + * * + * For example the Processor Name String of a Pentium 4 is right-aligned. * + * With this wrapping the first line looks centered. */ + + _tcsncpy(szBuf, lpBuf, 30); + szBuf[30] = 0; + szLastSpace = _tcsrchr(szBuf, ' '); + + if(szLastSpace == 0) + LastSpace = 30; + else + { + LastSpace = (szLastSpace - szBuf); + szBuf[LastSpace] = 0; + } + + _tcsncpy(szBuf, lpBuf, LastSpace); + + SetDlgItemText(hwnd, + uID1, + szBuf); + + SetDlgItemText(hwnd, + uID2, + lpBuf+LastSpace+1); + + /* Return the number of used lines */ + Ret = 2; + } + else + { + SetDlgItemText(hwnd, + uID1, + lpBuf); + + Ret = 1; + } + } + + HeapFree(GetProcessHeap(), + 0, + lpBuf); + + return Ret; + } + + return 0; } static VOID

1 0

[fireball] 27780: - Patch by Dmitry Chapyshev <lentind@yandex.ru>: * Add russian translation to shutdown app * Fix russian translation and fix text placement in timedate CPL applet
by fireball＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: fireball Date: Sun Jul 22 21:04:20 2007 New Revision: 27780 URL: http://svn.reactos.org/svn/reactos?rev=27780&view=rev Log: - Patch by Dmitry Chapyshev <lentind(a)yandex.ru>: * Add russian translation to shutdown app * Fix russian translation and fix text placement in timedate CPL applet Added: trunk/reactos/base/applications/shutdown/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc trunk/reactos/dll/cpl/timedate/lang/da-DK.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/el-GR.rc trunk/reactos/dll/cpl/timedate/lang/en-US.rc trunk/reactos/dll/cpl/timedate/lang/es-ES.rc trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc trunk/reactos/dll/cpl/timedate/lang/id-ID.rc trunk/reactos/dll/cpl/timedate/lang/it-IT.rc trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc trunk/reactos/dll/cpl/timedate/lang/th-TH.rc trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc Added: trunk/reactos/base/applications/shutdown/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/ru-RU.rc Sun Jul 22 21:04:20 2007 @@ -1,0 +1,16 @@ +// Russian language resource file (Dmitry Chapyshev, 2007-07-19) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Èñïîëüçîâàíèå: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Áåç àðãóìåíòîâ èëè -?\tÎòîáðàæåíèå ýòîãî ñîîáùåíèÿ\n\ + -l\t\t\tÇàâåðøåíèå ñåàíñà\n\ + -s\t\t\tÂûêëþ÷åíèå ýòîãî êîìïüþòåðà\n\ + -r\t\t\tÏåðåçàãðóçêà ýòîãî êîìïüþòåðà\n\ + -f\t\t\tÈãíîðèðîâàíèå çàïóùåííûõ ïðîãðàìì è çàâåðøåíèå èõ áåç ïðåäóïðåæäåíèÿ\n\ + \t\t\tÅñëè âû íå óêàçàëè äðóãèå ïàðàìåòðû, òî ýòà îïöèÿ ïðèâåäåò ê\n\ + \t\t\tçàâåðøåíèþ ñåàíñà." +} Propchange: trunk/reactos/base/applications/shutdown/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc Sun Jul 22 21:04:20 2007 @@ -3,5 +3,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/ru-RU.rc" #include "lang/nb-NO.rc" #include "lang/fr-FR.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/bg-B… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/bg-BG.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Äàòà", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/da-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/da-DK.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Dato", -1, 4, 2, 126, 133 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc Sun Jul 22 21:04:20 2007 @@ -8,7 +8,7 @@ BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 @@ -65,3 +65,4 @@ IDS_INETTIMENEXTSYNC "Nächste Synchronisierung am %s um %s" END + Modified: trunk/reactos/dll/cpl/timedate/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/el-GR.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Çìåñïìçíßá", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/en-US.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Date", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/es-ES.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Dia", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Date", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/hu-H… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc Sun Jul 22 21:04:20 2007 @@ -8,7 +8,7 @@ BEGIN GROUPBOX "&Dátum", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/id-I… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/id-ID.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Tanggal", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/it-IT.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Data", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "út(&D)", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "Da&tum", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc Sun Jul 22 21:04:20 2007 @@ -13,7 +13,7 @@ BEGIN GROUPBOX "&Data", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&Äàòà", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 @@ -43,13 +43,13 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "Àâòîìàòè÷åñêè ñèíõðîíèçèðîâàòü âðåìÿ ñ ñåðâåðîì â ñåòè", IDC_AUTOSYNC, - 11 ,7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + AUTOCHECKBOX "&Âûïîëíÿòü ñèíõðîíèçàöèþ ñ ñåðâåðîì âðåìåíè â Èíòåðíåòå", IDC_AUTOSYNC, + 11 ,7, 246, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Ñåðâåð:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "Îáíîâèòü", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "&Îáíîâèòü", IDC_UPDATEBUTTON, 187, 22, 49, 13 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Ñèíõðîíèçàöèÿ ìîæåò áûòü âûïîëíåíà òîëüêî ïðè íàëè÷èè ïîäêëþ÷åíèÿ ê ñåòè Internet.", -1, 12, 114, 225, 25 + LTEXT "Ñèíõðîíèçàöèÿ ìîæåò áûòü âûïîëíåíà òîëüêî ïðè íàëè÷èè ïîäêëþ÷åíèÿ ê ñåòè Èíòåðíåò.", -1, 12, 114, 225, 25 END Modified: trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sv-S… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc Sun Jul 22 21:04:20 2007 @@ -12,7 +12,7 @@ BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/th-T… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/th-TH.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/th-TH.rc Sun Jul 22 21:04:20 2007 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "&ÇÑ¹·Õè", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12 Modified: trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc Sun Jul 22 21:04:20 2007 @@ -15,7 +15,7 @@ BEGIN GROUPBOX "&Äàòà", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 120, 17, 50, 12

1 0

[cfinck] 27779: Updated Slovak User32 translation by Mario Kacmar (kario AT szm DOT sk) Fixes part of bug 2435 See issue #2435 for more details.
by cfinck＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: cfinck Date: Sun Jul 22 20:47:00 2007 New Revision: 27779 URL: http://svn.reactos.org/svn/reactos?rev=27779&view=rev Log: Updated Slovak User32 translation by Mario Kacmar (kario AT szm DOT sk) Fixes part of bug 2435 See issue #2435 for more details. Added: trunk/reactos/dll/win32/user32/Sk.rc Modified: trunk/reactos/dll/win32/user32/user32.rc Added: trunk/reactos/dll/win32/user32/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Sk.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/user32/Sk.rc (added) +++ trunk/reactos/dll/win32/user32/Sk.rc Sun Jul 22 20:47:00 2007 @@ -1,0 +1,79 @@ +/* Slovak translation + * Copyleft 2007 Kario (kario(a)szm.sk) + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Výber okna" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zrui", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Spä", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "Vystri&hnú", WM_CUT + MENUITEM "&Kopírova", WM_COPY + MENUITEM "&Prilepi", WM_PASTE + MENUITEM "&Odstráni", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Vybra &vetko", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Obnovi", 61728 + MENUITEM "&Premiestni", 61456 + MENUITEM "&Ve¾kos", 61440 + MENUITEM "&Minimalizova", 61472 + MENUITEM "M&aximalizova", 61488 + MENUITEM SEPARATOR + MENUITEM "&Zavrie\tAlt-F4", 61536 +} + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Chyba" + IDS_OK, "OK" + IDS_CANCEL, "Zrui" + IDS_ABORT, "&Prerui" + IDS_RETRY, "&Znova" + IDS_IGNORE, "&Ignorova" + IDS_YES, "Án&o" + IDS_NO, "&Nie" + IDS_HELP, "Pomoc" + IDS_TRYAGAIN, "&Skúsi znova" + IDS_CONTINUE, "&Pokraèova" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "&Viac okien..." +} + Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Sun Jul 22 20:47:00 2007 @@ -94,6 +94,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" +#include "Sk.rc" #include "Sv.rc" #include "Uk.rc" -#include "Ru.rc"

1 0

[cfinck] 27778: Updated Slovak Notepad translation by Mario Kacmar (kario AT szm DOT sk) See issue #2434 for more details.
by cfinck＠svn.reactos.org 22 Jul '07

22 Jul '07

Author: cfinck Date: Sun Jul 22 20:37:08 2007 New Revision: 27778 URL: http://svn.reactos.org/svn/reactos?rev=27778&view=rev Log: Updated Slovak Notepad translation by Mario Kacmar (kario AT szm DOT sk) See issue #2434 for more details. Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc Sun Jul 22 20:37:08 2007 @@ -4,20 +4,8 @@ * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Translation: + * Copyleft 2007 Kario <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -40,47 +28,47 @@ MAIN_MENU MENU { - POPUP "&File" + POPUP "&Súbor" BEGIN - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open", CMD_OPEN - MENUITEM "&Save", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM "&Print", CMD_PRINT - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM "&Nový...", CMD_NEW + MENUITEM "&Otvori", CMD_OPEN + MENUITEM "&Uloi", CMD_SAVE + MENUITEM "Uloi &ako...", CMD_SAVE_AS + MENUITEM "&Tlaèi", CMD_PRINT + MENUITEM "Nasta&venie strany...", CMD_PAGE_SETUP + MENUITEM "Nastavenie tlaèia&rne...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "&Exit", CMD_EXIT + MENUITEM "&Skonèi", CMD_EXIT } - POPUP "&Edit" + POPUP "Úpr&avy" BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM "&Spä\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM "&Vystrihnú\tCtrl+X", CMD_CUT + MENUITEM "&Kopírova\tCtrl+C", CMD_COPY + MENUITEM "Pri&lepi\tCtrl+V", CMD_PASTE + MENUITEM "&Odstráni\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Select &all", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + MENUITEM "Vy&bra vetko", CMD_SELECT_ALL + MENUITEM "Èas alebo dátu&m\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Zalomi text", CMD_WRAP } - POPUP "&Search" + POPUP "&H¾ada" BEGIN - MENUITEM "&Search", CMD_SEARCH - MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT + MENUITEM "&H¾ada", CMD_SEARCH + MENUITEM "H¾a&da ïalej\tF3", CMD_SEARCH_NEXT } - POPUP "&Help" + POPUP "&Pomocník" BEGIN - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM "&Témy Pomocníka", CMD_HELP_CONTENTS + MENUITEM "&H¾ada...", CMD_HELP_SEARCH + MENUITEM "&Pomoc", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "Inf&o..." BEGIN - MENUITEM "&About" CMD_ABOUT - MENUITEM "&About Wine", CMD_ABOUT_WINE + MENUITEM "È&o je Poznámkový blok" CMD_ABOUT + MENUITEM "Èo je &Víno (Wine)", CMD_ABOUT_WINE } } } @@ -90,38 +78,38 @@ DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Nastavenie strany" { -LTEXT "&Header:", 0x140, 10, 07, 40, 15 +LTEXT "H&lavièka:", 0x140, 10, 07, 40, 15 EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Footer:", 0x142, 10, 24, 40, 15 +LTEXT "&Päta:", 0x142, 10, 24, 40, 15 EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "&Margins:", 0x144, 10, 43,160, 45 -LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "&Okraje:", 0x144, 10, 43,160, 45 +LTEXT "¼a&vý:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "&Horný:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "P&ravý:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "&Dolný:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Zrui", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Pomocník", 0x153, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" +CAPTION "Èo je Poznámkový blok ReactOSu" +FONT 8, "Tahoma" BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", + CONTROL "Poznámkový blok ReactOSu v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\nPreklad 2007 Kario <kario(a)szm.sk>\r\n ", -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + DEFPUSHBUTTON "Zavrie",IDOK,114,149,44,15,WS_GROUP ICON IDI_NPICON,-1,12,9,20,30 EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -141,27 +129,26 @@ STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "ERROR" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" +STRING_NOTEPAD, "Poznávkový blok" +STRING_ERROR, "CHYBA" +STRING_WARNING, "UPOZORNENIE" +STRING_INFO, "Informácie" -STRING_UNTITLED, "(untitled)" +STRING_UNTITLED, "(bez názvu)" -STRING_ALL_FILES, "All files (*.*)" -STRING_TEXT_FILES_TXT, "Text files (*.txt)" +STRING_ALL_FILES, "Vetky súbory (*.*)" +STRING_TEXT_FILES_TXT, "Textové súbory (*.txt)" -STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ -Please use a different editor." -STRING_NOTEXT, "You didn't enter any text. \ -\nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' can not be found." -STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task. \nClose one or more applications to increase the amount of \nfree \ -memory." +STRING_TOOLARGE, "Súbor '%s' je pre Poznámkový blok príli ve¾ký.\n \ +Na otvorenie súboru pouite iný editor." +STRING_NOTEXT, "Nevloili Ste iadny text. \ +\nProsím, napíte nieèo a skúste to znova." +STRING_DOESNOTEXIST, "Nie je moné nájs súbor '%s'\n\n \ +Chcete vytvori nový súbor?" +STRING_NOTSAVED, "Text súboru '%s'\nsa zmenil.\n\n \ +Chcete uloi zmeny?" +STRING_NOTFOUND, "Nie je moné nájs '%s' ." +STRING_OUT_OF_MEMORY, "Nedostatok pamäte na dokonèenie tejto operácie. Zatvorte jednu \n \ +alebo viac aplikácií, aby sa uvo¾nila pamä a skúste to znova." }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007