Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70442: [0.4.0] * Merge the ntvdm floppy read/write corruption fix by Hermès in r70424.
by akhaldi＠svn.reactos.org 27 Dec '15

27 Dec '15

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...

1 0

[tkreuzer] 70441: [SETUPAPI] Fix invalid use of wcslen with NULL pointer. Should fix crash in setupapi_winetest:install.
by tkreuzer＠svn.reactos.org 27 Dec '15

27 Dec '15

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; }

1 0

[akhaldi] 70440: [0.4.0] * Merge the enumerating device lists fix by Ged in r70408.
by akhaldi＠svn.reactos.org 27 Dec '15

27 Dec '15

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;

1 0

[akhaldi] 70439: [0.4.0] * Merge the fix for some usetup localization problems by Hermès in r70436.
by akhaldi＠svn.reactos.org 27 Dec '15

27 Dec '15

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,

1 0

[akhaldi] 70438: [0.4.0] * Merge msgina's text improvements by Henry Tang Ih in r70437. CORE-10720
by akhaldi＠svn.reactos.org 27 Dec '15

27 Dec '15

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

1 0

[ekohl] 70437: [MSGINA] Improve msgina's text in ReactOS. Patch by Henry Tang Ih. CORE-10720 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: ekohl Date: Sun Dec 27 16:36:32 2015 New Revision: 70437 URL: http://svn.reactos.org/svn/reactos?rev=70437&view=rev Log: [MSGINA] Improve msgina's text in ReactOS. Patch by Henry Tang Ih. CORE-10720 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Dec 27 16:36:32 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

1 0

[hbelusca] 70436: [USETUP]: Fix some localization problems.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 15:22:39 2015 New Revision: 70436 URL: http://svn.reactos.org/svn/reactos?rev=70436&view=rev Log: [USETUP]: Fix some localization problems. Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Dec 27 15:22:39 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY deDEComputerPageEntries[] = { { @@ -1605,7 +1606,6 @@ NULL } }; - MUI_PAGE deDEPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Dec 27 15:22:39 2015 @@ -500,6 +500,7 @@ 0 } }; + static MUI_ENTRY nlNLComputerPageEntries[] = { { @@ -1641,7 +1642,6 @@ NULL } }; - MUI_PAGE nlNLPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY ruRUComputerPageEntries[] = { { @@ -1602,7 +1603,6 @@ NULL } }; - MUI_PAGE ruRUPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Dec 27 15:22:39 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: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Dec 27 15:22:39 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,

1 0

[hbelusca] 70435: Fix build.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 02:04:09 2015 New Revision: 70435 URL: http://svn.reactos.org/svn/reactos?rev=70435&view=rev Log: Fix build. 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 02:04:09 2015 @@ -376,7 +376,7 @@ // 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", ret); + DPRINT1("No need to check FS; fs_close returning %d\n", (unsigned int)ret); return STATUS_SUCCESS; } @@ -439,8 +439,8 @@ /* Close the volume */ // NOTE: Returning the value of fs_close looks suspicious. // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - res = fs_close(FixErrors); - DPRINT1("fs_close returning %d\n", ret); + ret = fs_close(FixErrors); + DPRINT1("fs_close returning %d\n", (unsigned int)ret); return STATUS_SUCCESS; }

1 0

[hbelusca] 70434: [VFATLIB] It seems suspicious to directly return the value of fs_close as the NTSTATUS code of the check-disk operation (for FAT32 volumes it happens to return 1 whereas for FAT16...
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 02:01:52 2015 New Revision: 70434 URL: http://svn.reactos.org/svn/reactos?rev=70434&view=rev Log: [VFATLIB] It seems suspicious to directly return the value of fs_close as the NTSTATUS code of the check-disk operation (for FAT32 volumes it happens to return 1 whereas for FAT16 volumes it returns 0). The documentation of this function says that it "returns a non-zero integer if the file system has been changed since the last fs_open, zero otherwise." Maybe somebody has a more precise idea on that subject? In the meantime I also add some DPRINTs to attempt to diagnose the conditions where this problem occurs. 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 02:01:52 2015 @@ -351,6 +351,7 @@ BOOLEAN salvage_files; ULONG free_clusters; DOS_FS fs; + int ret; /* Store callback pointer */ ChkdskCallback = Callback; @@ -372,7 +373,11 @@ if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ - return fs_close(FALSE); + // 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", ret); + return STATUS_SUCCESS; } read_boot(&fs); @@ -404,6 +409,8 @@ if (fs_changed()) { + DPRINT1("fs_changed is TRUE!\n"); + if (FixErrors) { if (FsCheckFlags & FSCHECK_INTERACTIVE) @@ -430,7 +437,11 @@ } /* Close the volume */ - return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + // NOTE: Returning the value of fs_close looks suspicious. + // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + res = fs_close(FixErrors); + DPRINT1("fs_close returning %d\n", ret); + return STATUS_SUCCESS; } /* EOF */

1 0

[hbelusca] 70433: [VFATLIB] - Gather common code in one file instead of duplicating it everywhere. - Implement full format for FAT12 and FAT16 (using the same function Fat1216WipeSectors), based on...
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 00:57:51 2015 New Revision: 70433 URL: http://svn.reactos.org/svn/reactos?rev=70433&view=rev Log: [VFATLIB] - Gather common code in one file instead of duplicating it everywhere. - Implement full format for FAT12 and FAT16 (using the same function Fat1216WipeSectors), based on similar code for FAT32 implemented by Eric Kohl in revision 63693. Added: trunk/reactos/lib/fslib/vfatlib/common.c (with props) trunk/reactos/lib/fslib/vfatlib/common.h (with props) Modified: trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/CMakeLis… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -7,6 +7,7 @@ check/file.c check/io.c check/lfn.c + common.c fat12.c fat16.c fat32.c Added: 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 (added) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -0,0 +1,136 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VFAT filesystem library + * FILE: lib\fslib\vfatlib\common.c + * PURPOSE: Common code for Fat support + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Eric Kohl + */ + +/* INCLUDES *******************************************************************/ + +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +ULONG +GetShiftCount(IN ULONG Value) +{ + ULONG i = 1; + + while (Value > 0) + { + i++; + Value /= 2; + } + + return i - 2; +} + +ULONG +CalcVolumeSerialNumber(VOID) +{ + LARGE_INTEGER SystemTime; + TIME_FIELDS TimeFields; + ULONG Serial; + PUCHAR Buffer; + + NtQuerySystemTime(&SystemTime); + RtlTimeToTimeFields(&SystemTime, &TimeFields); + + Buffer = (PUCHAR)&Serial; + Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); + Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); + Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); + Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); + + return Serial; +} + +/***** Wipe function for FAT12 and FAT16 formats, adapted from FAT32 code *****/ +NTSTATUS +Fat1216WipeSectors( + IN HANDLE FileHandle, + IN PFAT16_BOOT_SECTOR BootSector, + IN OUT PFORMAT_CONTEXT Context) +{ + IO_STATUS_BLOCK IoStatusBlock; + PUCHAR Buffer; + LARGE_INTEGER FileOffset; + ULONGLONG Sector; + ULONG SectorsHuge; + ULONG Length; + NTSTATUS Status; + + /* Allocate buffer for the cluster */ + Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BootSector->SectorsPerCluster * BootSector->BytesPerSector); + if (Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Sector = 0; + Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; + + SectorsHuge = (BootSector->SectorsHuge != 0 ? BootSector->SectorsHuge : BootSector->Sectors); + + while (Sector + BootSector->SectorsPerCluster < SectorsHuge) + { + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + + Sector += BootSector->SectorsPerCluster; + } + + if (Sector + BootSector->SectorsPerCluster > SectorsHuge) + { + DPRINT("Remaining sectors %lu\n", SectorsHuge - Sector); + + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + Length = (SectorsHuge - Sector) * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, SectorsHuge - Sector); + } + +done: + /* Free the buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/lib/fslib/vfatlib/common.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/vfatlib/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.h… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.h (added) +++ trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VFAT filesystem library + * FILE: lib\fslib\vfatlib\common.h + * PURPOSE: Common code for Fat support + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Eric Kohl + */ + +#ifndef _VFATCOMMON_H_ +#define _VFATCOMMON_H_ + +ULONG GetShiftCount(IN ULONG Value); +ULONG CalcVolumeSerialNumber(VOID); + +NTSTATUS +Fat1216WipeSectors( + IN HANDLE FileHandle, + IN PFAT16_BOOT_SECTOR BootSector, + IN OUT PFORMAT_CONTEXT Context); + +#endif /* _VFATCOMMON_H_ */ + +/* EOF */ Propchange: trunk/reactos/lib/fslib/vfatlib/common.h ------------------------------------------------------------------------------ svn:eol-style = native 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 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat12 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime(&SystemTime); - RtlTimeToTimeFields(&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat12WriteBootSector(IN HANDLE FileHandle, @@ -323,7 +291,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -357,6 +325,20 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = Fat1216WipeSectors(FileHandle, + &BootSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("Fat12WipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat12WriteBootSector(FileHandle, &BootSector, Context); @@ -396,10 +378,5 @@ DPRINT("Fat12WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } 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 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat16 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat16WriteBootSector(IN HANDLE FileHandle, @@ -330,7 +298,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -365,6 +333,20 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = Fat1216WipeSectors(FileHandle, + &BootSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("Fat16WipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat16WriteBootSector(FileHandle, &BootSector, Context); @@ -404,10 +386,5 @@ DPRINT("Fat16WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } 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 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat32 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat32WriteBootSector(IN HANDLE FileHandle, @@ -490,7 +458,7 @@ BootSector.BootBackup = 6; BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; - BootSector.VolumeID = CalcVolumeSerialNumber (); + BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) { memcpy(&BootSector.VolumeLabel[0], "NO NAME ", 11); 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 00:57:51 2015 @@ -4,13 +4,17 @@ * FILE: lib\fslib\vfatlib\vfatlib.c * PURPOSE: Main API * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> + + +/* GLOBALS & FUNCTIONS ********************************************************/ PFMIFSCALLBACK ChkdskCallback = NULL; PVOID FsCheckMemQueue; @@ -282,7 +286,7 @@ if (Callback != NULL) { Context.Success = (BOOLEAN)(NT_SUCCESS(Status)); - Callback (DONE, 0, (PVOID)&Context.Success); + Callback(DONE, 0, (PVOID)&Context.Success); } DPRINT("VfatFormat() done. Status 0x%.08x\n", Status); @@ -307,7 +311,7 @@ Context->Percent = NewPercent; if (Context->Callback != NULL) { - Context->Callback (PROGRESS, 0, &Context->Percent); + Context->Callback(PROGRESS, 0, &Context->Percent); } } } 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 00:57:51 2015 @@ -57,7 +57,6 @@ unsigned long Signature1; // 508 } FAT16_BOOT_SECTOR, *PFAT16_BOOT_SECTOR; - typedef struct _FAT32_BOOT_SECTOR { unsigned char magic0; // 0 @@ -114,6 +113,8 @@ ULONG Percent; } FORMAT_CONTEXT, *PFORMAT_CONTEXT; +#include "common.h" + NTSTATUS Fat12Format(HANDLE FileHandle,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs