7 Feb
2021
7 Feb
'21
7:37 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c917caf723c539b02f3f1…
commit c917caf723c539b02f3f12ce75f779b07dac6870
Author: Yaroslav Kibysh <yanet.prod(a)gmail.com>
AuthorDate: Sun Feb 7 21:36:55 2021 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Feb 7 20:36:55 2021 +0100
[SYSSETUP] Make status dialog look like msgina status dialog (#2825)
* [SYSSETUP] Add msgina-like resources
* [SYSSETUP] Add bitmaps functionality, remove progress bar
* [SYSSETUP] Update resources
* [SYSSETUP] Use DPRINT1
* [SYSSETUP:INSTALL] %d - %lu for GetLastError in DPRINT1
* [SYSSETUP:INSTALL] Check pDlgData for NULL value
+ add some comments
---
dll/win32/syssetup/install.c | 113 +++++++++++++++++++++++++++++--
dll/win32/syssetup/lang/bg-BG.rc | 7 +-
dll/win32/syssetup/lang/cs-CZ.rc | 7 +-
dll/win32/syssetup/lang/da-DK.rc | 7 +-
dll/win32/syssetup/lang/de-DE.rc | 7 +-
dll/win32/syssetup/lang/el-GR.rc | 7 +-
dll/win32/syssetup/lang/en-US.rc | 7 +-
dll/win32/syssetup/lang/es-ES.rc | 7 +-
dll/win32/syssetup/lang/et-EE.rc | 7 +-
dll/win32/syssetup/lang/fi-FI.rc | 7 +-
dll/win32/syssetup/lang/fr-FR.rc | 7 +-
dll/win32/syssetup/lang/he-IL.rc | 7 +-
dll/win32/syssetup/lang/hi-IN.rc | 7 +-
dll/win32/syssetup/lang/hu-HU.rc | 7 +-
dll/win32/syssetup/lang/id-ID.rc | 7 +-
dll/win32/syssetup/lang/it-IT.rc | 7 +-
dll/win32/syssetup/lang/ja-JP.rc | 7 +-
dll/win32/syssetup/lang/lt-LT.rc | 7 +-
dll/win32/syssetup/lang/nl-NL.rc | 7 +-
dll/win32/syssetup/lang/no-NO.rc | 7 +-
dll/win32/syssetup/lang/pl-PL.rc | 7 +-
dll/win32/syssetup/lang/pt-BR.rc | 7 +-
dll/win32/syssetup/lang/pt-PT.rc | 7 +-
dll/win32/syssetup/lang/ro-RO.rc | 7 +-
dll/win32/syssetup/lang/ru-RU.rc | 7 +-
dll/win32/syssetup/lang/sk-SK.rc | 7 +-
dll/win32/syssetup/lang/sq-AL.rc | 7 +-
dll/win32/syssetup/lang/sv-SE.rc | 7 +-
dll/win32/syssetup/lang/th-TH.rc | 7 +-
dll/win32/syssetup/lang/tr-TR.rc | 7 +-
dll/win32/syssetup/lang/uk-UA.rc | 7 +-
dll/win32/syssetup/lang/zh-CN.rc | 7 +-
dll/win32/syssetup/lang/zh-TW.rc | 7 +-
dll/win32/syssetup/resource.h | 8 ++-
dll/win32/syssetup/resources/line.bmp | Bin 0 -> 6254 bytes
dll/win32/syssetup/resources/reactos.bmp | Bin 0 -> 89334 bytes
dll/win32/syssetup/syssetup.rc | 2 +
37 files changed, 243 insertions(+), 104 deletions(-)
diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c
index 348ca43d663..f0ce192f498 100644
--- a/dll/win32/syssetup/install.c
+++ b/dll/win32/syssetup/install.c
@@ -37,6 +37,16 @@ SetupStartService(LPCWSTR lpServiceName, BOOL bWait);
HINF hSysSetupInf = INVALID_HANDLE_VALUE;
ADMIN_INFO AdminInfo;
+typedef struct _DLG_DATA
+{
+ HBITMAP hLogoBitmap;
+ HBITMAP hBarBitmap;
+ HWND hWndBarCtrl;
+ DWORD BarCounter;
+ DWORD BarWidth;
+ DWORD BarHeight;
+} DLG_DATA, *PDLG_DATA;
+
/* FUNCTIONS ****************************************************************/
static VOID
@@ -531,17 +541,112 @@ StatusMessageWindowProc(
IN WPARAM wParam,
IN LPARAM lParam)
{
+ PDLG_DATA pDlgData;
UNREFERENCED_PARAMETER(wParam);
+ pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
+
+ /* pDlgData is required for each case except WM_INITDIALOG */
+ if (uMsg != WM_INITDIALOG && pDlgData == NULL) return FALSE;
+
switch (uMsg)
{
case WM_INITDIALOG:
{
+ BITMAP bm;
WCHAR szMsg[256];
+ /* Allocate pDlgData */
+ pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pDlgData));
+ if (pDlgData)
+ {
+ /* Set pDlgData to GWLP_USERDATA, so we can get it for new messages */
+ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData);
+
+ /* Load bitmaps */
+ pDlgData->hLogoBitmap = LoadImageW(hDllInstance,
+ MAKEINTRESOURCEW(IDB_REACTOS),
IMAGE_BITMAP,
+ 0, 0, LR_DEFAULTCOLOR);
+
+ pDlgData->hBarBitmap = LoadImageW(hDllInstance,
MAKEINTRESOURCEW(IDB_LINE),
+ IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+ GetObject(pDlgData->hBarBitmap, sizeof(bm), &bm);
+ pDlgData->BarWidth = bm.bmWidth;
+ pDlgData->BarHeight = bm.bmHeight;
+
+ if (pDlgData->hLogoBitmap && pDlgData->hBarBitmap)
+ {
+ if (SetTimer(hwndDlg, IDT_BAR, 20, NULL) == 0)
+ {
+ DPRINT1("SetTimer(IDT_BAR) failed: %lu\n",
GetLastError());
+ }
+
+ /* Get the animation bar control */
+ pDlgData->hWndBarCtrl = GetDlgItem(hwndDlg, IDC_BAR);
+ }
+ }
+
+ /* Get and set status text */
if (!LoadStringW(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg,
ARRAYSIZE(szMsg)))
return FALSE;
SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, szMsg);
+
+ return TRUE;
+ }
+
+ case WM_TIMER:
+ {
+ if (pDlgData->hBarBitmap)
+ {
+ /*
+ * Default rotation bar image width is 413 (same as logo)
+ * We can divide 413 by 7 without remainder
+ */
+ pDlgData->BarCounter = (pDlgData->BarCounter + 7) %
pDlgData->BarWidth;
+ InvalidateRect(pDlgData->hWndBarCtrl, NULL, FALSE);
+ UpdateWindow(pDlgData->hWndBarCtrl);
+ }
+ return TRUE;
+ }
+
+ case WM_DRAWITEM:
+ {
+ LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam;
+
+ if (lpDis->CtlID != IDC_BAR)
+ {
+ return FALSE;
+ }
+
+ if (pDlgData->hBarBitmap)
+ {
+ HDC hdcMem;
+ HGDIOBJ hOld;
+ DWORD off = pDlgData->BarCounter;
+ DWORD iw = pDlgData->BarWidth;
+ DWORD ih = pDlgData->BarHeight;
+
+ hdcMem = CreateCompatibleDC(lpDis->hDC);
+ hOld = SelectObject(hdcMem, pDlgData->hBarBitmap);
+ BitBlt(lpDis->hDC, off, 0, iw - off, ih, hdcMem, 0, 0, SRCCOPY);
+ BitBlt(lpDis->hDC, 0, 0, off, ih, hdcMem, iw - off, 0, SRCCOPY);
+ SelectObject(hdcMem, hOld);
+ DeleteDC(hdcMem);
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ case WM_DESTROY:
+ {
+ if (pDlgData->hBarBitmap)
+ {
+ KillTimer(hwndDlg, IDT_BAR);
+ }
+
+ DeleteObject(pDlgData->hLogoBitmap);
+ DeleteObject(pDlgData->hBarBitmap);
+ HeapFree(GetProcessHeap(), 0, pDlgData);
return TRUE;
}
}
@@ -552,7 +657,7 @@ static DWORD WINAPI
ShowStatusMessageThread(
IN LPVOID lpParameter)
{
- HWND hWnd, hItem;
+ HWND hWnd;
MSG Msg;
UNREFERENCED_PARAMETER(lpParameter);
@@ -566,12 +671,6 @@ ShowStatusMessageThread(
ShowWindow(hWnd, SW_SHOW);
- hItem = GetDlgItem(hWnd, IDC_STATUSPROGRESS);
- if (hItem)
- {
- PostMessage(hItem, PBM_SETMARQUEE, TRUE, 40);
- }
-
/* Message loop for the Status window */
while (GetMessage(&Msg, NULL, 0, 0))
{
diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index b44ed78a87c..19cfc38c22e 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "Добре", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Почакайте..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 81e8900915f..c088501a01e 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -141,13 +141,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Prosím čekejte..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index e0ef504d3ff..7159b92d21b 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index db51991860f..c4c124b6a08 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "Schließen", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Bitte warten..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index a1591e40d72..170abdeaf9e 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Παρακαλώ περιμένετε..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index ee4deaa57f6..0660c4c41c4 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index ac7c02d2517..9f8b03c48b2 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -144,13 +144,14 @@ BEGIN
DEFPUSHBUTTON "Aceptar", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Espere un momento..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index d32aa2eb4bd..78e709380ae 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "Olgu", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Palun oota..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index 6ebf43e9acf..ff3861bb9e2 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index da8c984f089..24af64425c3 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Veuillez patienter..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index 0427892aa4e..07ebe207ed9 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "אישור", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "נא להמתין..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index 984694686d3..d84f00b7b24 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -142,13 +142,14 @@ BEGIN
DEFPUSHBUTTON "ठीक", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "कृपया प्रतीक्षा करें..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index d0ccb457c08..7f7fb4f20c3 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -134,13 +134,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Kérem várjon..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index 9a6174cd70b..ff848529a8b 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Mohon tunggu..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index fdbf25d98d2..e7eab20fbf4 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Attendere ..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 19e65b7b706..82859a3b927 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "お待ち下さい..."
FONT 9, "MS UI Gothic", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index af6758fca4c..86823b22672 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 41d051a2535..f636b1d9b5c 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index 3b91ee6195e..292971ee1a5 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Vennligst vent..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index aaf74a18604..9c26f169236 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Proszę czekać..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index aa53f8aac7d..38ebaefcf07 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Por favor aguarde..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc
index cd9a7862216..f6060d968ca 100644
--- a/dll/win32/syssetup/lang/pt-PT.rc
+++ b/dll/win32/syssetup/lang/pt-PT.rc
@@ -135,13 +135,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Por favor aguarde..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 0020754b2cd..9bdeac2c74d 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -144,13 +144,14 @@ BEGIN
DEFPUSHBUTTON "Î&nchide", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Așteptați…"
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index 96fc1a15171..cf74da8f248 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -138,13 +138,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Пожалуйста подождите..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index ecdb07f61d1..a6e03a142b2 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -141,13 +141,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Počkajte, prosím ..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index 0fc1f13688a..a62635f8b5a 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Ju Lutem prisni..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index 1c31d23d2f2..acbbd0cd301 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 48f1156f2ae..211ecb24712 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -154,13 +154,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Please wait..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index 8c94f5a07c6..4934a9dadcc 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -137,13 +137,14 @@ BEGIN
DEFPUSHBUTTON "Tamam", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Lütfen bekleyiniz..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index 4310bfb315c..68b1529e100 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -143,13 +143,14 @@ BEGIN
DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "Зачекайте..."
FONT 8, "MS Shell Dlg", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index dbce04d3cbc..513adaefc56 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -137,13 +137,14 @@ BEGIN
DEFPUSHBUTTON "确定", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "请稍候..."
FONT 9, "宋体", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index 066697b4f91..a6f4494bc99 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -160,13 +160,14 @@ BEGIN
DEFPUSHBUTTON "確定", IDOK, 141, 209, 50, 14
END
-IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37
+IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78
STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION
| WS_DLGFRAME | WS_POPUP
CAPTION "請稍候..."
FONT 9, "新細明體", 400, 0, 1
BEGIN
- LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS
- CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32",
WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10
+ CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+ CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4
+ LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS
END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h
index 57dcff258f1..f4f24462dff 100644
--- a/dll/win32/syssetup/resource.h
+++ b/dll/win32/syssetup/resource.h
@@ -24,6 +24,8 @@
#define IDB_LAUTUS 103
#define IDB_LUNAR 104
#define IDB_MIZU 105
+#define IDB_REACTOS 106
+#define IDB_LINE 107
#define IDI_ICON1 10
#define IDI_ICON2 11
@@ -78,7 +80,8 @@
#define IDD_STATUSWINDOW_DLG 2200
#define IDC_STATUSLABEL 2201
-#define IDC_STATUSPROGRESS 2202
+#define IDC_ROSLOGO 2202
+#define IDC_BAR 2503
#define IDD_PS2MOUSEPROPERTIES 2300
#define IDC_PS2MOUSESAMPLERATE 2301
@@ -161,3 +164,6 @@
#define IDS_DEFAULT 3906
#define IDR_GPL 4000
+
+/* Timer ID for the animated dialog bar. */
+#define IDT_BAR 1
diff --git a/dll/win32/syssetup/resources/line.bmp
b/dll/win32/syssetup/resources/line.bmp
new file mode 100644
index 00000000000..08717d3cbe7
Binary files /dev/null and b/dll/win32/syssetup/resources/line.bmp differ
diff --git a/dll/win32/syssetup/resources/reactos.bmp
b/dll/win32/syssetup/resources/reactos.bmp
new file mode 100644
index 00000000000..bfee4ff308f
Binary files /dev/null and b/dll/win32/syssetup/resources/reactos.bmp differ
diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc
index 7d002554769..ce7f4a460a9 100644
--- a/dll/win32/syssetup/syssetup.rc
+++ b/dll/win32/syssetup/syssetup.rc
@@ -22,6 +22,8 @@ IDB_CLASSIC BITMAP "resources/thmclassic.bmp"
IDB_LAUTUS BITMAP "resources/thmlautus.bmp"
IDB_LUNAR BITMAP "resources/thmlunar.bmp"
IDB_MIZU BITMAP "resources/thmmizu.bmp"
+IDB_REACTOS BITMAP "resources/reactos.bmp"
+IDB_LINE BITMAP "resources/line.bmp"
IDI_ICON1 ICON "resources/1.ico"
IDI_ICON2 ICON "resources/2.ico"
1371
days inactive
1371
days old
0 comments
1 participants
participants (1)
-
Yaroslav Kibysh