Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT] Simplify canvas mouse message handling (#5803)
by Katayama Hirofumi MZ 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f49919ce5d3de933c6dd4… commit f49919ce5d3de933c6dd42b2beb54f82cae47e8c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 17 13:48:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 13:48:19 2023 +0900 [MSPAINT] Simplify canvas mouse message handling (#5803) - Unify some mouse message handlers of CCanvasWindow. - Add CCanvasWindow::m_nMouseDownMsg member. CORE-19094 --- base/applications/mspaint/canvas.cpp | 54 +++++++++++------------------------- base/applications/mspaint/canvas.h | 25 +++++++---------- 2 files changed, 26 insertions(+), 53 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index e19c4e6e306..e8b024e21ec 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -310,10 +310,13 @@ LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } -LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + m_nMouseDownMsg = nMsg; + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -333,7 +336,7 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam } else { - canvasWindow.ClientToScreen(&pt); + ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } return 0; @@ -347,13 +350,13 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam case TOOL_BEZIER: case TOOL_SHAPE: toolsModel.OnCancelDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: toolsModel.OnFinishDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; default: @@ -386,40 +389,21 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam return 0; } -LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(FALSE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); m_drawing = FALSE; - ReleaseCapture(); + ::ReleaseCapture(); + m_nMouseDownMsg = 0; - toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, TRUE); + toolsModel.OnButtonDown(nMsg == WM_LBUTTONDBLCLK, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; } -LRESULT CCanvasWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; @@ -612,13 +596,16 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); ::ReleaseCapture(); + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + m_nMouseDownMsg = 0; + if (m_drawing) { m_drawing = FALSE; @@ -680,16 +667,6 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, return 0; } -LRESULT CCanvasWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (CWaitCursor::IsWaiting()) @@ -760,6 +737,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { // Cancel dragging ::ReleaseCapture(); + m_nMouseDownMsg = 0; m_hitCanvasSizeBox = HIT_NONE; ::SetRectEmpty(&m_rcResizing); Invalidate(TRUE); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 21a6e11ecfa..238229e3b2b 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,13 +20,13 @@ public: MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) @@ -76,14 +76,8 @@ protected: LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -91,7 +85,8 @@ protected: LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + UINT m_nMouseDownMsg = 0; + LRESULT OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); };

1 0

[reactos] 01/01: [MSPAINT] Improve Zoom tool (#5798)
by Katayama Hirofumi MZ 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f1eb03ad28f6262b7322… commit 8f1eb03ad28f6262b7322a637f775d7e1312351c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 17 07:25:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 07:25:50 2023 +0900 [MSPAINT] Improve Zoom tool (#5798) - Delete global zoomTo function. - Add CCanvasWindow::zoomTo and CCanvasWindow::getNewZoomRect functions. - Rename CCanvasWindow::updateScrollInfo as CCanvasWindow::updateScrollRange. - Rename CCanvasWindow::resetScrollPos as CCanvasWindow::updateScrollPos. - Draw the proper zoom rectangle on mouse move. - Revert the active tool on click when the tool was Zoom. CORE-19094 --- base/applications/mspaint/canvas.cpp | 57 ++++++++++++++++++++++++---- base/applications/mspaint/canvas.h | 6 ++- base/applications/mspaint/common.h | 1 - base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/mouse.cpp | 61 +++++++++++++++++++++--------- base/applications/mspaint/toolsettings.cpp | 2 +- base/applications/mspaint/winproc.cpp | 55 ++++++--------------------- 8 files changed, 113 insertions(+), 73 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 60aa29929b5..e19c4e6e306 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -89,6 +89,49 @@ HITTEST CCanvasWindow::CanvasHitTest(POINT pt) return getSizeBoxHitTest(pt, &rcBase); } +VOID CCanvasWindow::getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget) +{ + CRect rcImage; + GetImageRect(rcImage); + ImageToCanvas(rcImage); + + // Calculate the zoom rectangle + INT oldZoom = toolsModel.GetZoom(); + GetClientRect(rcView); + LONG cxView = rcView.right * oldZoom / newZoom, cyView = rcView.bottom * oldZoom / newZoom; + ::SetRect(&rcView, ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, + ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); + + // Shift the rectangle if necessary + INT dx = 0, dy = 0; + if (rcView.left < rcImage.left) + dx = rcImage.left - rcView.left; + else if (rcImage.right < rcView.right) + dx = rcImage.right - rcView.right; + if (rcView.top < rcImage.top) + dy = rcImage.top - rcView.top; + else if (rcImage.bottom < rcView.bottom) + dy = rcImage.bottom - rcView.bottom; + rcView.OffsetRect(dx, dy); + + rcView.IntersectRect(&rcView, &rcImage); +} + +VOID CCanvasWindow::zoomTo(INT newZoom, LONG left, LONG top) +{ + POINT pt = { left, top }; + CanvasToImage(pt); + + toolsModel.SetZoom(newZoom); + ImageToCanvas(pt); + pt.x += GetScrollPos(SB_HORZ); + pt.y += GetScrollPos(SB_VERT); + + updateScrollRange(); + updateScrollPos(pt.x, pt.y); + Invalidate(TRUE); +} + VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) { // This is the target area we have to draw on @@ -180,7 +223,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::updateScrollInfo() +VOID CCanvasWindow::updateScrollRange() { CRect rcClient; GetClientRect(&rcClient); @@ -211,16 +254,16 @@ VOID CCanvasWindow::updateScrollInfo() SetScrollInfo(SB_VERT, &si); } -VOID CCanvasWindow::resetScrollPos() +VOID CCanvasWindow::updateScrollPos(INT x, INT y) { - SetScrollPos(SB_HORZ, 0); - SetScrollPos(SB_VERT, 0); + SetScrollPos(SB_HORZ, x); + SetScrollPos(SB_VERT, y); } LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - updateScrollInfo(); + updateScrollRange(); return 0; } @@ -251,7 +294,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) break; } SetScrollInfo(fnBar, &si); - updateScrollInfo(); + updateScrollRange(); Invalidate(FALSE); // FIXME: Flicker } @@ -632,7 +675,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - updateScrollInfo(); + updateScrollRange(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 193d7603abd..21a6e11ecfa 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -42,8 +42,8 @@ public: VOID cancelDrawing(); VOID finishDrawing(); - VOID updateScrollInfo(); - VOID resetScrollPos(); + VOID updateScrollRange(); + VOID updateScrollPos(INT x = 0, INT y = 0); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); @@ -51,6 +51,8 @@ public: VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); VOID MoveSelection(INT xDelta, INT yDelta); + VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); + VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0); protected: HITTEST m_hitSelection; diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index d2e862b0114..3dda6703441 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -43,7 +43,6 @@ enum HITTEST // hit /* FUNCTIONS ********************************************************/ -BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 7b458138618..eede3325c55 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -241,7 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 05990df42b8..2d28cb5def2 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -16,7 +16,7 @@ void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) { - canvasWindow.updateScrollInfo(); + canvasWindow.updateScrollRange(); canvasWindow.Invalidate(); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index dc9ce6b89a2..c7c19e16544 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -563,40 +563,67 @@ struct ColorTool : ToolBase // TOOL_ZOOM struct ZoomTool : ToolBase { + BOOL m_bZoomed = FALSE; + ZoomTool() : ToolBase(TOOL_ZOOM) { } + BOOL getNewZoomRect(CRect& rcView, INT newZoom); + void OnDrawOverlayOnCanvas(HDC hdc) override { - CRect rc; - canvasWindow.GetImageRect(rc); - canvasWindow.ImageToCanvas(rc); - - POINT pt; - ::GetCursorPos(&pt); - ::ScreenToClient(canvasWindow, &pt); - - // FIXME: Draw the border of the area that is to be zoomed in - if (rc.PtInRect(pt)) - DrawXorRect(hdc, &rc); + CRect rcView; + INT oldZoom = toolsModel.GetZoom(); + if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) + DrawXorRect(hdc, &rcView); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + INT newZoom, oldZoom = toolsModel.GetZoom(); if (bLeftButton) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, x, y); - } + newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; else + newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; + + m_bZoomed = FALSE; + + if (oldZoom != newZoom) { - if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, x, y); + CRect rcView; + if (getNewZoomRect(rcView, newZoom)) + { + canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); + m_bZoomed = TRUE; + } } } + + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + { + if (m_bZoomed) + toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + + return TRUE; + } }; +BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) +{ + CPoint pt; + ::GetCursorPos(&pt); + canvasWindow.ScreenToClient(&pt); + + canvasWindow.getNewZoomRect(rcView, newZoom, pt); + + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + return rc.PtInRect(pt); +} + // TOOL_PEN struct PenTool : SmoothDrawTool { diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 182862ec305..745f2afe3e0 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -309,7 +309,7 @@ LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { INT trackPos = MAX_ZOOM_TRACK - (INT)trackbarZoom.SendMessage(TBM_GETPOS, 0, 0); - zoomTo(MIN_ZOOM << trackPos, 0, 0); + canvasWindow.zoomTo(MIN_ZOOM << trackPos); INT zoomRate = toolsModel.GetZoom(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 58bf4a98909..c1cbff31b8c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -41,37 +41,6 @@ static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_P return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); } -BOOL -zoomTo(int newZoom, int mouseX, int mouseY) -{ - int x, y, w, h; - RECT clientRectScrollbox; - canvasWindow.GetClientRect(&clientRectScrollbox); - - RECT clientRectImageArea; - ::SetRect(&clientRectImageArea, 0, 0, imageModel.GetWidth(), imageModel.GetHeight()); - Zoomed(clientRectImageArea); - - w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); - h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); - if (!w || !h) - { - return FALSE; - } - w = clientRectImageArea.right * clientRectScrollbox.right / w; - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); - - toolsModel.SetZoom(newZoom); - - canvasWindow.Invalidate(TRUE); - - canvasWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - canvasWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); - return TRUE; -} - void CMainWindow::alignChildrenToMainWindow() { RECT clientRect, rc; @@ -216,20 +185,20 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { INT zDelta = (SHORT)HIWORD(wParam); - if (::GetAsyncKeyState(VK_CONTROL) < 0) + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel { if (zDelta < 0) { if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() / 2); } else if (zDelta > 0) { if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() * 2); } } - else + else // Wheel only { UINT nCount = 3; if (::GetAsyncKeyState(VK_SHIFT) < 0) @@ -921,7 +890,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEROTATEMIRROR: { CWaitCursor waitCursor; - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ @@ -1054,25 +1023,25 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWZOOM125: - zoomTo(125, 0, 0); + canvasWindow.zoomTo(125); break; case IDM_VIEWZOOM25: - zoomTo(250, 0, 0); + canvasWindow.zoomTo(250); break; case IDM_VIEWZOOM50: - zoomTo(500, 0, 0); + canvasWindow.zoomTo(500); break; case IDM_VIEWZOOM100: - zoomTo(1000, 0, 0); + canvasWindow.zoomTo(1000); break; case IDM_VIEWZOOM200: - zoomTo(2000, 0, 0); + canvasWindow.zoomTo(2000); break; case IDM_VIEWZOOM400: - zoomTo(4000, 0, 0); + canvasWindow.zoomTo(4000); break; case IDM_VIEWZOOM800: - zoomTo(8000, 0, 0); + canvasWindow.zoomTo(8000); break; case IDM_VIEWFULLSCREEN:

1 0

[reactos] 01/01: [NTUSER] Remove a wrong check in MENU_MouseMove (#5736)
by Egor Ananyin 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d3aa7f4ac40e0d84c05… commit e2d3aa7f4ac40e0d84c05aa98dd1554ba8c6c456 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Mon Oct 16 19:10:52 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 16 19:10:52 2023 +0300 [NTUSER] Remove a wrong check in MENU_MouseMove (#5736) This check doesn't seem to be correct in modern ReactOS. Furthermore, it actually hadn't been working for a long time until it was uncovered by the recent system menu changes. Reverts a hack introduced in 17a315285 (r72517), fixes CORE-19170. The initial bug described in CORE-2338 is not observed. --- win32ss/user/ntuser/menu.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 869b9bb4cc4..6b2f242cc25 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3683,20 +3683,7 @@ static BOOL FASTCALL MENU_MouseMove(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Index = NO_SELECTED_ITEM; if ( PtMenu ) - { - if (IS_SYSTEM_MENU(PtMenu)) - { - Index = 0; - //// ReactOS only HACK: CORE-2338 - // Windows tracks mouse moves to the system menu but does not open it. - // Only keyboard tracking can do that. - // - TRACE("SystemMenu\n"); - return TRUE; // Stay inside the Loop! - } - else - MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); - } + MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); if (Index == NO_SELECTED_ITEM) {

1 0

[reactos] 01/01: [USERENV] SetUserEnvironmentVariable(): Remove use of uninit' ShortName
by Serge Gautherie 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13a145b6d808816b299b1… commit 13a145b6d808816b299b1691d699996f7a34e4fe Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 16 19:02:27 2023 +0300 [USERENV] SetUserEnvironmentVariable(): Remove use of uninit' ShortName Addendum to 96fe018 (r72066). --- dll/win32/userenv/environment.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/userenv/environment.c b/dll/win32/userenv/environment.c index 043e3123790..0b54ba6f6c2 100644 --- a/dll/win32/userenv/environment.c +++ b/dll/win32/userenv/environment.c @@ -88,8 +88,6 @@ SetUserEnvironmentVariable(PWSTR* Environment, { DPRINT("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); } - - DPRINT("Buffer: %S\n", ShortName); } RtlInitUnicodeString(&Name, lpName);

1 0

[reactos] 01/01: [ATL][ATL_APITEST] Add some missing CRect methods (#5800)
by Katayama Hirofumi MZ 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86696794993a6e94dd10d… commit 86696794993a6e94dd10d710a817d365e2a81ead Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 16 21:57:57 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 16 21:57:57 2023 +0900 [ATL][ATL_APITEST] Add some missing CRect methods (#5800) - Strengthen "atltest.h". - Strengthen atl_apitest:atltypes testcase. - Implement some missing CRect methods. --- modules/rostests/apitests/atl/atltest.h | 42 +++++- modules/rostests/apitests/atl/atltypes.cpp | 46 +++++- modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 ++ .../rostests/apitests/atl/devenv/atltypes.vcxproj | 154 +++++++++++++++++++++ sdk/lib/atl/atltypes.h | 72 ++++++++-- 5 files changed, 313 insertions(+), 11 deletions(-) diff --git a/modules/rostests/apitests/atl/atltest.h b/modules/rostests/apitests/atl/atltest.h index 42740868814..74a30054f1f 100644 --- a/modules/rostests/apitests/atl/atltest.h +++ b/modules/rostests/apitests/atl/atltest.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS api tests * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Testing - * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: Copyright 2019-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef ATLTEST_H_ @@ -135,4 +135,44 @@ char *wine_dbgstr_w(const wchar_t *wstr) #define ok_ntstatus(status, expected) ok_hex(status, expected) #define ok_hdl ok_ptr +static inline const char *wine_dbgstr_point(const POINT *ppt) +{ + static char s_asz[4][40]; /* Ring buffer */ + static int s_i = 0; + char *buf; + + if (!ppt) + return "(null)"; + if (IS_INTRESOURCE(ppt)) + return "(invalid ptr)"; + + buf = s_asz[s_i]; + s_i = (s_i + 1) % _countof(s_asz); + sprintf_s(buf, _countof(s_asz[0]), "(%ld, %ld)", ppt->x, ppt->y); + return buf; +} + +static inline const char *wine_dbgstr_size(const SIZE *psize) +{ + return wine_dbgstr_point((const POINT *)psize); +} + +static inline const char *wine_dbgstr_rect(const RECT *prc) +{ + static char s_asz[4][80]; /* Ring buffer */ + static int s_i = 0; + char *buf; + + if (!prc) + return "(null)"; + if (IS_INTRESOURCE(prc)) + return "(invalid ptr)"; + + buf = s_asz[s_i]; + s_i = (s_i + 1) % _countof(s_asz); + sprintf_s(buf, _countof(s_asz[0]), "(%ld, %ld) - (%ld, %ld)", + prc->left, prc->top, prc->right, prc->bottom); + return buf; +} + #endif /* ndef ATLTEST_H_ */ diff --git a/modules/rostests/apitests/atl/atltypes.cpp b/modules/rostests/apitests/atl/atltypes.cpp index 08ee26bce6a..1d074e6787f 100644 --- a/modules/rostests/apitests/atl/atltypes.cpp +++ b/modules/rostests/apitests/atl/atltypes.cpp @@ -7,7 +7,11 @@ * Code based on MSDN samples regarding CPoint, CSize, CRect */ -#include <apitest.h> +#ifdef HAVE_APITEST + #include <apitest.h> +#else + #include "atltest.h" +#endif #include <windows.h> #include <atltypes.h> @@ -527,6 +531,46 @@ static void test_CRect() rect2 = rect1 - sz; rectResult = CRect(-100, -50, 200, 250); ok_rect(rectResult, rect2); + + SetRect(&rect2, 10, 20, 300, 120); + rect2.MoveToX(30); + rectResult = CRect(30, 20, 320, 120); + ok_rect(rectResult, rect2); + + SetRect(&rect2, 10, 20, 300, 120); + rect2.MoveToY(40); + rectResult = CRect(10, 40, 300, 140); + ok_rect(rectResult, rect2); + + SetRect(&rect2, 10, 20, 300, 120); + rect2.MoveToXY(30, 40); + rectResult = CRect(30, 40, 320, 140); + ok_rect(rectResult, rect2); + + SetRect(&rect2, 100, 80, -100, -50); + rectResult = CRect(-100, -50, 100, 80); + rect2.NormalizeRect(); + ok_rect(rectResult, rect2); + + rect2.SetRectEmpty(); + rectResult = CRect(0, 0, 0, 0); + ok_rect(rectResult, rect2); + + BOOL ret; + + rect1 = CRect(5, 40, 40, 120); + rect2 = CRect(10, 30, 80, 100); + ret = rect.SubtractRect(rect1, rect2); + rectResult = CRect(10, 30, 80, 100); + ok_int(ret, TRUE); + ok_rect(rectResult, rect2); + + rect1 = CRect(10, 40, 70, 110); + rect2 = CRect(8, 20, 40, 130); + ret = rect.SubtractRect(rect1, rect2); + rectResult = CRect(8, 20, 40, 130); + ok_int(ret, TRUE); + ok_rect(rect2, rectResult); } diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 128101222af..68f30447443 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -33,6 +33,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlObjMap", "AtlObjMap.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlconv", "atlconv.vcxproj", "{85194CA3-A828-4270-962A-333743E2BF83}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atltypes", "atltypes.vcxproj", "{6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -161,6 +163,14 @@ Global {85194CA3-A828-4270-962A-333743E2BF83}.Release|x64.Build.0 = Release|x64 {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.ActiveCfg = Release|Win32 {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.Build.0 = Release|Win32 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Debug|x64.ActiveCfg = Debug|x64 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Debug|x64.Build.0 = Debug|x64 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Debug|x86.ActiveCfg = Debug|Win32 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Debug|x86.Build.0 = Debug|Win32 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Release|x64.ActiveCfg = Release|x64 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Release|x64.Build.0 = Release|x64 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Release|x86.ActiveCfg = Release|Win32 + {6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/atltypes.vcxproj b/modules/rostests/apitests/atl/devenv/atltypes.vcxproj new file mode 100644 index 00000000000..a935da68534 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/atltypes.vcxproj @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\atltypes.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{6F9D87BA-0FBD-4A0D-9B11-6363D12ADD1D}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>atltypes</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>Use</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/sdk/lib/atl/atltypes.h b/sdk/lib/atl/atltypes.h index 5d1e9892d3c..76c651eca59 100644 --- a/sdk/lib/atl/atltypes.h +++ b/sdk/lib/atl/atltypes.h @@ -359,11 +359,46 @@ public: top == 0 && bottom == 0); } - //void MoveToX(int x) noexcept - //void MoveToXY(int x, int y) noexcept - //void MoveToXY(POINT point) noexcept - //void MoveToY(int y) noexcept - //void NormalizeRect() noexcept + void MoveToX(int x) noexcept + { + int dx = x - left; + left = x; + right += dx; + } + + void MoveToY(int y) noexcept + { + int dy = y - top; + top = y; + bottom += dy; + } + + void MoveToXY(int x, int y) noexcept + { + MoveToX(x); + MoveToY(y); + } + + void MoveToXY(POINT point) noexcept + { + MoveToXY(point.x, point.y); + } + + void NormalizeRect() noexcept + { + if (left > right) + { + LONG tmp = left; + left = right; + right = tmp; + } + if (top > bottom) + { + LONG tmp = top; + top = bottom; + bottom = tmp; + } + } void OffsetRect(int x, int y) noexcept { @@ -384,10 +419,29 @@ public: { return ::PtInRect(this, point); } - //void SetRect(int x1, int y1, int x2, int y2) noexcept - //void SetRectEmpty() noexcept - //CSize Size() const noexcept - //BOOL SubtractRect(LPCRECT lpRectSrc1, LPCRECT lpRectSrc2) noexcept + + void SetRect(int x1, int y1, int x2, int y2) noexcept + { + left = x1; + top = y1; + right = x2; + bottom = y2; + } + + void SetRectEmpty() noexcept + { + ZeroMemory(this, sizeof(*this)); + } + + CSize Size() const noexcept + { + return CSize(Width(), Height()); + } + + BOOL SubtractRect(LPCRECT lpRectSrc1, LPCRECT lpRectSrc2) noexcept + { + return ::SubtractRect(this, lpRectSrc1, lpRectSrc2); + } CPoint& TopLeft() noexcept {

1 0

[reactos] 01/01: [ATL] s/throw()/noexcept/ (#5799)
by Katayama Hirofumi MZ 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d955b9321b79df0623884… commit d955b9321b79df0623884dced49e920c2ffb6fa4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 16 15:40:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 16 15:40:17 2023 +0900 [ATL] s/throw()/noexcept/ (#5799) Mechanically replace throw() with noexcept. --- sdk/lib/atl/atlbase.h | 70 ++++++++-------- sdk/lib/atl/atlcoll.h | 4 +- sdk/lib/atl/atlcomcli.h | 2 +- sdk/lib/atl/atlconv.h | 48 +++++------ sdk/lib/atl/atlcore.h | 2 +- sdk/lib/atl/atlfile.h | 20 ++--- sdk/lib/atl/atlpath.h | 8 +- sdk/lib/atl/atlsimpstr.h | 48 +++++------ sdk/lib/atl/atlstr.h | 10 +-- sdk/lib/atl/atltime.h | 146 ++++++++++++++++----------------- sdk/lib/atl/atltypes.h | 206 +++++++++++++++++++++++------------------------ sdk/lib/atl/cstringt.h | 58 ++++++------- 12 files changed, 311 insertions(+), 311 deletions(-) diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index d6e0e9ec386..54effd79975 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -1120,40 +1120,40 @@ public: public: - CRegKey() throw() + CRegKey() noexcept : m_hKey(NULL) { } - CRegKey(CRegKey& key) throw() + CRegKey(CRegKey& key) noexcept : m_hKey(key.Detach()) { } - explicit CRegKey(HKEY hKey) throw() + explicit CRegKey(HKEY hKey) noexcept : m_hKey(hKey) { } #if 0 // FIXME & TODO: - CRegKey(CAtlTransactionManager* pTM) throw() + CRegKey(CAtlTransactionManager* pTM) noexcept { ... } #endif - ~CRegKey() throw() + ~CRegKey() noexcept { Close(); } - void Attach(HKEY hKey) throw() + void Attach(HKEY hKey) noexcept { m_hKey = hKey; } - LONG Close() throw() + LONG Close() noexcept { if (m_hKey) { @@ -1163,7 +1163,7 @@ public: return ERROR_SUCCESS; } - HKEY Detach() throw() + HKEY Detach() noexcept { HKEY hKey = m_hKey; m_hKey = NULL; @@ -1171,7 +1171,7 @@ public: } LONG Open(HKEY hKeyParent, LPCTSTR lpszKeyName, - REGSAM samDesired = KEY_READ | KEY_WRITE) throw() + REGSAM samDesired = KEY_READ | KEY_WRITE) noexcept { ATLASSERT(hKeyParent); ATLASSERT(lpszKeyName); @@ -1191,7 +1191,7 @@ public: DWORD dwOptions = REG_OPTION_NON_VOLATILE, REGSAM samDesired = KEY_READ | KEY_WRITE, LPSECURITY_ATTRIBUTES lpSecAttr = NULL, - LPDWORD lpdwDisposition = NULL) throw() + LPDWORD lpdwDisposition = NULL) noexcept { ATLASSERT(hKeyParent); ATLASSERT(lpszKeyName); @@ -1208,13 +1208,13 @@ public: return lRes; } - LONG QueryValue(LPCTSTR pszValueName, DWORD* pdwType, void* pData, ULONG* pnBytes) throw() + LONG QueryValue(LPCTSTR pszValueName, DWORD* pdwType, void* pData, ULONG* pnBytes) noexcept { ATLASSERT(m_hKey); return ::RegQueryValueEx(m_hKey, pszValueName, NULL, pdwType, (LPBYTE)pData, pnBytes); } - LONG QueryDWORDValue(LPCTSTR pszValueName, DWORD& dwValue) throw() + LONG QueryDWORDValue(LPCTSTR pszValueName, DWORD& dwValue) noexcept { ULONG size = sizeof(DWORD); DWORD type = 0; @@ -1226,7 +1226,7 @@ public: return lRet; } - LONG QueryBinaryValue(LPCTSTR pszValueName, void* pValue, ULONG* pnBytes) throw() + LONG QueryBinaryValue(LPCTSTR pszValueName, void* pValue, ULONG* pnBytes) noexcept { DWORD type = 0; LONG lRet = QueryValue(pszValueName, &type, pValue, pnBytes); @@ -1237,7 +1237,7 @@ public: return lRet; } - LONG QueryStringValue(LPCTSTR pszValueName, LPTSTR pszValue, ULONG* pnChars) throw() + LONG QueryStringValue(LPCTSTR pszValueName, LPTSTR pszValue, ULONG* pnChars) noexcept { ULONG size = (*pnChars) * sizeof(TCHAR); DWORD type = 0; @@ -1250,7 +1250,7 @@ public: return lRet; } - LONG QueryGUIDValue(LPCTSTR pszValueName, GUID& guidValue) throw() + LONG QueryGUIDValue(LPCTSTR pszValueName, GUID& guidValue) noexcept { OLECHAR buf[40] = {0}; ULONG nChars = 39; @@ -1275,7 +1275,7 @@ public: return lRet; } - LONG QueryQWORDValue(LPCTSTR pszValueName, ULONGLONG& qwValue) throw() + LONG QueryQWORDValue(LPCTSTR pszValueName, ULONGLONG& qwValue) noexcept { ULONG size = sizeof(ULONGLONG); DWORD type = 0; @@ -1288,7 +1288,7 @@ public: } LONG QueryMultiStringValue(LPCTSTR pszValueName, LPTSTR pszValue, - ULONG* pnChars) throw() + ULONG* pnChars) noexcept { ULONG size = (*pnChars) * sizeof(TCHAR); DWORD type; @@ -1301,18 +1301,18 @@ public: return lRet; } - LONG SetValue(LPCTSTR pszValueName, DWORD dwType, const void* pValue, ULONG nBytes) throw() + LONG SetValue(LPCTSTR pszValueName, DWORD dwType, const void* pValue, ULONG nBytes) noexcept { ATLASSERT(m_hKey); return ::RegSetValueEx(m_hKey, pszValueName, 0, dwType, (const BYTE*)pValue, nBytes); } - LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) throw() + LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) noexcept { return SetValue(pszValueName, REG_DWORD, &dwValue, sizeof(DWORD)); } - LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) throw() + LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) noexcept { SIZE_T length; switch (dwType) @@ -1328,7 +1328,7 @@ public: } } - LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) throw() + LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) noexcept { OLECHAR buf[40] = {0}; ::StringFromGUID2(guidValue, buf, 39); @@ -1341,25 +1341,25 @@ public: #endif } - LONG SetBinaryValue(LPCTSTR pszValueName, const void* pValue, ULONG nBytes) throw() + LONG SetBinaryValue(LPCTSTR pszValueName, const void* pValue, ULONG nBytes) noexcept { return SetValue(pszValueName, REG_BINARY, pValue, nBytes); } - LONG SetMultiStringValue(LPCTSTR pszValueName, LPCTSTR pszValue) throw() + LONG SetMultiStringValue(LPCTSTR pszValueName, LPCTSTR pszValue) noexcept { ULONG dwSize = CRegKey::_GetMultiStringSize(pszValue); return SetValue(pszValueName, REG_MULTI_SZ, pszValue, dwSize); } - LONG SetQWORDValue(LPCTSTR pszValueName, ULONGLONG qwValue) throw() + LONG SetQWORDValue(LPCTSTR pszValueName, ULONGLONG qwValue) noexcept { ULONG dwSize = sizeof(ULONGLONG); return SetValue(pszValueName, REG_QWORD, &qwValue, dwSize); } LONG NotifyChangeKeyValue(BOOL bWatchSubtree, DWORD dwNotifyFilter, - HANDLE hEvent, BOOL bAsync = TRUE) throw() + HANDLE hEvent, BOOL bAsync = TRUE) noexcept { ATLASSERT(m_hKey); LONG ret = ::RegNotifyChangeKeyValue(m_hKey, bWatchSubtree, @@ -1367,7 +1367,7 @@ public: return ret; } - LONG Flush() throw() + LONG Flush() noexcept { ATLASSERT(m_hKey); LONG ret = ::RegFlushKey(m_hKey); @@ -1387,7 +1387,7 @@ public: } LONG SetKeyValue(LPCTSTR lpszKeyName, LPCTSTR lpszValue, - LPCTSTR lpszValueName = NULL) throw() + LPCTSTR lpszValueName = NULL) noexcept { CRegKey key; LONG lRet = key.Create(m_hKey, lpszKeyName); @@ -1398,20 +1398,20 @@ public: return lRet; } - LONG DeleteValue(LPCTSTR lpszValue) throw() + LONG DeleteValue(LPCTSTR lpszValue) noexcept { ATLASSERT(m_hKey); return ::RegDeleteValue(m_hKey, lpszValue); } - LONG DeleteSubKey(LPCTSTR lpszSubKey) throw() + LONG DeleteSubKey(LPCTSTR lpszSubKey) noexcept { ATLASSERT(m_hKey); ATLASSERT(lpszSubKey); return ::RegDeleteKey(m_hKey, lpszSubKey); } - LONG RecurseDeleteKey(LPCTSTR lpszKey) throw() + LONG RecurseDeleteKey(LPCTSTR lpszKey) noexcept { ATLASSERT(m_hKey); ATLASSERT(lpszKey); @@ -1419,7 +1419,7 @@ public: } LONG EnumKey(DWORD iIndex, LPTSTR pszName, LPDWORD pnNameLength, - FILETIME* pftLastWriteTime = NULL) throw() + FILETIME* pftLastWriteTime = NULL) noexcept { ATLASSERT(m_hKey); LONG ret = ::RegEnumKeyEx(m_hKey, iIndex, pszName, pnNameLength, NULL, @@ -1428,7 +1428,7 @@ public: } LONG GetKeySecurity(SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR psd, - LPDWORD pnBytes) throw() + LPDWORD pnBytes) noexcept { ATLASSERT(m_hKey); LONG ret = ::RegGetKeySecurity(m_hKey, si, psd, pnBytes); @@ -1436,19 +1436,19 @@ public: } LONG SetKeySecurity(SECURITY_INFORMATION si, - PSECURITY_DESCRIPTOR psd) throw() + PSECURITY_DESCRIPTOR psd) noexcept { ATLASSERT(m_hKey); LONG ret = ::RegSetKeySecurity(m_hKey, si, psd); return ret; } - operator HKEY() const throw() + operator HKEY() const noexcept { return m_hKey; } - CRegKey& operator=(CRegKey& key) throw() + CRegKey& operator=(CRegKey& key) noexcept { if (m_hKey != key.m_hKey) { diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index 66a93a27b7f..1068deeacc5 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -9,8 +9,8 @@ // would also need to set the option 'WITH_STL'.. // For now we just copy the definition here, under a guard.. #ifndef _NEW -inline void* operator new (size_t size, void* ptr) throw() { return ptr; } -inline void operator delete (void* ptr, void* voidptr2) throw() { } +inline void* operator new (size_t size, void* ptr) noexcept { return ptr; } +inline void operator delete (void* ptr, void* voidptr2) noexcept { } #endif diff --git a/sdk/lib/atl/atlcomcli.h b/sdk/lib/atl/atlcomcli.h index e6effc2ffcf..a11b05ace36 100644 --- a/sdk/lib/atl/atlcomcli.h +++ b/sdk/lib/atl/atlcomcli.h @@ -53,7 +53,7 @@ namespace ATL { -inline HRESULT AtlHresultFromLastError() throw() +inline HRESULT AtlHresultFromLastError() noexcept { DWORD dwError = ::GetLastError(); return HRESULT_FROM_WIN32(dwError); diff --git a/sdk/lib/atl/atlconv.h b/sdk/lib/atl/atlconv.h index 7ba62045575..f9a7c669795 100644 --- a/sdk/lib/atl/atlconv.h +++ b/sdk/lib/atl/atlconv.h @@ -29,14 +29,14 @@ public: UNREFERENCED_PARAMETER(nCodePage); } - ~CA2CAEX() throw() { } // There is nothing to free here + ~CA2CAEX() noexcept { } // There is nothing to free here - _Ret_z_ operator LPCSTR() const throw() { return m_psz; } + _Ret_z_ operator LPCSTR() const noexcept { return m_psz; } private: // CA2CAEX is not copyable - CA2CAEX(_In_ const CA2CAEX&) throw() = delete; - CA2CAEX& operator=(_In_ const CA2CAEX&) throw() = delete; + CA2CAEX(_In_ const CA2CAEX&) noexcept = delete; + CA2CAEX& operator=(_In_ const CA2CAEX&) noexcept = delete; }; // This class does not own the string @@ -53,14 +53,14 @@ public: UNREFERENCED_PARAMETER(nCodePage); } - ~CW2CWEX() throw() { } // There is nothing to free here + ~CW2CWEX() noexcept { } // There is nothing to free here - _Ret_z_ operator LPCWSTR() const throw() { return m_psz; } + _Ret_z_ operator LPCWSTR() const noexcept { return m_psz; } private: // CW2CWEX is not copyable - CW2CWEX(_In_ const CW2CWEX&) throw() = delete; - CW2CWEX& operator=(_In_ const CW2CWEX&) throw() = delete; + CW2CWEX(_In_ const CW2CWEX&) noexcept = delete; + CW2CWEX& operator=(_In_ const CW2CWEX&) noexcept = delete; }; template <int t_nBufferLength = 128> @@ -81,21 +81,21 @@ public: Init(psz); } - ~CA2AEX() throw() + ~CA2AEX() noexcept { if (m_psz != m_szBuffer) free(m_psz); } - _Ret_z_ operator LPSTR() const throw() + _Ret_z_ operator LPSTR() const noexcept { return m_psz; } private: // CA2AEX is not copyable - CA2AEX(_In_ const CA2AEX &) throw() = delete; - CA2AEX& operator=(_In_ const CA2AEX &) throw() = delete; + CA2AEX(_In_ const CA2AEX &) noexcept = delete; + CA2AEX& operator=(_In_ const CA2AEX &) noexcept = delete; void Init(_In_z_ LPCSTR psz) { @@ -142,21 +142,21 @@ public: Init(psz); } - ~CW2WEX() throw() + ~CW2WEX() noexcept { if (m_psz != m_szBuffer) free(m_psz); } - _Ret_z_ operator LPWSTR() const throw() + _Ret_z_ operator LPWSTR() const noexcept { return m_psz; } private: // CW2WEX is not copyable - CW2WEX(_In_ const CW2WEX&) throw() = delete; - CW2WEX& operator=(_In_ const CW2WEX&) throw() = delete; + CW2WEX(_In_ const CW2WEX&) noexcept = delete; + CW2WEX& operator=(_In_ const CW2WEX&) noexcept = delete; void Init(_In_z_ LPCWSTR psz) { @@ -202,21 +202,21 @@ public: Init(psz, nCodePage); } - ~CA2WEX() throw() + ~CA2WEX() noexcept { if (m_psz != m_szBuffer) free(m_psz); } - _Ret_z_ operator LPWSTR() const throw() + _Ret_z_ operator LPWSTR() const noexcept { return m_psz; } private: // CA2WEX is not copyable - CA2WEX(_In_ const CA2WEX&) throw() = delete; - CA2WEX& operator=(_In_ const CA2WEX&) throw() = delete; + CA2WEX(_In_ const CA2WEX&) noexcept = delete; + CA2WEX& operator=(_In_ const CA2WEX&) noexcept = delete; void Init(_In_z_ LPCSTR psz, _In_ UINT nCodePage) { @@ -269,21 +269,21 @@ public: Init(psz, nCodePage); } - ~CW2AEX() throw() + ~CW2AEX() noexcept { if (m_psz != m_szBuffer) free(m_psz); } - _Ret_z_ operator LPSTR() const throw() + _Ret_z_ operator LPSTR() const noexcept { return m_psz; } private: // CW2AEX is not copyable - CW2AEX(_In_ const CW2AEX&) throw() = delete; - CW2AEX& operator=(_In_ const CW2AEX&) throw() = delete; + CW2AEX(_In_ const CW2AEX&) noexcept = delete; + CW2AEX& operator=(_In_ const CW2AEX&) noexcept = delete; void Init(_In_z_ LPCWSTR psz, _In_ UINT nConvertCodePage) { diff --git a/sdk/lib/atl/atlcore.h b/sdk/lib/atl/atlcore.h index 26f3cedc73e..d1527493864 100644 --- a/sdk/lib/atl/atlcore.h +++ b/sdk/lib/atl/atlcore.h @@ -272,7 +272,7 @@ inline const ATLSTRINGRESOURCEIMAGE* _AtlGetStringResourceImage( inline const ATLSTRINGRESOURCEIMAGE* AtlGetStringResourceImage( _In_ HINSTANCE hInstance, - _In_ UINT id) throw() + _In_ UINT id) noexcept { HRSRC hResource; hResource = ::FindResourceW(hInstance, MAKEINTRESOURCEW((((id >> 4) + 1) & static_cast<WORD>(~0))), (LPWSTR)RT_STRING); diff --git a/sdk/lib/atl/atlfile.h b/sdk/lib/atl/atlfile.h index d204cce5e1e..52d251b51c2 100644 --- a/sdk/lib/atl/atlfile.h +++ b/sdk/lib/atl/atlfile.h @@ -34,7 +34,7 @@ private: DWORD m_dwViewDesiredAccess; public: - CAtlFileMappingBase() throw() + CAtlFileMappingBase() noexcept :m_pData(NULL) ,m_nMappingSize(0) ,m_hMapping(NULL) @@ -43,7 +43,7 @@ public: m_nOffset.QuadPart = 0; } - ~CAtlFileMappingBase() throw() + ~CAtlFileMappingBase() noexcept { Unmap(); } @@ -74,7 +74,7 @@ public: return *this; } - HRESULT CopyFrom(CAtlFileMappingBase& orig) throw() + HRESULT CopyFrom(CAtlFileMappingBase& orig) noexcept { HRESULT hr = S_OK; @@ -112,7 +112,7 @@ public: SIZE_T nMappingSize = 0, ULONGLONG nOffset = 0, DWORD dwMappingProtection = PAGE_READONLY, - DWORD dwViewDesiredAccess = FILE_MAP_READ) throw() + DWORD dwViewDesiredAccess = FILE_MAP_READ) noexcept { HRESULT hr = S_OK; ULARGE_INTEGER FileSize; @@ -153,7 +153,7 @@ public: BOOL* pbAlreadyExisted = NULL, LPSECURITY_ATTRIBUTES lpsa = NULL, DWORD dwMappingProtection = PAGE_READWRITE, - DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) throw() + DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) noexcept { HRESULT hr = S_OK; ULARGE_INTEGER Size; @@ -194,7 +194,7 @@ public: LPCTSTR szName, SIZE_T nMappingSize, ULONGLONG nOffset = 0, - DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) throw() + DWORD dwViewDesiredAccess = FILE_MAP_ALL_ACCESS) noexcept { HRESULT hr = S_OK; @@ -225,7 +225,7 @@ public: return hr; } - HRESULT Unmap() throw() + HRESULT Unmap() noexcept { HRESULT hr = S_OK; @@ -248,7 +248,7 @@ public: return hr; } - void* GetData() const throw() + void* GetData() const noexcept { return m_pData; } @@ -258,7 +258,7 @@ public: return m_hMapping; } - SIZE_T GetMappingSize() throw() + SIZE_T GetMappingSize() noexcept { return m_nMappingSize; } @@ -271,7 +271,7 @@ class CAtlFileMapping: public CAtlFileMappingBase { public: - operator T*() const throw() + operator T*() const noexcept { return reinterpret_cast<T*>(GetData()); } diff --git a/sdk/lib/atl/atlpath.h b/sdk/lib/atl/atlpath.h index 6c5c03df68a..bbf3321f429 100644 --- a/sdk/lib/atl/atlpath.h +++ b/sdk/lib/atl/atlpath.h @@ -111,7 +111,7 @@ public: m_strPath = path.m_strPath; } - CPathT() throw() + CPathT() noexcept { // do nothing, m_strPath initializes itself } @@ -367,17 +367,17 @@ public: m_strPath.ReleaseBuffer(); } - operator const StringType&() const throw() + operator const StringType&() const noexcept { return m_strPath; } - operator PCXSTR() const throw() + operator PCXSTR() const noexcept { return m_strPath; } - operator StringType&() throw() + operator StringType&() noexcept { return m_strPath; } diff --git a/sdk/lib/atl/atlsimpstr.h b/sdk/lib/atl/atlsimpstr.h index a2956a9abbe..2b571a299e0 100644 --- a/sdk/lib/atl/atlsimpstr.h +++ b/sdk/lib/atl/atlsimpstr.h @@ -52,18 +52,18 @@ struct CStringData int nDataLength; long nRefs; - void* data() throw() + void* data() noexcept { return (this + 1); } - void AddRef() throw() + void AddRef() noexcept { ATLASSERT(nRefs > 0); _InterlockedIncrement(&nRefs); } - void Release() throw() + void Release() noexcept { ATLASSERT(nRefs != 0); @@ -73,12 +73,12 @@ struct CStringData } } - bool IsLocked() const throw() + bool IsLocked() const noexcept { return (nRefs < 0); } - bool IsShared() const throw() + bool IsShared() const noexcept { return (nRefs > 1); } @@ -88,7 +88,7 @@ class CNilStringData : public CStringData { public: - CNilStringData() throw() + CNilStringData() noexcept { pStringMgr = NULL; nRefs = 2; @@ -98,7 +98,7 @@ public: achNil[1] = 0; } - void SetManager(_In_ IAtlStringMgr* pMgr) throw() + void SetManager(_In_ IAtlStringMgr* pMgr) noexcept { ATLASSERT(pStringMgr == NULL); pStringMgr = pMgr; @@ -193,7 +193,7 @@ public: CopyChars(m_pszData, nLength, pchSrc, nLength); } - ~CSimpleStringT() throw() + ~CSimpleStringT() noexcept { CStringData* pData = GetData(); pData->Release(); @@ -245,12 +245,12 @@ public: return *this; } - operator PCXSTR() const throw() + operator PCXSTR() const noexcept { return m_pszData; } - void Empty() throw() + void Empty() noexcept { CStringData* pOldData = GetData(); IAtlStringMgr* pStringMgr = pOldData->pStringMgr; @@ -354,21 +354,21 @@ public: return PrepareWrite(nMinBufferLength); } - int GetAllocLength() const throw() + int GetAllocLength() const noexcept { return GetData()->nAllocLength; } - int GetLength() const throw() + int GetLength() const noexcept { return GetData()->nDataLength; } - PXSTR GetString() throw() + PXSTR GetString() noexcept { return m_pszData; } - PCXSTR GetString() const throw() + PCXSTR GetString() const noexcept { return m_pszData; } @@ -386,17 +386,17 @@ public: ReleaseBufferSetLength(nNewLength); } - bool IsEmpty() const throw() + bool IsEmpty() const noexcept { return (GetLength() == 0); } - CStringData* GetData() const throw() + CStringData* GetData() const noexcept { return (reinterpret_cast<CStringData*>(m_pszData) - 1); } - IAtlStringMgr* GetManager() const throw() + IAtlStringMgr* GetManager() const noexcept { IAtlStringMgr* pStringMgr = GetData()->pStringMgr; return (pStringMgr ? pStringMgr->Clone() : NULL); @@ -434,7 +434,7 @@ public: _Out_writes_to_(nDestLen, nChars) XCHAR* pchDest, _In_ size_t nDestLen, _In_reads_opt_(nChars) const XCHAR* pchSrc, - _In_ int nChars) throw() + _In_ int nChars) noexcept { memcpy(pchDest, pchSrc, nChars * sizeof(XCHAR)); } @@ -443,18 +443,18 @@ public: _Out_writes_to_(nDestLen, nDestLen) XCHAR* pchDest, _In_ size_t nDestLen, _In_reads_(nChars) const XCHAR* pchSrc, - _In_ int nChars) throw() + _In_ int nChars) noexcept { memmove(pchDest, pchSrc, nChars * sizeof(XCHAR)); } - static int __cdecl StringLength(_In_opt_z_ const char* psz) throw() + static int __cdecl StringLength(_In_opt_z_ const char* psz) noexcept { if (psz == NULL) return 0; return (int)strlen(psz); } - static int __cdecl StringLength(_In_opt_z_ const wchar_t* psz) throw() + static int __cdecl StringLength(_In_opt_z_ const wchar_t* psz) noexcept { if (psz == NULL) return 0; return (int)wcslen(psz); @@ -464,7 +464,7 @@ public: // strnlen / wcsnlen are available in MSVCRT starting Vista+. static int __cdecl StringLengthN( _In_opt_z_count_(sizeInXChar) const char* psz, - _In_ size_t sizeInXChar) throw() + _In_ size_t sizeInXChar) noexcept { if (psz == NULL) return 0; return (int)strnlen(psz, sizeInXChar); @@ -472,7 +472,7 @@ public: static int __cdecl StringLengthN( _In_opt_z_count_(sizeInXChar) const wchar_t* psz, - _In_ size_t sizeInXChar) throw() + _In_ size_t sizeInXChar) noexcept { if (psz == NULL) return 0; return (int)wcsnlen(psz, sizeInXChar); @@ -495,7 +495,7 @@ protected: } private: - void Attach(_Inout_ CStringData* pData) throw() + void Attach(_Inout_ CStringData* pData) noexcept { m_pszData = static_cast<PXSTR>(pData->data()); } diff --git a/sdk/lib/atl/atlstr.h b/sdk/lib/atl/atlstr.h index 9131bab531c..30c4f940bce 100644 --- a/sdk/lib/atl/atlstr.h +++ b/sdk/lib/atl/atlstr.h @@ -61,7 +61,7 @@ public: virtual _Ret_maybenull_ _Post_writable_byte_size_(sizeof(CStringData) + nChars*nCharSize) CStringData* Reallocate( _Inout_ _Post_readable_byte_size_(sizeof(CStringData)) CStringData* StrData, _In_ int nChars, - _In_ int nCharSize) throw() + _In_ int nCharSize) noexcept { ATLASSERT(StrData->pStringMgr == this); @@ -79,12 +79,12 @@ public: pNewData->nAllocLength = nChars - 1; return pNewData; } - virtual CStringData* GetNilString() throw() + virtual CStringData* GetNilString() noexcept { m_NilStrData.AddRef(); return &m_NilStrData; } - virtual IAtlStringMgr* Clone() throw() + virtual IAtlStringMgr* Clone() noexcept { return this; } @@ -111,12 +111,12 @@ class StrTraitATL : public StringIterator { public: - static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() + static HINSTANCE FindStringResourceInstance(_In_ UINT nID) noexcept { return AtlFindStringResourceInstance(nID); } - static IAtlStringMgr* GetDefaultManager() throw() + static IAtlStringMgr* GetDefaultManager() noexcept { return CAtlStringMgr::GetInstance(); } diff --git a/sdk/lib/atl/atltime.h b/sdk/lib/atl/atltime.h index c1b8898366a..3b3c9b1853e 100644 --- a/sdk/lib/atl/atltime.h +++ b/sdk/lib/atl/atltime.h @@ -23,17 +23,17 @@ class CTimeSpan { __time64_t m_nSpan; public: - CTimeSpan() throw() + CTimeSpan() noexcept { // leave uninitialized } - CTimeSpan(__time64_t time) throw() + CTimeSpan(__time64_t time) noexcept { m_nSpan = time; } - CTimeSpan(LONG lDays, int nHours, int nMins, int nSecs) throw() + CTimeSpan(LONG lDays, int nHours, int nMins, int nSecs) noexcept { ATLASSERT(lDays >= 0 && nHours >= 0 && nHours <= 23 && nMins >= 0 && nMins <= 59 && nSecs >= 0 && nSecs <= 59); m_nSpan = ((((LONGLONG)lDays) * 24 + nHours) * 60 + nMins) * 60 + nSecs; @@ -79,42 +79,42 @@ public: return strTime; } - LONGLONG GetTotalHours() const throw() + LONGLONG GetTotalHours() const noexcept { return m_nSpan / 60 / 60; } - LONGLONG GetTotalMinutes() const throw() + LONGLONG GetTotalMinutes() const noexcept { return m_nSpan / 60; } - LONGLONG GetTotalSeconds() const throw() + LONGLONG GetTotalSeconds() const noexcept { return m_nSpan; } - LONGLONG GetDays() const throw() + LONGLONG GetDays() const noexcept { return m_nSpan / 60 / 60 / 24; } - LONG GetHours() const throw() + LONG GetHours() const noexcept { return GetTotalHours() - GetDays() * 24; } - LONG GetMinutes() const throw() + LONG GetMinutes() const noexcept { return GetTotalMinutes() - GetTotalHours() * 60; } - LONG GetSeconds() const throw() + LONG GetSeconds() const noexcept { return GetTotalSeconds() - GetTotalMinutes() * 60; } - __time64_t GetTimeSpan() const throw() + __time64_t GetTimeSpan() const noexcept { return m_nSpan; } @@ -130,12 +130,12 @@ class CTime { __time64_t m_nTime; public: - CTime() throw() + CTime() noexcept { // leave uninitialized } - CTime(__time64_t time) throw() + CTime(__time64_t time) noexcept { m_nTime = time; } @@ -170,7 +170,7 @@ public: m_nTime = _mktime64(&time); } - CTime(const SYSTEMTIME& st, int nDST = -1) throw() + CTime(const SYSTEMTIME& st, int nDST = -1) noexcept { struct tm time; time.tm_year = st.wYear; @@ -198,7 +198,7 @@ public: m_nTime = _mktime64(&time); } - CTime(const DBTIMESTAMP& dbts, int nDST = -1) throw() + CTime(const DBTIMESTAMP& dbts, int nDST = -1) noexcept { struct tm time; time.tm_year = dbts.year; @@ -270,7 +270,7 @@ public: return strTime; } - bool GetAsDBTIMESTAMP(DBTIMESTAMP& dbts) const throw() + bool GetAsDBTIMESTAMP(DBTIMESTAMP& dbts) const noexcept { struct tm time; _gmtime64_s(&time, &m_nTime); @@ -284,7 +284,7 @@ public: return true; // TODO: error handling? } - bool GetAsSystemTime(SYSTEMTIME& st) const throw() + bool GetAsSystemTime(SYSTEMTIME& st) const noexcept { struct tm time; _gmtime64_s(&time, &m_nTime); @@ -299,21 +299,21 @@ public: return true; // TODO: error handling? } - static CTime WINAPI GetCurrentTime() throw() + static CTime WINAPI GetCurrentTime() noexcept { __time64_t time; _time64(&time); return CTime(time); } - int GetDay() const throw() + int GetDay() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); return time.tm_mday; } - int GetDayOfWeek() const throw() + int GetDayOfWeek() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); @@ -326,7 +326,7 @@ public: return ptm; } - int GetHour() const throw() + int GetHour() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); @@ -339,28 +339,28 @@ public: return ptm; } - int GetMinute() const throw() + int GetMinute() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); return time.tm_min; } - int GetMonth() const throw() + int GetMonth() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); return time.tm_mon; } - int GetSecond() const throw() + int GetSecond() const noexcept { struct tm time; _localtime64_s(&time, &m_nTime); return time.tm_sec; } - __time64_t GetTime() const throw() + __time64_t GetTime() const noexcept { return m_nTime; } @@ -377,65 +377,65 @@ public: // // TODO // } - CTime operator+(CTimeSpan timeSpan) const throw() + CTime operator+(CTimeSpan timeSpan) const noexcept { return CTime(m_nTime + timeSpan.GetTimeSpan()); } - CTime operator-(CTimeSpan timeSpan) const throw() + CTime operator-(CTimeSpan timeSpan) const noexcept { return CTime(m_nTime - timeSpan.GetTimeSpan()); } - CTimeSpan operator-(CTime time) const throw() + CTimeSpan operator-(CTime time) const noexcept { return CTimeSpan(m_nTime - time.GetTime()); } - CTime& operator+=(CTimeSpan span) throw() + CTime& operator+=(CTimeSpan span) noexcept { m_nTime += span.GetTimeSpan(); return *this; } - CTime& operator-=(CTimeSpan span) throw() + CTime& operator-=(CTimeSpan span) noexcept { m_nTime -= span.GetTimeSpan(); return *this; } - CTime& operator=(__time64_t time) throw() + CTime& operator=(__time64_t time) noexcept { m_nTime = time; return *this; } - bool operator==(CTime time) const throw() + bool operator==(CTime time) const noexcept { return m_nTime == time.GetTime(); } - bool operator!=(CTime time) const throw() + bool operator!=(CTime time) const noexcept { return m_nTime != time.GetTime(); } - bool operator<(CTime time) const throw() + bool operator<(CTime time) const noexcept { return m_nTime < time.GetTime(); } - bool operator>(CTime time) const throw() + bool operator>(CTime time) const noexcept { return m_nTime > time.GetTime(); } - bool operator<=(CTime time) const throw() + bool operator<=(CTime time) const noexcept { return m_nTime <= time.GetTime(); } - bool operator>=(CTime time) const throw() + bool operator>=(CTime time) const noexcept { return m_nTime >= time.GetTime(); } @@ -446,85 +446,85 @@ class CFileTimeSpan { LONGLONG m_nSpan; public: - CFileTimeSpan() throw() + CFileTimeSpan() noexcept { m_nSpan = 0; } - CFileTimeSpan(const CFileTimeSpan& span) throw() + CFileTimeSpan(const CFileTimeSpan& span) noexcept { m_nSpan = span.GetTimeSpan(); } - CFileTimeSpan(LONGLONG nSpan) throw() + CFileTimeSpan(LONGLONG nSpan) noexcept { m_nSpan = nSpan; } - LONGLONG GetTimeSpan() const throw() + LONGLONG GetTimeSpan() const noexcept { return m_nSpan; } - void SetTimeSpan(LONGLONG nSpan) throw() + void SetTimeSpan(LONGLONG nSpan) noexcept { m_nSpan = nSpan; } - CFileTimeSpan operator-(CFileTimeSpan span) const throw() + CFileTimeSpan operator-(CFileTimeSpan span) const noexcept { return CFileTimeSpan(m_nSpan - span.GetTimeSpan()); } - bool operator!=(CFileTimeSpan span) const throw() + bool operator!=(CFileTimeSpan span) const noexcept { return m_nSpan != span.GetTimeSpan(); } - CFileTimeSpan operator+(CFileTimeSpan span) const throw() + CFileTimeSpan operator+(CFileTimeSpan span) const noexcept { return CFileTimeSpan(m_nSpan + span.GetTimeSpan()); } - CFileTimeSpan& operator+=(CFileTimeSpan span) throw() + CFileTimeSpan& operator+=(CFileTimeSpan span) noexcept { m_nSpan += span.GetTimeSpan(); return *this; } - bool operator<(CFileTimeSpan span) const throw() + bool operator<(CFileTimeSpan span) const noexcept { return m_nSpan < span.GetTimeSpan(); } - bool operator<=(CFileTimeSpan span) const throw() + bool operator<=(CFileTimeSpan span) const noexcept { return m_nSpan <= span.GetTimeSpan(); } - CFileTimeSpan& operator=(const CFileTimeSpan& span) throw() + CFileTimeSpan& operator=(const CFileTimeSpan& span) noexcept { m_nSpan = span.GetTimeSpan(); return *this; } - CFileTimeSpan& operator-=(CFileTimeSpan span) throw() + CFileTimeSpan& operator-=(CFileTimeSpan span) noexcept { m_nSpan -= span.GetTimeSpan(); return *this; } - bool operator==(CFileTimeSpan span) const throw() + bool operator==(CFileTimeSpan span) const noexcept { return m_nSpan == span.GetTimeSpan(); } - bool operator>(CFileTimeSpan span) const throw() + bool operator>(CFileTimeSpan span) const noexcept { return m_nSpan > span.GetTimeSpan(); } - bool operator>=(CFileTimeSpan span) const throw() + bool operator>=(CFileTimeSpan span) const noexcept { return m_nSpan >= span.GetTimeSpan(); } @@ -541,116 +541,116 @@ public: static const ULONGLONG Day = Hour * 24; static const ULONGLONG Week = Day * 7; - CFileTime() throw() + CFileTime() noexcept { this->dwLowDateTime = 0; this->dwHighDateTime = 0; } - CFileTime(const FILETIME& ft) throw() + CFileTime(const FILETIME& ft) noexcept { this->dwLowDateTime = ft.dwLowDateTime; this->dwHighDateTime = ft.dwHighDateTime; } - CFileTime(ULONGLONG nTime) throw() + CFileTime(ULONGLONG nTime) noexcept { this->dwLowDateTime = (DWORD) nTime; this->dwHighDateTime = nTime >> 32; } - static CFileTime GetCurrentTime() throw() + static CFileTime GetCurrentTime() noexcept { FILETIME ft; GetSystemTimeAsFileTime(&ft); return CFileTime(ft); } - ULONGLONG GetTime() const throw() + ULONGLONG GetTime() const noexcept { return ((ULONGLONG)this->dwLowDateTime) | (((ULONGLONG)this->dwHighDateTime) << 32); } - CFileTime LocalToUTC() const throw() + CFileTime LocalToUTC() const noexcept { FILETIME ft; LocalFileTimeToFileTime(this, &ft); return CFileTime(ft); } - void SetTime(ULONGLONG nTime) throw() + void SetTime(ULONGLONG nTime) noexcept { this->dwLowDateTime = (DWORD) nTime; this->dwHighDateTime = nTime >> 32; } - CFileTime UTCToLocal() const throw() + CFileTime UTCToLocal() const noexcept { FILETIME ft; FileTimeToLocalFileTime(this, &ft); return CFileTime(ft); } - CFileTime operator-(CFileTimeSpan span) const throw() + CFileTime operator-(CFileTimeSpan span) const noexcept { return CFileTime(this->GetTime() - span.GetTimeSpan()); } - CFileTimeSpan operator-(CFileTime ft) const throw() + CFileTimeSpan operator-(CFileTime ft) const noexcept { return CFileTimeSpan(this->GetTime() - ft.GetTime()); } - bool operator!=(CFileTime ft) const throw() + bool operator!=(CFileTime ft) const noexcept { return this->GetTime() != ft.GetTime(); } - CFileTime operator+(CFileTimeSpan span) const throw() + CFileTime operator+(CFileTimeSpan span) const noexcept { return CFileTime(this->GetTime() + span.GetTimeSpan()); } - CFileTime& operator+=(CFileTimeSpan span) throw() + CFileTime& operator+=(CFileTimeSpan span) noexcept { this->SetTime(this->GetTime() + span.GetTimeSpan()); return *this; } - bool operator<(CFileTime ft) const throw() + bool operator<(CFileTime ft) const noexcept { return this->GetTime() < ft.GetTime(); } - bool operator<=(CFileTime ft) const throw() + bool operator<=(CFileTime ft) const noexcept { return this->GetTime() <= ft.GetTime(); } - CFileTime& operator=(const FILETIME& ft) throw() + CFileTime& operator=(const FILETIME& ft) noexcept { this->dwLowDateTime = ft.dwLowDateTime; this->dwHighDateTime = ft.dwHighDateTime; return *this; } - CFileTime& operator-=(CFileTimeSpan span) throw() + CFileTime& operator-=(CFileTimeSpan span) noexcept { this->SetTime(this->GetTime() - span.GetTimeSpan()); return *this; } - bool operator==(CFileTime ft) const throw() + bool operator==(CFileTime ft) const noexcept { return this->GetTime() == ft.GetTime(); } - bool operator>(CFileTime ft) const throw() + bool operator>(CFileTime ft) const noexcept { return this->GetTime() > ft.GetTime(); } - bool operator>=(CFileTime ft) const throw() + bool operator>=(CFileTime ft) const noexcept { return this->GetTime() >= ft.GetTime(); } diff --git a/sdk/lib/atl/atltypes.h b/sdk/lib/atl/atltypes.h index a4559c5ecf5..5d1e9892d3c 100644 --- a/sdk/lib/atl/atltypes.h +++ b/sdk/lib/atl/atltypes.h @@ -29,101 +29,101 @@ class CPoint : public tagPOINT { public: - CPoint() throw() + CPoint() noexcept { x = y = 0; } - CPoint(int initX, int initY) throw() + CPoint(int initX, int initY) noexcept { x = initX; y = initY; } - CPoint(POINT initPt) throw() + CPoint(POINT initPt) noexcept { *((POINT*)this) = initPt; } - CPoint(SIZE initSize) throw() + CPoint(SIZE initSize) noexcept { *((SIZE*)this) = initSize; } - CPoint(LPARAM dwPoint) throw() + CPoint(LPARAM dwPoint) noexcept { x = LOWORD(dwPoint); y = HIWORD(dwPoint); } - void Offset(int xOffset, int yOffset) throw() + void Offset(int xOffset, int yOffset) noexcept { x += xOffset; y += yOffset; } - void Offset(POINT point) throw() + void Offset(POINT point) noexcept { Offset(point.x, point.y); } - void Offset(SIZE size) throw() + void Offset(SIZE size) noexcept { Offset(size.cx, size.cy); } - BOOL operator==(POINT point) const throw() + BOOL operator==(POINT point) const noexcept { return (x == point.x && y == point.y); } - BOOL operator!=(POINT point) const throw() + BOOL operator!=(POINT point) const noexcept { return !(*this == point); } - void operator+=(SIZE size) throw() + void operator+=(SIZE size) noexcept { Offset(size); } - void operator+=(POINT point) throw() + void operator+=(POINT point) noexcept { Offset(point); } - void operator-=(SIZE size) throw() + void operator-=(SIZE size) noexcept { Offset(-size.cx, -size.cy); } - void operator-=(POINT point) throw() + void operator-=(POINT point) noexcept { Offset(-point.x, -point.y); } - CPoint operator+(SIZE size) const throw() + CPoint operator+(SIZE size) const noexcept { return CPoint(x + size.cx, y + size.cy); } - CPoint operator+(POINT point) const throw() + CPoint operator+(POINT point) const noexcept { return CPoint(x + point.x, y + point.y); } - CRect operator+(const RECT* lpRect) const throw(); + CRect operator+(const RECT* lpRect) const noexcept; - CSize operator-(POINT point) const throw(); + CSize operator-(POINT point) const noexcept; - CPoint operator-(SIZE size) const throw() + CPoint operator-(SIZE size) const noexcept { return CPoint(x - size.cx, y - size.cy); } - CRect operator-(const RECT* lpRect) const throw(); + CRect operator-(const RECT* lpRect) const noexcept; - CPoint operator-() const throw() + CPoint operator-() const noexcept { return CPoint(-x, -y); } @@ -132,87 +132,87 @@ public: class CSize : public tagSIZE { public: - CSize() throw() + CSize() noexcept { cx = cy = 0; } - CSize(int initCX, int initCY) throw() + CSize(int initCX, int initCY) noexcept { cx = initCX; cy = initCY; } - CSize(SIZE initSize) throw() + CSize(SIZE initSize) noexcept { *((SIZE*)this) = initSize; } - CSize(POINT initPt) throw() + CSize(POINT initPt) noexcept { *((POINT*)this) = initPt; } - CSize(DWORD dwSize) throw() + CSize(DWORD dwSize) noexcept { cx = LOWORD(dwSize); cy = HIWORD(dwSize); } - BOOL operator==(SIZE size) const throw() + BOOL operator==(SIZE size) const noexcept { return (size.cx == cx && size.cy == cy); } - BOOL operator!=(SIZE size) const throw() + BOOL operator!=(SIZE size) const noexcept { return !(*this == size); } - void operator+=(SIZE size) throw() + void operator+=(SIZE size) noexcept { cx += size.cx; cy += size.cy; } - void operator-=(SIZE size) throw() + void operator-=(SIZE size) noexcept { cx -= size.cx; cy -= size.cy; } - CSize operator+(SIZE size) const throw() + CSize operator+(SIZE size) const noexcept { return CSize(cx + size.cx, cy + size.cy); } - CPoint operator+(POINT point) const throw() + CPoint operator+(POINT point) const noexcept { return CPoint(cx + point.x, cy + point.y); } - CRect operator+(const RECT* lpRect) const throw(); + CRect operator+(const RECT* lpRect) const noexcept; - CSize operator-(SIZE size) const throw() + CSize operator-(SIZE size) const noexcept { return CSize(cx - size.cx, cy - size.cy); } - CPoint operator-(POINT point) const throw() + CPoint operator-(POINT point) const noexcept { return CPoint(cx - point.x, cy - point.y); } - CRect operator-(const RECT* lpRect) const throw(); + CRect operator-(const RECT* lpRect) const noexcept; - CSize operator-() const throw() + CSize operator-() const noexcept { return CSize(-cx, -cy); } }; -inline CSize CPoint::operator-(POINT point) const throw() +inline CSize CPoint::operator-(POINT point) const noexcept { return CSize(x - point.x, y - point.y); } @@ -221,12 +221,12 @@ inline CSize CPoint::operator-(POINT point) const throw() class CRect : public tagRECT { public: - CRect() throw() + CRect() noexcept { left = top = right = bottom = 0; } - CRect(int l, int t, int r, int b) throw() + CRect(int l, int t, int r, int b) noexcept { left = l; top = t; @@ -234,7 +234,7 @@ public: bottom = b; } - CRect(const RECT& srcRect) throw() + CRect(const RECT& srcRect) noexcept { left = srcRect.left; top = srcRect.top; @@ -242,7 +242,7 @@ public: bottom = srcRect.bottom; } - CRect(LPCRECT lpSrcRect) throw() + CRect(LPCRECT lpSrcRect) noexcept { left = lpSrcRect->left; top = lpSrcRect->top; @@ -250,7 +250,7 @@ public: bottom = lpSrcRect->bottom; } - CRect(POINT point, SIZE size) throw() + CRect(POINT point, SIZE size) noexcept { left = point.x; top = point.y; @@ -258,7 +258,7 @@ public: bottom = point.y + size.cy; } - CRect(POINT topLeft, POINT bottomRight) throw() + CRect(POINT topLeft, POINT bottomRight) noexcept { left = topLeft.x; top = topLeft.y; @@ -266,42 +266,42 @@ public: bottom = bottomRight.y; } - CPoint& BottomRight() throw() + CPoint& BottomRight() noexcept { return ((CPoint*)this)[1]; } - const CPoint& BottomRight() const throw() + const CPoint& BottomRight() const noexcept { return ((const CPoint*)this)[1]; } - CPoint CenterPoint() const throw() + CPoint CenterPoint() const noexcept { return CPoint(left + (Width() >> 1), top + (Height() >> 1)); } - void CopyRect(LPCRECT lpSrcRect) throw() + void CopyRect(LPCRECT lpSrcRect) noexcept { ::CopyRect(this, lpSrcRect); } - void DeflateRect(int x, int y) throw() + void DeflateRect(int x, int y) noexcept { ::InflateRect(this, -x, -y); } - void DeflateRect(SIZE size) throw() + void DeflateRect(SIZE size) noexcept { ::InflateRect(this, -size.cx, -size.cy); } - void DeflateRect(LPCRECT lpRect) throw() + void DeflateRect(LPCRECT lpRect) noexcept { DeflateRect(lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); } - void DeflateRect(int l, int t, int r, int b) throw() + void DeflateRect(int l, int t, int r, int b) noexcept { left += l; top += t; @@ -309,33 +309,33 @@ public: bottom -= b; } - BOOL EqualRect(LPCRECT lpRect) const throw() + BOOL EqualRect(LPCRECT lpRect) const noexcept { return ::EqualRect(this, lpRect); } - int Height() const throw() + int Height() const noexcept { return bottom - top; } - void InflateRect(int x, int y) throw() + void InflateRect(int x, int y) noexcept { ::InflateRect(this, x, y); } - void InflateRect(SIZE size) throw() + void InflateRect(SIZE size) noexcept { ::InflateRect(this, size.cx, size.cy); } - void InflateRect(LPCRECT lpRect) throw() + void InflateRect(LPCRECT lpRect) noexcept { InflateRect(lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); } - void InflateRect(int l, int t, int r, int b) throw() + void InflateRect(int l, int t, int r, int b) noexcept { left -= l; top -= t; @@ -343,74 +343,74 @@ public: bottom += b; } - BOOL IntersectRect(LPCRECT lpRect1, LPCRECT lpRect2) throw() + BOOL IntersectRect(LPCRECT lpRect1, LPCRECT lpRect2) noexcept { return ::IntersectRect(this, lpRect1, lpRect2); } - BOOL IsRectEmpty() const throw() + BOOL IsRectEmpty() const noexcept { return ::IsRectEmpty(this); } - BOOL IsRectNull() const throw() + BOOL IsRectNull() const noexcept { return (left == 0 && right == 0 && top == 0 && bottom == 0); } - //void MoveToX(int x) throw() - //void MoveToXY(int x, int y) throw() - //void MoveToXY(POINT point) throw() - //void MoveToY(int y) throw() - //void NormalizeRect() throw() + //void MoveToX(int x) noexcept + //void MoveToXY(int x, int y) noexcept + //void MoveToXY(POINT point) noexcept + //void MoveToY(int y) noexcept + //void NormalizeRect() noexcept - void OffsetRect(int x, int y) throw() + void OffsetRect(int x, int y) noexcept { ::OffsetRect(this, x, y); } - void OffsetRect(POINT point) throw() + void OffsetRect(POINT point) noexcept { ::OffsetRect(this, point.x, point.y); } - void OffsetRect(SIZE size) throw() + void OffsetRect(SIZE size) noexcept { ::OffsetRect(this, size.cx, size.cy); } - BOOL PtInRect(POINT point) const throw() + BOOL PtInRect(POINT point) const noexcept { return ::PtInRect(this, point); } - //void SetRect(int x1, int y1, int x2, int y2) throw() - //void SetRectEmpty() throw() - //CSize Size() const throw() - //BOOL SubtractRect(LPCRECT lpRectSrc1, LPCRECT lpRectSrc2) throw() + //void SetRect(int x1, int y1, int x2, int y2) noexcept + //void SetRectEmpty() noexcept + //CSize Size() const noexcept + //BOOL SubtractRect(LPCRECT lpRectSrc1, LPCRECT lpRectSrc2) noexcept - CPoint& TopLeft() throw() + CPoint& TopLeft() noexcept { return ((CPoint*)this)[0]; } - const CPoint& TopLeft() const throw() + const CPoint& TopLeft() const noexcept { return ((const CPoint*)this)[0]; } - BOOL UnionRect(LPCRECT lpRect1, LPCRECT lpRect2) throw() + BOOL UnionRect(LPCRECT lpRect1, LPCRECT lpRect2) noexcept { return ::UnionRect(this, lpRect1, lpRect2); } - int Width() const throw() + int Width() const noexcept { return right - left; } - BOOL operator==(const RECT& rect) const throw() + BOOL operator==(const RECT& rect) const noexcept { return (left == rect.left && top == rect.top && @@ -418,12 +418,12 @@ public: bottom == rect.bottom); } - BOOL operator!=(const RECT& rect) const throw() + BOOL operator!=(const RECT& rect) const noexcept { return !(*this == rect); } - void operator=(const RECT& srcRect) throw() + void operator=(const RECT& srcRect) noexcept { left = srcRect.left; top = srcRect.top; @@ -431,136 +431,136 @@ public: bottom = srcRect.bottom; } - void operator+=(POINT point) throw() + void operator+=(POINT point) noexcept { OffsetRect(point); } - void operator+=(SIZE size) throw() + void operator+=(SIZE size) noexcept { OffsetRect(size); } - void operator+=(LPCRECT lpRect) throw() + void operator+=(LPCRECT lpRect) noexcept { InflateRect(lpRect); } - void operator-=(POINT point) throw() + void operator-=(POINT point) noexcept { OffsetRect(-point.x, -point.y); } - void operator-=(SIZE size) throw() + void operator-=(SIZE size) noexcept { OffsetRect(-size.cx, -size.cy); } - void operator-=(LPCRECT lpRect) throw() + void operator-=(LPCRECT lpRect) noexcept { DeflateRect(lpRect); } - CRect operator+(POINT point) const throw() + CRect operator+(POINT point) const noexcept { CRect r(this); r.OffsetRect(point); return r; } - CRect operator+(LPCRECT lpRect) const throw() + CRect operator+(LPCRECT lpRect) const noexcept { CRect r(this); r.InflateRect(lpRect); return r; } - CRect operator+(SIZE size) const throw() + CRect operator+(SIZE size) const noexcept { CRect r(this); r.OffsetRect(size); return r; } - CRect operator-(POINT point) const throw() + CRect operator-(POINT point) const noexcept { CRect r(this); r.OffsetRect(-point.x, -point.y); return r; } - CRect operator-(SIZE size) const throw() + CRect operator-(SIZE size) const noexcept { CRect r(this); r.OffsetRect(-size.cx, -size.cy); return r; } - CRect operator-(LPCRECT lpRect) const throw() + CRect operator-(LPCRECT lpRect) const noexcept { CRect r(this); r.DeflateRect(lpRect); return r; } - void operator&=(const RECT& rect) throw() + void operator&=(const RECT& rect) noexcept { IntersectRect(this, &rect); } - CRect operator&(const RECT& rect2) const throw() + CRect operator&(const RECT& rect2) const noexcept { CRect r; r.IntersectRect(this, &rect2); return r; } - void operator|=(const RECT& rect) throw() + void operator|=(const RECT& rect) noexcept { UnionRect(this, &rect); } - CRect operator|(const RECT& rect2) const throw() + CRect operator|(const RECT& rect2) const noexcept { CRect r; r.UnionRect(this, &rect2); return r; } - operator LPRECT() throw() + operator LPRECT() noexcept { return this; } - operator LPCRECT() const throw() + operator LPCRECT() const noexcept { return this; } }; -inline CRect CPoint::operator+(const RECT* lpRect) const throw() +inline CRect CPoint::operator+(const RECT* lpRect) const noexcept { CRect r(lpRect); r += *this; return r; } -inline CRect CPoint::operator-(const RECT* lpRect) const throw() +inline CRect CPoint::operator-(const RECT* lpRect) const noexcept { CRect r(lpRect); r -= *this; return r; } -inline CRect CSize::operator+(const RECT* lpRect) const throw() +inline CRect CSize::operator+(const RECT* lpRect) const noexcept { CRect r(lpRect); r += *this; return r; } -inline CRect CSize::operator-(const RECT* lpRect) const throw() +inline CRect CSize::operator-(const RECT* lpRect) const noexcept { CRect r(lpRect); r -= *this; diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index 2e5a18b1a54..ce66b9787bb 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -11,7 +11,7 @@ namespace ATL { -inline UINT WINAPI _AtlGetConversionACP() throw() +inline UINT WINAPI _AtlGetConversionACP() noexcept { #ifdef _CONVERSION_DONT_USE_THREAD_LOCALE return CP_ACP; @@ -26,13 +26,13 @@ class ChTraitsCRT : public ChTraitsBase<_CharType> { public: - static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) throw() + static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) noexcept { if (pszSource == NULL) return -1; return static_cast<int>(wcslen(pszSource)); } - static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) throw() + static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) noexcept { if (pszSource == NULL) return 0; return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource, -1, NULL, 0) - 1; @@ -40,14 +40,14 @@ public: static int __cdecl GetBaseTypeLength( _In_reads_(nLength) LPCWSTR pszSource, - _In_ int nLength) throw() + _In_ int nLength) noexcept { return nLength; } static int __cdecl GetBaseTypeLength( _In_reads_(nLength) LPCSTR pszSource, - _In_ int nLength) throw() + _In_ int nLength) noexcept { return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0); } @@ -214,12 +214,12 @@ class ChTraitsCRT<char> : public ChTraitsBase<char> { public: - static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) throw() + static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) noexcept { return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, -1, NULL, 0, NULL, NULL) - 1; } - static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) throw() + static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) noexcept { if (pszSource == NULL) return 0; return static_cast<int>(strlen(pszSource)); @@ -227,14 +227,14 @@ public: static int __cdecl GetBaseTypeLength( _In_reads_(nLength) LPCWSTR pszSource, - _In_ int nLength) throw() + _In_ int nLength) noexcept { return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0, NULL, NULL); } static int __cdecl GetBaseTypeLength( _In_reads_(nLength) LPCSTR pszSource, - _In_ int nLength) throw() + _In_ int nLength) noexcept { return nLength; } @@ -428,12 +428,12 @@ public: typedef typename CThisSimpleString::PCYSTR PCYSTR; public: - CStringT() throw() : + CStringT() noexcept : CThisSimpleString(StringTraits::GetDefaultManager()) { } - explicit CStringT( _In_ IAtlStringMgr* pStringMgr) throw() : + explicit CStringT( _In_ IAtlStringMgr* pStringMgr) noexcept : CThisSimpleString(pStringMgr) { } @@ -544,76 +544,76 @@ public: return *this; } - friend bool operator==(const CStringT& str1, const CStringT& str2) throw() + friend bool operator==(const CStringT& str1, const CStringT& str2) noexcept { return str1.Compare(str2) == 0; } - friend bool operator==(const CStringT& str1, PCXSTR psz2) throw() + friend bool operator==(const CStringT& str1, PCXSTR psz2) noexcept { return str1.Compare(psz2) == 0; } - friend bool operator==(const CStringT& str1, PCYSTR psz2) throw() + friend bool operator==(const CStringT& str1, PCYSTR psz2) noexcept { CStringT tmp(psz2, str1.GetManager()); return tmp.Compare(str1) == 0; } - friend bool operator==(const CStringT& str1, XCHAR ch2) throw() + friend bool operator==(const CStringT& str1, XCHAR ch2) noexcept { return str1.GetLength() == 1 && str1[0] == ch2; } - friend bool operator==(PCXSTR psz1, const CStringT& str2) throw() + friend bool operator==(PCXSTR psz1, const CStringT& str2) noexcept { return str2.Compare(psz1) == 0; } - friend bool operator==(PCYSTR psz1, const CStringT& str2) throw() + friend bool operator==(PCYSTR psz1, const CStringT& str2) noexcept { CStringT tmp(psz1, str2.GetManager()); return tmp.Compare(str2) == 0; } - friend bool operator==(XCHAR ch1, const CStringT& str2) throw() + friend bool operator==(XCHAR ch1, const CStringT& str2) noexcept { return str2.GetLength() == 1 && str2[0] == ch1; } - friend bool operator!=(const CStringT& str1, const CStringT& str2) throw() + friend bool operator!=(const CStringT& str1, const CStringT& str2) noexcept { return str1.Compare(str2) != 0; } - friend bool operator!=(const CStringT& str1, PCXSTR psz2) throw() + friend bool operator!=(const CStringT& str1, PCXSTR psz2) noexcept { return str1.Compare(psz2) != 0; } - friend bool operator!=(const CStringT& str1, PCYSTR psz2) throw() + friend bool operator!=(const CStringT& str1, PCYSTR psz2) noexcept { CStringT tmp(psz2, str1.GetManager()); return tmp.Compare(str1) != 0; } - friend bool operator!=(const CStringT& str1, XCHAR ch2) throw() + friend bool operator!=(const CStringT& str1, XCHAR ch2) noexcept { return str1.GetLength() != 1 || str1[0] != ch2; } - friend bool operator!=(PCXSTR psz1, const CStringT& str2) throw() + friend bool operator!=(PCXSTR psz1, const CStringT& str2) noexcept { return str2.Compare(psz1) != 0; } - friend bool operator!=(PCYSTR psz1, const CStringT& str2) throw() + friend bool operator!=(PCYSTR psz1, const CStringT& str2) noexcept { CStringT tmp(psz1, str2.GetManager()); return tmp.Compare(str2) != 0; } - friend bool operator!=(XCHAR ch1, const CStringT& str2) throw() + friend bool operator!=(XCHAR ch1, const CStringT& str2) noexcept { return str2.GetLength() != 1 || str2[0] != ch1; } @@ -693,7 +693,7 @@ public: return *this; } - int Find(_In_ PCXSTR pszSub, _In_opt_ int iStart = 0) const throw() + int Find(_In_ PCXSTR pszSub, _In_opt_ int iStart = 0) const noexcept { int nLength = CThisSimpleString::GetLength(); @@ -706,7 +706,7 @@ public: return pszResult ? ((int)(pszResult - pszString)) : -1; } - int Find(_In_ XCHAR ch, _In_opt_ int iStart = 0) const throw() + int Find(_In_ XCHAR ch, _In_opt_ int iStart = 0) const noexcept { int nLength = CThisSimpleString::GetLength(); @@ -719,7 +719,7 @@ public: return pszResult ? ((int)(pszResult - pszString)) : -1; } - int FindOneOf(_In_ PCXSTR pszCharSet) const throw() + int FindOneOf(_In_ PCXSTR pszCharSet) const noexcept { PCXSTR pszString = CThisSimpleString::GetString(); PCXSTR pszResult = StringTraits::FindOneOf(pszString, pszCharSet); @@ -727,7 +727,7 @@ public: return pszResult ? ((int)(pszResult - pszString)) : -1; } - int ReverseFind(_In_ XCHAR ch) const throw() + int ReverseFind(_In_ XCHAR ch) const noexcept { PCXSTR pszString = CThisSimpleString::GetString(); PCXSTR pszResult = StringTraits::FindCharReverse(pszString, ch);

1 0

[reactos] 01/01: [MSPAINT] Calculate intersection to reduce bits transfer (#5795)
by Katayama Hirofumi MZ 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd1e158480bc35b9d2918… commit fd1e158480bc35b9d2918853cd7f2cffc6a6e602 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 16 09:09:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 16 09:09:40 2023 +0900 [MSPAINT] Calculate intersection to reduce bits transfer (#5795) Drawing lines smoothly on big image. - In CCanvasWindow::DoDraw, calculate the intersection to reduce bits transfer. - Improve SmoothDrawTool in handling Shift key. CORE-19094, CORE-19237 --- base/applications/mspaint/canvas.cpp | 26 +++++++++++++++++++------- base/applications/mspaint/mouse.cpp | 18 ++++++++---------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 680acd6fe56..60aa29929b5 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -91,29 +91,43 @@ HITTEST CCanvasWindow::CanvasHitTest(POINT pt) VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) { + // This is the target area we have to draw on + CRect rcCanvasDraw; + rcCanvasDraw.IntersectRect(&rcClient, &rcPaint); + // We use a memory bitmap to reduce flickering HDC hdcMem0 = ::CreateCompatibleDC(hDC); m_ahbmCached[0] = CachedBufferDIB(m_ahbmCached[0], rcClient.right, rcClient.bottom); HGDIOBJ hbm0Old = ::SelectObject(hdcMem0, m_ahbmCached[0]); // Fill the background on hdcMem0 - ::FillRect(hdcMem0, &rcPaint, (HBRUSH)(COLOR_APPWORKSPACE + 1)); + ::FillRect(hdcMem0, &rcCanvasDraw, (HBRUSH)(COLOR_APPWORKSPACE + 1)); // Draw the sizeboxes if necessary RECT rcBase = GetBaseRect(); if (!selectionModel.m_bShow && !::IsWindowVisible(textEditWindow)) - drawSizeBoxes(hdcMem0, &rcBase, FALSE, &rcPaint); + drawSizeBoxes(hdcMem0, &rcBase, FALSE, &rcCanvasDraw); // Calculate image size CRect rcImage; GetImageRect(rcImage); SIZE sizeImage = { imageModel.GetWidth(), imageModel.GetHeight() }; + // Calculate the target area on the image + CRect rcImageDraw = rcCanvasDraw; + CanvasToImage(rcImageDraw); + rcImageDraw.IntersectRect(&rcImageDraw, &rcImage); + + // Consider rounding down by zooming + rcImageDraw.right += 1; + rcImageDraw.bottom += 1; + // hdcMem1 <-- imageModel HDC hdcMem1 = ::CreateCompatibleDC(hDC); m_ahbmCached[1] = CachedBufferDIB(m_ahbmCached[1], sizeImage.cx, sizeImage.cy); HGDIOBJ hbm1Old = ::SelectObject(hdcMem1, m_ahbmCached[1]); - BitBlt(hdcMem1, 0, 0, sizeImage.cx, sizeImage.cy, imageModel.GetDC(), 0, 0, SRCCOPY); + ::BitBlt(hdcMem1, rcImageDraw.left, rcImageDraw.top, rcImageDraw.Width(), rcImageDraw.Height(), + imageModel.GetDC(), rcImageDraw.left, rcImageDraw.top, SRCCOPY); // Draw overlay #1 on hdcMem1 toolsModel.OnDrawOverlayOnImage(hdcMem1); @@ -158,10 +172,8 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) DrawXorRect(hdcMem0, &m_rcResizing); // Transfer the bits (hDC <-- hdcMem0) - ::BitBlt(hDC, - rcPaint.left, rcPaint.top, - rcPaint.right - rcPaint.left, rcPaint.bottom - rcPaint.top, - hdcMem0, rcPaint.left, rcPaint.top, SRCCOPY); + ::BitBlt(hDC, rcCanvasDraw.left, rcCanvasDraw.top, rcCanvasDraw.Width(), rcCanvasDraw.Height(), + hdcMem0, rcCanvasDraw.left, rcCanvasDraw.top, SRCCOPY); // Clean up hdcMem0 ::SelectObject(hdcMem0, hbm0Old); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 4984ab63432..dc9ce6b89a2 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -421,6 +421,7 @@ RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) struct SmoothDrawTool : ToolBase { DIRECTION m_direction = NO_DIRECTION; + BOOL m_bShiftDown = FALSE; SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { @@ -433,11 +434,12 @@ struct SmoothDrawTool : ToolBase m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); imageModel.NotifyImageChanged(); + m_bShiftDown = (::GetKeyState(VK_SHIFT) & 0x8000); // Is Shift key pressed? } BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - if (::GetKeyState(VK_SHIFT) < 0) // Shift key is pressed + if (m_bShiftDown) { if (m_direction == NO_DIRECTION) { @@ -450,14 +452,10 @@ struct SmoothDrawTool : ToolBase } else { - if (m_direction != NO_DIRECTION) - { - m_direction = NO_DIRECTION; - draw(bLeftButton, x, y); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; - return TRUE; - } + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; } draw(bLeftButton, x, y); @@ -467,7 +465,7 @@ struct SmoothDrawTool : ToolBase BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - if (m_direction != NO_DIRECTION) + if (m_bShiftDown && m_direction != NO_DIRECTION) { RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); }

1 0

[reactos] 01/01: [USETUP] Decouple bootloader install choice page from its actual installation (#5786)
by Hermès Bélusca-Maïto 14 Oct '23

14 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c2ec83fa7658fb472313… commit 5c2ec83fa7658fb472313e094f7a29a216fe16b1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 11 22:05:56 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 14 16:29:43 2023 +0200 [USETUP] Decouple bootloader install choice page from its actual installation (#5786) This allows to move this choice sooner in the process, thus having all the user key presses at first, then all the actual installation going without any key presses needed anymore... (that is, unless you wanted to install the bootloader on a removable device. Then it will prompt you there!) - Additional "cosmetic"/future-proof changes: Rename all instances of "floppy" in the bootloader install variables to "RemovableDisk" because it would be great to have this install choice later. - Layout adjustments in the translated bootloader pages. - Skip bootloader installation on upgrades. The idea here is that if we were able to find a ReactOS installation to upgrade, this means we were able to find a valid bootloader + boot entry. See also PR #5633. This logic may be slightly improved in the future to detect whether the underlying bootloader is FreeLdr and if so, only update its files. But this is for the future. --- base/setup/usetup/lang/bg-BG.h | 127 ++++++++++++++------------ base/setup/usetup/lang/bn-BD.h | 170 +++++++++++++++++----------------- base/setup/usetup/lang/cs-CZ.h | 120 ++++++++++++------------ base/setup/usetup/lang/da-DK.h | 127 ++++++++++++++------------ base/setup/usetup/lang/de-DE.h | 127 ++++++++++++++------------ base/setup/usetup/lang/el-GR.h | 127 ++++++++++++++------------ base/setup/usetup/lang/en-US.h | 122 ++++++++++++------------- base/setup/usetup/lang/es-ES.h | 127 ++++++++++++++------------ base/setup/usetup/lang/et-EE.h | 120 ++++++++++++------------ base/setup/usetup/lang/eu-ES.h | 127 ++++++++++++++------------ base/setup/usetup/lang/fr-FR.h | 122 ++++++++++++------------- base/setup/usetup/lang/he-IL.h | 120 ++++++++++++------------ base/setup/usetup/lang/hr-HR.h | 141 ++++++++++++++-------------- base/setup/usetup/lang/hu-HU.h | 127 ++++++++++++++------------ base/setup/usetup/lang/id-ID.h | 127 ++++++++++++++------------ base/setup/usetup/lang/it-IT.h | 175 ++++++++++++++++++----------------- base/setup/usetup/lang/ja-JP.h | 127 ++++++++++++++------------ base/setup/usetup/lang/lt-LT.h | 122 ++++++++++++------------- base/setup/usetup/lang/ms-MY.h | 129 +++++++++++++------------- base/setup/usetup/lang/nl-NL.h | 127 ++++++++++++++------------ base/setup/usetup/lang/pl-PL.h | 127 ++++++++++++++------------ base/setup/usetup/lang/pt-BR.h | 127 ++++++++++++++------------ base/setup/usetup/lang/pt-PT.h | 127 ++++++++++++++------------ base/setup/usetup/lang/ro-RO.h | 127 ++++++++++++++------------ base/setup/usetup/lang/ru-RU.h | 127 ++++++++++++++------------ base/setup/usetup/lang/sk-SK.h | 127 ++++++++++++++------------ base/setup/usetup/lang/sq-AL.h | 129 +++++++++++++------------- base/setup/usetup/lang/sv-SE.h | 120 ++++++++++++------------ base/setup/usetup/lang/tr-TR.h | 113 ++++++++++++----------- base/setup/usetup/lang/uk-UA.h | 127 ++++++++++++++------------ base/setup/usetup/usetup.c | 202 +++++++++++++++++++++-------------------- base/setup/usetup/usetup.h | 6 +- 32 files changed, 2113 insertions(+), 1957 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 84e07910fa5..8537ccdf490 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -944,59 +944,6 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = } }; -static MUI_ENTRY bgBGBootPageEntries[] = -{ - { - 4, - 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "\210\255\341\342\240\253\250\340\240\255\245 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240 (bootloader) \255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240 \242\250", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\241\245 \255\245\343\341\257\245\350\255\256.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "\221\253\256\246\245\342\245 \344\256\340\254\240\342\250\340\240\255\240 \244\250\341\252\245\342\240 \242 \343\341\342\340\256\251\341\342\242\256 A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "\250 \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - " ENTER = \217\340\256\244\352\253\246\250 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY bgBGSelectPartitionEntries[] = { { @@ -1481,7 +1428,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = } }; -static MUI_ENTRY bgBGBootLoaderEntries[] = +static MUI_ENTRY bgBGBootLoaderSelectPageEntries[] = { { 4, @@ -1493,7 +1440,7 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = { 6, 8, - "\217\340\256\342\250\347\240 \250\255\341\342\240\253\250\340\240\255\245\342\256 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240.", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1549,6 +1496,13 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "\217\340\256\342\250\347\240 \250\255\341\342\240\253\250\340\240\255\245\342\256 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1564,6 +1518,59 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY bgBGBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " \210\255\341\342\240\253\240\346\250\357 \255\240 ReactOS " KERNEL_VERSION_STR " .", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\210\255\341\342\240\253\250\340\240\255\245 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240 (bootloader) \255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240 \242\250", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "\241\245 \255\245\343\341\257\245\350\255\256.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "\221\253\256\246\245\342\245 \344\256\340\254\240\342\250\340\240\255\240 \244\250\341\252\245\342\240 \242 \343\341\342\340\256\251\341\342\242\256 A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "\250 \255\240\342\250\341\255\245\342\245 ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + " ENTER = \217\340\256\244\352\253\246\250 F3 = \210\247\345\256\244", + TEXT_TYPE_STATUS, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { { @@ -2198,8 +2205,8 @@ MUI_PAGE bgBGPages[] = bgBGKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - bgBGBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + bgBGBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2214,12 +2221,12 @@ MUI_PAGE bgBGPages[] = bgBGSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, bgBGBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - bgBGBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + bgBGBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 8ecec83cd19..ba42c1a058f 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -928,83 +928,6 @@ static MUI_ENTRY bnBDSuccessPageEntries[] = } }; -static MUI_ENTRY bnBDBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Setup cannot install the bootloader on your computers", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "hardisk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Please insert a formatted floppy disk in drive A: and", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "press ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - -static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 0, - 0, - "Installing the bootloader onto the media, please wait...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } -}; - static MUI_ENTRY bnBDSelectPartitionEntries[] = { { @@ -1488,7 +1411,7 @@ static MUI_ENTRY bnBDFileCopyEntries[] = } }; -static MUI_ENTRY bnBDBootLoaderEntries[] = +static MUI_ENTRY bnBDBootLoaderSelectPageEntries[] = { { 4, @@ -1500,7 +1423,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = { 6, 8, - "Setup is installing the boot loader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1528,7 +1451,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = { 8, 15, - "Skip install bootloader.", + "Skip bootloader installation.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1547,6 +1470,83 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = } }; +static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup is installing the bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computer's harddisk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "and press ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY bnBDKeyboardSettingsEntries[] = { { @@ -2180,8 +2180,8 @@ MUI_PAGE bnBDPages[] = bnBDKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - bnBDBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + bnBDBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2196,12 +2196,12 @@ MUI_PAGE bnBDPages[] = bnBDSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, bnBDBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - bnBDBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + bnBDBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 7ee0878be8e..9b8092616c1 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -936,59 +936,6 @@ static MUI_ENTRY csCZSuccessPageEntries[] = } }; -static MUI_ENTRY csCZBootPageEntries[] = -{ - { - 4, - 3, - " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na tento", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "disk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Vlo\247te naform\240tovanou disketu do jednotky A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "a stiskn\330te ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Pokra\237ovat F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY csCZSelectPartitionEntries[] = { { @@ -1472,7 +1419,7 @@ static MUI_ENTRY csCZFileCopyEntries[] = } }; -static MUI_ENTRY csCZBootLoaderEntries[] = +static MUI_ENTRY csCZBootLoaderSelectPageEntries[] = { { 4, @@ -1484,7 +1431,7 @@ static MUI_ENTRY csCZBootLoaderEntries[] = { 6, 8, - "Instalace nyn\241 nainstaluje zavad\330\237.", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1540,6 +1487,13 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Instalace nyn\241 nainstaluje zavad\330\237.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1555,6 +1509,52 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY csCZBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instalace ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na tento disk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Vlo\247te naform\240tovanou disketu do jednotky A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "a stiskn\330te ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Pokra\237ovat F3 = Ukon\237it", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY csCZKeyboardSettingsEntries[] = { { @@ -2188,8 +2188,8 @@ MUI_PAGE csCZPages[] = csCZKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - csCZBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + csCZBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2204,12 +2204,12 @@ MUI_PAGE csCZPages[] = csCZSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, csCZBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - csCZBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + csCZBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index d953f6c0d46..8485e176eb2 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -937,59 +937,6 @@ static MUI_ENTRY daDKSuccessPageEntries[] = } }; -static MUI_ENTRY daDKBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " installationen ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Installationen kan ikke installere opstartsl\221seren p\206", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "din computers hardisk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "S\221t en formateret diskette i drev A: og", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "tryk p\206 ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Forts\221t F3 = Afslut", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY daDKSelectPartitionEntries[] = { { @@ -1466,7 +1413,7 @@ static MUI_ENTRY daDKFileCopyEntries[] = } }; -static MUI_ENTRY daDKBootLoaderEntries[] = +static MUI_ENTRY daDKBootLoaderSelectPageEntries[] = { { 4, @@ -1478,7 +1425,7 @@ static MUI_ENTRY daDKBootLoaderEntries[] = { 6, 8, - "Installatione af opstartsl\221ser", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1534,6 +1481,13 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Installatione af opstartsl\221ser.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1549,6 +1503,59 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY daDKBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Installationen kan ikke installere opstartsl\221seren p\206", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "din computers harddisk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "S\221t en formateret diskette i drev A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "og tryk p\206 ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Forts\221t F3 = Afslut", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY daDKKeyboardSettingsEntries[] = { { @@ -2183,8 +2190,8 @@ MUI_PAGE daDKPages[] = daDKKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - daDKBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + daDKBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2199,12 +2206,12 @@ MUI_PAGE daDKPages[] = daDKSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, daDKBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - daDKBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + daDKBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 10d7c8610cc..0d095400c67 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -923,59 +923,6 @@ static MUI_ENTRY deDESuccessPageEntries[] = } }; -static MUI_ENTRY deDEBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Der Bootsektor konnte nicht auf der", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "Festplatte Ihres Computers installiert werden.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Bitte legen Sie eine formatierte Diskette in Laufwerk A: ein und", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "dr\201cken Sie ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Fortsetzen F3 = Installation abbrechen", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY deDESelectPartitionEntries[] = { { @@ -1466,7 +1413,7 @@ static MUI_ENTRY deDEFileCopyEntries[] = } }; -static MUI_ENTRY deDEBootLoaderEntries[] = +static MUI_ENTRY deDEBootLoaderSelectPageEntries[] = { { 4, @@ -1478,7 +1425,7 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { 6, 8, - "Bestimmen Sie, wo der Bootloader installiert werden soll:", + "Bestimmen Sie, wo Setup den Bootloader installieren soll:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1534,6 +1481,13 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Setup installiert den Bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1549,6 +1503,59 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY deDEBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Der Bootsektor konnte nicht auf der Festplatte Ihres Computers", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "installiert werden.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Bitte legen Sie eine formatierte Diskette in Laufwerk A: ein", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "und dr\201cken Sie ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Fortsetzen F3 = Installation abbrechen", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY deDEKeyboardSettingsEntries[] = { { @@ -2185,8 +2192,8 @@ MUI_PAGE deDEPages[] = deDEKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - deDEBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + deDEBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2201,12 +2208,12 @@ MUI_PAGE deDEPages[] = deDESuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, deDEBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - deDEBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + deDEBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index edb49657ef2..401f7ae16fc 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -944,59 +944,6 @@ static MUI_ENTRY elGRSuccessPageEntries[] = } }; -static MUI_ENTRY elGRBootPageEntries[] = -{ - { - 4, - 3, - " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\246\250\234\345 \244\230 \234\232\241\230\253\230\251\253\343\251\234\240 \253\246\244 bootloader", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 \253\246\254 \254\247\246\242\246\232\240\251\253\343 \251\230\252", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "\217\230\250\230\241\230\242\351 \234\240\251\341\232\234\253\234 \243\240\230 \233\240\230\243\246\250\255\340\243\342\244\236 \233\240\251\241\342\253\230 \251\253\246 A: \241\230\240", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "\247\230\253\343\251\253\234 ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - " ENTER = \221\254\244\342\256\234\240\230 F3 = \200\247\246\256\351\250\236\251\236", - TEXT_TYPE_STATUS, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY elGRSelectPartitionEntries[] = { { @@ -1481,7 +1428,7 @@ static MUI_ENTRY elGRFileCopyEntries[] = } }; -static MUI_ENTRY elGRBootLoaderEntries[] = +static MUI_ENTRY elGRBootLoaderSelectPageEntries[] = { { 4, @@ -1493,7 +1440,7 @@ static MUI_ENTRY elGRBootLoaderEntries[] = { 6, 8, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240 \253\246\244 boot loader", + "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240 \253\246\244 bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1549,6 +1496,13 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240 \253\246\244 bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1564,6 +1518,59 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY elGRBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\246\250\234\345 \244\230 \234\232\241\230\253\230\251\253\343\251\234\240 \253\246\244 bootloader", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 \253\246\254 \254\247\246\242\246\232\240\251\253\343 \251\230\252.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "\217\230\250\230\241\230\242\351 \234\240\251\341\232\234\253\234 \243\240\230 \233\240\230\243\246\250\255\340\243\342\244\236 \233\240\251\241\342\253\230 \251\253\246 A: \241\230\240", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "\247\230\253\343\251\253\234 ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + " ENTER = \221\254\244\342\256\234\240\230 F3 = \200\247\246\256\351\250\236\251\236", + TEXT_TYPE_STATUS, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY elGRKeyboardSettingsEntries[] = { { @@ -2196,8 +2203,8 @@ MUI_PAGE elGRPages[] = elGRKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - elGRBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + elGRBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2212,12 +2219,12 @@ MUI_PAGE elGRPages[] = elGRSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, elGRBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - elGRBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + elGRBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 1c94ac657e4..3354212a0a2 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -928,59 +928,6 @@ static MUI_ENTRY enUSSuccessPageEntries[] = } }; -static MUI_ENTRY enUSBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Setup cannot install the bootloader on your computers", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "hardisk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Please insert a formatted floppy disk in drive A: and", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "press ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY enUSSelectPartitionEntries[] = { { @@ -1464,7 +1411,7 @@ static MUI_ENTRY enUSFileCopyEntries[] = } }; -static MUI_ENTRY enUSBootLoaderEntries[] = +static MUI_ENTRY enUSBootLoaderSelectPageEntries[] = { { 4, @@ -1476,7 +1423,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { 6, 8, - "Setup is installing the boot loader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1504,7 +1451,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { 8, 15, - "Skip install bootloader.", + "Skip bootloader installation.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1532,6 +1479,13 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Setup is installing the bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1547,6 +1501,52 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY enUSBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computer's harddisk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "and press ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY enUSKeyboardSettingsEntries[] = { { @@ -2180,8 +2180,8 @@ MUI_PAGE enUSPages[] = enUSKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - enUSBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + enUSBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2196,12 +2196,12 @@ MUI_PAGE enUSPages[] = enUSSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, enUSBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - enUSBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + enUSBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index ba445ecfc0f..6f588779e21 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -933,59 +933,6 @@ static MUI_ENTRY esESSuccessPageEntries[] = } }; -static MUI_ENTRY esESBootPageEntries[] = -{ - { - 4, - 3, - " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "El instalador no pudo instalar el cargador de arranque en el disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "duro del equipo", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Inserte un disquete formateado en la unidad A: y", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "Pulse INTRO.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - " INTRO = Continuar F3 = Salir", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY esESSelectPartitionEntries[] = { { @@ -1470,7 +1417,7 @@ static MUI_ENTRY esESFileCopyEntries[] = } }; -static MUI_ENTRY esESBootLoaderEntries[] = +static MUI_ENTRY esESBootLoaderSelectPageEntries[] = { { 4, @@ -1482,7 +1429,7 @@ static MUI_ENTRY esESBootLoaderEntries[] = { 6, 8, - "En este paso, el instalador crear\240 el cargador de arranque", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1538,6 +1485,13 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "En este paso, el instalador crear\240 el cargador de arranque.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1553,6 +1507,59 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY esESBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "El instalador no pudo instalar el cargador de arranque en el disco", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "duro del equipo.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Inserte un disquete formateado en la unidad A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "y pulse INTRO.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + " INTRO = Continuar F3 = Salir", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY esESKeyboardSettingsEntries[] = { { @@ -2186,8 +2193,8 @@ MUI_PAGE esESPages[] = esESKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - esESBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + esESBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2202,12 +2209,12 @@ MUI_PAGE esESPages[] = esESSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, etESBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - esESBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + esESBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index c29a79ab4d1..881f99de721 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -930,59 +930,6 @@ static MUI_ENTRY etEESuccessPageEntries[] = } }; -static MUI_ENTRY etEEBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " paigaldus ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Alglaadurit ei saanud kettale kirjutada.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Sisesta vormindatud flopiketas draivi A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "ja vajuta ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = J\204tka F3 = V\204lju", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY etEESelectPartitionEntries[] = { { @@ -1467,7 +1414,7 @@ static MUI_ENTRY etEEFileCopyEntries[] = } }; -static MUI_ENTRY etEEBootLoaderEntries[] = +static MUI_ENTRY etEEBootLoaderSelectPageEntries[] = { { 4, @@ -1479,7 +1426,7 @@ static MUI_ENTRY etEEBootLoaderEntries[] = { 6, 8, - "Alglaaduri paigaldamine", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1535,6 +1482,13 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Alglaaduri paigaldamine.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1550,6 +1504,52 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY etEEBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldus ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Alglaadurit ei saanud kettale kirjutada.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Sisesta vormindatud flopiketas draivi A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "ja vajuta ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = J\204tka F3 = V\204lju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY etEEKeyboardSettingsEntries[] = { { @@ -2181,8 +2181,8 @@ MUI_PAGE etEEPages[] = etEEKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - etEEBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + etEEBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2197,12 +2197,12 @@ MUI_PAGE etEEPages[] = etEESuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, etEEBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - etEEBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + etEEBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index c78fe8dd234..0c2688a9d8e 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -929,59 +929,6 @@ static MUI_ENTRY euESSuccessPageEntries[] = } }; -static MUI_ENTRY euESBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Instalazioa ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Instalazio ez du ahalmenik bootloader-a instalatu zure ordenagailuaren", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "disko gogorra", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Mesedez sartu diskete bat formateatuta A: unitaten barnean", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "eta sakatu SARTU.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "SARTU = Jarraitu F3 = Irten", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY euESSelectPartitionEntries[] = { { @@ -1465,7 +1412,7 @@ static MUI_ENTRY euESFileCopyEntries[] = } }; -static MUI_ENTRY euESBootLoaderEntries[] = +static MUI_ENTRY euESBootLoaderSelectPageEntries[] = { { 4, @@ -1477,7 +1424,7 @@ static MUI_ENTRY euESBootLoaderEntries[] = { 6, 8, - "Instalazioak bootloader-a sartzen ari du", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1533,6 +1480,13 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Instalazioak bootloader-a sartzen ari du.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1548,6 +1502,59 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY euESBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalazioa ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalazio ez du ahalmenik bootloader-a instalatu zure ordenagailuaren", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "disko gogorra.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Mesedez sartu diskete bat formateatuta A: unitaten barnean", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "eta sakatu SARTU.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "SARTU = Jarraitu F3 = Irten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY euESKeyboardSettingsEntries[] = { { @@ -2181,8 +2188,8 @@ MUI_PAGE euESPages[] = euESKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - euESBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + euESBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2197,12 +2204,12 @@ MUI_PAGE euESPages[] = euESSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, euESBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - euESBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + euESBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index b34852b57c1..4c8d04461f7 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -951,59 +951,6 @@ static MUI_ENTRY frFRSuccessPageEntries[] = } }; -static MUI_ENTRY frFRBootPageEntries[] = -{ - { - 4, - 3, - " Installation de ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Setup ne peut installer le chargeur sur le disque dur", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "de votre ordinateur", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Veuillez ins\202rer une disquette format\202e dans le lecteur A: et", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "appuyer sur ENTR\220E.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTR\220E = Continuer F3 = Quitter", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY frFRSelectPartitionEntries[] = { { @@ -1416,7 +1363,7 @@ static MUI_ENTRY frFRInstallDirectoryEntries[] = { 6, 9, - "Choisissez un repertoire o\227 vous voulez que ReactOS soit install\202 :", + "Choisissez un r\202pertoire o\227 vous voulez que ReactOS soit install\202 :", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1501,7 +1448,7 @@ static MUI_ENTRY frFRFileCopyEntries[] = } }; -static MUI_ENTRY frFRBootLoaderEntries[] = +static MUI_ENTRY frFRBootLoaderSelectPageEntries[] = { { 4, @@ -1513,7 +1460,7 @@ static MUI_ENTRY frFRBootLoaderEntries[] = { 6, 8, - "Setup installe le chargeur de d\202marrage", + "Veuillez choisir o\227 Setup doit installer le chargeur de d\202marrage :", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1569,6 +1516,13 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Setup installe le chargeur de d\202marrage.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1584,6 +1538,52 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY frFRBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup ne peut installer le chargeur sur le disque dur de votre ordinateur.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Veuillez ins\202rer une disquette format\202e dans le lecteur A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "et appuyer sur ENTR\220E.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTR\220E = Continuer F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY frFRKeyboardSettingsEntries[] = { { @@ -2217,8 +2217,8 @@ MUI_PAGE frFRPages[] = frFRKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - frFRBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + frFRBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2233,12 +2233,12 @@ MUI_PAGE frFRPages[] = frFRSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, frFRBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - frFRBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + frFRBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 85751ce77e6..d0b6b7a5fda 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -932,59 +932,6 @@ static MUI_ENTRY heILSuccessPageEntries[] = } }; -static MUI_ENTRY heILBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "\207\211\231\227\204 \217\220\205\213\204 \214\222 \214\205\207\232\200\204 \214\204\220\216 \232\200 \217\211\227\232\204\214 \204\214\205\213\211 \204\220\211\200 \204\220\227\232\204\204", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\212\201\231\207\216\201", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - ".ENTER \225\207\214\205 :A \217\220\205\213\214 \214\207\232\205\200\216 \217\205\210\211\214\227\232 \221\220\213\204 \204\231\227\201\201", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "\204\220\227\232\204 \214\205\210\211\201 = F3 \212\231\216\204 = ENTER", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY heILSelectPartitionEntries[] = { { @@ -1468,7 +1415,7 @@ static MUI_ENTRY heILFileCopyEntries[] = } }; -static MUI_ENTRY heILBootLoaderEntries[] = +static MUI_ENTRY heILBootLoaderSelectPageEntries[] = { { 4, @@ -1480,7 +1427,7 @@ static MUI_ENTRY heILBootLoaderEntries[] = { 6, 8, - "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213 \204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232", + "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213 \204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1536,6 +1483,13 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213 \204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1551,6 +1505,52 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY heILBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\207\211\231\227\204 \217\220\205\213\204 \214\222 \214\205\207\232\200\204 \214\204\220\216 \232\200 \217\211\227\232\204\214 \204\214\205\213\211 \204\220\211\200 \204\220\227\232\204\204", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "\212\201\231\207\216\201.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + ".ENTER \225\207\214\205 :A \217\220\205\213\214 \214\207\232\205\200\216 \217\205\210\211\214\227\232 \221\220\213\204 \204\231\227\201\201", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\204\220\227\232\204 \214\205\210\211\201 = F3 \212\231\216\204 = ENTER", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY heILKeyboardSettingsEntries[] = { { @@ -2182,8 +2182,8 @@ MUI_PAGE heILPages[] = heILKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - heILBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + heILBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2198,12 +2198,12 @@ MUI_PAGE heILPages[] = heILSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, heILBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - heILBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + heILBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index ba7d46d1226..798cd0738ee 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -938,59 +938,6 @@ static MUI_ENTRY hrHRSuccessPageEntries[] = } }; -static MUI_ENTRY hrHRBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " instalacija ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Instalacijski program ne mo\247e instalirati bootloader (pokreta\237 operativnog sustava) na va\347", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "tvrdi disk u ra\237unalu", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Ubacite formatiranu disketu u Disk A: i", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "pritisnite ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Nastavi F3 = Iza\320i", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY hrHRSelectPartitionEntries[] = { { @@ -1481,7 +1428,7 @@ static MUI_ENTRY hrHRFileCopyEntries[] = } }; -static MUI_ENTRY hrHRBootLoaderEntries[] = +static MUI_ENTRY hrHRBootLoaderSelectPageEntries[] = { { 4, @@ -1493,14 +1440,7 @@ static MUI_ENTRY hrHRBootLoaderEntries[] = { 6, 8, - "Instalacijski program instalirava bootloader", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "(pokreta\237a operativnog sustava)", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1556,6 +1496,20 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Instalacijski program instalirava bootloader", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "(pokreta\237a operativnog sustava).", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1571,6 +1525,59 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY hrHRBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " instalacija ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalacijski program ne mo\247e instalirati bootloader (pokreta\237 operativnog sustava) na va\347", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "tvrdi disk u ra\237unalu.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Ubacite formatiranu disketu u Disk A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "i pritisnite ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Nastavi F3 = Iza\320i", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY hrHRKeyboardSettingsEntries[] = { { @@ -2204,8 +2211,8 @@ MUI_PAGE hrHRPages[] = hrHRKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - hrHRBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + hrHRBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2220,12 +2227,12 @@ MUI_PAGE hrHRPages[] = hrHRSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, hrHRBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - hrHRBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + hrHRBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 270cac926eb..84a5335e7d5 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -937,59 +937,6 @@ static MUI_ENTRY huHUSuccessPageEntries[] = } }; -static MUI_ENTRY huHUBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "a sz\240m\241t\242g\202p merevlemez\202re.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "K\202rj\201k helyezzen be egy megform\240zott floppy lemezt", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "az A: meghajt\242ba, majd nyomjon ENTER-t.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Folytat\240s F3 = Kil\202p\202s", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY huHUSelectPartitionEntries[] = { { @@ -1358,7 +1305,7 @@ static MUI_ENTRY huHUFileCopyEntries[] = } }; -static MUI_ENTRY huHUBootLoaderEntries[] = +static MUI_ENTRY huHUBootLoaderSelectPageEntries[] = { { 4, @@ -1370,7 +1317,7 @@ static MUI_ENTRY huHUBootLoaderEntries[] = { 6, 8, - "Boot loader telep\241t\202se", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1426,6 +1373,13 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Bootloader telep\241t\202se.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1441,6 +1395,59 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY huHUBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "a sz\240m\241t\242g\202p merevlemez\202re.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "K\202rj\201k helyezzen be egy megform\240zott floppy lemezt", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "az A: meghajt\242ba, majd nyomjon ENTER-t.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Folytat\240s F3 = Kil\202p\202s", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY huHUKeyboardSettingsEntries[] = { { @@ -2071,8 +2078,8 @@ MUI_PAGE huHUPages[] = huHUKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - huHUBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + huHUBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2087,12 +2094,12 @@ MUI_PAGE huHUPages[] = huHUSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, huHUBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - huHUBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + huHUBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index e43a768a2d8..676284f7f67 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -928,59 +928,6 @@ static MUI_ENTRY idIDSuccessPageEntries[] = } }; -static MUI_ENTRY idIDBootPageEntries[] = -{ - { - 4, - 3, - " Penyetelan ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Penyetelan tidak dapat menasang bootloader pada komputer Anda", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "hardisk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Mohon masukkan cakram disket yang terformat di drive A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "dan tekan ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Lanjut F3 = Keluar", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY idIDSelectPartitionEntries[] = { { @@ -1464,7 +1411,7 @@ static MUI_ENTRY idIDFileCopyEntries[] = } }; -static MUI_ENTRY idIDBootLoaderEntries[] = +static MUI_ENTRY idIDBootLoaderSelectPageEntries[] = { { 4, @@ -1476,7 +1423,7 @@ static MUI_ENTRY idIDBootLoaderEntries[] = { 6, 8, - "Penyetelan sedang memasang the boot loader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1532,6 +1479,13 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Penyetelan sedang memasang the bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1547,6 +1501,59 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY idIDBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Penyetelan ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Penyetelan tidak dapat menasang bootloader pada komputer Anda", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "harddisk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Mohon masukkan cakram disket yang terformat di drive A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "dan tekan ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Lanjut F3 = Keluar", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY idIDKeyboardSettingsEntries[] = { { @@ -2180,8 +2187,8 @@ MUI_PAGE idIDPages[] = idIDKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - idIDBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + idIDBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2196,12 +2203,12 @@ MUI_PAGE idIDPages[] = idIDSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, idIDBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - idIDBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + idIDBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index e5a6b812a3f..8561f381f08 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -927,83 +927,6 @@ static MUI_ENTRY itITSuccessPageEntries[] = } }; -static MUI_ENTRY itITBootPageEntries[] = -{ - { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Il Setup non ha potuto installare il bootloader nel disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "del vostro computer", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Inserire un disco floppy formattato nell'unit\x85 A: e", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "premere INVIO.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - " INVIO = Continua F3 = Termina", - TEXT_TYPE_STATUS, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - -static MUI_ENTRY itITBootLoaderInstallPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 0, - 0, - "Installing the bootloader onto the media, please wait...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } -}; - static MUI_ENTRY itITSelectPartitionEntries[] = { { @@ -1494,7 +1417,7 @@ static MUI_ENTRY itITFileCopyEntries[] = } }; -static MUI_ENTRY itITBootLoaderEntries[] = +static MUI_ENTRY itITBootLoaderSelectPageEntries[] = { { 4, @@ -1506,7 +1429,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = { 6, 8, - "Setup sta installando il bootloader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1553,6 +1476,90 @@ static MUI_ENTRY itITBootLoaderEntries[] = } }; +static MUI_ENTRY itITBootLoaderInstallPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup sta installando il bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Installing the bootloader onto the media, please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY itITBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Il Setup non ha potuto installare il bootloader nel disco", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "del vostro computer.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Inserire un disco floppy formattato nell'unit\x85 A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "e premere INVIO.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + " INVIO = Continua F3 = Termina", + TEXT_TYPE_STATUS, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY itITKeyboardSettingsEntries[] = { { @@ -2186,8 +2193,8 @@ MUI_PAGE itITPages[] = itITKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - itITBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + itITBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2202,12 +2209,12 @@ MUI_PAGE itITPages[] = itITSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, itITBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - itITBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + itITBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 461281ffa2a..86ba2f45f9b 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -930,59 +930,6 @@ static MUI_ENTRY jaJPSuccessPageEntries[] = } }; -static MUI_ENTRY jaJPBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "\276\257\304\261\257\314\337\312 \314\336\260\304\333\260\300\336\246 \272\335\313\337\255\260\300\311 \312\260\304\336\303\336\250\275\270\274\336\256\263\306 \262\335\275\304\260\331", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\303\336\267\317\276\335\303\336\274\300", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "\304\336\327\262\314\336 A: \306 \314\253\260\317\257\304 \273\332\300 \314\333\257\313\337\260 \303\336\250\275\270\246 \262\332\303\244", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = \277\336\257\272\263 F3 = \301\255\263\274", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY jaJPSelectPartitionEntries[] = { { @@ -1467,7 +1414,7 @@ static MUI_ENTRY jaJPFileCopyEntries[] = } }; -static MUI_ENTRY jaJPBootLoaderEntries[] = +static MUI_ENTRY jaJPBootLoaderSelectPageEntries[] = { { 4, @@ -1479,7 +1426,7 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = { 6, 8, - "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246 \262\335\275\304\260\331 \274\317\275", + "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246 \262\335\275\304\260\331 \274\317\275.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1535,6 +1482,13 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246 \262\335\275\304\260\331 \274\317\275.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1550,6 +1504,59 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY jaJPBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\276\257\304\261\257\314\337\312 \314\336\260\304\333\260\300\336\246 \272\335\313\337\255\260\300\311 \312\260\304\336\303\336\250\275\270\274\336\256\263\306 \262\335\275\304\260\331", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "\303\336\267\317\276\335\303\336\274\300.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "\304\336\327\262\314\336 A: \306 \314\253\260\317\257\304 \273\332\300 \314\333\257\313\337\260 \303\336\250\275\270\246 \262\332\303\244", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "ENTER \267\260\246 \265\274\303 \270\300\336\273\262\241", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = \277\336\257\272\263 F3 = \301\255\263\274", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY jaJPKeyboardSettingsEntries[] = { { @@ -2183,8 +2190,8 @@ MUI_PAGE jaJPPages[] = jaJPKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - jaJPBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + jaJPBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2199,12 +2206,12 @@ MUI_PAGE jaJPPages[] = jaJPSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, jaJPBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - jaJPBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + jaJPBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 9c5942222eb..5e98513d4b8 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -939,59 +939,6 @@ static MUI_ENTRY ltLTSuccessPageEntries[] = } }; -static MUI_ENTRY ltLTBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " diegimo programa ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Setup cannot install the bootloader on your computers", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "hardisk", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Please insert a formatted floppy disk in drive A: and", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "press ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = T\322sti F3 = Baigti", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY ltLTSelectPartitionEntries[] = { { @@ -1475,7 +1422,7 @@ static MUI_ENTRY ltLTFileCopyEntries[] = } }; -static MUI_ENTRY ltLTBootLoaderEntries[] = +static MUI_ENTRY ltLTBootLoaderSelectPageEntries[] = { { 4, @@ -1487,7 +1434,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = { 6, 8, - "Setup is installing the boot loader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1515,7 +1462,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = { 8, 15, - "Skip install bootloader.", + "Skip bootloader installation.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1543,6 +1490,13 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Setup is installing the bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1558,6 +1512,52 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY ltLTBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computer's harddisk.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "and press ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = T\322sti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY ltLTKeyboardSettingsEntries[] = { { @@ -2191,8 +2191,8 @@ MUI_PAGE ltLTPages[] = ltLTKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - ltLTBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + ltLTBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2207,12 +2207,12 @@ MUI_PAGE ltLTPages[] = ltLTSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, ltLTBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - ltLTBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + ltLTBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 933e4795cd9..50b6aba84f5 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -927,59 +927,6 @@ static MUI_ENTRY msMYSuccessPageEntries[] = } }; -static MUI_ENTRY msMYBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Persediaan ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Persediaan tidak dapat memasang bootloader pada komputer", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "cakera keras anda", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Sila sisipkan cakera liut diformatkan dalam pemacu A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "dan tekan ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Teruskan F3 = Keluar", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY msMYSelectPartitionEntries[] = { { @@ -1456,7 +1403,7 @@ static MUI_ENTRY msMYFileCopyEntries[] = } }; -static MUI_ENTRY msMYBootLoaderEntries[] = +static MUI_ENTRY msMYBootLoaderSelectPageEntries[] = { { 4, @@ -1468,7 +1415,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] = { 6, 8, - "Persediaan sedang memasang boot loader", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1496,7 +1443,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] = { 8, 15, - "Langkau memasang boot loader.", + "Langkau memasang bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1524,6 +1471,13 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Persediaan sedang memasang bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1539,6 +1493,59 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY msMYBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Persediaan ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Persediaan tidak dapat memasang bootloader pada komputer", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "cakera keras anda.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Sila sisipkan cakera liut diformatkan dalam pemacu A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "dan tekan ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Teruskan F3 = Keluar", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY msMYKeyboardSettingsEntries[] = { { @@ -2165,8 +2172,8 @@ MUI_PAGE msMYPages[] = msMYKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - msMYBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + msMYBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2181,12 +2188,12 @@ MUI_PAGE msMYPages[] = msMYSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, msMYBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - msMYBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + msMYBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 3da7c994373..b007421627b 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -942,59 +942,6 @@ static MUI_ENTRY nlNLSuccessPageEntries[] = } }; -static MUI_ENTRY nlNLBootPageEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Setup kan de bootloader niet op de vaste schijf van uw computer", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "installeren", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Voer een geformatteerde diskette in station A: in en", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "druk op ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Doorgaan F3 = Afsluiten", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY nlNLSelectPartitionEntries[] = { { @@ -1479,7 +1426,7 @@ static MUI_ENTRY nlNLFileCopyEntries[] = } }; -static MUI_ENTRY nlNLBootLoaderEntries[] = +static MUI_ENTRY nlNLBootLoaderSelectPageEntries[] = { { 4, @@ -1491,7 +1438,7 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = { 6, 8, - "Setup installeert de bootloader.", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1547,6 +1494,13 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Setup installeert de bootloader.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1562,6 +1516,59 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY nlNLBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup kan de bootloader niet op de vaste schijf van uw computer", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "installeren.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Voer een geformatteerde diskette in station A: in", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "en druk op ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Doorgaan F3 = Afsluiten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY nlNLkeyboardSettingsEntries[] = { { @@ -2205,8 +2212,8 @@ MUI_PAGE nlNLPages[] = nlNLkeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - nlNLBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + nlNLBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2221,12 +2228,12 @@ MUI_PAGE nlNLPages[] = nlNLSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, nlNLBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - nlNLBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + nlNLBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 7c735287b95..2c1407ec554 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -940,59 +940,6 @@ static MUI_ENTRY plPLSuccessPageEntries[] = } }; -static MUI_ENTRY plPLBootPageEntries[] = -{ - { - 4, - 3, - " Instalator ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Instalator systemu ReactOS nie mo\276e zainstalowa\206", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "mened\276era rozruchu na dysku twardym", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "W\210\242\276 sformatowan\245 dyskietk\251 do nap\251du A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "i nacisnij klawisz ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Kontynuacja F3 = Wyj\230cie", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY plPLSelectPartitionEntries[] = { { @@ -1476,7 +1423,7 @@ static MUI_ENTRY plPLFileCopyEntries[] = } }; -static MUI_ENTRY plPLBootLoaderEntries[] = +static MUI_ENTRY plPLBootLoaderSelectPageEntries[] = { { 4, @@ -1488,7 +1435,7 @@ static MUI_ENTRY plPLBootLoaderEntries[] = { 6, 8, - "Instalator musi teraz zainstalowa\206 mened\276er rozruchu", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1544,6 +1491,13 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Instalator musi teraz zainstalowa\206 mened\276er rozruchu.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1559,6 +1513,59 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY plPLBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instalator ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalator systemu ReactOS nie mo\276e zainstalowa\206", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "mened\276era rozruchu na dysku twardym.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "W\210\242\276 sformatowan\245 dyskietk\251 do nap\251du A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "i nacisnij klawisz ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Kontynuacja F3 = Wyj\230cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY plPLKeyboardSettingsEntries[] = { { @@ -2192,8 +2199,8 @@ MUI_PAGE plPLPages[] = plPLKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - plPLBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + plPLBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2208,12 +2215,12 @@ MUI_PAGE plPLPages[] = plPLSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, plPLBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - plPLBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + plPLBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index e898699a295..b4d5b5a448b 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -937,59 +937,6 @@ static MUI_ENTRY ptBRSuccessPageEntries[] = } }; -static MUI_ENTRY ptBRBootPageEntries[] = -{ - { - 4, - 3, - " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "O instalador n\306o p\223de instalar o ger\210nciador de inicializa\207\306o no disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "r\241gido do computador.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Por favor insira um disquete formatado na unidade A: e", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "pressione ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER=Continuar F3=Sair", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY ptBRSelectPartitionEntries[] = { { @@ -1481,7 +1428,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] = } }; -static MUI_ENTRY ptBRBootLoaderEntries[] = +static MUI_ENTRY ptBRBootLoaderSelectPageEntries[] = { { 4, @@ -1493,7 +1440,7 @@ static MUI_ENTRY ptBRBootLoaderEntries[] = { 6, 8, - "O instalador ir\240 configurar o ger\210nciador de inicializa\207\306o", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1549,6 +1496,13 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "O instalador ir\240 configurar o ger\210nciador de inicializa\207\306o.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1564,6 +1518,59 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY ptBRBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "O instalador n\306o p\223de instalar o ger\210nciador de inicializa\207\306o no disco", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "r\241gido do computador.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Por favor insira um disquete formatado na unidade A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "e pressione ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY ptBRKeyboardSettingsEntries[] = { { @@ -2218,8 +2225,8 @@ MUI_PAGE ptBRPages[] = ptBRKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - ptBRBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + ptBRBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2234,12 +2241,12 @@ MUI_PAGE ptBRPages[] = ptBRSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, ptBRBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - ptBRBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + ptBRBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 6ee892d49ba..41cbb66cd13 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -937,59 +937,6 @@ static MUI_ENTRY ptPTSuccessPageEntries[] = } }; -static MUI_ENTRY ptPTBootPageEntries[] = -{ - { - 4, - 3, - " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "O instalador n\306o pode instalar o gestor de inicializa\207\306o no disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "r\241gido do computador.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Por favor insira uma disquete formatada na unidade A: e", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "pressione ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER=Continuar F3=Sair", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY ptPTSelectPartitionEntries[] = { { @@ -1481,7 +1428,7 @@ static MUI_ENTRY ptPTFileCopyEntries[] = } }; -static MUI_ENTRY ptPTBootLoaderEntries[] = +static MUI_ENTRY ptPTBootLoaderSelectPageEntries[] = { { 4, @@ -1493,7 +1440,7 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 6, 8, - "O instalador ir\240 configurar o gestor de arranque.", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1549,6 +1496,13 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "O instalador ir\240 configurar o gestor de arranque.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1564,6 +1518,59 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY ptPTBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "O instalador n\306o pode instalar o gestor de inicializa\207\306o no disco", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "r\241gido do computador.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Por favor insira uma disquete formatada na unidade A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "e pressione ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY ptPTKeyboardSettingsEntries[] = { { @@ -2218,8 +2225,8 @@ MUI_PAGE ptPTPages[] = ptPTKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - ptPTBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + ptPTBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2234,12 +2241,12 @@ MUI_PAGE ptPTPages[] = ptPTSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, ptPTBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - ptPTBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + ptPTBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 2cd6db98fc3..1a543ea2325 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -975,59 +975,6 @@ static MUI_ENTRY roROSuccessPageEntries[] = } }; -static MUI_ENTRY roROBootPageEntries[] = -{ - { - 4, - 3, - " Instalare ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Programul de instalare nu poate instala modulul de", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "ini\376ializare a calculatorului pe discul local.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Introduce\376i un disc flexibil formatat \356n", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "unitatea A: apoi s\343 ap\343sa\376i ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Continuare F3 = Ie\272ire", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY roROSelectPartitionEntries[] = { { @@ -1497,7 +1444,7 @@ static MUI_ENTRY roROFileCopyEntries[] = } }; -static MUI_ENTRY roROBootLoaderEntries[] = +static MUI_ENTRY roROBootLoaderSelectPageEntries[] = { { 4, @@ -1509,7 +1456,7 @@ static MUI_ENTRY roROBootLoaderEntries[] = { 6, 8, - "Instalare modul de ini\376ializare al calculatorului", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1565,6 +1512,13 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "Instalare modul de ini\376ializare al calculatorului.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1580,6 +1534,59 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY roROBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Programul de instalare nu poate instala modulul de", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "ini\376ializare a calculatorului pe discul local.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Introduce\376i un disc flexibil formatat \356n unitatea A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "apoi s\343 ap\343sa\376i ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Continuare F3 = Ie\272ire", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY roROKeyboardSettingsEntries[] = { { @@ -2234,8 +2241,8 @@ MUI_PAGE roROPages[] = roROKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - roROBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + roROBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2250,12 +2257,12 @@ MUI_PAGE roROPages[] = roROSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, roROBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - roROBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + roROBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index aa4dd8cc8a3..a39c99c22f6 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -951,59 +951,6 @@ static MUI_ENTRY ruRUSuccessPageEntries[] = } }; -static MUI_ENTRY ruRUBootPageEntries[] = -{ - { - 4, - 3, - " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \255\245 \341\254\256\243\253\240 \343\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\246\245\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "\217\256\246\240\253\343\251\341\342\240 \242\341\342\240\242\354\342\245 \256\342\344\256\340\254\240\342\250\340\256\242\240\255\255\353\251 \243\250\241\252\250\251 \244\250\341\252 \242 \244\250\341\252\256\242\256\244 A: \250", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "\255\240\246\254\250\342\245 ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = \217\340\256\244\256\253\246\250\342\354 F3 = \202\353\345\256\244", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY ruRUSelectPartitionEntries[] = { { @@ -1487,7 +1434,7 @@ static MUI_ENTRY ruRUFileCopyEntries[] = } }; -static MUI_ENTRY ruRUBootLoaderEntries[] = +static MUI_ENTRY ruRUBootLoaderSelectPageEntries[] = { { 4, @@ -1499,7 +1446,7 @@ static MUI_ENTRY ruRUBootLoaderEntries[] = { 6, 8, - "\223\341\342\240\255\256\242\252\240 \247\240\243\340\343\247\347\250\252\240 ReactOS:", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1555,6 +1502,13 @@ static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "\223\341\342\240\255\256\242\252\240 \247\240\243\340\343\247\347\250\252\240 ReactOS", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1570,6 +1524,59 @@ static MUI_ENTRY ruRUBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY ruRUBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \255\245 \341\254\256\243\253\240 \343\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "\246\245\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "\217\256\246\240\253\343\251\341\342\240 \242\341\342\240\242\354\342\245 \256\342\344\256\340\254\240\342\250\340\256\242\240\255\255\353\251 \243\250\241\252\250\251 \244\250\341\252 \242 \244\250\341\252\256\242\256\244 A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "\250 \255\240\246\254\250\342\245 ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = \217\340\256\244\256\253\246\250\342\354 F3 = \202\353\345\256\244", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY ruRUKeyboardSettingsEntries[] = { { @@ -2203,8 +2210,8 @@ MUI_PAGE ruRUPages[] = ruRUKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - ruRUBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + ruRUBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2219,12 +2226,12 @@ MUI_PAGE ruRUPages[] = ruRUSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, ruRUBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - ruRUBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + ruRUBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 5ec671ea635..b8af569276d 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -936,59 +936,6 @@ static MUI_ENTRY skSKSuccessPageEntries[] = } }; -static MUI_ENTRY skSKBootPageEntries[] = -{ - { - 4, - 3, - " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza� syst�mu - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "po\237\241ta\237a", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Vlo\247te pros\241m, naform\240tovan\243 disketu do mechaniky A:", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "a stla\237te ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Pokra\237ova\234 F3 = Skon\237i\234", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY skSKSelectPartitionEntries[] = { { @@ -1473,7 +1420,7 @@ static MUI_ENTRY skSKFileCopyEntries[] = } }; -static MUI_ENTRY skSKBootLoaderEntries[] = +static MUI_ENTRY skSKBootLoaderSelectPageEntries[] = { { 4, @@ -1485,7 +1432,7 @@ static MUI_ENTRY skSKBootLoaderEntries[] = { 6, 8, - "In\347tal\240tor je pripraven\354 nain\347talova\234 zav\240dza\237 opera\237n\202ho syst\202mu", + "Please select where Setup should install the bootloader:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1541,6 +1488,13 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, + { + 6, + 8, + "In\347tal\240tor je pripraven\354 nain\347talova\234 zav\240dza\237 opera\237n\202ho syst\202mu.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, { 0, 0, @@ -1556,6 +1510,59 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = } }; +static MUI_ENTRY skSKBootLoaderRemovableDiskPageEntries[] = +{ + { + 4, + 3, + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza� syst�mu + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 9, + "po\237\241ta\237a.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 13, + "Vlo\247te pros\241m, naform\240tovan\243 disketu do mechaniky A:", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 6, + 14, + "a stla\237te ENTER.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "ENTER = Pokra\237ova\234 F3 = Skon\237i\234", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } + +}; + static MUI_ENTRY skSKKeyboardSettingsEntries[] = { { @@ -2192,8 +2199,8 @@ MUI_PAGE skSKPages[] = skSKKeyboardSettingsEntries }, { - BOOT_LOADER_PAGE, - skSKBootLoaderEntries + BOOTLOADER_SELECT_PAGE, + skSKBootLoaderSelectPageEntries }, { LAYOUT_SETTINGS_PAGE, @@ -2208,12 +2215,12 @@ MUI_PAGE skSKPages[] = skSKSuccessPageEntries }, { - BOOT_LOADER_INSTALLATION_PAGE, + BOOTLOADER_INSTALL_PAGE, skSKBootLoaderInstallPageEntries }, { - BOOT_LOADER_FLOPPY_PAGE, - skSKBootPageEntries + BOOTLOADER_REMOVABLE_DISK_PAGE, + skSKBootLoaderRemovableDiskPageEntries }, { REGISTRY_PAGE, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 584c30c278e..6322664d6a7 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -934,59 +934,6 @@ static MUI_ENTRY sqALSuccessPageEntries[] = } }; -static MUI_ENTRY sqALBootPageEntries[] = -{ - { - 4, - 3, - " Instalimi i ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE, - TEXT_ID_STATIC - }, - { - 6, - 8, - "Instalimi nuk mund t\211 instaloj\211 programin e bootloaderit ne kompjuterin tuaj", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "hardisku", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 13, - "Ju lutem fusni nje floppy disk t\211 formatuar n\211 drive A: dhe", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 14, - "klikoni ENTER.", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 0, - 0, - "ENTER = Vazhdo F3 = Dil", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG, - TEXT_ID_STATIC - }, - { - 0, - 0, - NULL, - 0 - } - -}; - static MUI_ENTRY sqALSelectPartitionEntries[] = { { @@ -999,7 +946,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] = { 6, 8, - "Lista meposht tregon particionet dhe pjes\211n e paperdorur t\211 hard diskut", + "Lista meposht tregon particionet dhe pjes\211n e paperdorur t\211 harddiskut", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1471,7 +1418,7 @@ static MUI_ENTRY sqALFileCopyEntries[] = } }; -static MUI_ENTRY sqALBootLoaderEntries[] = +static MUI_ENTRY sqALBootLoaderSelectPageEntries[] = { { 4, @@ -1483,7 +1430,7 @@ static MUI_ENTRY sqALBootLoaderEntries[] = { 6, 8, - "Instalimi po instalon boot loaderin", ... 1012 lines suppressed ...

1 0

[reactos] 01/01: [MSPAINT] Don't include useless <mapicode.h>
by Katayama Hirofumi MZ 13 Oct '23

13 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c4bf2d702d0e96f7c64c… commit 1c4bf2d702d0e96f7c64c40f6e522c877f897d44 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 13 18:07:55 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 13 18:07:55 2023 +0900 [MSPAINT] Don't include useless <mapicode.h> CORE-19094 --- base/applications/mspaint/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 7357bb134cb..ac1a037ddae 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -8,7 +8,6 @@ #include "precomp.h" #include <mapi.h> -#include <mapicode.h> POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry

1 0

[reactos] 01/01: [MSPAINT] Reset scroll position in some situations (#5789)
by Katayama Hirofumi MZ 12 Oct '23

12 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1183e797b4c9e7fe97a78… commit 1183e797b4c9e7fe97a78b7f3dfd2922a0598eff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 12 22:59:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 12 22:59:17 2023 +0900 [MSPAINT] Reset scroll position in some situations (#5789) In some situations, the scroll position should be reset. - Add CCanvasWindow::resetScrollPos method. - Reset the scroll position on loading a file. - Reset the scroll position on mirroring/rotating the image. CORE-19094 --- base/applications/mspaint/canvas.cpp | 6 ++++++ base/applications/mspaint/canvas.h | 1 + base/applications/mspaint/dib.cpp | 1 + base/applications/mspaint/winproc.cpp | 1 + 4 files changed, 9 insertions(+) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 17eb2610ae2..680acd6fe56 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -199,6 +199,12 @@ VOID CCanvasWindow::updateScrollInfo() SetScrollInfo(SB_VERT, &si); } +VOID CCanvasWindow::resetScrollPos() +{ + SetScrollPos(SB_HORZ, 0); + SetScrollPos(SB_VERT, 0); +} + LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 19920018214..193d7603abd 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -43,6 +43,7 @@ public: VOID cancelDrawing(); VOID finishDrawing(); VOID updateScrollInfo(); + VOID resetScrollPos(); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 10f4511c5c7..7b458138618 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -241,6 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image + canvasWindow.resetScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b0330b4292d..58bf4a98909 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -921,6 +921,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEROTATEMIRROR: { CWaitCursor waitCursor; + canvasWindow.resetScrollPos(); switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs