Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[hbelusca] 70447: [VFATLIB] - DPRINT messages printed via VfatPrint by the check-disk procedure. - Addendum to r70434 and r70435 : The return value of fs_close is equal to the number of corrections...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 19:55:47 2015 New Revision: 70447 URL: http://svn.reactos.org/svn/reactos?rev=70447&view=rev Log: [VFATLIB] - DPRINT messages printed via VfatPrint by the check-disk procedure. - Addendum to r70434 and r70435 : The return value of fs_close is equal to the number of corrections made on the disk (0 corrections --> success; 1+ --> something was corrected). That way, the old code "return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;" that we had since eons (which always happened to return STATUS_SUCCESS) was actually indicating to us that our FAT32-formatted volumes were corrupted. If you test this revision, you should see something happening if you try to install ReactOS now (something that should have happened since ages actually). Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 19:55:47 2015 @@ -265,7 +265,6 @@ DPRINT1("Failed to umount volume (Status: 0x%x)\n", LockStatus); } - LockStatus = NtFsControlFile(FileHandle, NULL, NULL, @@ -302,7 +301,6 @@ ULONG NewPercent; Context->CurrentSectorCount += (ULONGLONG)Increment; - NewPercent = (Context->CurrentSectorCount * 100ULL) / Context->TotalSectorCount; @@ -331,6 +329,8 @@ /* Prepare parameters */ TextOut.Lines = 1; TextOut.Output = TextBuf; + + DPRINT1("VfatPrint -- %s", TextBuf); /* Do the callback */ if (ChkdskCallback) @@ -351,7 +351,6 @@ BOOLEAN salvage_files; ULONG free_clusters; DOS_FS fs; - int ret; /* Store callback pointer */ ChkdskCallback = Callback; @@ -373,11 +372,7 @@ if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ - // NOTE: Returning the value of fs_close looks suspicious. - // return fs_close(FALSE); - ret = fs_close(FALSE); - DPRINT1("No need to check FS; fs_close returning %d\n", (unsigned int)ret); - return STATUS_SUCCESS; + return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } read_boot(&fs); @@ -425,7 +420,7 @@ } VfatPrint("%wZ: %u files, %lu/%lu clusters\n", DriveRoot, - FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters ); + FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters); if (FixErrors) { @@ -437,11 +432,7 @@ } /* Close the volume */ - // NOTE: Returning the value of fs_close looks suspicious. - // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - ret = fs_close(FixErrors); - DPRINT1("fs_close returning %d\n", (unsigned int)ret); - return STATUS_SUCCESS; + return (fs_close(FixErrors) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } /* EOF */

8 years, 12 months

[hbelusca] 70446: [VFATLIB] - Formatting + RtlZero/FillMemory modifications as addendum to r70445. - Do not hardcode FSInfo signature values, use instead the same set of macros fastfat_new introduces.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 19:38:13 2015 New Revision: 70446 URL: http://svn.reactos.org/svn/reactos?rev=70446&view=rev Log: [VFATLIB] - Formatting + RtlZero/FillMemory modifications as addendum to r70445. - Do not hardcode FSInfo signature values, use instead the same set of macros fastfat_new introduces. Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun Dec 27 19:38:13 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); /* FAT32 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); + /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,8 +60,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); @@ -81,16 +81,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); } - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -113,13 +112,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new sector */ - memset(FsInfo, 0, BootSector->BytesPerSector); - - FsInfo->LeadSig = 0x41615252; - FsInfo->StrucSig = 0x61417272; + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + + FsInfo->LeadSig = FSINFO_SECTOR_BEGIN_SIGNATURE; + FsInfo->StrucSig = FSINFO_SIGNATURE; FsInfo->FreeCount = 0xffffffff; - FsInfo->NextFree = 0xffffffff; - FsInfo->TrailSig = 0xaa550000; + FsInfo->NextFree = 0xffffffff; + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; /* Write sector */ FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector; @@ -135,15 +134,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new sector buffer */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; } @@ -169,7 +167,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 64 * 1024); + RtlZeroMemory(Buffer, 64 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -203,14 +201,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 12); + RtlZeroMemory(Buffer, 12); /* Zero the rest of the FAT */ Sectors = 64 * 1024 / BootSector->BytesPerSector; @@ -236,16 +233,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -270,7 +266,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, BootSector->SectorsPerCluster * BootSector->BytesPerSector); + RtlZeroMemory(Buffer, BootSector->SectorsPerCluster * BootSector->BytesPerSector); DPRINT("BootSector->ReservedSectors = %lu\n", BootSector->ReservedSectors); DPRINT("BootSector->FATSectors32 = %lu\n", BootSector->FATSectors32); @@ -301,15 +297,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -390,7 +385,6 @@ done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -435,7 +429,7 @@ } } - memset(&BootSector, 0, sizeof(FAT32_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT32_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -466,7 +460,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Sun Dec 27 19:38:13 2015 @@ -104,6 +104,10 @@ } FAT32_FSINFO, *PFAT32_FSINFO; #include <poppack.h> +#define FSINFO_SECTOR_BEGIN_SIGNATURE 0x41615252 // 'RRaA' +#define FSINFO_SECTOR_END_SIGNATURE 0xAA550000 +#define FSINFO_SIGNATURE 0x61417272 // 'rrAa' + typedef struct _FORMAT_CONTEXT { PFMIFSCALLBACK Callback;

8 years, 12 months

[hbelusca] 70445: [VFATLIB] - Formatting fixes. - Use RtlZeroMemory/RtlFillMemory instead of memset.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 19:30:53 2015 New Revision: 70445 URL: http://svn.reactos.org/svn/reactos?rev=70445&view=rev Log: [VFATLIB] - Formatting fixes. - Use RtlZeroMemory/RtlFillMemory instead of memset. Modified: trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -129,7 +129,6 @@ done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; - } - - /* Free the new boot sector */ + goto done; + } + + UpdateProgress(Context, 1); + +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - - UpdateProgress(Context, 1); - return Status; } @@ -94,7 +94,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 & 1*/ Buffer[0] = 0xf8; /* Media type */ @@ -115,14 +115,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 3); + RtlZeroMemory(Buffer, 3); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -148,16 +147,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -198,7 +196,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -225,16 +223,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -277,7 +274,7 @@ DPRINT("SectorCount = %lu\n", SectorCount); - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -301,7 +298,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -93,7 +93,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -117,14 +117,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 4); + RtlZeroMemory(Buffer, 4); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -150,16 +149,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -199,7 +197,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -224,16 +222,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -284,7 +281,7 @@ SectorCount = PartitionInfo->PartitionLength.QuadPart >> GetShiftCount(DiskGeometry->BytesPerSector); /* Use shifting to avoid 64-bit division */ - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -308,7 +305,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel);

8 years, 12 months

[hbelusca] 70444: [TASKMGR]: Use taskmgr's icon for its run file dialog. Inspired by Wine.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 19:06:16 2015 New Revision: 70444 URL: http://svn.reactos.org/svn/reactos?rev=70444&view=rev Log: [TASKMGR]: Use taskmgr's icon for its run file dialog. Inspired by Wine. Modified: trunk/reactos/base/applications/taskmgr/run.c Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] Sun Dec 27 19:06:16 2015 @@ -34,16 +34,19 @@ LoadStringW(hInst, IDS_CREATENEWTASK, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); LoadStringW(hInst, IDS_CREATENEWTASK_DESC, szText, sizeof(szText) / sizeof(szText[0])); - hShell32 = LoadLibraryW(L"SHELL32.DLL"); - RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)0x3D); + RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) { + HICON hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER)); + /* NOTE - don't check whether running on win 9x or NT, let's just assume that a unicode build only runs on NT */ - RunFileDlg(hMainWnd, 0, NULL, NULL, szText, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, hIcon, NULL, NULL, szText, RFF_CALCDIRECTORY); + + DeleteObject(hIcon); } FreeLibrary(hShell32);

8 years, 12 months

[tkreuzer] 70443: [CRT] Fix handling of NULL buffer in streamout. Fixes a few msvcrt_crt_apitests, while it breaks a few for crtdll. crtdll is broken anyway and obsolete, nothing uses it, so it doe...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 27 18:22:13 2015 New Revision: 70443 URL: http://svn.reactos.org/svn/reactos?rev=70443&view=rev Log: [CRT] Fix handling of NULL buffer in streamout. Fixes a few msvcrt_crt_apitests, while it breaks a few for crtdll. crtdll is broken anyway and obsolete, nothing uses it, so it doesn't really matter. CORE-9105 #resolve Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sun Dec 27 18:22:13 2015 @@ -227,11 +227,10 @@ int streamout_char(FILE *stream, int chr) { -#ifdef _LIBCNT_ - if ((stream->_flag & _IOSTRG) && (!stream->_ptr)) +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) return 1; -#endif - +#endif #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) @@ -254,6 +253,11 @@ TCHAR chr; int written = 0; +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif + while (count--) { #ifdef _UNICODE @@ -276,6 +280,11 @@ { wchar_t chr; int written = 0; + +#if defined(_UNICODE) && !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif while (count--) {

8 years, 12 months

[akhaldi] 70442: [0.4.0] * Merge the ntvdm floppy read/write corruption fix by Hermès in r70424.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 27 17:59:27 2015 New Revision: 70442 URL: http://svn.reactos.org/svn/reactos?rev=70442&view=rev Log: [0.4.0] * Merge the ntvdm floppy read/write corruption fix by Hermès in r70424. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/hardware/disk.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:59:27 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70436-70437 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:59:27 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70436-70437 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 Modified: branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/subsys… ============================================================================== --- branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sun Dec 27 17:59:27 2015 @@ -608,8 +608,8 @@ setAH(0x03); /* Number of 512-byte sectors in CX:DX */ - NumSectors = DiskImage->DiskInfo.Cylinders * DiskImage->DiskInfo.Heads - * DiskImage->DiskInfo.Sectors; + NumSectors = (ULONG)((ULONG)DiskImage->DiskInfo.Cylinders * DiskImage->DiskInfo.Heads) + * DiskImage->DiskInfo.Sectors; setCX(HIWORD(NumSectors)); setDX(LOWORD(NumSectors)); } Modified: branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/subsys… ============================================================================== --- branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sun Dec 27 17:59:27 2015 @@ -342,7 +342,7 @@ /* Set position */ // Compute the offset - FilePointer = ((Cylinder * DiskImage->DiskInfo.Heads + Head) + FilePointer = (DWORD)((DWORD)((DWORD)Cylinder * DiskImage->DiskInfo.Heads + Head) * DiskImage->DiskInfo.Sectors + (Sector - 1)) * DiskImage->DiskInfo.SectorSize; FilePointer = SetFilePointer(DiskImage->hDisk, FilePointer, NULL, FILE_BEGIN); @@ -373,7 +373,7 @@ if (Result != 0x00) return Result; - BytesToRead = NumSectors * DiskImage->DiskInfo.SectorSize; + BytesToRead = (DWORD)NumSectors * DiskImage->DiskInfo.SectorSize; // FIXME: Consider just looping around filling each time the buffer... @@ -434,7 +434,7 @@ if (Result != 0x00) return Result; - BytesToWrite = NumSectors * DiskImage->DiskInfo.SectorSize; + BytesToWrite = (DWORD)NumSectors * DiskImage->DiskInfo.SectorSize; // FIXME: Consider just looping around filling each time the buffer...

8 years, 12 months

[tkreuzer] 70441: [SETUPAPI] Fix invalid use of wcslen with NULL pointer. Should fix crash in setupapi_winetest:install.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 27 17:55:14 2015 New Revision: 70441 URL: http://svn.reactos.org/svn/reactos?rev=70441&view=rev Log: [SETUPAPI] Fix invalid use of wcslen with NULL pointer. Should fix crash in setupapi_winetest:install. Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Dec 27 17:55:14 2015 @@ -1079,7 +1079,9 @@ hr = IShellLinkW_QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); if (SUCCEEDED(hr)) { - Required = (MAX_PATH + wcslen(LinkSubDir) + 1 + wcslen(LinkName)) * sizeof(WCHAR); + Required = (MAX_PATH + 1 + + ((LinkSubDir != NULL) ? wcslen(LinkSubDir) : 0) + + ((LinkName != NULL) ? wcslen(LinkName) : 0)) * sizeof(WCHAR); FullLinkName = MyMalloc(Required); if (!FullLinkName) hr = E_OUTOFMEMORY; @@ -1812,7 +1814,7 @@ if (!GetLineText(hInf, ServiceSection, ServiceBinaryKey, &ServiceBinary)) { - SetLastError( ERROR_BAD_SERVICE_INSTALLSECT ); + SetLastError( ERROR_BAD_SERVICE_INSTALLSECT ); goto cleanup; }

8 years, 12 months

[akhaldi] 70440: [0.4.0] * Merge the enumerating device lists fix by Ged in r70408.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 27 17:49:53 2015 New Revision: 70440 URL: http://svn.reactos.org/svn/reactos?rev=70440&view=rev Log: [0.4.0] * Merge the enumerating device lists fix by Ged in r70408. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/ntoskrnl/io/iomgr/device.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:49:53 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70436-70437 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70436-70437 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:49:53 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70436-70437 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70436-70437 Modified: branches/ros-branch-0_4_0/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_0/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Dec 27 17:49:53 2015 @@ -1088,6 +1088,10 @@ { ULONG ActualDevices = 1; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; + KIRQL OldIrql; + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Find out how many devices we'll enumerate */ while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; @@ -1099,13 +1103,14 @@ *ActualNumberDeviceObjects = ActualDevices; /* Check if we can support so many */ - if ((ActualDevices * 4) > DeviceObjectListSize) + if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize) { /* Fail because the buffer was too small */ + KeLowerIrql(OldIrql); return STATUS_BUFFER_TOO_SMALL; } - /* Check if the caller only wanted the size */ + /* Check if the caller wanted the device list */ if (DeviceObjectList) { /* Loop through all the devices */ @@ -1123,6 +1128,9 @@ DeviceObjectList++; } } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); /* Return the status */ return STATUS_SUCCESS;

8 years, 12 months

[akhaldi] 70439: [0.4.0] * Merge the fix for some usetup localization problems by Hermès in r70436.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 27 17:26:25 2015 New Revision: 70439 URL: http://svn.reactos.org/svn/reactos?rev=70439&view=rev Log: [0.4.0] * Merge the fix for some usetup localization problems by Hermès in r70436. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bg-BG.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bn-BD.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/cs-CZ.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/de-DE.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/el-GR.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/en-US.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/es-ES.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/et-EE.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/fr-FR.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/he-IL.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/it-IT.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ja-JP.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/lt-LT.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ms-MY.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/nl-NL.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pl-PL.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pt-BR.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ro-RO.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ru-RU.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sk-SK.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sq-AL.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sv-SE.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/tr-TR.h branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/uk-UA.h Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:26:25 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70436-70437 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:26:25 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70436-70437 Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -481,6 +481,7 @@ 0 } }; + static MUI_ENTRY bgBGComputerPageEntries[] = { { @@ -839,7 +840,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " « £ ¥ ¥ ªâ " KERNEL_VERSION_STR " . ", TEXT_STYLE_UNDERLINE }, { @@ -1614,7 +1615,6 @@ NULL } }; - MUI_PAGE bgBGPages[] = { @@ -1759,7 +1759,7 @@ {STRING_CHECKINGPART, "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, {STRING_QUITCONTINUE, - "F3= §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, + "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_REBOOTCOMPUTER, "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà "}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY bnBDComputerPageEntries[] = { { @@ -1432,7 +1433,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1743,7 +1744,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -480,6 +480,7 @@ 0 } }; + static MUI_ENTRY csCZComputerPageEntries[] = { { @@ -837,7 +838,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalace ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1440,7 +1441,7 @@ "\n" " \x07 Stisknut¡m F3 ukon¡te instalaci.\n" " \x07 Stisknut¡m ENTER budete pokraovat v instalaci.", - "F3= Ukonit ENTER = Pokraovat" + "F3 = Ukonit ENTER = Pokraovat" }, { //ERROR_NEW_PARTITION, @@ -1609,7 +1610,6 @@ NULL } }; - MUI_PAGE csCZPages[] = { @@ -1752,7 +1752,7 @@ {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."}, {STRING_QUITCONTINUE, - "F3= Ukonit ENTER = Pokraovat"}, + "F3 = Ukonit ENTER = Pokraovat"}, {STRING_REBOOTCOMPUTER, "ENTER = Restartovat po¡ta"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY deDEComputerPageEntries[] = { { @@ -1605,7 +1606,6 @@ NULL } }; - MUI_PAGE deDEPages[] = { Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY elGRComputerPageEntries[] = { { @@ -842,7 +843,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1391,7 +1392,7 @@ "\n" " \x07 «ã©« ENTER ¤ ©¬¤®å©« «¤ ¡«á©«©.\n" " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©.", - "F3= §¦®é¨© ENTER = ¬¤â® " + "F3 = §¦®é¨© ENTER = ¬¤â® " }, { //ERROR_NO_HDD @@ -1457,7 +1458,7 @@ "\n" " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©.\n" " \x07 «ã©« ENTER ¤ ©¬¤®å©«.", - "F3= §¦®é¨© ENTER = ¬¤â® " + "F3 = §¦®é¨© ENTER = ¬¤â® " }, { //ERROR_NEW_PARTITION, @@ -1618,7 +1619,6 @@ NULL } }; - MUI_PAGE elGRPages[] = { @@ -1763,7 +1763,7 @@ {STRING_CHECKINGPART, " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, {STRING_QUITCONTINUE, - "F3= §¦®é¨© ENTER = ¬¤â® "}, + "F3 = §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER, "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -1433,7 +1433,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1744,7 +1744,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -481,6 +481,7 @@ 0 } }; + static MUI_ENTRY esESComputerPageEntries[] = { { @@ -1442,7 +1443,7 @@ "\n" " \x07 Presione F3 para salir del instalador.\n" " \x07 Presione INTRO para continuar.", - "F3= Salir INTRO = Continuar" + "F3 = Salir INTRO = Continuar" }, { //ERROR_NEW_PARTITION, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -69,7 +69,7 @@ { 6, 11, - "Selles paigaldamise osas kopeeritakse ReactOSi failid arvutisse ja", + "Selles paigaldamise osas kopeeritakse ReactOSi failid arvutisse ja", TEXT_STYLE_NORMAL }, { @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY etEEComputerPageEntries[] = { { @@ -730,7 +731,7 @@ { 6, 13, - "Sisesta vormindatud flopiketas draivi A:", + "Sisesta vormindatud flopiketas draivi A:", TEXT_STYLE_NORMAL }, { @@ -830,7 +831,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", TEXT_STYLE_UNDERLINE }, { @@ -970,7 +971,7 @@ { 6, 9, - "Vali kaust, kuhu ReactOS paigaldada:", + "Vali kaust, kuhu ReactOS paigaldada:", TEXT_STYLE_NORMAL }, { @@ -1433,7 +1434,7 @@ "\n" " \x07 Vajuta F3, et vljuda paigaldusest..\n" " \x07 Vajuta ENTER, et jtkata.", - "F3= Vlju ENTER = Jtka" + "F3 = Vlju ENTER = Jtka" }, { //ERROR_NEW_PARTITION, @@ -1517,7 +1518,7 @@ }, { //ERROR_TXTSETUP_SECTION, - "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", + "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", "ENTER = Taaskivita arvuti" }, { @@ -1599,7 +1600,6 @@ NULL } }; - MUI_PAGE etEEPages[] = { @@ -1744,7 +1744,7 @@ {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."}, {STRING_QUITCONTINUE, - "F3= Vlju ENTER = Jtka"}, + "F3 = Vlju ENTER = Jtka"}, {STRING_REBOOTCOMPUTER, "ENTER = Taaskivita arvuti"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -485,6 +485,7 @@ 0 } }; + static MUI_ENTRY frFRComputerPageEntries[] = { { @@ -842,7 +843,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1379,7 +1380,7 @@ "\n" " \x07 Appuyer sur ENTRE pour continuer Setup.\n" " \x07 Appuyer sur F3 pour quitter Setup.", - "F3= Quitter ENTRE = Continuer" + "F3 = Quitter ENTRE = Continuer" }, { //ERROR_NO_HDD @@ -1445,7 +1446,7 @@ "\n" " \x07 Appuyer sur F3 pour quitter Setup.\n" " \x07 Appuyer sur ENTRE pour continuer Setup.", - "F3= Quitter ENTRE = Continuer" + "F3 = Quitter ENTRE = Continuer" }, { //ERROR_NEW_PARTITION, @@ -1614,7 +1615,6 @@ NULL } }; - MUI_PAGE frFRPages[] = { @@ -1757,7 +1757,7 @@ {STRING_CHECKINGPART, "Setup vrifie la partition slectionne."}, {STRING_QUITCONTINUE, - "F3= Quitter ENTRE = Continuer"}, + "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER, "ENTRE = Redmarrer l'ordinateur"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY heILComputerPageEntries[] = { { @@ -1433,7 +1434,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1745,7 +1746,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= ENTER = "}, + "F3 = ENTER = "}, {STRING_REBOOTCOMPUTER, "ENTER = "}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY itITComputerPageEntries[] = { { @@ -835,9 +836,9 @@ static MUI_ENTRY itITConfirmDeletePartitionEntries[] = { { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1308,7 +1309,7 @@ { 11, 19, - "ATTENZIONE: Tutti i dati di questa partizione saranno persi!!", + "ATTENZIONE: Tutti i dati di questa partizione saranno persi!!", TEXT_STYLE_NORMAL }, { @@ -1374,7 +1375,7 @@ "\n" " \x07 Premere INVIO per continuare il setup.\n" " \x07 Premere F3 per uscire.", - "F3= Uscire INVIO = Continuare" + "F3 = Uscire INVIO = Continuare" }, { //ERROR_NO_HDD @@ -1440,7 +1441,7 @@ "\n" " \x07 Premere F3 per uscire dal Setup.\n" " \x07 Premere INVIO per continuare.", - "F3= Uscire INVIO = Continuare" + "F3 = Uscire INVIO = Continuare" }, { //ERROR_NEW_PARTITION, @@ -1609,7 +1610,6 @@ NULL } }; - MUI_PAGE itITPages[] = { @@ -1754,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, {STRING_QUITCONTINUE, - "F3= Esci INVIO = Continua"}, + "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, "INVIO = Riavvia il computer"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY jaJPComputerPageEntries[] = { { @@ -831,7 +832,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", TEXT_STYLE_UNDERLINE }, { @@ -1434,7 +1435,7 @@ "\n" " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3 ·°¦ µ¼Ã ¸ÀÞ»²¡\n" " \x07 ¿Þ¯º³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", - "F3= Á³¼ ENTER = ¿Þ¯º³" + "F3 = Á³¼ ENTER = ¿Þ¯º³" }, { //ERROR_NEW_PARTITION, @@ -1747,7 +1748,7 @@ {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, {STRING_QUITCONTINUE, - "F3= Á³¼ ENTER = ¿Þ¯º³"}, + "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, "ENTER = ºÝËß°ÀÉ »²·ÄÞ³"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -482,6 +482,7 @@ 0 } }; + static MUI_ENTRY ltLTComputerPageEntries[] = { { @@ -839,7 +840,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", TEXT_STYLE_UNDERLINE }, { @@ -1442,7 +1443,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1611,7 +1612,6 @@ NULL } }; - MUI_PAGE ltLTPages[] = { @@ -1754,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY msMYComputerPageEntries[] = { { @@ -1332,7 +1333,7 @@ "\n" " \x07 Tekan F3 untuk keluar persediaan.\n" " \x07 Tekan ENTER untuk teruskan.", - "F3= Keluar ENTER = Teruskan" + "F3 = Keluar ENTER = Teruskan" }, { //ERROR_NEW_PARTITION, @@ -1632,7 +1633,7 @@ {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."}, {STRING_QUITCONTINUE, - "F3= Keluar ENTER = Teruskan"}, + "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, "ENTER = Memulakan semuala komputer"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -500,6 +500,7 @@ 0 } }; + static MUI_ENTRY nlNLComputerPageEntries[] = { { @@ -1641,7 +1642,6 @@ NULL } }; - MUI_PAGE nlNLPages[] = { Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -483,6 +483,7 @@ 0 } }; + static MUI_ENTRY plPLComputerPageEntries[] = { { @@ -840,7 +841,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalator ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1377,7 +1378,7 @@ "\n" " \x07 Nacinij ENTER, aby kontynuowa instalacj©.\n" " \x07 Nacinij F3, aby wyj z instalatora.", - "F3= Wyjcie ENTER = Kontynuacja" + "F3 = Wyjcie ENTER = Kontynuacja" }, { //ERROR_NO_HDD @@ -1443,7 +1444,7 @@ "\n" " \x07 Nacinij F3, aby wyj z instalatora.\n" " \x07 Nacinij ENTER, aby kontynuowa.", - "F3= Wyjcie ENTER = Kontynuacja" + "F3 = Wyjcie ENTER = Kontynuacja" }, { //ERROR_NEW_PARTITION, @@ -1754,7 +1755,7 @@ {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."}, {STRING_QUITCONTINUE, - "F3= Wyjcie ENTER = Kontynuacja"}, + "F3 = Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY ptBRComputerPageEntries[] = { { @@ -849,7 +850,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -528,6 +528,7 @@ 0 } }; + static MUI_ENTRY roROComputerPageEntries[] = { { @@ -885,7 +886,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalare ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1418,7 +1419,7 @@ //ERROR_NOT_INSTALLED "ReactOS nu a fost instalat complet în calculatorul\n" "dumneavoastrã. Dacã abandonaþi instalarea ReactOS\n" - "acum, va fi nevoie sã o reluaþi din nou altã datã.\n" + "acum, va fi nevoie sã o reluaþi din nou altã datã.\n" "\n" " \x07 Apãsaþi ENTER pentru a continua instalarea.\n" " \x07 Apãsaþi F3 pentru a abandona instalarea.", @@ -1452,37 +1453,37 @@ { //ERROR_DRIVE_INFORMATION "Nu se pot obþine informaþii despre dispozitiv(ele)\n" - "din calculator.\n", + "din calculator.\n", "ENTER = Repornire calculator" }, { //ERROR_WRITE_BOOT, "Nu s-a reuºit instalarea codului FAT de iniþializare\n" - "pe partiþia de sistem.", + "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_COMPUTER, "A eºuat încãrcarea listei cu arhitecturi de\n" - "calcul disponibile.", + "calcul disponibile.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_DISPLAY, "A eºuat încãrcarea listei cu parametri de\n" - "afiºare pentru ecran.", + "afiºare pentru ecran.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_KEYBOARD, "A eºuat încãrcarea listei cu tipuri\n" - "disponibile de tastaturã.", + "disponibile de tastaturã.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_KBLAYOUT, "A eºuat încãrcarea listei de configuraþii\n" - "ale tastaturii.", + "ale tastaturii.", "ENTER = Repornire calculator" }, { @@ -1491,11 +1492,11 @@ "nerecunoscutã, ce nu pot fi gestionatã corespunzãtor!\n" "\n" "Crearea sau ºtergerea de partiþii poate astfel cauza\n" - "distrugerea tabelei de partiþii." + "distrugerea tabelei de partiþii." "\n" " \x07 Apãsaþi F3 pentru a abandona instalarea.\n" " \x07 Apãsaþi ENTER pentru a continua.", - "F3= Ieºire ENTER = Continuare" + "F3 = Ieºire ENTER = Continuare" }, { //ERROR_NEW_PARTITION, @@ -1516,7 +1517,7 @@ { //ERROR_INSTALL_BOOTCODE, "Nu s-a reuºit instalarea codului FAT de iniþializare\n" - "pe partiþia de sistem.", + "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { @@ -1532,18 +1533,18 @@ { //ERROR_UPDATE_DISPLAY_SETTINGS, "Nu s-a reuºit actualizarea registrului cu\n" - "parametrii grafici ai ecranului!", + "parametrii grafici ai ecranului!", "ENTER = Repornire calculator" }, { //ERROR_IMPORT_HIVE, - "Nu s-a reuºit importarea registrului.", + "Nu s-a reuºit importarea registrului.", "ENTER = Repornire calculator" }, { //ERROR_FIND_REGISTRY "Fiºierele cu datele registrului\n" - "nu au putut fi localizate.", + "nu au putut fi localizate.", "ENTER = Repornire calculator" }, { @@ -1559,7 +1560,7 @@ { //ERROR_INVALID_CABINET_INF, "Fiºierul cabinet nu conþine nici un fiºier\n" - "valid de tip inf.", + "valid de tip inf.", "ENTER = Repornire calculator" }, { @@ -1570,13 +1571,13 @@ { //ERROR_CABINET_SCRIPT, "Fiºierul cabinet nu conþine nici un script\n" - "de instalare.", + "de instalare.", "ENTER = Repornire calculator" }, { //ERROR_COPY_QUEUE, "Nu se poate deschide lista de fiºiere\n" - "pentru copiere.", + "pentru copiere.", "ENTER = Repornire calculator" }, { @@ -1587,7 +1588,7 @@ { //ERROR_TXTSETUP_SECTION, "Nu se poate gãsi secþiunea de directoare\n" - "în fiºierul TXTSETUP.SIF.", + "în fiºierul TXTSETUP.SIF.", "ENTER = Repornire calculator" }, { @@ -1814,7 +1815,7 @@ {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."}, {STRING_QUITCONTINUE, - "F3= Ieºire ENTER = Continuare"}, + "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, "ENTER = Repornire calculator"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY ruRUComputerPageEntries[] = { { @@ -1602,7 +1603,6 @@ NULL } }; - MUI_PAGE ruRUPages[] = { Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -480,6 +480,7 @@ 0 } }; + static MUI_ENTRY skSKComputerPageEntries[] = { { @@ -838,7 +839,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1613,7 +1614,6 @@ NULL } }; - MUI_PAGE skSKPages[] = { @@ -1758,7 +1758,7 @@ {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblas."}, {STRING_QUITCONTINUE, - "F3= Skoni ENTER = Pokraova"}, + "F3 = Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER, "ENTER = Reçtart po¡taa"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -476,6 +476,7 @@ 0 } }; + static MUI_ENTRY sqALComputerPageEntries[] = { { @@ -834,7 +835,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1437,7 +1438,7 @@ "\n" " \x07 Kliko F3 pr daljen nga instalimi.\n" " \x07 Kliko ENTER pr t vazhduar.", - "F3= Dil ENTER = Vazhdo" + "F3 = Dil ENTER = Vazhdo" }, { //ERROR_NEW_PARTITION, @@ -1750,7 +1751,7 @@ {STRING_CHECKINGPART, "Instalimi tani sht duke kontrolluar particionin e przgjedhur."}, {STRING_QUITCONTINUE, - "F3= Dil ENTER = Vazhdo"}, + "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, "ENTER = Ristarto kompjuterin"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY svSEComputerPageEntries[] = { { @@ -1374,7 +1375,7 @@ "\n" " \x07 Tryck ENTER fr att fortstta Setup.\n" " \x07 Tryck F3 fr att avsluta Setup.", - "F3= Avsluta ENTER = Fortstta" + "F3 = Avsluta ENTER = Fortstta" }, { //ERROR_NO_HDD @@ -1440,7 +1441,7 @@ "\n" " \x07 Tryck F3 fr att avsluta Setup." " \x07 Tryck ENTER fr att fortstta.", - "F3= Avsluta ENTER = Fortstt" + "F3 = Avsluta ENTER = Fortstt" }, { //ERROR_NEW_PARTITION, @@ -1753,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup undersker nu den valda partitionen."}, {STRING_QUITCONTINUE, - "F3= Avsluta ENTER = Fortstt"}, + "F3 = Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER, "ENTER = Starta om datorn"}, {STRING_TXTSETUPFAILED, Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -361,7 +361,7 @@ { 25, 16, - "Bu aygt ayarlarn do§rula.", + "Bu aygt ayarlarn do§rula.", TEXT_STYLE_NORMAL }, { @@ -376,7 +376,7 @@ "basarak de§itirebilirsiniz. Sonra baka ayarlar semek iin Giri", TEXT_STYLE_NORMAL }, - { + { 6, 21, "d§mesine basnz.", @@ -920,7 +920,7 @@ "Blm Biimlendirme", TEXT_STYLE_NORMAL }, - { + { 6, 10, "Kur, imdi blm biimlendirecek. Srdrmek iin Giri'e basnz.", @@ -1000,7 +1000,7 @@ "ReactOS Kur, ReactOS kurulum dizininize ktkleri o§altrken", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, - { + { 0, 13, " ltfen bekleyiniz.", @@ -1408,7 +1408,7 @@ { //ERROR_WARN_PARTITION, "Kur, dzgn ynetilemeyen bir uyumsuz blm tablosu ieren en az\n" - "bir sbit disk buldu!\n" + "bir sbit disk buldu!\n" "\n" "Blmleri oluturmak vey silmek blm tablosunu yok edebilir.\n" "\n" Modified: branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Dec 27 17:26:25 2015 @@ -478,6 +478,7 @@ 0 } }; + static MUI_ENTRY ukUAComputerPageEntries[] = { { @@ -836,7 +837,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1440,7 +1441,7 @@ "\n" " \x07 â¨áiâì F3 ¤«ï ¢¨å®¤ã § ¢áâ ®¢«î¢ ç .\n" " \x07 â¨áiâì ENTER é®¡ ¯à®¤®¢¦¨â¨.", - "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨" + "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨" }, { //ERROR_NEW_PARTITION, @@ -1753,7 +1754,7 @@ {STRING_CHECKINGPART, "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, {STRING_QUITCONTINUE, - "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, + "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"}, {STRING_TXTSETUPFAILED,

8 years, 12 months

[akhaldi] 70438: [0.4.0] * Merge msgina's text improvements by Henry Tang Ih in r70437. CORE-10720

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 27 17:23:26 2015 New Revision: 70438 URL: http://svn.reactos.org/svn/reactos?rev=70438&view=rev Log: [0.4.0] * Merge msgina's text improvements by Henry Tang Ih in r70437. CORE-10720 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:23:26 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 27 17:23:26 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70437 Modified: branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Dec 27 17:23:26 2015 @@ -33,7 +33,7 @@ COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 @@ -46,11 +46,11 @@ LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "What do you want to do?", IDC_STATIC, 10, 119, 255, 8 - PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14 - PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 - PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 + PUSHBUTTON "Loc&k Computer", IDC_LOCK, 10, 135, 76, 14 + PUSHBUTTON "&Log Off...", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 189, 135, 76, 14 + PUSHBUTTON "&Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "&Task Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Cancel", IDCANCEL, 189, 154, 76, 14 END

8 years, 12 months

← Newer
1
2
3
4
5
6
7
...
26
Older →

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 December 2015