Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[tfaber] 62585: [NTOS] - Try compiling before committing, Arch!

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 30 09:44:02 2014 New Revision: 62585 URL: http://svn.reactos.org/svn/reactos?rev=62585&view=rev Log: [NTOS] - Try compiling before committing, Arch! Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sun Mar 30 09:44:02 2014 @@ -756,7 +756,7 @@ KEY_ALL_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT("Failed to open HKLM\SYSTEM, Status=%lx\n", Status); + DPRINT("Failed to open HKLM\\SYSTEM, Status=%lx\n", Status); return; }

10 years, 5 months

[tfaber] 62584: [NTOS:IO] - Fix some incredibly useless debug prints

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 30 09:35:50 2014 New Revision: 62584 URL: http://svn.reactos.org/svn/reactos?rev=62584&view=rev Log: [NTOS:IO] - Fix some incredibly useless debug prints Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sun Mar 30 09:35:50 2014 @@ -233,8 +233,8 @@ /* How much buffer space */ Status = ZwQueryValueKey(ControllerKeyHandle, &ControllerString, KeyValueFullInformation, NULL, 0, &LenKeyFullInformation); - if(!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) - continue; + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + continue; /* Allocate it */ ControllerInformation[ControllerLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); @@ -337,7 +337,7 @@ /* Create String */ Status |= RtlAppendUnicodeToString(&ControllerRootRegName, L"\\"); - Status |= RtlAppendUnicodeStringToString(&ControllerRootRegName, &TempString); + Status |= RtlAppendUnicodeStringToString(&ControllerRootRegName, &TempString); /* Something messed up */ if (!NT_SUCCESS(Status)) break; @@ -362,11 +362,11 @@ /* How much buffer space */ Status = ZwQueryValueKey(PeripheralKeyHandle, &PeripheralString, KeyValueFullInformation, NULL, 0, &LenKeyFullInformation); - if(!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) - { - PeripheralInformation[PeripheralLoop] = NULL; - continue; - } + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + { + PeripheralInformation[PeripheralLoop] = NULL; + continue; + } /* Allocate it */ PeripheralInformation[PeripheralLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); @@ -482,7 +482,7 @@ /* Allocate it */ FullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); - if(!FullInformation) + if (!FullInformation) return STATUS_NO_MEMORY; /* Get the Information */ @@ -722,7 +722,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("Failed opening given symbolic link!\n"); + DPRINT("Failed to open symlink %wZ, Status=%lx\n", NtSystemPartitionDeviceName, Status); return; } @@ -742,7 +742,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Failed querying given symbolic link!\n"); + DPRINT("Failed querying symlink %wZ, Status=%lx\n", NtSystemPartitionDeviceName, Status); return; } @@ -756,7 +756,7 @@ KEY_ALL_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT("Failed opening registry!\n"); + DPRINT("Failed to open HKLM\SYSTEM, Status=%lx\n", Status); return; } @@ -775,7 +775,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Failed opening/creating Setup key!\n"); + DPRINT("Failed opening/creating Setup key, Status=%lx\n", Status); return; } @@ -791,7 +791,7 @@ LinkTarget.Length + sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT("Failed writing SystemPartition value!\n"); + DPRINT("Failed writing SystemPartition value, Status=%lx\n", Status); } /* Prepare for second data writing... */ @@ -811,10 +811,10 @@ 0, REG_SZ, OsLoaderPathName->Buffer, - OsLoaderPathName->Length + sizeof(WCHAR)); + OsLoaderPathName->Length + sizeof(UNICODE_NULL)); if (!NT_SUCCESS(Status)) { - DPRINT("Failed writing OsLoaderPath value!\n"); + DPRINT("Failed writing OsLoaderPath value, Status=%lx\n", Status); } /* We're finally done! */ @@ -870,22 +870,22 @@ { NTSTATUS Status; PCM_RESOURCE_LIST ResourceList; - + DPRINT1("IoReportResourceUsage is halfplemented!\n"); - + if (!DriverList && !DeviceList) return STATUS_INVALID_PARAMETER; - + if (DeviceList) ResourceList = DeviceList; else ResourceList = DriverList; - + Status = IopDetectResourceConflict(ResourceList, FALSE, NULL); if (Status == STATUS_CONFLICTING_ADDRESSES) { *ConflictDetected = TRUE; - + if (!OverrideConflict) { DPRINT1("Denying an attempt to claim resources currently in use by another device!\n"); @@ -902,9 +902,9 @@ } /* TODO: Claim resources in registry */ - + *ConflictDetected = FALSE; - + return STATUS_SUCCESS; }

10 years, 5 months

[tfaber] 62583: [PCI] - Silence some noisy debug prints

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 30 09:17:28 2014 New Revision: 62583 URL: http://svn.reactos.org/svn/reactos?rev=62583&view=rev Log: [PCI] - Silence some noisy debug prints Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Sun Mar 30 09:17:28 2014 @@ -503,7 +503,7 @@ DPRINT("Called\n"); - DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; IrpSp = IoGetCurrentIrpStackLocation(Irp); switch (IrpSp->MinorFunction) @@ -582,8 +582,13 @@ Status = STATUS_SUCCESS; break; + case IRP_MN_QUERY_CAPABILITIES: + case IRP_MN_QUERY_PNP_DEVICE_STATE: + /* Don't print the warning, too much noise */ + break; + default: - DPRINT1("Unknown IOCTL 0x%lx\n", IrpSp->MinorFunction); + DPRINT1("Unknown PNP minor function 0x%x\n", IrpSp->MinorFunction); break; } @@ -591,7 +596,7 @@ IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->Ldo, Irp); - DPRINT("Leaving. Status 0x%X\n", Status); + DPRINT("Leaving. Status 0x%lx\n", Status); return Status; }

10 years, 5 months

[tfaber] 62582: [USBEHCI] - Fix some debug prints and some whitespace issues

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 30 09:17:18 2014 New Revision: 62582 URL: http://svn.reactos.org/svn/reactos?rev=62582&view=rev Log: [USBEHCI] - Fix some debug prints and some whitespace issues Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Mar 30 09:17:18 2014 @@ -171,7 +171,7 @@ // // store device objects - // + // m_DriverObject = DriverObject; m_FunctionalDeviceObject = FunctionalDeviceObject; m_PhysicalDeviceObject = PhysicalDeviceObject; @@ -357,17 +357,17 @@ } // - // Get controllers capabilities + // Get controllers capabilities // m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase + EHCI_CAPLENGTH); - m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + EHCI_HCIVERSION)); - m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCSPARAMS)); - m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS)); - - DPRINT1("Controller has %c Length\n", m_Capabilities.Length); - DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); - DPRINT1("Controller EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); - DPRINT1("Controller EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG_PTR)ResourceBase + EHCI_HCIVERSION)); + m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + EHCI_HCSPARAMS)); + m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + EHCI_HCCPARAMS)); + + DPRINT1("Controller Capabilities Length 0x%x\n", m_Capabilities.Length); + DPRINT1("Controller EHCI Version 0x%x\n", m_Capabilities.HCIVersion); + DPRINT1("Controller EHCI Caps HCSParamsLong 0x%lx\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controller EHCI Caps HCCParamsLong 0x%lx\n", m_Capabilities.HCCParamsLong); DPRINT1("Controller has %lu Ports\n", m_Capabilities.HCSParams.PortCount); // @@ -391,7 +391,7 @@ m_Capabilities.PortRoute[(Count*2)+1] = (Value & 0x0F); Count++; - }while(Count < PortCount); + } while(Count < PortCount); } // @@ -456,7 +456,7 @@ return Status; } - // + // // Create a queuehead for the Async Register // m_MemoryManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&AsyncQueueHead, &AsyncPhysicalAddress); @@ -1250,7 +1250,7 @@ CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); - DPRINT("CStatus %x\n", CStatus); + DPRINT("InterruptServiceRoutine CStatus %lx\n", CStatus); // // Check that it belongs to EHCI @@ -1301,7 +1301,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; - DPRINT("CStatus %x\n", CStatus); + DPRINT("EhciDefferedRoutine CStatus %lx\n", CStatus); // // check for completion of async schedule @@ -1318,7 +1318,7 @@ // // controller reported error // - DPRINT1("CStatus %x\n", CStatus); + DPRINT1("CStatus %lx\n", CStatus); //ASSERT(FALSE); } @@ -1330,33 +1330,33 @@ // // was a queue head completed? // - if (ShouldRingDoorBell) - { - // - // set door ring bell in progress status flag - // - This->m_DoorBellRingInProgress = TRUE; - - // - // get command register - // - This->GetCommandRegister(&UsbCmd); - - // - // set door rang bell bit - // - UsbCmd.DoorBell = TRUE; - - // - // update command status - // - This->SetCommandRegister(&UsbCmd); - } - } - } - - // - // check if the controller has acknowledged the door bell + if (ShouldRingDoorBell) + { + // + // set door ring bell in progress status flag + // + This->m_DoorBellRingInProgress = TRUE; + + // + // get command register + // + This->GetCommandRegister(&UsbCmd); + + // + // set door rang bell bit + // + UsbCmd.DoorBell = TRUE; + + // + // update command status + // + This->SetCommandRegister(&UsbCmd); + } + } + } + + // + // check if the controller has acknowledged the door bell // if (CStatus & EHCI_STS_IAA) {

10 years, 5 months

[pschweitzer] 62581: [ROSTESTS] Add notifications test application. It is: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365261%28v=vs.85%29.aspx It properly works in ReactOS since r624...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 29 21:12:17 2014 New Revision: 62581 URL: http://svn.reactos.org/svn/reactos?rev=62581&view=rev Log: [ROSTESTS] Add notifications test application. It is: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365261%28v=vs.85%… It properly works in ReactOS since r62446 CORE-2582 Added: trunk/rostests/win32/kernel32/CMakeLists.txt (with props) trunk/rostests/win32/kernel32/notificationtest/ trunk/rostests/win32/kernel32/notificationtest/CMakeLists.txt (with props) trunk/rostests/win32/kernel32/notificationtest/notificationtest.c (with props) Added: trunk/rostests/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/CMakeLists… ============================================================================== --- trunk/rostests/win32/kernel32/CMakeLists.txt (added) +++ trunk/rostests/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Mar 29 21:12:17 2014 @@ -0,0 +1 @@ +add_subdirectory(notificationtest) Propchange: trunk/rostests/win32/kernel32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/kernel32/notificationtest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/notificati… ============================================================================== --- trunk/rostests/win32/kernel32/notificationtest/CMakeLists.txt (added) +++ trunk/rostests/win32/kernel32/notificationtest/CMakeLists.txt [iso-8859-1] Sat Mar 29 21:12:17 2014 @@ -0,0 +1,9 @@ + +list(APPEND SOURCE + notificationtest.c) + +add_executable(notificationtest ${SOURCE}) +target_link_libraries(notificationtest wine ${PSEH_LIB}) +set_module_type(notificationtest win32cui) +add_importlibs(notificationtest gdi32 user32 shlwapi msvcrt kernel32 ntdll) +add_cd_file(TARGET notificationtest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/win32/kernel32/notificationtest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/kernel32/notificationtest/notificationtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/notificati… ============================================================================== --- trunk/rostests/win32/kernel32/notificationtest/notificationtest.c (added) +++ trunk/rostests/win32/kernel32/notificationtest/notificationtest.c [iso-8859-1] Sat Mar 29 21:12:17 2014 @@ -0,0 +1,157 @@ +/* + * FILE: notificationtest.c + * PURPOSE: Files notifications testing + * NOTES: MSDN code from: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365261%28v=vs.85%… + */ + +#include <windows.h> +#include <stdlib.h> +#include <stdio.h> +#include <tchar.h> + +#if defined(_tsplitpath) && !defined(_tsplitpath_s) +#define _tsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _tsplitpath(f, d, p, n, e) +#else +#define _wsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _wsplitpath(f, d, p, n, e) +#define _splitpath_s(f, d,dl, p,pl, n,nl, e,el) _splitpath(f, d, p, n, e) +#endif + +void RefreshDirectory(LPTSTR); +void RefreshTree(LPTSTR); +void WatchDirectory(LPTSTR); + +int _tmain(int argc, TCHAR *argv[]) +{ + if(argc != 2) + { + _tprintf(TEXT("Usage: %s <dir>\n"), argv[0]); + return -1; + } + + WatchDirectory(argv[1]); + + return 0; +} + +void WatchDirectory(LPTSTR lpDir) +{ + DWORD dwWaitStatus; + HANDLE dwChangeHandles[2]; + TCHAR lpDrive[4]; + TCHAR lpFile[_MAX_FNAME]; + TCHAR lpExt[_MAX_EXT]; + + _tsplitpath_s(lpDir, lpDrive, 4, NULL, 0, lpFile, _MAX_FNAME, lpExt, _MAX_EXT); + + lpDrive[2] = (TCHAR)'\\'; + lpDrive[3] = (TCHAR)'\0'; + +// Watch the directory for file creation and deletion. + + dwChangeHandles[0] = FindFirstChangeNotification( + lpDir, // directory to watch + FALSE, // do not watch subtree + FILE_NOTIFY_CHANGE_FILE_NAME); // watch file name changes + + if (dwChangeHandles[0] == INVALID_HANDLE_VALUE) + { + printf("\n ERROR: FindFirstChangeNotification function failed.\n"); + ExitProcess(GetLastError()); + } + +// Watch the subtree for directory creation and deletion. + + dwChangeHandles[1] = FindFirstChangeNotification( + lpDrive, // directory to watch + TRUE, // watch the subtree + FILE_NOTIFY_CHANGE_DIR_NAME); // watch dir name changes + + if (dwChangeHandles[1] == INVALID_HANDLE_VALUE) + { + printf("\n ERROR: FindFirstChangeNotification function failed.\n"); + ExitProcess(GetLastError()); + } + + +// Make a final validation check on our handles. + + if ((dwChangeHandles[0] == NULL) || (dwChangeHandles[1] == NULL)) + { + printf("\n ERROR: Unexpected NULL from FindFirstChangeNotification.\n"); + ExitProcess(GetLastError()); + } + +// Change notification is set. Now wait on both notification +// handles and refresh accordingly. + + while (TRUE) + { + // Wait for notification. + + printf("\nWaiting for notification...\n"); + + dwWaitStatus = WaitForMultipleObjects(2, dwChangeHandles, + FALSE, INFINITE); + + switch (dwWaitStatus) + { + case WAIT_OBJECT_0: + + // A file was created, renamed, or deleted in the directory. + // Refresh this directory and restart the notification. + + RefreshDirectory(lpDir); + if ( FindNextChangeNotification(dwChangeHandles[0]) == FALSE ) + { + printf("\n ERROR: FindNextChangeNotification function failed.\n"); + ExitProcess(GetLastError()); + } + break; + + case WAIT_OBJECT_0 + 1: + + // A directory was created, renamed, or deleted. + // Refresh the tree and restart the notification. + + RefreshTree(lpDrive); + if (FindNextChangeNotification(dwChangeHandles[1]) == FALSE ) + { + printf("\n ERROR: FindNextChangeNotification function failed.\n"); + ExitProcess(GetLastError()); + } + break; + + case WAIT_TIMEOUT: + + // A timeout occurred, this would happen if some value other + // than INFINITE is used in the Wait call and no changes occur. + // In a single-threaded environment you might not want an + // INFINITE wait. + + printf("\nNo changes in the timeout period.\n"); + break; + + default: + printf("\n ERROR: Unhandled dwWaitStatus.\n"); + ExitProcess(GetLastError()); + break; + } + } +} + +void RefreshDirectory(LPTSTR lpDir) +{ + // This is where you might place code to refresh your + // directory listing, but not the subtree because it + // would not be necessary. + + _tprintf(TEXT("Directory (%s) changed.\n"), lpDir); +} + +void RefreshTree(LPTSTR lpDrive) +{ + // This is where you might place code to refresh your + // directory listing, including the subtree. + + _tprintf(TEXT("Directory tree (%s) changed.\n"), lpDrive); +} Propchange: trunk/rostests/win32/kernel32/notificationtest/notificationtest.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 5 months

[ekohl] 62580: [SYSSETUP] Extend the maximum password length to 127 characters for unattended setup too. CORE-7762 #comment Fixed it! Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 29 20:39:50 2014 New Revision: 62580 URL: http://svn.reactos.org/svn/reactos?rev=62580&view=rev Log: [SYSSETUP] Extend the maximum password length to 127 characters for unattended setup too. CORE-7762 #comment Fixed it! Thanks a lot! Modified: trunk/reactos/dll/win32/syssetup/globals.h Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Sat Mar 29 20:39:50 2014 @@ -45,7 +45,7 @@ WCHAR OwnerName[51]; WCHAR OwnerOrganization[51]; WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 15 characters */ - WCHAR AdminPassword[15]; /* max. 14 characters */ + WCHAR AdminPassword[128]; /* max. 127 characters */ BOOL UnattendSetup; BOOL DisableVmwInst;

10 years, 5 months

[pschweitzer] 62579: [ROSTESTS] Add a usermode test application for tunnel cache. It is based on MS article at: http://support.microsoft.com/?kbid=172190 Tested successfully on Windows 7 & NTFS. Fe...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 29 18:50:36 2014 New Revision: 62579 URL: http://svn.reactos.org/svn/reactos?rev=62579&view=rev Log: [ROSTESTS] Add a usermode test application for tunnel cache. It is based on MS article at: http://support.microsoft.com/?kbid=172190 Tested successfully on Windows 7 & NTFS. Feel free to test on w2k3 NTFS or FAT/FAT32. Added: trunk/rostests/win32/fs/ trunk/rostests/win32/fs/CMakeLists.txt (with props) trunk/rostests/win32/fs/tunneltest/ trunk/rostests/win32/fs/tunneltest/CMakeLists.txt (with props) trunk/rostests/win32/fs/tunneltest/tunneltest.c (with props) Added: trunk/rostests/win32/fs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/fs/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/win32/fs/CMakeLists.txt (added) +++ trunk/rostests/win32/fs/CMakeLists.txt [iso-8859-1] Sat Mar 29 18:50:36 2014 @@ -0,0 +1 @@ +add_subdirectory(tunneltest) Propchange: trunk/rostests/win32/fs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/fs/tunneltest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/fs/tunneltest/CMake… ============================================================================== --- trunk/rostests/win32/fs/tunneltest/CMakeLists.txt (added) +++ trunk/rostests/win32/fs/tunneltest/CMakeLists.txt [iso-8859-1] Sat Mar 29 18:50:36 2014 @@ -0,0 +1,8 @@ + +list(APPEND SOURCE + tunneltest.c) + +add_executable(tunneltest ${SOURCE}) +set_module_type(tunneltest win32cui UNICODE) +add_importlibs(tunneltest msvcrt kernel32 ntdll) +add_cd_file(TARGET tunneltest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/win32/fs/tunneltest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/fs/tunneltest/tunneltest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/fs/tunneltest/tunne… ============================================================================== --- trunk/rostests/win32/fs/tunneltest/tunneltest.c (added) +++ trunk/rostests/win32/fs/tunneltest/tunneltest.c [iso-8859-1] Sat Mar 29 18:50:36 2014 @@ -0,0 +1,163 @@ +/* + * PROJECT: ReactOS Tests + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tunneltest.c + * PURPOSE: Usermode tunnel cache testing + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + * NOTES: Based on indications from: http://support.microsoft.com/?kbid=172190 + */ + +#include <stdio.h> +#include <windef.h> +#include <winternl.h> +#include <winbase.h> +#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } + +const UNICODE_STRING FatName = RTL_CONSTANT_STRING(L"FAT"); +const UNICODE_STRING Fat32Name = RTL_CONSTANT_STRING(L"FAT32"); +const UNICODE_STRING NtfsName = RTL_CONSTANT_STRING(L"NTFS"); + +int wmain(int argc, WCHAR * argv[]) +{ + WCHAR TempPath[MAX_PATH + 1]; + WCHAR CopyPath[MAX_PATH + 1]; + WCHAR RootPath[] = {'A', ':', '\\', '\0'}; + WCHAR FileSystemName[sizeof("FAT32")]; /* Max we should hold - fail otherwise, we don't care */ + UNICODE_STRING FSName; + WCHAR File1[] = {'\\', 'f', 'i', 'l', 'e', '1', '\0'}; + WCHAR File2[] = {'\\', 'f', 'i', 'l', 'e', '2', '\0'}; + ULONG FilePos; + HANDLE hFile; + FILETIME FileTime, File1Time; + + /* Get temp path in which will work */ + if (GetTempPathW(sizeof(TempPath) / sizeof(TempPath[0]), TempPath) == 0) + { + fprintf(stderr, "Failed to get temp path\n"); + return GetLastError(); + } + + /* Assume it's X:\ something */ + RootPath[0] = TempPath[0]; + + /* Get information about the volume */ + if (GetVolumeInformationW(RootPath, NULL, 0, NULL, NULL, NULL, FileSystemName, sizeof(FileSystemName) / sizeof(FileSystemName[0])) == 0) + { + fprintf(stderr, "Failed to get volume info\n"); + return GetLastError(); + } + + /* Convert to string */ + RtlInitUnicodeString(&FSName, FileSystemName); + + /* Bail out if that's not FAT or NTFS */ + if (RtlCompareUnicodeString(&FSName, &FatName, FALSE) != 0 && + RtlCompareUnicodeString(&FSName, &Fat32Name, FALSE) != 0 && + RtlCompareUnicodeString(&FSName, &NtfsName, FALSE) != 0) + { + fprintf(stderr, "!(FAT, FAT32, NTFS): \'%S\'\n", FSName.Buffer); + return 0; + } + + /* Ensure we can store complete path - no overrun */ + FilePos = wcslen(TempPath); + if (FilePos > MAX_PATH - sizeof(File2) / sizeof(WCHAR)) + { + fprintf(stderr, "Files won't fit\n"); + return 0; + } + + /* Create first file */ + wcscat(TempPath, File1); + hFile = CreateFileW(TempPath, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "Failed to create file1\n"); + return GetLastError(); + } + CloseHandle(hFile); + + /* Wait a least 10ms (resolution of FAT) */ + Sleep(10 * 2); + + /* Create second file */ + /* Remove old file from buffer */ + TempPath[FilePos - 1] = 0; + wcscat(TempPath, File2); + hFile = CreateFileW(TempPath, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "Failed to create file2\n"); + return GetLastError(); + } + CloseHandle(hFile); + + /* Rename file1 to file */ + TempPath[FilePos] = 0; + wcscat(TempPath, File1); + wcscpy(CopyPath, TempPath); + /* Remove number for dest */ + CopyPath[wcslen(TempPath) - 1] = 0; + if (MoveFileW(TempPath, CopyPath) == 0) + { + fprintf(stderr, "Failed to rename file1\n"); + return GetLastError(); + } + + /* Rename file2 to file1 */ + wcscpy(CopyPath, TempPath); + /* Change 1 to 2 */ + CopyPath[wcslen(TempPath) - 1] = L'2'; + if (MoveFileW(CopyPath, TempPath) == 0) + { + fprintf(stderr, "Failed to rename file2\n"); + return GetLastError(); + } + + /* Time to compare creation time of both file & file1 */ + CopyPath[wcslen(TempPath) - 1] = 0; + + /* Open file and get its creation time */ + hFile = CreateFileW(CopyPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "Failed to open file\n"); + return GetLastError(); + } + if (GetFileTime(hFile, &FileTime, NULL, NULL) == FALSE) + { + fprintf(stderr, "Failed to read creation time\n"); + CloseHandle(hFile); + return GetLastError(); + } + CloseHandle(hFile); + + /* Open file1 and get its creation time */ + hFile = CreateFileW(TempPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "Failed to open file1\n"); + return GetLastError(); + } + if (GetFileTime(hFile, &File1Time, NULL, NULL) == FALSE) + { + fprintf(stderr, "Failed to read creation time\n"); + CloseHandle(hFile); + return GetLastError(); + } + CloseHandle(hFile); + + /* Delete file */ + DeleteFileW(TempPath); + DeleteFileW(CopyPath); + + /* Compare both, they have to be strictly identical */ + if (RtlCompareMemory(&FileTime, &File1Time, sizeof(FILETIME)) == sizeof(FILETIME)) + { + fprintf(stdout, "Tunnel cache in action\n"); + return 0; + } + + fprintf(stdout, "Tunnel cache NOT in action\n"); + return 0; +} Propchange: trunk/rostests/win32/fs/tunneltest/tunneltest.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 5 months

[ekohl] 62578: [SAMSRV] Add a note for translators to keep the administrator account name string resources in syssetup.dll and samsrv.dll synchonized.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 29 17:28:47 2014 New Revision: 62578 URL: http://svn.reactos.org/svn/reactos?rev=62578&view=rev Log: [SAMSRV] Add a note for translators to keep the administrator account name string resources in syssetup.dll and samsrv.dll synchonized. Modified: trunk/reactos/dll/win32/samsrv/lang/de-DE.rc trunk/reactos/dll/win32/samsrv/lang/en-US.rc trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc trunk/reactos/dll/win32/samsrv/lang/ro-RO.rc trunk/reactos/dll/win32/samsrv/lang/sq-AL.rc Modified: trunk/reactos/dll/win32/samsrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/lang/de-DE.rc [iso-8859-1] Sat Mar 29 17:28:47 2014 @@ -13,6 +13,11 @@ IDS_ALIAS_POWER_USERS_COMMENT "Hauptbenutzer besitzen die meisten Rechte mit einigen EinschrÃ¤nkungen." IDS_ALIAS_USERS_NAME "Benutzer" IDS_ALIAS_USERS_COMMENT "Benutzer kÃ¶nnen keine Ãnderungen am System vornehmen." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ IDS_USER_ADMINISTRATOR_NAME "Administrator" IDS_USER_ADMINISTRATOR_COMMENT "Vordefiniertes Konto fÃ¼r die Verwaltung des Comuters oder der DomÃ¤ne." IDS_USER_GUEST_NAME "Gast" Modified: trunk/reactos/dll/win32/samsrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/lang/en-US.rc [iso-8859-1] Sat Mar 29 17:28:47 2014 @@ -13,6 +13,11 @@ IDS_ALIAS_POWER_USERS_COMMENT "Power Users have most administrative rights with some restrictions." IDS_ALIAS_USERS_NAME "Users" IDS_ALIAS_USERS_COMMENT "Users are prevented from making system-wide changes." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ IDS_USER_ADMINISTRATOR_NAME "Administrator" IDS_USER_ADMINISTRATOR_COMMENT "Built-in account used to administate the computer or domain." IDS_USER_GUEST_NAME "Guest" Modified: trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc [iso-8859-1] Sat Mar 29 17:28:47 2014 @@ -13,6 +13,11 @@ IDS_ALIAS_POWER_USERS_COMMENT "UÅ¼ytkownicy zaawansowani maja wiÄkszoÅÄ uprawnieÅ administracyjnych, z kilkoma wyjÄtkami." IDS_ALIAS_USERS_NAME "UÅ¼ytkownicy" IDS_ALIAS_USERS_COMMENT "UÅ¼ytkownicy nie mogÄ dokonywaÄ istotnych zmian w systemie." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ IDS_USER_ADMINISTRATOR_NAME "Administrator" IDS_USER_ADMINISTRATOR_COMMENT "Wbudowane konto do zarzÄdzania komputerem bÄdÅº domenÄ." IDS_USER_GUEST_NAME "GoÅÄ" Modified: trunk/reactos/dll/win32/samsrv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/lang/ro-RO.rc [iso-8859-1] Sat Mar 29 17:28:47 2014 @@ -15,6 +15,11 @@ IDS_ALIAS_POWER_USERS_COMMENT "Utilizatorii avansaÈi posedÄ majoritatea drepturilor administrative cu unele restricÈii." IDS_ALIAS_USERS_NAME "Utilizatori" IDS_ALIAS_USERS_COMMENT "Utilizatorilor le este limitatÄ capacitatea de a aduce modificÄri Ã®n sistem." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ IDS_USER_ADMINISTRATOR_NAME "Administrator" IDS_USER_ADMINISTRATOR_COMMENT "Contul inerent utilizat pentru a administra acest calculator sau domeniu." IDS_USER_GUEST_NAME "Oaspete" Modified: trunk/reactos/dll/win32/samsrv/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/lang/sq-AL.rc [iso-8859-1] Sat Mar 29 17:28:47 2014 @@ -17,6 +17,11 @@ IDS_ALIAS_POWER_USERS_COMMENT "PÃ«rdorues tÃ« FuqishÃ«m katÃ« tÃ« drejta administrative me disa kufizime." IDS_ALIAS_USERS_NAME "PÃ«rdoruesit" IDS_ALIAS_USERS_COMMENT "PÃ«rdoruesit janÃ« tÃ« penguar pÃ«r ndryshim bÃ«rje tÃ« gjÃ«rave tÃ« sistemit." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ IDS_USER_ADMINISTRATOR_NAME "AdministratorÃ«r" IDS_USER_ADMINISTRATOR_COMMENT "Llogaria NdÃ«rtimit tÃ« pÃ«rdorura pÃ«r tÃ« administruar kompjuterin ose domain." IDS_USER_GUEST_NAME "VizitorÃ«"

10 years, 5 months

[ekohl] 62577: [SYSSETUP] - Store the administrator account name as the default user name. - Extend the maximum password length to 127 characters. CORE-7762 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 29 17:18:14 2014 New Revision: 62577 URL: http://svn.reactos.org/svn/reactos?rev=62577&view=rev Log: [SYSSETUP] - Store the administrator account name as the default user name. - Extend the maximum password length to 127 characters. CORE-7762 #resolve Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/he-IL.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°ÑÐ° ÑÐµ ÑÑÐ·Ð´Ð°Ð´Ðµ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÐºÐ° ÑÐ¼ÐµÑÐºÐ°, Ð¿Ð¾Ð´ Ð¸Ð¼ÐµÑÐ¾ âAdministratorâ. ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÑÐµ ÑÐ°Ð·Ð¸ ÑÐ¼ÐµÑÐºÐ°, Ð·Ð° Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ¸ÑÐµ Ð¿ÑÐ»ÐµÐ½ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°.", IDC_STATIC, 45, 57, 250, 25 - LTEXT "ÐÐ°Ð¿Ð¸ÑÐµÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð° Ð·Ð° âAdministratorâ, Ð½Ðµ Ð¿Ð¾- Ð´ÑÐ»Ð³Ð° Ð¾Ñ 14 Ð·Ð½Ð°ÐºÐ°.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "ÐÐ°Ð¿Ð¸ÑÐµÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð° Ð·Ð° âAdministratorâ, Ð½Ðµ Ð¿Ð¾- Ð´ÑÐ»Ð³Ð° Ð¾Ñ 127 Ð·Ð½Ð°ÐºÐ°.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ÐÐ°ÑÐ¾Ð»Ð° Ð·Ð° âAdministratorâ:", IDC_STATIC, 45, 104, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ÐÐ¾&ÑÐ²ÑÑÐ´ÐµÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð°ÑÐ°:", IDC_STATIC, 45, 123, 95, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ DllInstall: " IDS_TIMEOUT "ÐÑÐ¾ÑÑÐ¾ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð³Ð¸ÑÑÑÐ¸ÑÐ°Ð½ÐµÑÐ¾" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -52,7 +52,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "InstalÃ¡tor vytvoÅÃ uÅ¾ivatelskÃ½ ÃºÄet nazvanÃ½ Administrator. MÅ¯Å¾ete tento ÃºÄet pouÅ¾Ãt, pokud budete potÅebovat ÃºplnÃ½ pÅÃstup k VaÅ¡emu poÄÃtaÄi.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Zadejte heslo ÃºÄtu Administrator o dÃ©lce 14 znakÅ¯ nebo mÃ©nÄ.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Zadejte heslo ÃºÄtu Administrator o dÃ©lce 127 znakÅ¯ nebo mÃ©nÄ.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Heslo:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&Potvrdit heslo:", IDC_STATIC, 54, 123, 75, 8 @@ -154,6 +154,13 @@ IDS_DLLINSTALL_FAILED "DllInstall failed: " IDS_TIMEOUT "VyprÅ¡el ÄasovÃ½ limit registrace" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Das Setup wird ein Administratorkonto erstellen. Benutzen Sie es, wenn Sie vollen Zugriff auf Ihren Computer benÃ¶tigen.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Geben Sie ein Passwort fÃ¼r das Administratorkonto mit max. 14 Zeichen ein.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Geben Sie ein Passwort fÃ¼r das Administratorkonto mit max. 127 Zeichen ein.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Administratorpasswort:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&Passwort bestÃ¤tigen:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall fehlgeschlagen: " IDS_TIMEOUT "ZeitÃ¼berschreitung wÃ¤hrend der Registrierung" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Î ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î¸Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ ÎÎ½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¹ÏÎ¼Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® ÏÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± Administrator. ÎÎµ ÏÎ¿ Î»Î¿Î³Î¹Î±ÏÎ¹Î±ÏÎ¼Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±ÏÎ¿ÎºÏÎ®ÏÎµÏÎµ ÏÎ¿Î½ ÏÎ»Î®ÏÎ· ÎÎ»ÎµÎ³ÏÎ¿ ÏÎ¿Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "ÎÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÏÏÏÏÎ²Î±ÏÎ·Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® Î¿ Î¿ÏÎ¿Î¯Î¿Ï Î´ÎµÎ½ ÏÏÎÏÎµÎ¹ Î½Î± Î¾ÎµÏÎµÏÎ½Î¬ ÏÎ¿ÏÏ 14 ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ.", IDC_STATIC, 54, 83, 250, 16 + LTEXT "ÎÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÏÏÏÏÎ²Î±ÏÎ·Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® Î¿ Î¿ÏÎ¿Î¯Î¿Ï Î´ÎµÎ½ ÏÏÎÏÎµÎ¹ Î½Î± Î¾ÎµÏÎµÏÎ½Î¬ ÏÎ¿ÏÏ 127 ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ.", IDC_STATIC, 54, 83, 250, 16 LTEXT "&ÎÏÎ´Î¹ÎºÏÏ ÏÏÏÏÎ²Î±ÏÎ·Ï:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÎºÏÎ´Î¹ÎºÎ¿Ï:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "Î¤Î¿ DllInstall Î±ÏÎÏÏÏÎµ: " IDS_TIMEOUT "ÎÎ®Î¾Î· ÏÏÏÎ½Î¿Ï ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -65,7 +65,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Type an Administrator Password that is 127 characters or less.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 105, 8 @@ -167,6 +167,13 @@ IDS_DLLINSTALL_FAILED "DllInstall failed: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "El instalador crearÃ¡ un perfil de usuario en su equipo llamado Administrator. Puede utilizar este perfil si necesita acceso completo a su equipo.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Escriba una contraseÃ±a para este perfil de 14 caracteres o menos.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Escriba una contraseÃ±a para este perfil de 127 caracteres o menos.", IDC_STATIC, 54, 87, 250, 8 LTEXT "ContraseÃ±a &Administrator:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfirme contraseÃ±a:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall fallÃ³: " IDS_TIMEOUT "Tiempo agotado durante la instalaciÃ³n" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Arvuti tÃ¤ielikuks haldamiseks luuakse administraatori konto (Administrator). ", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Sisesta administraatori parool, mille pikkus on maksimaalselt 14 tÃ¤hemÃ¤rki.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Sisesta administraatori parool, mille pikkus on maksimaalselt 127 tÃ¤hemÃ¤rki.", IDC_STATIC, 54, 87, 250, 8 LTEXT "A&dministraatori parool:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&Kinnita parool:", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall ebaÃµnnestus: " IDS_TIMEOUT "Aeg sai registreerimise kÃ¤igus otsa" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "L'assistant va crÃ©er un compte utilisateur sur votre ordinateur appelÃ© Administrateur. Vous pourrez utiliser ce compte pour avoir un accÃ¨s complet Ã votre ordinateur.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Entrez le mot de passe Administrateur (14 caractÃ¨res ou moins).", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Entrez le mot de passe Administrateur (127 caractÃ¨res ou moins).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Mot de passe :", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "Confirmation :", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "Ãchec de DllInstall : " IDS_TIMEOUT "DÃ©lai dÃ©passÃ© lors de l'enregistrement" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Type an Administrator Password that is 127 characters or less.", IDC_STATIC, 54, 87, 250, 8 LTEXT "×¡××¡××ª ×× ××:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "×××©××¨ ×¡××¡××:", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall × ××©×: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "A telepÃtÃµ lÃ©trehoz egy felhasznÃ¡lÃ³i fiÃ³kot, a RendszergazdÃ¡t. Ezzel a fiÃ³kkal teljes jogod van a szÃ¡mÃtÃ³gÃ©ped felett.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Adj meg egy jelszÃ³t, ami nem tÃ¶bb mint 14 karakter.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Adj meg egy jelszÃ³t, ami nem tÃ¶bb mint 127 karakter.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&JelszÃ³:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&MegerÃµsÃtÃ©s:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall hiba: " IDS_TIMEOUT "A regisztrÃ¡ciÃ³ tÃºllÃ©pte az idÃµkorlÃ¡tot" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Type an Administrator Password that is 127 characters or less.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall gagal: " IDS_TIMEOUT "Kehabisan waktu selama registrasi" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 140, 35, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Questa procedura creerÃ su questo computer un account utente chiamato Administrator. Si potrÃ usare questo account se si necessita l'accesso completo al computer.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", IDC_STATIC, 26, 87, 280, 8 + LTEXT "Scrivere una password per Administrator che sia lunga al massimo 127 caratteri.", IDC_STATIC, 26, 87, 280, 8 LTEXT "Password per &Administrator:", IDC_STATIC, 29, 105, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 140, 100, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfermare la password:", IDC_STATIC, 29, 125, 95, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall fallito: " IDS_TIMEOUT "Tempo scaduto durante la registrazione" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Administratorã¨å¼ã°ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ããä½æãã¾ãã ã³ã³ãã¥ã¼ã¿ã«ãã«ã¢ã¯ã»ã¹ãå¿è¦ãªã¨ãããã®ã¢ã«ã¦ã³ããä½¿ç¨ãã¾ãã", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Administratorã®ãã¹ã¯ã¼ããåè§ 14 æåä»¥åã§å¥åãã¦ãã ããã", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Administratorã®ãã¹ã¯ã¼ããåè§ 127 æåä»¥åã§å¥åãã¦ãã ããã", IDC_STATIC, 54, 87, 250, 8 LTEXT "Administrator ã®ãã¹ã¯ã¼ã(&A):", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ãã¹ã¯ã¼ãã®ç¢ºèªå¥å(&O):", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstallã«å¤±æ: " IDS_TIMEOUT "ç»é²ä¸ã«ã¿ã¤ã ã¢ã¦ããã¾ãã" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Type an Administrator Password that is 127 characters or less.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall failed: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Installasjonen vil lage en brukerkonto som blir kalt Administrator. Du kan bruke denne kontoen hvis du trenger full adgang til din datamaskin.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Skriv inn et Administrator passord som er 14 karakterer eller mindre.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Skriv inn et Administrator passord som er 127 karakterer eller mindre.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Administrator passord:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "B&ekreft passord:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall feilet: " IDS_TIMEOUT "Tidsavbrudd under registrering" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Program konfiguracyjny stworzy konto Administrator. DziÄki niemu uzyskasz, w razie potrzeby, peÅny dostÄp do systemu.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Podaj hasÅo administratora, nie dÅuÅ¼sze niÅ¼ 14 znakÃ³w.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Podaj hasÅo administratora, nie dÅuÅ¼sze niÅ¼ 127 znakÃ³w.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&HasÅo administratora:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&Potwierdzenie hasÅa:", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "Nieudane DllInstall: " IDS_TIMEOUT "UpÅynÄÅ czas rejestracji" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "A instalaÃ§Ã£o vai criar uma conta no seu computador chamada Administrator. VocÃª pode usar esta conta se precisar de acesso total ao seu computador.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Digite uma senha para o administrador com 14 caracteres ou menos.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Digite uma senha para o administrador com 127 caracteres ou menos.", IDC_STATIC, 54, 87, 250, 8 LTEXT "Senha do &Administrador:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "C&onfirma Senha:", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall falhou: " IDS_TIMEOUT "Tempo limite esgotado durante registro" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -48,7 +48,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Asistentul va crea un cont de utilizator cu numele Administrator. Ãl puteÈi folosi cÃ¢nd veÈi avea nevoie de control complet asupra calculatorului.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "IntroduceÈi o parolÄ pentru Administrator de maxim 14 caractere.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "IntroduceÈi o parolÄ pentru Administrator de maxim 127 caractere.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ParolÄ administrator:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&Confirmarea parolei:", IDC_STATIC, 54, 123, 105, 8 @@ -150,6 +150,13 @@ IDS_DLLINSTALL_FAILED "DllInstall a eÈuat: " IDS_TIMEOUT "Timp expirat Ã®n timpul Ã®nregistrÄrii" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -48,7 +48,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "ÐÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Administrator ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ, ÐµÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° (Ð½Ðµ Ð±Ð¾Ð»ÐµÐµ 14 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²).", IDC_STATIC, 54, 87, 250, 8 + LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° (Ð½Ðµ Ð±Ð¾Ð»ÐµÐµ 127 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°:", IDC_STATIC, 54, 104, 96, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "Ð&Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_STATIC, 54, 123, 75, 8 @@ -150,6 +150,13 @@ IDS_DLLINSTALL_FAILED "ÐÑÐ¸Ð±ÐºÐ° DllInstall: " IDS_TIMEOUT "Ð¢Ð°Ð¹Ð¼Ð°ÑÑ Ð² ÑÐ¾Ð´Ðµ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -52,7 +52,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "InÅ¡talÃ¡tor vytvorÃ na poÄÃtaÄi pouÅ¾ÃvateÄ¾skÃ½ ÃºÄet nazvanÃ½ Administrator. Tento ÃºÄet mÃ´Å¾ete pouÅ¾iÅ¥, keÄ budete potrebovaÅ¥ plnÃ½ prÃstup k VÃ¡Å¡mu poÄÃtaÄu.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Zadajte heslo ÃºÄtu Administrator v dÄºÅ¾ke 14 znakov alebo menej.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Zadajte heslo ÃºÄtu Administrator v dÄºÅ¾ke 127 znakov alebo menej.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Heslo:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "&PotvrdiÅ¥ heslo:", IDC_STATIC, 54, 123, 75, 8 @@ -154,6 +154,13 @@ IDS_DLLINSTALL_FAILED "DllInstall zlyhal: " IDS_TIMEOUT "VyprÅ¡al ÄasovÃ½ limit registrÃ¡cie" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -65,7 +65,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "NdÃ«rtuesi do tÃ« krijojÃ« njÃ« llogari pÃ«rdoruesi nÃ« kompjuterin tuaj tÃ« quajtur Administrator. Ju mund tÃ« pÃ«rdorni kÃ«tÃ« llogari nÃ« qoftÃ« se keni nevojÃ« pÃ«r akses tÃ« plotÃ« nÃ« kompjuterin tuaj.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Shkruani njÃ« fjalÃ«kalim Administratori qÃ« Ã«shtÃ« 14 karaktere ose mÃ« pak.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Shkruani njÃ« fjalÃ«kalim Administratori qÃ« Ã«shtÃ« 127 karaktere ose mÃ« pak.", IDC_STATIC, 54, 87, 250, 8 LTEXT "FjalÃ«kalimi &Administratorit:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "K&onfirmo FjalÃ«kalimin:", IDC_STATIC, 54, 123, 105, 8 @@ -167,6 +167,13 @@ IDS_DLLINSTALL_FAILED "DllInstall dÃ«shtoj: " IDS_TIMEOUT "Timeout gjatÃ« regjistrimit" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "AdministratorÃ«r" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Kur,'Administrator' adÄ±yla bir yÃ¶netici hesabÄ± oluÅturacak. Bu hesabÄ± bilgisayara tam eriÅim iÃ§in kullanabileceksiniz.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "14 karakter yada daha az bir YÃ¶netici ParolasÄ± yazÄ±n.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "127 karakter yada daha az bir YÃ¶netici ParolasÄ± yazÄ±n.", IDC_STATIC, 54, 87, 250, 8 LTEXT "&YÃ¶netici ParolasÄ±:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ParolayÄ± &DoÄrula:", IDC_STATIC, 54, 123, 105, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "Dll Kurulumu baÅarÄ±sÄ±z oldu: " IDS_TIMEOUT "KayÄ±t zaman aÅÄ±mÄ±na uÄradÄ±" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -54,7 +54,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑÐ²Ð¾ÑÐ¸ÑÑ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° 'ÐÐ´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾Ñ', ÑÐºÐ¸Ð¹ Ð´Ð°Ñ Ð¿Ð¾Ð²Ð½Ñ Ð¿ÑÐ°Ð²Ð° Ð´Ð¾ÑÑÑÐ¿Ñ Ð´Ð¾ ÐÐ°ÑÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "ÐÐ²ÐµÐ´ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ° Ð´Ð¾Ð²Ð¶Ð¸Ð½Ð¾Ñ Ð´Ð¾ 14 ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ².", IDC_STATIC, 54, 87, 250, 8 + LTEXT "ÐÐ²ÐµÐ´ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ° Ð´Ð¾Ð²Ð¶Ð¸Ð½Ð¾Ñ Ð´Ð¾ 127 ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ².", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ°:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ÐÑ&Ð´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ:", IDC_STATIC, 54, 123, 75, 8 @@ -156,6 +156,13 @@ IDS_DLLINSTALL_FAILED "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° DllInstall: " IDS_TIMEOUT "Ð¢Ð°Ð¹Ð¼Ð°ÑÑ Ð¿ÑÐ´ ÑÐ°Ñ ÑÐµÑÑÑÑÐ°ÑÑÑ" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -46,7 +46,7 @@ EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "å®è£ç¨åºä¼åå»ºä¸ä¸ªç§°ä¸º Administrator (ç³»ç»ç®¡çå)çç¨æ·å¸æ·ãéè¦å®å¨æ§å¶è®¡ç®æºæ¶ï¼å¯ä»¥ä½¿ç¨è¿ä¸ªå¸æ·ã", IDC_STATIC, 54, 57, 250, 25 - LTEXT "è¯·é®å¥ä¸è¶è¿14ä¸ªåç¬¦çç³»ç»ç®¡çåå¯ç ã", IDC_STATIC, 54, 87, 250, 8 + LTEXT "è¯·é®å¥ä¸è¶è¿127ä¸ªåç¬¦çç³»ç»ç®¡çåå¯ç ã", IDC_STATIC, 54, 87, 250, 8 LTEXT "ç³»ç»ç®¡çåå¯ç (&A):", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ç¡®è®¤å¯ç (&O):", IDC_STATIC, 54, 123, 75, 8 @@ -148,6 +148,13 @@ IDS_DLLINSTALL_FAILED "DllInstall å¤±è´¥: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -101,6 +101,7 @@ #define IDS_DLLINSTALL_FAILED 3306 #define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 +#define IDS_ADMINISTRATOR_NAME 3309 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451 Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Mar 29 17:18:14 2014 @@ -566,6 +566,59 @@ return TRUE; } + +static +BOOL +WriteDefaultLogonData(LPWSTR Domain) +{ + WCHAR szAdministratorName[256]; + HKEY hKey = NULL; + LONG lError; + + if (LoadStringW(hDllInstance, + IDS_ADMINISTRATOR_NAME, + szAdministratorName, + sizeof(szAdministratorName) / sizeof(WCHAR)) == 0) + { + wcscpy(szAdministratorName, L"Administrator"); + } + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, + KEY_SET_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + return FALSE; + + lError = RegSetValueEx(hKey, + L"DefaultDomain", + 0, + REG_SZ, + (LPBYTE)Domain, + (wcslen(Domain)+ 1) * sizeof(WCHAR)); + if (lError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx(\"DefaultDomain\") failed!\n"); + } + + lError = RegSetValueEx(hKey, + L"DefaultUserName", + 0, + REG_SZ, + (LPBYTE)szAdministratorName, + (wcslen(szAdministratorName)+ 1) * sizeof(WCHAR)); + if (lError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx(\"DefaultUserName\") failed!\n"); + } + + RegCloseKey(hKey); + + return TRUE; +} + + /* lpBuffer will be filled with a 15-char string (plus the null terminator) */ static void GenerateComputerName(LPWSTR lpBuffer) @@ -592,8 +645,8 @@ LPARAM lParam) { WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR Password1[15]; - WCHAR Password2[15]; + WCHAR Password1[128]; + WCHAR Password2[128]; PWCHAR Password; WCHAR Title[64]; WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256]; @@ -607,7 +660,6 @@ switch (uMsg) { case WM_INITDIALOG: - { /* Generate a new pseudo-random computer name */ GenerateComputerName(ComputerName); @@ -616,8 +668,8 @@ /* Set text limits */ SendDlgItemMessage(hwndDlg, IDC_COMPUTERNAME, EM_LIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); - SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD1, EM_LIMITTEXT, 14, 0); - SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD2, EM_LIMITTEXT, 14, 0); + SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD1, EM_LIMITTEXT, 127, 0); + SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD2, EM_LIMITTEXT, 127, 0); /* Set focus to computer name */ SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); @@ -630,8 +682,9 @@ SetAdministratorPassword(SetupData.AdminPassword); } - } - break; + /* Store the administrator account name as the default user name */ + WriteDefaultLogonData(SetupData.ComputerName); + break; case WM_NOTIFY: @@ -676,8 +729,8 @@ #if 0 /* Check if admin passwords have been entered */ - if ((GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15) == 0) || - (GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15) == 0)) + if ((GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 128) == 0) || + (GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD2, Password2, 128) == 0)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDEMPTY, EmptyPassword, sizeof(EmptyPassword) / sizeof(EmptyPassword[0]))) @@ -689,8 +742,8 @@ return TRUE; } #else - GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15); - GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15); + GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD1, Password1, 128); + GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD2, Password2, 128); #endif /* Check if passwords match */ if (wcscmp(Password1, Password2))

10 years, 5 months

[hbelusca] 62576: Addendum to rev 62573: simplify my story, thanks Amine ; )

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 29 17:09:46 2014 New Revision: 62576 URL: http://svn.reactos.org/svn/reactos?rev=62576&view=rev Log: Addendum to rev 62573: simplify my story, thanks Amine ;) Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6257… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Mar 29 17:09:46 2014 @@ -23,7 +23,7 @@ #define strcasecmp _stricmp #endif//_WIN32 - #if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))) + #if (!defined(_MSC_VER) || (_MSC_VER < 1500)) #define _In_ #define _Out_ #define _Inout_ Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sat Mar 29 17:09:46 2014 @@ -130,7 +130,7 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))) +#if (!defined(_MSC_VER) || (_MSC_VER < 1500)) #define _In_ #define _Out_ #define _In_opt_

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014