Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/01: [FONT][WIN32SS] Improve readability of IntGdiGetFontResourceInfo (#945)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2410bcb133e3651da775a… commit 2410bcb133e3651da775a699850efc84d4be2835 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:58:03 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:58:03 2018 +0900 [FONT][WIN32SS] Improve readability of IntGdiGetFontResourceInfo (#945) Make it human friendly code. --- win32ss/gdi/ntgdi/freetype.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 10fb8655d7..aca18ccd6c 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5063,7 +5063,7 @@ IntGdiGetFontResourceInfo( DWORD dwType) { UNICODE_STRING EntryFileName; - POBJECT_NAME_INFORMATION NameInfo1, NameInfo2; + POBJECT_NAME_INFORMATION NameInfo1 = NULL, NameInfo2 = NULL; PLIST_ENTRY ListEntry; PFONT_ENTRY FontEntry; ULONG Size, i, Count; @@ -5071,47 +5071,46 @@ IntGdiGetFontResourceInfo( BOOL IsEqual; FONTFAMILYINFO *FamInfo; const ULONG MaxFamInfo = 64; + const ULONG MAX_FAM_INFO_BYTES = sizeof(FONTFAMILYINFO) * MaxFamInfo; BOOL bSuccess; + const ULONG NAMEINFO_SIZE = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); DPRINT("IntGdiGetFontResourceInfo: dwType == %lu\n", dwType); - /* Create buffer for full path name */ - Size = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); - NameInfo1 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo1) + do { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + /* Create buffer for full path name */ + NameInfo1 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF); + if (!NameInfo1) + break; - /* Get the full path name */ - if (!IntGetFullFileName(NameInfo1, Size, FileName)) - { - ExFreePoolWithTag(NameInfo1, TAG_FINF); - return FALSE; - } + /* Get the full path name */ + if (!IntGetFullFileName(NameInfo1, NAMEINFO_SIZE, FileName)) + break; - /* Create a buffer for the entries' names */ - NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo2) - { - ExFreePoolWithTag(NameInfo1, TAG_FINF); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + /* Create a buffer for the entries' names */ + NameInfo2 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF); + if (!NameInfo2) + break; - FamInfo = ExAllocatePoolWithTag(PagedPool, - sizeof(FONTFAMILYINFO) * MaxFamInfo, - TAG_FINF); - if (!FamInfo) + FamInfo = ExAllocatePoolWithTag(PagedPool, MAX_FAM_INFO_BYTES, TAG_FINF); + } while (0); + + if (!NameInfo1 || !NameInfo2 || !FamInfo) { - ExFreePoolWithTag(NameInfo2, TAG_FINF); - ExFreePoolWithTag(NameInfo1, TAG_FINF); + if (NameInfo2) + ExFreePoolWithTag(NameInfo2, TAG_FINF); + + if (NameInfo1) + ExFreePoolWithTag(NameInfo1, TAG_FINF); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - /* Try to find the pathname in the global font list */ + Count = 0; + + /* Try to find the pathname in the global font list */ IntLockGlobalFonts(); for (ListEntry = g_FontListHead.Flink; ListEntry != &g_FontListHead; ListEntry = ListEntry->Flink) @@ -5121,7 +5120,7 @@ IntGdiGetFontResourceInfo( continue; RtlInitUnicodeString(&EntryFileName , FontEntry->Font->Filename); - if (!IntGetFullFileName(NameInfo2, Size, &EntryFileName)) + if (!IntGetFullFileName(NameInfo2, NAMEINFO_SIZE, &EntryFileName)) continue; if (!RtlEqualUnicodeString(&NameInfo1->Name, &NameInfo2->Name, FALSE))

5 years, 11 months

01/01: [WIN32SS][MENU] Fix menu text Y positioning (#887)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3545475f91e666dc0dd6f… commit 3545475f91e666dc0dd6f79430ffb216c2417175 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:54:41 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:54:41 2018 +0900 [WIN32SS][MENU] Fix menu text Y positioning (#887) Fix the vertical position of menu bar text. CORE-15094 --- win32ss/user/ntuser/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 48d9dcc169..f4159030cc 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2099,7 +2099,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd //TRACE("lprect %p %s\n", lprect, wine_dbgstr_rect( lprect)); lppop->cxMenu = lprect->right - lprect->left; lppop->cyMenu = 0; - maxY = lprect->top+1; + maxY = lprect->top; start = 0; helpPos = ~0U; lppop->cxTextAlign = 0; @@ -2140,7 +2140,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd start = i; /* This works! */ } - lprect->bottom = maxY; + lprect->bottom = maxY + 1; lppop->cyMenu = lprect->bottom - lprect->top; /* Flush right all items between the MF_RIGHTJUSTIFY and */

5 years, 11 months

01/01: [SHIMGVW] Play gif animation (#934)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=375a78e70680718d4525b… commit 375a78e70680718d4525b89d1ec061844b3f10e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 19:51:30 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 19:51:30 2018 +0900 [SHIMGVW] Play gif animation (#934) Make "Picture and Fax Viewer" able to play GIF animation. CORE-12680 --- dll/win32/shimgvw/shimgvw.c | 180 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 3 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 8339b66b16..683e9b3c7e 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -9,6 +9,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define INITGUID #include <stdarg.h> @@ -31,7 +32,6 @@ #include "shimgvw.h" - HINSTANCE hInstance; SHIMGVW_SETTINGS shiSettings; SHIMGVW_FILENODE *currentFile; @@ -49,6 +49,137 @@ static const UINT ZoomSteps[] = 10, 25, 50, 100, 200, 400, 800, 1600 }; +/* animation */ +UINT m_nFrameIndex = 0; +UINT m_nFrameCount = 0; +UINT m_nLoopIndex = 0; +UINT m_nLoopCount = (UINT)-1; +PropertyItem *m_pDelayItem = NULL; + +#define ANIME_TIMER_ID 9999 + +static void Anime_FreeInfo(void) +{ + if (m_pDelayItem) + { + free(m_pDelayItem); + m_pDelayItem = NULL; + } + m_nFrameIndex = 0; + m_nFrameCount = 0; + m_nLoopIndex = 0; + m_nLoopCount = (UINT)-1; +} + +static BOOL Anime_LoadInfo(void) +{ + GUID *dims; + UINT nDimCount = 0; + UINT cbItem; + UINT result; + PropertyItem *pItem; + + Anime_FreeInfo(); + KillTimer(hDispWnd, ANIME_TIMER_ID); + + if (!image) + return FALSE; + + GdipImageGetFrameDimensionsCount(image, &nDimCount); + if (nDimCount) + { + dims = (GUID *)calloc(nDimCount, sizeof(GUID)); + if (dims) + { + GdipImageGetFrameDimensionsList(image, dims, nDimCount); + GdipImageGetFrameCount(image, dims, &result); + m_nFrameCount = result; + free(dims); + } + } + + result = 0; + GdipGetPropertyItemSize(image, PropertyTagFrameDelay, &result); + cbItem = result; + if (cbItem) + { + m_pDelayItem = (PropertyItem *)malloc(cbItem); + GdipGetPropertyItem(image, PropertyTagFrameDelay, cbItem, m_pDelayItem); + } + + result = 0; + GdipGetPropertyItemSize(image, PropertyTagLoopCount, &result); + cbItem = result; + if (cbItem) + { + pItem = (PropertyItem *)malloc(cbItem); + if (pItem) + { + if (GdipGetPropertyItem(image, PropertyTagLoopCount, cbItem, pItem) == Ok) + { + m_nLoopCount = *(WORD *)pItem->value; + } + free(pItem); + } + } + + if (m_pDelayItem) + { + SetTimer(hDispWnd, ANIME_TIMER_ID, 0, NULL); + } + + return m_pDelayItem != NULL; +} + +static void Anime_SetFrameIndex(UINT nFrameIndex) +{ + if (nFrameIndex < m_nFrameCount) + { + GUID guid = FrameDimensionTime; + if (Ok != GdipImageSelectActiveFrame(image, &guid, nFrameIndex)) + { + guid = FrameDimensionPage; + GdipImageSelectActiveFrame(image, &guid, nFrameIndex); + } + } + m_nFrameIndex = nFrameIndex; +} + +DWORD Anime_GetFrameDelay(UINT nFrameIndex) +{ + if (nFrameIndex < m_nFrameCount && m_pDelayItem) + { + return ((DWORD *)m_pDelayItem->value)[m_nFrameIndex] * 10; + } + return 0; +} + +BOOL Anime_Step(DWORD *pdwDelay) +{ + *pdwDelay = INFINITE; + if (m_nLoopCount == (UINT)-1) + return FALSE; + + if (m_nFrameIndex + 1 < m_nFrameCount) + { + *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); + Anime_SetFrameIndex(m_nFrameIndex); + ++m_nFrameIndex; + return TRUE; + } + + if (m_nLoopCount == 0 || m_nLoopIndex < m_nLoopCount) + { + *pdwDelay = Anime_GetFrameDelay(m_nFrameIndex); + Anime_SetFrameIndex(m_nFrameIndex); + m_nFrameIndex = 0; + ++m_nLoopIndex; + return TRUE; + } + + return FALSE; +} + static void ZoomInOrOut(BOOL bZoomIn) { INT i; @@ -171,6 +302,7 @@ static void pLoadImage(LPWSTR szOpenFileName) DPRINT1("GdipLoadImageFromFile() failed\n"); return; } + Anime_LoadInfo(); /* reset zoom */ ResetZoom(); @@ -257,9 +389,26 @@ static void pSaveImageAs(HWND hwnd) if (GetSaveFileNameW(&sfn)) { - if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + if (m_pDelayItem) + { + /* save animation */ + KillTimer(hDispWnd, ANIME_TIMER_ID); + + DPRINT1("FIXME: save animation\n"); + if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + { + DPRINT1("GdipSaveImageToFile() failed\n"); + } + + SetTimer(hDispWnd, ANIME_TIMER_ID, 0, NULL); + } + else { - DPRINT1("GdipSaveImageToFile() failed\n"); + /* save non-animation */ + if (GdipSaveImageToFile(image, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) + { + DPRINT1("GdipSaveImageToFile() failed\n"); + } } } @@ -595,6 +744,19 @@ ImageView_CreateToolBar(HWND hwnd) return FALSE; } +static void ImageView_OnTimer(HWND hwnd) +{ + DWORD dwDelay; + + KillTimer(hwnd, ANIME_TIMER_ID); + InvalidateRect(hwnd, NULL, TRUE); + + if (Anime_Step(&dwDelay)) + { + SetTimer(hwnd, ANIME_TIMER_ID, dwDelay, NULL); + } +} + LRESULT CALLBACK ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -605,6 +767,15 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ImageView_DrawImage(hwnd); return 0L; } + case WM_TIMER: + { + if (wParam == ANIME_TIMER_ID) + { + ImageView_OnTimer(hwnd); + return 0; + } + break; + } } return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); } @@ -874,6 +1045,9 @@ ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) if (image) GdipDisposeImage(image); + + Anime_FreeInfo(); + GdiplusShutdown(gdiplusToken); return -1; }

5 years, 11 months

01/01: [REGEDIT] Improve the layout of controls (#967)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efbebf983cc1708eca691… commit efbebf983cc1708eca69194fa6461d6d54622707 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 18:19:48 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 18:19:48 2018 +0900 [REGEDIT] Improve the layout of controls (#967) The horizontal scroll bar of the listview was wrongly hidden. CORE-15187 --- base/applications/regedit/childwnd.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index b1fb9fd0c5..e6511fc03f 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -42,7 +42,9 @@ extern void ResizeWnd(int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(4); RECT rt, rs, rb; - const int tHeight = 22; + const int nButtonWidth = 44; + const int nButtonHeight = 22; + int cyEdge = GetSystemMetrics(SM_CYEDGE); const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE; SetRect(&rt, 0, 0, cx, cy); cy = 0; @@ -56,22 +58,26 @@ extern void ResizeWnd(int cx, int cy) if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, NULL, rt.left, rt.top, - rt.right - rt.left - 2*tHeight, tHeight, + rt.right - rt.left - nButtonWidth, nButtonHeight, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, NULL, - rt.right - 2*tHeight, rt.top, - 2*tHeight, tHeight, + rt.right - nButtonWidth, rt.top, + nButtonWidth, nButtonHeight, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, NULL, - rt.left, rt.top + tHeight + 2, - g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left, rt.bottom - rt.top - cy, + rt.left, + rt.top + nButtonHeight + cyEdge, + g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left, + rt.bottom - rt.top - cy - 2 * cyEdge, uFlags); if (hdwp) hdwp = DeferWindowPos(hdwp, g_pChildWnd->hListWnd, NULL, - rt.left + cx, rt.top + tHeight + 2, - rt.right - cx, rt.bottom - rt.top - cy, + rt.left + cx, + rt.top + nButtonHeight + cyEdge, + rt.right - cx, + rt.bottom - rt.top - cy - 2 * cyEdge, uFlags); if (hdwp) EndDeferWindowPos(hdwp);

5 years, 11 months

01/01: [REGEDIT] Don't paint background in WM_PAINT (#970)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4c2cff6c8ba1bb6a61e8… commit e4c2cff6c8ba1bb6a61e89e0dd3527e255c81eb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 24 18:17:28 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 24 18:17:28 2018 +0900 [REGEDIT] Don't paint background in WM_PAINT (#970) Use the background brush or WM_ERASEBKGND message instead. There was graphical glidge. CORE-15187 --- base/applications/regedit/childwnd.c | 15 --------------- base/applications/regedit/main.c | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 3afe53a740..b1fb9fd0c5 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -105,17 +105,6 @@ static void draw_splitbar(HWND hWnd, int x) ReleaseDC(hWnd, hdc); } -static void OnPaint(HWND hWnd) -{ - PAINTSTRUCT ps; - RECT rt; - - GetClientRect(hWnd, &rt); - BeginPaint(hWnd, &ps); - FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); - EndPaint(hWnd, &ps); -} - /******************************************************************************* * finish_splitbar [internal] * @@ -384,7 +373,6 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) * PURPOSE: Processes messages for the child windows. * * WM_COMMAND - process the application menu - * WM_PAINT - Paint the main window * WM_DESTROY - post a quit message and return * */ @@ -449,9 +437,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; } break; - case WM_PAINT: - OnPaint(hWnd); - return 0; case WM_SETCURSOR: if (LOWORD(lParam) == HTCLIENT) { diff --git a/base/applications/regedit/main.c b/base/applications/regedit/main.c index e8cdc02561..fc187689ec 100644 --- a/base/applications/regedit/main.c +++ b/base/applications/regedit/main.c @@ -71,6 +71,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); wcFrame.hCursor = LoadCursorW(NULL, IDC_ARROW); + wcFrame.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wcFrame.lpszClassName = szFrameClass; hFrameWndClass = RegisterClassExW(&wcFrame); /* register frame window class */

5 years, 11 months

02/02: [USETUP] Reshuffle a bit the main-function of USetup.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dffe964a3f7b5af7e627… commit 3dffe964a3f7b5af7e6277707ae97d78c8d755f2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 9 16:37:53 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:55:16 2018 +0200 [USETUP] Reshuffle a bit the main-function of USetup. svn path=/branches/setup_improvements/; revision=74975 --- base/setup/usetup/usetup.c | 57 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index d83be76f24..9170b23225 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4855,16 +4855,22 @@ PnpEventThread(IN LPVOID lpParameter); /* * The start routine and page management */ -VOID +NTSTATUS RunUSetup(VOID) { + NTSTATUS Status; INPUT_RECORD Ir; PAGE_NUMBER Page; - LARGE_INTEGER Time; - NTSTATUS Status; BOOLEAN Old; - NtQuerySystemTime(&Time); + InfSetHeap(ProcessHeap); + +#if 0 + /* Tell the Cm this is a setup boot, and it has to behave accordingly */ + Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); + if (!NT_SUCCESS(Status)) + DPRINT1("NtInitializeRegistry() failed (Status 0x%08lx)\n", Status); +#endif /* Create the PnP thread in suspended state */ Status = RtlCreateUserThread(NtCurrentProcess(), @@ -4886,9 +4892,8 @@ RunUSetup(VOID) PrintString(MUIGetString(STRING_CONSOLEFAIL2)); PrintString(MUIGetString(STRING_CONSOLEFAIL3)); - /* Raise a hard error (crash the system/BSOD) */ - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, - 0,0,0,0,0); + /* We failed to initialize the video, just quit the installer */ + return STATUS_APP_INIT_FAILURE; } /* Initialize global unicode strings */ @@ -5065,26 +5070,50 @@ RunUSetup(VOID) FreeConsole(); - /* Avoid bugcheck */ - Time.QuadPart += 50000000; - NtDelayExecution(FALSE, &Time); - /* Reboot */ RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); NtShutdownSystem(ShutdownReboot); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); - NtTerminateProcess(NtCurrentProcess(), 0); + + return STATUS_SUCCESS; } VOID NTAPI NtProcessStartup(PPEB Peb) { + NTSTATUS Status; + LARGE_INTEGER Time; + RtlNormalizeProcessParams(Peb->ProcessParameters); ProcessHeap = Peb->ProcessHeap; - InfSetHeap(ProcessHeap); - RunUSetup(); + + NtQuerySystemTime(&Time); + + Status = RunUSetup(); + + if (NT_SUCCESS(Status)) + { + /* + * Avoid a bugcheck if RunUSetup() finishes too quickly by implementing + * a protective waiting. + * This wait is needed because, since we are started as SMSS.EXE, + * the NT kernel explicitly waits 5 seconds for the initial process + * SMSS.EXE to initialize (as a protective measure), and otherwise + * bugchecks with the code SESSION5_INITIALIZATION_FAILED. + */ + Time.QuadPart += 50000000; + NtDelayExecution(FALSE, &Time); + } + else + { + /* The installer failed to start: raise a hard error (crash the system/BSOD) */ + Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, + 0, 0, NULL, 0, NULL); + } + + NtTerminateProcess(NtCurrentProcess(), Status); } /* EOF */

5 years, 11 months

01/02: [USETUP] The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fd27d34a51d4086d509d… commit 3fd27d34a51d4086d509d5bffd6d7db29dc4001e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 8 02:01:56 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:55:13 2018 +0200 [USETUP] The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only. svn path=/branches/setup_improvements/; revision=74951 --- base/setup/usetup/usetup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 410e25753a..d83be76f24 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -93,7 +93,8 @@ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; -static WCHAR DestinationDriveLetter; // FIXME: Is it really useful?? +// FIXME: Is it really useful?? Just used for SetDefaultPagefile... +static WCHAR DestinationDriveLetter; static HINF SetupInf; @@ -1527,7 +1528,6 @@ IsDiskSizeValid(PPARTENTRY PartEntry) * QuitPage * * SIDEEFFECTS - * Init DestinationDriveLetter (only if unattended or not free space is selected) * Set InstallShortcut (only if not unattended + free space is selected) * * RETURNS @@ -1594,8 +1594,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1611,8 +1609,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1707,8 +1703,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ @@ -3254,6 +3248,9 @@ BuildInstallPaths(PWSTR InstallDir, PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); + + /* Initialize DestinationDriveLetter */ + DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; }

5 years, 11 months

04/04: [USETUP] Whitespace fixes only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b714cbe6a1ed5126b40e… commit 0b714cbe6a1ed5126b40ef1701f028729e6d82de Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue May 23 21:01:10 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:54 2018 +0200 [USETUP] Whitespace fixes only. svn path=/branches/setup_improvements/; revision=74636 svn path=/branches/setup_improvements/; revision=74639 --- base/setup/usetup/cabinet.c | 4 +- base/setup/usetup/consup.c | 10 ++--- base/setup/usetup/lang/it-IT.h | 84 +++++++++++++++++++++--------------------- base/setup/usetup/lang/nl-NL.h | 4 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/base/setup/usetup/cabinet.c b/base/setup/usetup/cabinet.c index 8cc35aa796..f6bc22b485 100644 --- a/base/setup/usetup/cabinet.c +++ b/base/setup/usetup/cabinet.c @@ -765,7 +765,7 @@ CabinetFindNext(PCAB_SEARCH Search) Search->CFData = NULL; Search->Offset = 0; } - + /* don't match the file we started with */ if (wcscmp(Search->Search, L"*") == 0) { @@ -1033,7 +1033,7 @@ CabinetExtractFile(PCAB_SEARCH Search) CurrentOffset += CFData->UncompSize; CFData = (PCFDATA)((char *)(CFData + 1) + DataReserved + CFData->CompSize); } - + Search->CFData = CFData; Search->Offset = CurrentOffset; diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 4103c0a0f9..3c4bf3d011 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -685,11 +685,11 @@ CONSOLE_SetStyledText( if (Flags & TEXT_ALIGN_CENTER) { - coPos.X = (xScreen - Length) /2; + coPos.X = (xScreen - Length) /2; } else if(Flags & TEXT_ALIGN_RIGHT) { - coPos.X = coPos.X - Length; + coPos.X = coPos.X - Length; if (Flags & TEXT_PADDING_SMALL) { @@ -697,7 +697,7 @@ CONSOLE_SetStyledText( } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X -= 2; + coPos.X -= 2; } else if (Flags & TEXT_PADDING_BIG) { @@ -712,8 +712,8 @@ CONSOLE_SetStyledText( } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X += 2; - } + coPos.X += 2; + } else if (Flags & TEXT_PADDING_BIG) { coPos.X += 3; diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index f4e00ed7d6..e7da50725e 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -56,7 +56,7 @@ static MUI_ENTRY itITLanguagePageEntries[] = static MUI_ENTRY itITWelcomePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -92,7 +92,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = TEXT_STYLE_NORMAL }, { - 8, + 8, 19, "\x07 Premere L per vedere i termini e condizioni della licenza.", TEXT_STYLE_NORMAL @@ -104,14 +104,14 @@ static MUI_ENTRY itITWelcomePageEntries[] = TEXT_STYLE_NORMAL }, { - 6, + 6, 23, "Per maggiori informazioni riguardo ReactOS, visitate il sito:", TEXT_STYLE_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_STYLE_HIGHLIGHT }, @@ -188,7 +188,7 @@ static MUI_ENTRY itITIntroPageEntries[] = { 0, 0, - "ENTER = Continua F3 = Termina", + "INVIO = Continua F3 = Termina", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -202,7 +202,7 @@ static MUI_ENTRY itITIntroPageEntries[] = static MUI_ENTRY itITLicensePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -279,43 +279,43 @@ static MUI_ENTRY itITLicensePageEntries[] = "della licenza GNU GPL con ReactOS, visiti il sito:", TEXT_STYLE_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 22, "Garanzia:", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 24, "Questo software \x8A libero; vedere il codice per le condizioni di copia.", TEXT_STYLE_NORMAL }, - { + { 8, 25, "NON esiste garanzia; n\x8A di COMMERCIABILIT\x85", TEXT_STYLE_NORMAL }, - { + { 8, 26, "o adeguatezza ad un uso particolare", TEXT_STYLE_NORMAL }, - { + { 0, 0, " INVIO = Ritorna", TEXT_TYPE_STATUS }, - { + { 0, 0, NULL, @@ -326,13 +326,13 @@ static MUI_ENTRY itITLicensePageEntries[] = static MUI_ENTRY itITDevicePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { - 6, + 6, 8, "L'elenco che segue mostra le impostazioni correnti delle periferiche.", TEXT_STYLE_NORMAL @@ -368,7 +368,7 @@ static MUI_ENTRY itITDevicePageEntries[] = TEXT_STYLE_NORMAL }, { - 25, + 25, 16, "Accettare queste impostazioni", TEXT_STYLE_NORMAL }, @@ -379,25 +379,25 @@ static MUI_ENTRY itITDevicePageEntries[] = TEXT_STYLE_NORMAL }, { - 6, - 20, + 6, + 20, "e modificarlo premendo INVIO per selezionare un valore alternativo.", TEXT_STYLE_NORMAL }, { - 6, + 6, 21, " ", TEXT_STYLE_NORMAL }, { - 6, - 23, + 6, + 23, "Quando le impostazioni saranno corrette, selezionare", TEXT_STYLE_NORMAL }, { - 6, + 6, 24, "\"Accettare queste impostazioni\" e premere INVIO.", TEXT_STYLE_NORMAL @@ -419,7 +419,7 @@ static MUI_ENTRY itITDevicePageEntries[] = static MUI_ENTRY itITRepairPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -483,7 +483,7 @@ static MUI_ENTRY itITRepairPageEntries[] = static MUI_ENTRY itITComputerPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -499,7 +499,7 @@ static MUI_ENTRY itITComputerPageEntries[] = 10, "\x07 Premere i tasti SU e GI\xEB per scegliere il tipo.", TEXT_STYLE_NORMAL - }, + }, { 8, 11, @@ -535,7 +535,7 @@ static MUI_ENTRY itITComputerPageEntries[] = static MUI_ENTRY itITFlushPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -575,7 +575,7 @@ static MUI_ENTRY itITFlushPageEntries[] = static MUI_ENTRY itITQuitPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -621,7 +621,7 @@ static MUI_ENTRY itITQuitPageEntries[] = static MUI_ENTRY itITDisplayPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -672,7 +672,7 @@ static MUI_ENTRY itITDisplayPageEntries[] = static MUI_ENTRY itITSuccessPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -718,7 +718,7 @@ static MUI_ENTRY itITSuccessPageEntries[] = static MUI_ENTRY itITBootPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -765,7 +765,7 @@ static MUI_ENTRY itITBootPageEntries[] = static MUI_ENTRY itITSelectPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -835,7 +835,7 @@ static MUI_ENTRY itITSelectPartitionEntries[] = static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -935,7 +935,7 @@ static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = static MUI_ENTRY itITFormatPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -969,7 +969,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = static MUI_ENTRY itITInstallDirectoryEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1021,7 +1021,7 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = static MUI_ENTRY itITFileCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1061,7 +1061,7 @@ static MUI_ENTRY itITFileCopyEntries[] = static MUI_ENTRY itITBootLoaderEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1113,7 +1113,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = static MUI_ENTRY itITKeyboardSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1165,7 +1165,7 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = static MUI_ENTRY itITLayoutSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1218,7 +1218,7 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = static MUI_ENTRY itITPrepareCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1247,7 +1247,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = static MUI_ENTRY itITSelectFSEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1294,7 +1294,7 @@ static MUI_ENTRY itITSelectFSEntries[] = static MUI_ENTRY itITDeletePartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 773598de21..d3872cc8f8 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -44,7 +44,7 @@ static MUI_ENTRY nlNLLanguagePageEntries[] = }, { 8, - 13, + 13, "\x07 Deze taal wordt later als standaard taal door het systeem gebruikt.", TEXT_STYLE_NORMAL }, @@ -1475,7 +1475,7 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + //ERROR_DELETE_SPACE, "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" "\n" " * Druk op een willekeurige toets om door te gaan.", diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 1b35608c7d..a28ecefabb 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1054,7 +1054,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] = { 50, 0, - "\xB3 Por favor, aguarde...", + "\xB3 Por favor, aguarde...", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 59ed8c9b4d..2874983dca 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1,4 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) * DATE OF TR: 29-11-2013 */ diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index f6fac58029..b3a370e607 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Setup - * FILE: base/setup/usetup/lang/sv-SE.h + * FILE: base/setup/usetup/lang/sv-SE.h * PURPOSE: Swedish resource file * Translation: Jaix Bly plus perhaps GreatLord if blame and translate.reactos.se is consulted. */ diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index ed011e9f29..63e780c64d 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1415,7 +1415,7 @@ MUI_ERROR trTRErrorEntries[] = //ERROR_WARN_PARTITION, "Kur, d�zg�n y�netilemeyen bir uyumsuz b�l�m tablosu i�eren en az\n" "bir s�bit disk buldu!\n" - "\n" + "\n" "B�l�mleri olu�turmak vey� silmek b�l�m tablosunu yok edebilir.\n" "\n" " \x07 Kur'dan ��kmak i�in F3'e bas�n�z.\n" diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 424d8d5f90..fdb4dcf692 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1,7 +1,7 @@ /* * translated by Artem Reznikov, Igor Paliychuk, 2010 * http://www.reactos.org/uk/ - */ + */ #pragma once

5 years, 11 months

03/04: [USETUP] Small formatting changes + two functions turned into FORCEINLINE.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=043a024d613b6153dc0f5… commit 043a024d613b6153dc0f5e7576b0a84b9d76917d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:34:03 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:54 2018 +0200 [USETUP] Small formatting changes + two functions turned into FORCEINLINE. Based on: svn path=/branches/setup_improvements/; revision=74616 --- base/setup/lib/partlist.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 71fd77a005..f5e062b6cb 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -107,15 +107,13 @@ GetDriverName( WCHAR KeyName[32]; NTSTATUS Status; - RtlInitUnicodeString(&DiskEntry->DriverName, - NULL); + RtlInitUnicodeString(&DiskEntry->DriverName, NULL); RtlStringCchPrintfW(KeyName, ARRAYSIZE(KeyName), L"\\Scsi\\Scsi Port %hu", DiskEntry->Port); - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); QueryTable[0].Name = L"Driver"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; @@ -364,7 +362,7 @@ EnumerateBiosDiskEntries( } AdapterCount = 0; - while (1) + while (TRUE) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), L"%s\\%lu", @@ -389,7 +387,7 @@ EnumerateBiosDiskEntries( NULL); if (NT_SUCCESS(Status)) { - while (1) + while (TRUE) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), L"%s\\%lu\\DiskController\\0", @@ -421,7 +419,7 @@ EnumerateBiosDiskEntries( QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; DiskCount = 0; - while (1) + while (TRUE) { BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); if (BiosDiskEntry == NULL) @@ -828,7 +826,7 @@ SetDiskSignature( Buffer = (PUCHAR)&DiskEntry->LayoutBuffer->Signature; - while (1) + while (TRUE) { NtQuerySystemTime(&SystemTime); RtlTimeToTimeFields(&SystemTime, &TimeFields); @@ -1264,7 +1262,6 @@ CreatePartitionList(VOID) if (NT_SUCCESS(Status)) { AddDiskToList(FileHandle, DiskNumber, List); - NtClose(FileHandle); } } @@ -1755,7 +1752,8 @@ GetPrevPartition( return NULL; } -static +// static +FORCEINLINE BOOLEAN IsEmptyLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo) @@ -1769,7 +1767,8 @@ IsEmptyLayoutEntry( return FALSE; } -static +// static +FORCEINLINE BOOLEAN IsSamePrimaryLayoutEntry( IN PPARTITION_INFORMATION PartitionInfo,

5 years, 11 months

02/04: [USETUP] Rename some of the uninformative "STRING_HDDINFOUNKx" string labels into more informative ones.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c616b625d620e7683112… commit 3c616b625d620e7683112affdf3ed02b661be425 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:17:24 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:53 2018 +0200 [USETUP] Rename some of the uninformative "STRING_HDDINFOUNKx" string labels into more informative ones. - Also, reserve a new field to display whether the disk is MBR or GPT-initialized. - Adjust the code that used the "STRING_HDDINFOUNKx" string labels. The extra slot added to some of the strings is to indicate whether the disk is MBR or GPT. As attentive readers will notice, the code that "determines" whether the disk is either MBR or GPT is of course just temporary: it's just a placeholder code that should currently just show "MBR". Having the NoMbr flag mostly signifies that the disk is uninitialized. A GPT disk also has a MBR but it's for "backcompatibility" / "protective" reasons (so that MBR-only tools would see the disk as just a big 1-partitioned only disk with which they could barely do anything). A real involved test for the nature of the disk should involve calling the correct IOCTLs in the disk detection code in partlist.c . This is for the future (and when ReactOS will better support GPT disks). svn path=/branches/setup_improvements/; revision=74614 svn path=/branches/setup_improvements/; revision=74615 --- base/setup/usetup/lang/bg-BG.h | 32 ++++++++++----------- base/setup/usetup/lang/bn-BD.h | 32 ++++++++++----------- base/setup/usetup/lang/cs-CZ.h | 32 ++++++++++----------- base/setup/usetup/lang/da-DK.h | 32 ++++++++++----------- base/setup/usetup/lang/de-DE.h | 32 ++++++++++----------- base/setup/usetup/lang/el-GR.h | 32 ++++++++++----------- base/setup/usetup/lang/en-US.h | 36 +++++++++++++----------- base/setup/usetup/lang/es-ES.h | 32 ++++++++++----------- base/setup/usetup/lang/et-EE.h | 32 ++++++++++----------- base/setup/usetup/lang/fr-FR.h | 32 ++++++++++----------- base/setup/usetup/lang/he-IL.h | 32 ++++++++++----------- base/setup/usetup/lang/it-IT.h | 32 ++++++++++----------- base/setup/usetup/lang/ja-JP.h | 32 ++++++++++----------- base/setup/usetup/lang/lt-LT.h | 32 ++++++++++----------- base/setup/usetup/lang/ms-MY.h | 32 ++++++++++----------- base/setup/usetup/lang/nl-NL.h | 32 ++++++++++----------- base/setup/usetup/lang/pl-PL.h | 32 ++++++++++----------- base/setup/usetup/lang/pt-BR.h | 32 ++++++++++----------- base/setup/usetup/lang/ro-RO.h | 32 ++++++++++----------- base/setup/usetup/lang/ru-RU.h | 32 ++++++++++----------- base/setup/usetup/lang/sk-SK.h | 32 ++++++++++----------- base/setup/usetup/lang/sq-AL.h | 32 ++++++++++----------- base/setup/usetup/lang/sv-SE.h | 32 ++++++++++----------- base/setup/usetup/lang/tr-TR.h | 32 ++++++++++----------- base/setup/usetup/lang/uk-UA.h | 32 ++++++++++----------- base/setup/usetup/mui.h | 26 ++++++++--------- base/setup/usetup/partlist.c | 10 ++++--- base/setup/usetup/usetup.c | 64 ++++++++++++++++++++++-------------------- 28 files changed, 457 insertions(+), 447 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 803de8a23c..01fc9482e9 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1810,28 +1810,28 @@ MUI_STRING bgBGStrings[] = " ��ଠ�࠭� �� 﫠 �� %S 䠩�� ।�� "}, {STRING_KEEPFORMAT, " �� 䠩�� ।�� (�� ஬��) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c �� 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "�� %I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %wZ."}, - {STRING_HDDINFOUNK3, - "�� %I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu)."}, - {STRING_HDINFOPARTZEROED, - "�� %lu (%I64u %s), ��=%hu, ��=%hu, ��=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "�� %I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "�� %I64u %s �� %lu (��=%hu, ��=%hu, ��=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "�� %lu (%I64u %s), ��=%hu, ��=%hu, ��=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c �� 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "�� %lu (%I64u %s), ��=%hu, ��=%hu, ��=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "�� %lu (%I64u %s), ��=%hu, ��=%hu, ��=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %s�� %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s �� %lu (��=%hu, ��=%hu, ��=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s �� %lu (��=%hu, ��=%hu, ��=%hu) �� %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s �� %lu (��=%hu, ��=%hu, ��=%hu) [%s]"}, {STRING_NEWPARTITION, "�� ꧤ�� "}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 145c0e86d0..689e88c2e2 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1795,28 +1795,28 @@ MUI_STRING bnBDStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 10e517619f..82a5691d78 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1803,28 +1803,28 @@ MUI_STRING csCZStrings[] = " Zform�tovat odd�l na souborov� syst�m %S "}, {STRING_KEEPFORMAT, " Ponechat sou�asn� souborov� syst�m (bez zm�ny) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK3, - "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Instalace vytvo�ila nov� odd�l na"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 9e1d724f2d..5e5c1ba35c 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1809,28 +1809,28 @@ MUI_STRING daDKStrings[] = " Formater partitionen som %S-filesystemet "}, {STRING_KEEPFORMAT, " Behold nuv�rende filsystem (ingen �ndringer) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "p� %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ."}, - {STRING_HDDINFOUNK3, - "p� %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "p� %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "p� %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "p� harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "p� harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %stype %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Installationen har lavet en ny partition p�"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index afc257b78b..abd84927c3 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1799,28 +1799,28 @@ MUI_STRING deDEStrings[] = " Partition mit dem %S-Dateisystem formatieren "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Ver�nderungen) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFOUNK3, - "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup erstellte eine neue Partition auf"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index ec8edb65f3..8431842f50 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1814,28 +1814,28 @@ MUI_STRING elGRStrings[] = " ��樭ਫ਼ �� partition � %S �穫�� "}, {STRING_KEEPFORMAT, " �� 夜� �� 穫�� ⮜� (�� ) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "�� 婡�� %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "�� 婡�� %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "�� 婡� %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "�� 婡� %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s �� 婡�� %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "� ��ᩫ�� 稚�� ⤘ �� partition ��"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index b8b5665d9c..396a009a95 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1795,28 +1795,32 @@ MUI_STRING enUSStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTZEROED_2, + // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTEXISTS_2, + // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 5e43233d52..569fd5ef75 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1799,28 +1799,28 @@ MUI_STRING esESStrings[] = " Formatear la partici�n con sistema de archivos %S "}, {STRING_KEEPFORMAT, " Mantener el sistema de archivos actual (sin cambios) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ."}, - {STRING_HDDINFOUNK3, - "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "El instalador ha creado una nueva partici�n en"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index e61b71ae53..87ccc8bcb5 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1795,28 +1795,28 @@ MUI_STRING etEEStrings[] = " Vorminda partitsioon %S failis�steemiga "}, {STRING_KEEPFORMAT, " �ra muuda praegust failis�steemi "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ."}, - {STRING_HDDINFOUNK3, - "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "K�vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "%I64u %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "K�vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "K�vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "K�vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sT��p %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s K�vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Loodi uus partitsioon"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 8363184f8c..ed74aec94c 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1814,28 +1814,28 @@ MUI_STRING frFRStrings[] = " Formater la partition comme syst�me de fichiers %S "}, {STRING_KEEPFORMAT, " Garder le syst�me de fichiers courant (pas de changements) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ."}, - {STRING_HDDINFOUNK3, - "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup a cr�� une nouvelle partition sur"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 8c3e4ce198..75a192a864 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1797,28 +1797,28 @@ MUI_STRING heILStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index c95073e10d..f4e00ed7d6 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1802,28 +1802,28 @@ MUI_STRING itITStrings[] = " Formatta la partizione con file system %S "}, {STRING_KEEPFORMAT, " Mantieni il file system attuale (nessuna modifica) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, - {STRING_HDDINFOUNK3, - "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup ha creato una nuova partizione su"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 0cbb7c52e6..52fc2c785d 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1799,28 +1799,28 @@ MUI_STRING jaJPStrings[] = " �߰è��ݦ %S ̧�� ̫�ϯ� "}, {STRING_KEEPFORMAT, " ��ݻ޲� ̧�� (�ݺ� �Ų) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c ��ٲ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "ʰ��ި�� %lu (%I64u %s), �߰�=%hu, �޽=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "ʰ��ި�� %lu (%I64u %s), �߰�=%hu, �޽=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c ��ٲ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on ʰ��ި�� %lu (%I64u %s), �߰�=%hu, �޽=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on ʰ��ި�� %lu (%I64u %s), �߰�=%hu, �޽=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %s��ٲ %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s ʰ��ި�� %lu (�߰�=%hu, �޽=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "��ı�� ׼� �߰è��ݦ ·�� ϼ�:"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 86b3bec27b..d5fc64768d 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1805,28 +1805,28 @@ MUI_STRING ltLTStrings[] = " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 7b76c4f81f..e7ef24f2fb 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1684,28 +1684,28 @@ MUI_STRING msMYStrings[] = " Format partition seperti sistem fail %S "}, {STRING_KEEPFORMAT, " Memastikan sistem fail semasa (tiada perubahan) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Persediaan yang dicipta partition yang baru di"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index cfcc71fce4..773598de21 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1825,28 +1825,28 @@ MUI_STRING nlNLStrings[] = " Formatteer partitie als %S bestandssysteem "}, {STRING_KEEPFORMAT, " Behoud huidig bestandssysteem (geen wijzigingen) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."}, - {STRING_HDDINFOUNK3, - "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup heeft een nieuwe partitie aangemaakt op"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 1849b809fe..5de776e8a9 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1806,28 +1806,28 @@ MUI_STRING plPLStrings[] = " Sformatuj partycj� z systemem plik�w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik�w (bez zmian) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Dysk 02 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Dysk 02 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c 03Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "na %I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK3, - "na %I64u %s Dysku 05 Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "na %I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "na %I64u %s Dysku 05 Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c 07Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %s09Typ %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Dysk11 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Dysk11 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Instalator utworzy� now� partycj�"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 0d9f7b3f37..1b35608c7d 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1829,28 +1829,28 @@ MUI_STRING ptBRStrings[] = " Formatar a parti��o utilizando o sistema de arquivos %S "}, {STRING_KEEPFORMAT, " Manter o sistema de arquivos atual (sem altera��es) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."}, - {STRING_HDDINFOUNK3, - "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Tipo 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTipo %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "O instalador criou uma nova parti��o em"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 457ba53ba3..443688b697 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1849,28 +1849,28 @@ MUI_STRING roROStrings[] = " Formateaz� parti�ia ca sistem de fi�iere %S "}, {STRING_KEEPFORMAT, " P�streaz� sistemul de fi�iere actual (f�r� schimb�ri) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Tip 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ."}, - {STRING_HDDINFOUNK3, - "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Tip 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTip %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "O nou� parti�ie a fost creat� �n"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 52e9b81da6..bfb351b2fd 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1796,28 +1796,28 @@ MUI_STRING ruRUStrings[] = " ��ଠ�஢�� ࠧ�� 䠩�� ⥬� %S "}, {STRING_KEEPFORMAT, " ��⠢�� 䠩�� ⥬� (�� ) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c �� 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %wZ."}, - {STRING_HDDINFOUNK3, - "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "��⪨� �� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "��⪨� �� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c �� 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "�� ⪮� ��᪥ %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "�� ⪮� ��᪥ %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %s�� %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) �� %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "�ணࠬ�� ⠭�� ᮧ�� ࠧ�� :"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index d44fcb9ac0..b347d8638e 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1809,28 +1809,28 @@ MUI_STRING skSKStrings[] = " Naform�tova� oblas� ako syst�m s�borov %S "}, {STRING_KEEPFORMAT, " Ponecha� s��asn� syst�m s�borov (bez zmeny) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s pevn� disk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s pevn� disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ."}, - {STRING_HDDINFOUNK3, - "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "pevn� disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "pevn� disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %styp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s pevn� disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s pevn� disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "In�tal�tor vytvoril nov� oblas� na"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 13c7c105a9..59ed8c9b4d 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1802,28 +1802,28 @@ MUI_STRING sqALStrings[] = " Formato particionin si %S dokumentat e sistemit"}, {STRING_KEEPFORMAT, " Mbaj dokumentat e sistemit siq jan� (pa ndryshime) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Tipi 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Tipi 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTipi %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Instalimi krijoj nj� particion t� ri n�"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 15c3f493a7..f6fac58029 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1805,28 +1805,28 @@ MUI_STRING svSEStrings[] = " Formaterar partition som %S filsystem "}, {STRING_KEEPFORMAT, " Beh�ll nuvarande filsystem (inga f�r�ndringar) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "on %I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ."}, - {STRING_HDDINFOUNK3, - "on %I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "H�rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "on %I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "on %I64u %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "H�rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Typ 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "p� H�rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "p� H�rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sTyp %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p� %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s H�rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "Setup skapade en ny partition p�"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index e61abbbdb3..ed011e9f29 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1776,28 +1776,28 @@ MUI_STRING trTRStrings[] = " B�l�m� %S k�t�k dizgesiyle bi�imlendir. "}, {STRING_KEEPFORMAT, " �imdiki k�t�k dizgesini koru. (De�i�iklik yok.) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ �zerinde."}, - {STRING_HDDINFOUNK1, - "%I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ �zerinde [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c T�r 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "�zerinde: %I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ �zerinde."}, - {STRING_HDDINFOUNK3, - "�zerinde: %I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu)."}, - {STRING_HDINFOPARTZEROED, - "S�bit Disk %lu (%I64u %s), Giri�=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "�zerinde: %I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ �zerinde [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "�zerinde: %I64u %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "S�bit Disk %lu (%I64u %s), Giri�=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c T�r 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "�zerinde: S�bit Disk %lu (%I64u %s), Giri�=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "�zerinde: S�bit Disk %lu (%I64u %s), Giri�=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sT�r %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %S �zerinde"}, - {STRING_HDDINFOUNK6, - "%6lu %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ �zerinde [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s S�bit Disk %lu (Giri�=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"}, {STRING_NEWPARTITION, "Kur, �zerinde bir yeni b�l�m olu�turdu:"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 12f3ce1bef..424d8d5f90 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1805,28 +1805,28 @@ MUI_STRING ukUAStrings[] = " ��ଠ�㢠� ஧�i� � 䠩��i� ��⥬i %S "}, {STRING_KEEPFORMAT, " �� i�� 䠩�� ⥬� (�� i�) "}, - {STRING_HDINFOPARTCREATE, - "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK1, - "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)."}, + {STRING_HDINFOPARTCREATE_1, + "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTCREATE_2, + "%I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]."}, {STRING_HDDINFOUNK2, " %c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTDELETE, - "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFOUNK3, - "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)."}, - {STRING_HDINFOPARTZEROED, - "��⪨� �� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTDELETE_1, + "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %wZ [%s]."}, + {STRING_HDINFOPARTDELETE_2, + "�� %I64u %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]."}, + {STRING_HDINFOPARTZEROED_1, + "��⪨� �� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, - {STRING_HDINFOPARTEXISTS, - "�� ⪮�� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ)."}, + {STRING_HDINFOPARTEXISTS_1, + "�� ⪮�� %lu (%I64u %s), ��=%hu, ��=%hu, Id=%hu (%wZ) [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, - {STRING_HDINFOPARTSELECT, - "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %S"}, - {STRING_HDDINFOUNK6, - "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu)"}, + {STRING_HDINFOPARTSELECT_1, + "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) on %wZ [%s]"}, + {STRING_HDINFOPARTSELECT_2, + "%6lu %s ��⪨� �� %lu (��=%hu, ��=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, "��⠭��� �⢮ਢ �� ஧�i� ��"}, {STRING_UNPSPACE, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 707bb80076..a823c33206 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -100,9 +100,9 @@ MUIGetString( #define STRING_PLEASEWAIT 1 #define STRING_INSTALLCREATEPARTITION 2 -#define STRING_INSTALLCREATELOGICAL 60 +#define STRING_INSTALLCREATELOGICAL 60 #define STRING_INSTALLDELETEPARTITION 3 -#define STRING_DELETEPARTITION 59 +#define STRING_DELETEPARTITION 59 #define STRING_PARTITIONSIZE 4 #define STRING_CHOOSENEWPARTITION 5 #define STRING_CHOOSE_NEW_EXTENDED_PARTITION 57 @@ -111,8 +111,8 @@ MUIGetString( #define STRING_CREATEPARTITION 7 #define STRING_PARTFORMAT 8 #define STRING_NONFORMATTEDPART 9 -#define STRING_NONFORMATTEDSYSTEMPART 62 -#define STRING_NONFORMATTEDOTHERPART 63 +#define STRING_NONFORMATTEDSYSTEMPART 62 +#define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 #define STRING_CONTINUE 12 @@ -137,22 +137,22 @@ MUIGetString( #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 -#define STRING_HDINFOPARTCREATE 36 -#define STRING_HDDINFOUNK1 37 +#define STRING_HDINFOPARTCREATE_1 36 +#define STRING_HDINFOPARTCREATE_2 37 #define STRING_HDDINFOUNK2 38 -#define STRING_HDINFOPARTDELETE 39 -#define STRING_HDDINFOUNK3 40 -#define STRING_HDINFOPARTZEROED 41 +#define STRING_HDINFOPARTDELETE_1 39 +#define STRING_HDINFOPARTDELETE_2 40 +#define STRING_HDINFOPARTZEROED_1 41 #define STRING_HDDINFOUNK4 42 -#define STRING_HDINFOPARTEXISTS 43 +#define STRING_HDINFOPARTEXISTS_1 43 #define STRING_HDDINFOUNK5 44 -#define STRING_HDINFOPARTSELECT 45 -#define STRING_HDDINFOUNK6 46 +#define STRING_HDINFOPARTSELECT_1 45 +#define STRING_HDINFOPARTSELECT_2 46 #define STRING_NEWPARTITION 47 #define STRING_UNPSPACE 48 #define STRING_MAXSIZE 49 #define STRING_UNFORMATTED 50 -#define STRING_EXTENDED_PARTITION 58 +#define STRING_EXTENDED_PARTITION 58 #define STRING_FORMATUNUSED 51 #define STRING_FORMATUNKNOWN 52 #define STRING_KB 53 diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 6feb52b80f..5ae9edc88d 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -458,25 +458,27 @@ PrintDiskData( if (DiskEntry->DriverName.Length > 0) { sprintf(LineBuffer, - MUIGetString(STRING_HDINFOPARTSELECT), + MUIGetString(STRING_HDINFOPARTSELECT_1), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DriverName.Buffer); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { sprintf(LineBuffer, - MUIGetString(STRING_HDDINFOUNK6), + MUIGetString(STRING_HDINFOPARTSELECT_2), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } if (ListUi->Line >= 0 && ListUi->Line <= Height) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index eea168791e..410e25753a 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2022,25 +2022,27 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2179,25 +2181,27 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2335,25 +2339,27 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDINFOPARTCREATE), + MUIGetString(STRING_HDINFOPARTCREATE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFOUNK1), + MUIGetString(STRING_HDINFOPARTCREATE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2572,25 +2578,27 @@ DeletePartitionPage(PINPUT_RECORD Ir) if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDINFOPARTDELETE), + MUIGetString(STRING_HDINFOPARTDELETE_1), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } else { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFOUNK3), + MUIGetString(STRING_HDINFOPARTDELETE_2), DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, - DiskEntry->Id); + DiskEntry->Id, + DiskEntry->NoMbr ? "GPT" : "MBR"); } while (TRUE) @@ -2802,14 +2810,15 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartTypeString); #endif - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1), DiskEntry->DiskNumber, DiskSize, DiskUnit, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2862,14 +2871,15 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartUnit); } - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS_1), DiskEntry->DiskNumber, DiskSize, DiskUnit, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + &DiskEntry->DriverName, + DiskEntry->NoMbr ? "GPT" : "MBR"); } MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); @@ -2885,8 +2895,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } } - DrawFileSystemList(FileSystemList); - if (RepairUpdateFlag) { return CHECK_FILE_SYSTEM_PAGE; @@ -2910,6 +2918,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) return CHECK_FILE_SYSTEM_PAGE; } + DrawFileSystemList(FileSystemList); + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -4441,15 +4451,12 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) static PAGE_NUMBER BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { - UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->SystemPartition->PartitionType; - Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, &DestinationArcPath, - PartitionType); + PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); @@ -4477,19 +4484,16 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) static PAGE_NUMBER BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { - UCHAR PartitionType; NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; WCHAR SourceMbrPathBuffer[MAX_PATH]; WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ - PartitionType = PartitionList->SystemPartition->PartitionType; - Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, &DestinationArcPath, - PartitionType); + PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);

5 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018