Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [RAPPS] Add error messages on all download failure cases
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb1582d330116f9946e23… commit fb1582d330116f9946e235d99b5384dd76b6fa79 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 23:52:57 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 23:52:57 2020 +0200 [RAPPS] Add error messages on all download failure cases - Implement error message for all failure condition of RAPPS Download - Implement logging for failure conditions not needing user complementary awareness (cancellation) - Support for localization CORE-16851 --- base/applications/rapps/include/resource.h | 2 + base/applications/rapps/lang/bg-BG.rc | 1 + base/applications/rapps/lang/cs-CZ.rc | 1 + base/applications/rapps/lang/de-DE.rc | 1 + base/applications/rapps/lang/en-US.rc | 1 + base/applications/rapps/lang/es-ES.rc | 1 + base/applications/rapps/lang/et-EE.rc | 1 + base/applications/rapps/lang/fr-FR.rc | 3 +- base/applications/rapps/lang/he-IL.rc | 1 + base/applications/rapps/lang/id-ID.rc | 1 + base/applications/rapps/lang/it-IT.rc | 1 + base/applications/rapps/lang/ja-JP.rc | 1 + base/applications/rapps/lang/no-NO.rc | 1 + base/applications/rapps/lang/pl-PL.rc | 1 + base/applications/rapps/lang/pt-BR.rc | 1 + base/applications/rapps/lang/pt-PT.rc | 1 + base/applications/rapps/lang/ro-RO.rc | 1 + base/applications/rapps/lang/ru-RU.rc | 1 + base/applications/rapps/lang/sk-SK.rc | 1 + base/applications/rapps/lang/sq-AL.rc | 1 + base/applications/rapps/lang/sv-SE.rc | 1 + base/applications/rapps/lang/tr-TR.rc | 1 + base/applications/rapps/lang/uk-UA.rc | 1 + base/applications/rapps/lang/zh-CN.rc | 1 + base/applications/rapps/lang/zh-TW.rc | 1 + base/applications/rapps/loaddlg.cpp | 64 +++++++++++++++++++++++++++--- 26 files changed, 86 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index b06a53cde0d..c922cbbe534 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -113,6 +113,8 @@ #define IDS_UNABLE_TO_INSTALL 128 #define IDS_SELECTEDFORINST 129 #define IDS_MISMATCH_CERT_INFO 130 +#define IDS_UNABLE_PATH 131 + /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 33a417442a9..0d58892311b 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -217,6 +217,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 6ad7cf8b6c4..a4843457cc4 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -218,6 +218,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index adc5e3c4bb7..adc081ac0af 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Ausgewählte Installieren" IDS_SELECTEDFORINST "Zur Installation ausgewählt" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index a5528dc9c8a..aa224bf0bd3 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index b031a1973b0..3c64018eb71 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -216,6 +216,7 @@ BEGIN IDS_INSTALL_SELECTED "Instalar selección" IDS_SELECTEDFORINST "Seleccionados para instalar" IDS_MISMATCH_CERT_INFO "El certificado que usa es desconocido:\nSujeto: %s\nEmisor: %s\n¿Quiere continuar a pesar de ello?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index ba857f28a2d..8a7e2960e0b 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -221,6 +221,7 @@ BEGIN IDS_INSTALL_SELECTED "Installi valitud" IDS_SELECTEDFORINST "Installimiseks valitud" IDS_MISMATCH_CERT_INFO "Kasutatud sertifikaat on tundmatu:\nSubject: %s\nIssuer: %s\nKas soovid siiski jätkata?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index c9ada1afef0..998be73d39e 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -212,7 +212,8 @@ BEGIN IDS_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_INSTALL_SELECTED "Installer la sélection" IDS_SELECTEDFORINST "Sélectionnées pour installation" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_MISMATCH_CERT_INFO "Certificat inconnu:\nSujet: %s\nEmetteur: %s\nVoulez-vous continuer ?" + IDS_UNABLE_PATH "Format de chemin invalide." END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 7a55dc68269..1cf1f5cd981 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -220,6 +220,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index a497a36a369..186f6316a80 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Pasang terpilih" IDS_SELECTEDFORINST "dipilih untuk pemasangan" IDS_MISMATCH_CERT_INFO "Sertifikat yang dipakai tidak dikenal:\nSubyek: %s\nIssuer: %s\nYakin ingin lanjut?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 0b4b9f35731..87156315e76 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Installa le selezionate" IDS_SELECTEDFORINST "Selezionate per l'installazione" IDS_MISMATCH_CERT_INFO "Il certificato in uso è sconosciuto:\nSoggetto: %s\nEmittente: %s\nVuoi continuare comunque?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index fe640d28060..103eee5ae15 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "選択をインストール" IDS_SELECTEDFORINST "インストールを選択済み" IDS_MISMATCH_CERT_INFO "証明書は未知のものです:\nSubject: %s\nIssuer: %s\nそれでも続けますか？" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 8c866f43f3e..c2ea98c36c5 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 93c5135382e..995e8be3fb0 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -221,6 +221,7 @@ BEGIN IDS_INSTALL_SELECTED "Instaluj Zaznaczone" IDS_SELECTEDFORINST "Wybrane do instalacji" IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index bb22b3bbe51..fe68d272fd2 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -215,6 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 74fedc62631..aaee19a06f5 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -215,6 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "Instalar selecção" IDS_SELECTEDFORINST "Seleccionados para instalação" IDS_MISMATCH_CERT_INFO "O certificado usado é desconhecido:\nAssunto: %s\nIssuer: %s\nDeseja continuar mesmo assim?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 4fa83823a7b..d89583ff464 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -222,6 +222,7 @@ BEGIN IDS_INSTALL_SELECTED "Instalează selecționate" IDS_SELECTEDFORINST "Selectate pentru instalare" IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 0fb40d419f6..2f945347554 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -213,6 +213,7 @@ BEGIN IDS_INSTALL_SELECTED "Установить выбранное" IDS_SELECTEDFORINST "Выбрано для установки" IDS_MISMATCH_CERT_INFO "Используемый сертификат не опознан:\nНазначение: %s\nВыдан: %s\nВы хотите продолжить в любом случае?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 331ca01ce8a..f991dc52995 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -218,6 +218,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 57a66c4cff3..c6e2fe19c02 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -217,6 +217,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 62078832efd..2943417b69c 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -220,6 +220,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 390f34e8565..f3c36917022 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -215,6 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "Seçileni Kur" IDS_SELECTEDFORINST "Kurulum için seçildi" IDS_MISMATCH_CERT_INFO "Kullanılan sertifika bilimmiyor:\nAçıklama: %s\nSertifikayı Veren: %s\nYine de sürdürmek istiyor musunuz?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index bf71509e84c..d30f20d63e2 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -221,6 +221,7 @@ BEGIN IDS_INSTALL_SELECTED "Встановити обране" IDS_SELECTEDFORINST "Обрані для встановлення" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 8d79e46ce5e..42c4ee23a3e 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -215,6 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "安装已选中的" IDS_SELECTEDFORINST "选中以安装" IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题: %s\n发行方: %s\n您是否仍然想继续？" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 2ca01a19306..d653c9057ad 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -215,6 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_PATH "Incorrect path format." END STRINGTABLE diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 4ee4cb518fb..b40d69288f7 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -39,6 +39,8 @@ #include <wininet.h> #include <shellutils.h> +#include <debug.h> + #include <rosctrls.h> #include <windowsx.h> #include <process.h> @@ -508,6 +510,28 @@ VOID CDownloadManager::UpdateProgress( } } +VOID ShowLastError( + HWND hWndOwner, + DWORD dwLastError) +{ + LPWSTR lpMsg; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwLastError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMsg, + 0, NULL)) + { + return; + } + + MessageBoxW(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); + LocalFree(lpMsg); +} + unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { ATL::CStringW Path; @@ -561,7 +585,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { bCab = TRUE; if (!GetStorageDirectory(Path)) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } } else { @@ -587,7 +614,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) // do we have a final slash separator? if (!p) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_PATH); goto end; + } // prepare the tentative length of the filename, maybe we've to remove part of it later on filenameLength = wcslen(p) * sizeof(WCHAR); @@ -601,7 +631,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES) { if (!CreateDirectoryW(Path.GetString(), NULL)) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } } // append a \ to the provided file system path, and the filename portion from the URL after that @@ -640,7 +673,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } if (!hOpen) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } dwStatusLen = sizeof(dwStatus); @@ -654,7 +690,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); if (!InternetCrackUrlW(InfoArray[iAppId].szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } dwContentLen = 0; @@ -665,13 +704,16 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) 0); if (!hFile) { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + ShowLastError(hMainWnd, GetLastError()); goto end; } // query connection if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } if (dwStatus != HTTP_STATUS_OK) { @@ -690,7 +732,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) 0); if (!hFile) { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + ShowLastError(hMainWnd, GetLastError()); goto end; } @@ -750,20 +792,23 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); if (hOut == INVALID_HANDLE_VALUE) + { + ShowLastError(hMainWnd, GetLastError()); goto end; + } dwCurrentBytesRead = 0; do { if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) { - MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD); + ShowLastError(hMainWnd, GetLastError()); goto end; } if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE); + ShowLastError(hMainWnd, GetLastError()); goto end; } @@ -775,7 +820,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) hOut = INVALID_HANDLE_VALUE; if (bCancelled) + { + DPRINT1("Operation cancelled\n"); goto end; + } if (!dwContentLen) { @@ -794,7 +842,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) // change a few strings in the download dialog to reflect the verification process if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_TITLE)) + { + DPRINT1("Unable to load string\n"); goto end; + } SetWindowTextW(hDlg, szMsgText.GetString()); SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); @@ -803,7 +854,10 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) if (!VerifyInteg(InfoArray[iAppId].szSHA1.GetString(), Path.GetString())) { if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_FAIL)) + { + DPRINT1("Unable to load string\n"); goto end; + } MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); goto end; @@ -839,7 +893,7 @@ run: } else { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_INSTALL); + ShowLastError(hMainWnd, GetLastError()); } }

1 0

[reactos] 01/01: [NETID] Disable the 'Network ID' and 'Change' buttons and show the admin note when the current user is not an administrator
by Eric Kohl 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c4b0c91428025b179196… commit 8c4b0c91428025b179196030a677c512f0af7428 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri May 1 22:34:01 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri May 1 22:34:01 2020 +0200 [NETID] Disable the 'Network ID' and 'Change' buttons and show the admin note when the current user is not an administrator --- dll/win32/netid/netid.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index 4d87a7a6cc7..2e2a1294525 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -159,6 +159,68 @@ GetComputerNames( return TRUE; } +static BOOL +IsUserAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + PSID pAdminsSid = NULL; + HANDLE hToken = NULL; + PTOKEN_GROUPS pGroups = NULL; + BOOL bIsAdmin = FALSE; + DWORD dwSize, i; + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &pAdminsSid)) + return FALSE; + + if (!OpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY, + &hToken)) + goto done; + + dwSize = 0; + GetTokenInformation(hToken, + TokenGroups, + NULL, + 0, + &dwSize); + if (dwSize == 0) + goto done; + + pGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pGroups == NULL) + goto done; + + if (!GetTokenInformation(hToken, + TokenGroups, + pGroups, + dwSize, + &dwSize)) + goto done; + + for (i = 0; i < pGroups->GroupCount; i++) + { + if (EqualSid(pGroups->Groups[i].Sid, pAdminsSid)) + { + bIsAdmin = TRUE; + break; + } + } + +done: + if (pGroups != NULL) + HeapFree(GetProcessHeap(), 0, pGroups); + + if (hToken != NULL) + CloseHandle(hToken); + + if (pAdminsSid != NULL) + FreeSid(pAdminsSid); + + return bIsAdmin; +} + static BOOL IsValidDomainName( @@ -611,6 +673,16 @@ NetIDPage_OnInitDialog( LoadStringW(hDllInstance, (pNetIdData->JoinStatus == NetSetupDomainName)? 6 : 5, szBuffer, ARRAYSIZE(szBuffer)); SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN, szBuffer); SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, pNetIdData->JoinName); + + /* Show the administrator note and disable controls when the user is not an administator */ + if (!IsUserAdmin()) + { + LoadStringW(hDllInstance, 1021, szBuffer, ARRAYSIZE(szBuffer)); + SetDlgItemText(hwndDlg, IDC_MESSAGETEXT, szBuffer); + + EnableWindow(GetDlgItem(hwndDlg, IDC_NETWORK_ID), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_NETWORK_PROPERTY), FALSE); + } } static

1 0

[reactos] 01/01: [NETID] Fix a typo in NetworkDlg_OnOK
by Eric Kohl 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=226878563fe0611556518… commit 226878563fe061155651822c17c6cc316e071cfb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri May 1 22:00:32 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri May 1 22:00:32 2020 +0200 [NETID] Fix a typo in NetworkDlg_OnOK --- dll/win32/netid/netid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index c7387831712..4d87a7a6cc7 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -487,7 +487,7 @@ NetworkDlg_OnOK( L"SyncDomainWithMembership", 0, REG_DWORD, - (LPBYTE)pNetIdData->bSyncDomainWithMembership, + (LPBYTE)&pNetIdData->bSyncDomainWithMembership, sizeof(pNetIdData->bSyncDomainWithMembership)); RegCloseKey(KeyHandle); }

1 0

[reactos] 01/01: [NETID] Fix the left margin on the Computer Name dialog
by Eric Kohl 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b25fe54f291f63434adf5… commit b25fe54f291f63434adf516dc2919d89423c2c81 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri May 1 20:00:12 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri May 1 20:00:12 2020 +0200 [NETID] Fix the left margin on the Computer Name dialog --- dll/win32/netid/lang/bg-BG.rc | 10 +++++----- dll/win32/netid/lang/cs-CZ.rc | 10 +++++----- dll/win32/netid/lang/de-DE.rc | 10 +++++----- dll/win32/netid/lang/el-GR.rc | 10 +++++----- dll/win32/netid/lang/en-US.rc | 10 +++++----- dll/win32/netid/lang/es-ES.rc | 10 +++++----- dll/win32/netid/lang/fr-FR.rc | 10 +++++----- dll/win32/netid/lang/he-IL.rc | 10 +++++----- dll/win32/netid/lang/id-ID.rc | 10 +++++----- dll/win32/netid/lang/it-IT.rc | 10 +++++----- dll/win32/netid/lang/ja-JP.rc | 10 +++++----- dll/win32/netid/lang/nl-NL.rc | 10 +++++----- dll/win32/netid/lang/no-NO.rc | 10 +++++----- dll/win32/netid/lang/pt-PT.rc | 10 +++++----- dll/win32/netid/lang/ro-RO.rc | 10 +++++----- dll/win32/netid/lang/ru-RU.rc | 10 +++++----- dll/win32/netid/lang/sk-SK.rc | 10 +++++----- dll/win32/netid/lang/sq-AL.rc | 10 +++++----- dll/win32/netid/lang/tr-TR.rc | 10 +++++----- dll/win32/netid/lang/uk-UA.rc | 10 +++++----- dll/win32/netid/lang/zh-CN.rc | 10 +++++----- dll/win32/netid/lang/zh-TW.rc | 10 +++++----- 22 files changed, 110 insertions(+), 110 deletions(-) diff --git a/dll/win32/netid/lang/bg-BG.rc b/dll/win32/netid/lang/bg-BG.rc index e1f7a6d47fb..a0185f3e088 100644 --- a/dll/win32/netid/lang/bg-BG.rc +++ b/dll/win32/netid/lang/bg-BG.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "РеактОС използва следните сведения, за опознаване компютъра ви в мрежата.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Описание на компютъра:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Описание на компютъра:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Цялото име на компютъра:", IDC_STATIC, 6, 68, 94, 9 + LTEXT "Цялото име на компютъра:", IDC_STATIC, 7, 68, 94, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Работна група:", IDC_WORKGROUPDOMAIN, 6, 84, 94, 9 + LTEXT "Работна група:", IDC_WORKGROUPDOMAIN, 7, 84, 94, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "За вълшебника за мрежово опознаване и създаване на местен потребител, натиснете „Мрежов опознавател...”.", IDC_STATIC, 6, 108, 172, 24 + LTEXT "За вълшебника за мрежово опознаване и създаване на местен потребител, натиснете „Мрежов опознавател...”.", IDC_STATIC, 7, 108, 172, 24 PUSHBUTTON "&Мрежов опознавател...", IDC_NETWORK_ID, 170, 114, 85, 15 - LTEXT "За преименуване на компютъра или присъединяване към имение, натиснете „Промяна”.", IDC_STATIC, 6, 149, 170, 24 + LTEXT "За преименуване на компютъра или присъединяване към имение, натиснете „Промяна”.", IDC_STATIC, 7, 149, 170, 24 PUSHBUTTON "Про&мяна...", IDC_NETWORK_PROPERTY, 170, 149, 85, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/cs-CZ.rc b/dll/win32/netid/lang/cs-CZ.rc index a6760baedbd..af8a97cb44e 100644 --- a/dll/win32/netid/lang/cs-CZ.rc +++ b/dll/win32/netid/lang/cs-CZ.rc @@ -12,15 +12,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS použije následující informace k identifikování tohoto počítače v síti.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Popis počítače:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Popis počítače:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Úplný název počítače:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Úplný název počítače:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Pracovní skupina:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Pracovní skupina:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Kliknutím na ""Síťová ID"" lze použít Průvodce síťovou identifikací k připojení se k doméně a vytvoření místního uživatele.", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Kliknutím na ""Síťová ID"" lze použít Průvodce síťovou identifikací k připojení se k doméně a vytvoření místního uživatele.", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Síťová ID...", IDC_NETWORK_ID, 190, 114, 58, 15 //FIXME nic vic nez "sitova ID" se nevejde na tlacitko! - LTEXT "Kliknutím na ""Změnit"" lze přejmenovat tento počítač nebo se připojit k doméně.", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Kliknutím na ""Změnit"" lze přejmenovat tento počítač nebo se připojit k doméně.", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Změnit...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/de-DE.rc b/dll/win32/netid/lang/de-DE.rc index 100dc5b3ae8..8d8361937f1 100644 --- a/dll/win32/netid/lang/de-DE.rc +++ b/dll/win32/netid/lang/de-DE.rc @@ -15,15 +15,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 7, 7, 20, 20, SS_ICON LTEXT "ReactOS benutzt folgende Informationen, um Ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Computerbeschreibung:", IDC_STATIC, 6, 40, 80, 9 + LTEXT "Computerbeschreibung:", IDC_STATIC, 7, 40, 80, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Computername:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Computername:", IDC_STATIC, 7, 68, 64, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Arbeitsgruppe:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Arbeitsgruppe:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Um den Netzwerk-Assistenten zum Anmelden an einer Domäne und dem Erstellen eines lokalen Benutzers aufzurufen, klicken Sie auf ""Netzwerk-ID"".", IDC_STATIC, 6, 108, 172, 32 + LTEXT "Um den Netzwerk-Assistenten zum Anmelden an einer Domäne und dem Erstellen eines lokalen Benutzers aufzurufen, klicken Sie auf ""Netzwerk-ID"".", IDC_STATIC, 7, 108, 172, 32 PUSHBUTTON "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Um diesen Computer umzubenennen oder sich an einer Domäne anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Um diesen Computer umzubenennen oder sich an einer Domäne anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Ändern...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 172, 242, 24 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON diff --git a/dll/win32/netid/lang/el-GR.rc b/dll/win32/netid/lang/el-GR.rc index f07da89eaf6..72c84aaf0b2 100644 --- a/dll/win32/netid/lang/el-GR.rc +++ b/dll/win32/netid/lang/el-GR.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "Το ReactOS χρησιμοποιεί τις παρακάτω πληροφορίες για την αναγνώριση του υπολογιστή σας στο δίκτυο.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Περιγραφή υπολογιστή:", IDC_STATIC, 6, 40, 70, 9 + LTEXT "Περιγραφή υπολογιστή:", IDC_STATIC, 7, 40, 70, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Πλήρες όνομα υπολογιστή:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Πλήρες όνομα υπολογιστή:", IDC_STATIC, 7, 68, 64, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ομάδα εργασίας:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Ομάδα εργασίας:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Για να χρησιμοποιήσετε το βοηθό Network Identfication για να μπείτε σε ένα domain και να δημιουργήσετε έναν τοπικό χρήστη, κάντε κλικ στο ""Network ID"".", IDC_STATIC, 6, 108, 172, 24 + LTEXT "Για να χρησιμοποιήσετε το βοηθό Network Identfication για να μπείτε σε ένα domain και να δημιουργήσετε έναν τοπικό χρήστη, κάντε κλικ στο ""Network ID"".", IDC_STATIC, 7, 108, 172, 24 PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Για να μετονομάσετε αυτόν τον υπολογιστή ή να συμμετάσχετε σε μια ομάδα εργασίας, κάντε κλικ στο κουμπί ""Αλλαγή"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Για να μετονομάσετε αυτόν τον υπολογιστή ή να συμμετάσχετε σε μια ομάδα εργασίας, κάντε κλικ στο κουμπί ""Αλλαγή"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Αλλαγή...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/en-US.rc b/dll/win32/netid/lang/en-US.rc index e8c98078e69..f0e4996d9f8 100644 --- a/dll/win32/netid/lang/en-US.rc +++ b/dll/win32/netid/lang/en-US.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS uses the following information to identify your computer on the network.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Computer Description:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Computer Description:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Full computer name:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Full computer name:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "To use the Network Identification Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "To use the Network Identification Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Change...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/es-ES.rc b/dll/win32/netid/lang/es-ES.rc index 77e32ba03f1..1ed5439b481 100644 --- a/dll/win32/netid/lang/es-ES.rc +++ b/dll/win32/netid/lang/es-ES.rc @@ -9,15 +9,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS usa la siguiente información para identificar su equipo en la red.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Descripción del equipo:", IDC_STATIC, 6, 40, 85, 9 + LTEXT "Descripción del equipo:", IDC_STATIC, 7, 40, 85, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nombre completo del equipo:", IDC_STATIC, 6, 66, 64, 16 + LTEXT "Nombre completo del equipo:", IDC_STATIC, 7, 66, 64, 16 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Grupo de trabajo:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Grupo de trabajo:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Para usar el Asistente para identificación de red para unirse a un dominio y crear una cuenta de usuario local, haga clic en ""Id de red"".", IDC_STATIC, 6, 108, 172, 24 + LTEXT "Para usar el Asistente para identificación de red para unirse a un dominio y crear una cuenta de usuario local, haga clic en ""Id de red"".", IDC_STATIC, 7, 108, 172, 24 PUSHBUTTON "&Id de red...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Para cambiar el nombre de este equipo o unirse a un dominio, haga clic en ""Cambiar"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Para cambiar el nombre de este equipo o unirse a un dominio, haga clic en ""Cambiar"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "Cam&biar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc index c15db5a7dae..f5c3eed7348 100644 --- a/dll/win32/netid/lang/fr-FR.rc +++ b/dll/win32/netid/lang/fr-FR.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur sur le réseau.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Description de l'ordinateur :", IDC_STATIC, 6, 40, 95, 9 + LTEXT "Description de l'ordinateur :", IDC_STATIC, 7, 40, 95, 9 EDITTEXT IDC_COMPDESC, 103, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nom complet de l'ordinateur :", IDC_STATIC, 6, 68, 95, 9 + LTEXT "Nom complet de l'ordinateur :", IDC_STATIC, 7, 68, 95, 9 EDITTEXT IDC_COMPUTERNAME, 103, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Groupe de travail :", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Groupe de travail :", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 103, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 6, 108, 160, 24 + LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 7, 108, 160, 24 PUSHBUTTON "ID &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15 - LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Modifier.", IDC_STATIC, 6, 149, 160, 17 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Modifier.", IDC_STATIC, 7, 149, 160, 17 PUSHBUTTON "Modifier...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/he-IL.rc b/dll/win32/netid/lang/he-IL.rc index d7f3c9ea7f8..fbb02c81063 100644 --- a/dll/win32/netid/lang/he-IL.rc +++ b/dll/win32/netid/lang/he-IL.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS uses the following information to identify your computer on the network.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "תיאור המחשב:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "תיאור המחשב:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "שם המחשב המלא:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "שם המחשב המלא:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "קבוצת עבודה:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "קבוצת עבודה:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "מזהה רשת...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "שנה...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/id-ID.rc b/dll/win32/netid/lang/id-ID.rc index f6b78ce4aa6..f28da2396a8 100644 --- a/dll/win32/netid/lang/id-ID.rc +++ b/dll/win32/netid/lang/id-ID.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS menggunakan informasi berikut guna mengidentifikasi komputer anda pada jaringan.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Deskripsi Komputer:", IDC_STATIC, 6, 40, 70, 9 + LTEXT "Deskripsi Komputer:", IDC_STATIC, 7, 40, 70, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nama lengkap komputer:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Nama lengkap komputer:", IDC_STATIC, 7, 68, 64, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Untuk menggunakan Bimbingan Identifikasi Jaringan untuk bergabung dengan domain dan membuat pengguna lokal, klik ""Network ID"".", IDC_STATIC, 6, 108, 172, 24 + LTEXT "Untuk menggunakan Bimbingan Identifikasi Jaringan untuk bergabung dengan domain dan membuat pengguna lokal, klik ""Network ID"".", IDC_STATIC, 7, 108, 172, 24 PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Untuk mengganti nama komputer ini atau bergabung dengan domain, klik ""Ubah"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Untuk mengganti nama komputer ini atau bergabung dengan domain, klik ""Ubah"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Ubah...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/it-IT.rc b/dll/win32/netid/lang/it-IT.rc index 645d092ad8b..36fdd82e9bc 100644 --- a/dll/win32/netid/lang/it-IT.rc +++ b/dll/win32/netid/lang/it-IT.rc @@ -9,15 +9,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS usa le informazioni seguenti per identificare questo computer nella rete.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Descrizione del computer:", IDC_STATIC, 6, 37, 78, 16 + LTEXT "Descrizione del computer:", IDC_STATIC, 7, 37, 78, 16 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nome esteso del computer:", IDC_STATIC, 6, 67, 78, 16 + LTEXT "Nome esteso del computer:", IDC_STATIC, 7, 67, 78, 16 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Gruppo di lavoro:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Gruppo di lavoro:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Per usare il wizard per la Identificazione in rete per collegarsi a un dominio e creare un utente locale, click ""Network ID"".", IDC_STATIC, 6, 108, 172, 24 + LTEXT "Per usare il wizard per la Identificazione in rete per collegarsi a un dominio e creare un utente locale, click ""Network ID"".", IDC_STATIC, 7, 108, 172, 24 PUSHBUTTON "&ID di rete...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Per cambiare il nome a questo computer o collegarsi a un dominio, clicca ""Modifica"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Per cambiare il nome a questo computer o collegarsi a un dominio, clicca ""Modifica"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Modifica...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/ja-JP.rc b/dll/win32/netid/lang/ja-JP.rc index 6f25136a811..690c89870a3 100644 --- a/dll/win32/netid/lang/ja-JP.rc +++ b/dll/win32/netid/lang/ja-JP.rc @@ -7,15 +7,15 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS は次の情報を使ってネットワーク上でこのコンピュータを\n識別します。", IDC_STATIC, 40, 5, 224, 20 - LTEXT "コンピュータの説明:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "コンピュータの説明:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "フルコンピュータ名:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "フルコンピュータ名:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "ワークグループ:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "ワークグループ:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "ネットワーク ID ウィザードを使ってドメインへの参加およびローカルユーザーの作成を行うには、[ネットワーク ID] をクリックしてください。", IDC_STATIC, 6, 113, 172, 24 + LTEXT "ネットワーク ID ウィザードを使ってドメインへの参加およびローカルユーザーの作成を行うには、[ネットワーク ID] をクリックしてください。", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "ネットワーク ID(&N)...", IDC_NETWORK_ID, 180, 114, 72, 15 - LTEXT "コンピュータ名を変更したりドメインに参加したりするには [変更] をクリックしてください。", IDC_STATIC, 6, 149, 170, 17 + LTEXT "コンピュータ名を変更したりドメインに参加したりするには [変更] をクリックしてください。", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "変更(&C)...", IDC_NETWORK_PROPERTY, 180, 149, 72, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/nl-NL.rc b/dll/win32/netid/lang/nl-NL.rc index a9ff78a6d3b..95d06303024 100644 --- a/dll/win32/netid/lang/nl-NL.rc +++ b/dll/win32/netid/lang/nl-NL.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS gebruikt de volgende informatie om uw computer te indentificeren op het netwerk.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Computerbeschrijving:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Computerbeschrijving:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Volledige computernaam:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Volledige computernaam:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Werkgroep:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Werkgroep:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Om de Netwerk Indentificatie wizard te gebruiken, word lid van een domein en maak een lokale gebruiker aan en klik op ""Network ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Om de Netwerk Indentificatie wizard te gebruiken, word lid van een domein en maak een lokale gebruiker aan en klik op ""Network ID"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Netwerk ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Om deze computer te hernoemen of om lid te worden van een domein, klik op ""Change"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Om deze computer te hernoemen of om lid te worden van een domein, klik op ""Change"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Wijzigen...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/no-NO.rc b/dll/win32/netid/lang/no-NO.rc index e354e769573..d44dc7bbdbd 100644 --- a/dll/win32/netid/lang/no-NO.rc +++ b/dll/win32/netid/lang/no-NO.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS bruker følgende informasjon for å identifisere datamaskinen på nettverket.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Beskrivelse av datamaskinen:", IDC_STATIC, 6, 40, 135, 9 + LTEXT "Beskrivelse av datamaskinen:", IDC_STATIC, 7, 40, 135, 9 EDITTEXT IDC_COMPDESC, 110, 38, 136, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Fullt datamaskinnavn:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Fullt datamaskinnavn:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Arbeidsgruppe:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Arbeidsgruppe:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Klikk nettverks-ID for å bruke veiviseren for nettverksidentifikasjon til å bli med i et domene og opprette en lokal brukerkonto.", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Klikk nettverks-ID for å bruke veiviseren for nettverksidentifikasjon til å bli med i et domene og opprette en lokal brukerkonto.", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Nettverk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Klikk Endre for å gi datamaskinen et nytt navn eller bli med i et domenet.", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Klikk Endre for å gi datamaskinen et nytt navn eller bli med i et domenet.", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Endre...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/pt-PT.rc b/dll/win32/netid/lang/pt-PT.rc index 66a1f1f99a4..cdbe88fe779 100644 --- a/dll/win32/netid/lang/pt-PT.rc +++ b/dll/win32/netid/lang/pt-PT.rc @@ -12,15 +12,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "O ReactOS utiliza as seguintes informações para identificar o computador na rede.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Descrição do computador:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Descrição do computador:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nome completo do computador:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Nome completo do computador:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Grupo de trabalho:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Grupo de trabalho:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Para utilizar o ""Assistente de identificação de rede"" para efectuar a adesão a um domínio e criar uma conta de utilizador local, clique em ""ID de rede""", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Para utilizar o ""Assistente de identificação de rede"" para efectuar a adesão a um domínio e criar uma conta de utilizador local, clique em ""ID de rede""", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&ID de rede", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Para alterar o nome a este computador ou escolher um domínio, clique em ""Alterar"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Para alterar o nome a este computador ou escolher um domínio, clique em ""Alterar"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Alterar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index ceea6a1a621..9a26dce791d 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -13,15 +13,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "Informațiile de mai jos vor fi utilizate pentru identificarea calculatorului în rețea.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Descrierea calculatorului:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Descrierea calculatorului:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Numele complet:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Numele complet:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Grup de lucru:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Grup de lucru:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Utilizați asistentul de identificare al rețelei (apăsând „ID de rețea”) pentru a crea un utilizator și a deveni membru al unui domeniu de rețea.", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Utilizați asistentul de identificare al rețelei (apăsând „ID de rețea”) pentru a crea un utilizator și a deveni membru al unui domeniu de rețea.", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "I&D de rețea…", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Pentru a schimba identitatea calculatorului sau a intra într-un domeniu, apăsați „Schimbare”.", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Pentru a schimba identitatea calculatorului sau a intra într-un domeniu, apăsați „Schimbare”.", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "S&chimbare…", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/ru-RU.rc b/dll/win32/netid/lang/ru-RU.rc index ec060e453cc..d1df41b40cb 100644 --- a/dll/win32/netid/lang/ru-RU.rc +++ b/dll/win32/netid/lang/ru-RU.rc @@ -7,15 +7,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "Указанные ниже сведения используются для идентификации компьютера в сети.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Описание:", IDC_STATIC, 6, 40, 70, 9 + LTEXT "Описание:", IDC_STATIC, 7, 40, 70, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Полное имя:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Полное имя:", IDC_STATIC, 7, 68, 64, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Рабочая группа:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Рабочая группа:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Чтобы вызвать мастер сетевой идентификации для присоединения компьютера к домену, нажмите кнопку ""Идентификация"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Чтобы вызвать мастер сетевой идентификации для присоединения компьютера к домену, нажмите кнопку ""Идентификация"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Идентификация...", IDC_NETWORK_ID, 180, 114, 72, 15 - LTEXT "Чтобы изменить имя компьютера или домена нажмите ""Изменить"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Чтобы изменить имя компьютера или домена нажмите ""Изменить"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "И&зменить...", IDC_NETWORK_PROPERTY, 180, 149, 72, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/sk-SK.rc b/dll/win32/netid/lang/sk-SK.rc index f712c4182a5..a9f9a021367 100644 --- a/dll/win32/netid/lang/sk-SK.rc +++ b/dll/win32/netid/lang/sk-SK.rc @@ -14,15 +14,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS použije nasledujúce informácie pri identifikácii počítača v sieti.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "&Popis počítača:", IDC_STATIC, 6, 40, 70, 9 + LTEXT "&Popis počítača:", IDC_STATIC, 7, 40, 70, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Úplný názov počítača:", IDC_STATIC, 6, 68, 75, 9 + LTEXT "Úplný názov počítača:", IDC_STATIC, 7, 68, 75, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Pracovná skupina:", IDC_WORKGROUPDOMAIN, 6, 84, 70, 9 + LTEXT "Pracovná skupina:", IDC_WORKGROUPDOMAIN, 7, 84, 70, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ak sa chcete pripojiť pomocou Sprievodcu identifikáciou v sieti na doménu a vytvoriť lokálne používateľské konto, kliknite na tlačidlo Sieťová identifikácia.", IDC_STATIC, 6, 108, 160, 33 + LTEXT "Ak sa chcete pripojiť pomocou Sprievodcu identifikáciou v sieti na doménu a vytvoriť lokálne používateľské konto, kliknite na tlačidlo Sieťová identifikácia.", IDC_STATIC, 7, 108, 160, 33 PUSHBUTTON "&Sieťová identifikácia", IDC_NETWORK_ID, 176, 114, 72, 15 - LTEXT "Ak chcete zmeniť názov počítača alebo sa pripojiť na doménu, kliknite na tlačidlo Zmeniť.", IDC_STATIC, 6, 149, 160, 17 + LTEXT "Ak chcete zmeniť názov počítača alebo sa pripojiť na doménu, kliknite na tlačidlo Zmeniť.", IDC_STATIC, 7, 149, 160, 17 PUSHBUTTON "Z&meniť...", IDC_NETWORK_PROPERTY, 176, 149, 72, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/sq-AL.rc b/dll/win32/netid/lang/sq-AL.rc index ba5abc45348..c053fbcaaaf 100644 --- a/dll/win32/netid/lang/sq-AL.rc +++ b/dll/win32/netid/lang/sq-AL.rc @@ -11,15 +11,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS përdor informacionin e mëposhtëm për të identifikuar kompjuterin tuaj në rrjet.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Përshkrimi Kompjuterit:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Përshkrimi Kompjuterit:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Emri plotë kompjuterit:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Emri plotë kompjuterit:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "GrupPune:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "GrupPune:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Për të përdorur Magjistarin Rrjetit Identifikues për t'u futur në një domain dhe për të krijuar një përdorues lokal, klikoni ""ID Rrjetit"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Për të përdorur Magjistarin Rrjetit Identifikues për t'u futur në një domain dhe për të krijuar një përdorues lokal, klikoni ""ID Rrjetit"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&ID Rrjetit...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Për të riemërtuar këtë kompjuter apo të bashkohet me një domain, klikoni ""Ndrysho"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Për të riemërtuar këtë kompjuter apo të bashkohet me një domain, klikoni ""Ndrysho"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Ndrysho...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/tr-TR.rc b/dll/win32/netid/lang/tr-TR.rc index 55df38a5c87..a070364f877 100644 --- a/dll/win32/netid/lang/tr-TR.rc +++ b/dll/win32/netid/lang/tr-TR.rc @@ -9,15 +9,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS, ağda bilgisayarınızı tanılamak için aşağıdaki bilgiyi kullanır.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Bilgisayar Tanımı:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "Bilgisayar Tanımı:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Tüm Bilgisayar Adı:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "Tüm Bilgisayar Adı:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Çalışma Takımı:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Çalışma Takımı:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Bir etki alanına katılmak ve bir yerli kullanıcı oluşturmak için, Ağ Tanılama Yardımcısı'nı kullanmak için ""Ağ Kimliği""ne tıklayınız.", IDC_STATIC, 6, 113, 172, 24 + LTEXT "Bir etki alanına katılmak ve bir yerli kullanıcı oluşturmak için, Ağ Tanılama Yardımcısı'nı kullanmak için ""Ağ Kimliği""ne tıklayınız.", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "&Ağ Kimliği...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Bu bilgisayarı yeniden adlandırmak veyâ bir etki alanına katılmak için ""Değiştir""e tıklayınız.", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Bu bilgisayarı yeniden adlandırmak veyâ bir etki alanına katılmak için ""Değiştir""e tıklayınız.", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Değştir...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/uk-UA.rc b/dll/win32/netid/lang/uk-UA.rc index c87ee976003..17cfda6e8fd 100644 --- a/dll/win32/netid/lang/uk-UA.rc +++ b/dll/win32/netid/lang/uk-UA.rc @@ -15,15 +15,15 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS використовує наступну інформацію для ідентифікації комп'ютера в мережі.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Опис:", IDC_STATIC, 6, 40, 70, 9 + LTEXT "Опис:", IDC_STATIC, 7, 40, 70, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Повне ім'я:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Повне ім'я:", IDC_STATIC, 7, 68, 64, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Робоча група:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "Робоча група:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Щоб запустити майстер мережної ідентифікації для приєднання до домену та створення облікового запису локального користувача, натисніть кнопку ""Ідентифікація"".", IDC_STATIC, 6, 108, 172, 32 + LTEXT "Щоб запустити майстер мережної ідентифікації для приєднання до домену та створення облікового запису локального користувача, натисніть кнопку ""Ідентифікація"".", IDC_STATIC, 7, 108, 172, 32 PUSHBUTTON "Іденти&фікація...", IDC_NETWORK_ID, 190, 114, 60, 15 - LTEXT "Щоб перейменувати цей комп'ютер або приєднати його до домену, натисніть кнопку ""Змінити"".", IDC_STATIC, 6, 149, 170, 17 + LTEXT "Щоб перейменувати цей комп'ютер або приєднати його до домену, натисніть кнопку ""Змінити"".", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "&Змінити...", IDC_NETWORK_PROPERTY, 190, 149, 60, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc index 2e8bb49202e..bd5c0d3fd44 100644 --- a/dll/win32/netid/lang/zh-CN.rc +++ b/dll/win32/netid/lang/zh-CN.rc @@ -10,15 +10,15 @@ FONT 9, "宋体" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS 使用以下信息在网络中标识这台计算机。", IDC_STATIC, 40, 5, 204, 20 - LTEXT "计算机描述:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "计算机描述:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "完整的计算机名:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "完整的计算机名:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "工作组:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "工作组:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "要使用网络识别向导去加入域并创建本地用户账户，请单击""网络 ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "要使用网络识别向导去加入域并创建本地用户账户，请单击""网络 ID"".", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "网络 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "若要重命名此计算机或加入域，请单击""更改""。", IDC_STATIC, 6, 149, 170, 17 + LTEXT "若要重命名此计算机或加入域，请单击""更改""。", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc index 4991450f8e2..82747c6e772 100644 --- a/dll/win32/netid/lang/zh-TW.rc +++ b/dll/win32/netid/lang/zh-TW.rc @@ -10,15 +10,15 @@ FONT 9, "新細明體" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS 使用以下資訊來標識您在網路上的電腦。", IDC_STATIC, 40, 5, 204, 20 - LTEXT "電腦描述:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "電腦描述:", IDC_STATIC, 7, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "完整的電腦名稱:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "完整的電腦名稱:", IDC_STATIC, 7, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "工作群組:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "工作群組:", IDC_WORKGROUPDOMAIN, 7, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "要使用網路識別精靈去加入域並建立本地使用者，請點選 [網路 ID]。", IDC_STATIC, 6, 113, 172, 24 + LTEXT "要使用網路識別精靈去加入域並建立本地使用者，請點選 [網路 ID]。", IDC_STATIC, 7, 113, 172, 24 PUSHBUTTON "網路 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "若要重新命名此電腦或加入域，請點選 [更改]。", IDC_STATIC, 6, 149, 170, 17 + LTEXT "若要重新命名此電腦或加入域，請點選 [更改]。", IDC_STATIC, 7, 149, 170, 17 PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE

1 0

[reactos] 01/01: [SERVMAN] UI update and Error Management (#2653)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3947d528316cd40705ad… commit b3947d528316cd40705ad39a273925840a873a40 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 19:01:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 19:01:59 2020 +0200 [SERVMAN] UI update and Error Management (#2653) Purpose ======= - Current design does not warn user nor logs DEBUG traces when Service Start/Stop command fails or reach timeout. - Current Service Start/Stop progress window are WS_EX_TOOLWINDOW which reduce lisibility, is a ReactOS specificity without good reason. Proposed changes ================ - DPRINT1 traces added on failure cases. - Error Message box presented to user upon failure with explicit root cause identification. - Change Dialog definition to standard window. --- base/applications/mscutils/servman/control.c | 32 +++++++-- base/applications/mscutils/servman/lang/bg-BG.rc | 1 - base/applications/mscutils/servman/lang/cs-CZ.rc | 1 - base/applications/mscutils/servman/lang/de-DE.rc | 1 - base/applications/mscutils/servman/lang/el-GR.rc | 1 - base/applications/mscutils/servman/lang/en-US.rc | 1 - base/applications/mscutils/servman/lang/es-ES.rc | 1 - base/applications/mscutils/servman/lang/fr-FR.rc | 1 - base/applications/mscutils/servman/lang/he-IL.rc | 1 - base/applications/mscutils/servman/lang/id-ID.rc | 1 - base/applications/mscutils/servman/lang/it-IT.rc | 1 - base/applications/mscutils/servman/lang/ja-JP.rc | 1 - base/applications/mscutils/servman/lang/ko-KR.rc | 1 - base/applications/mscutils/servman/lang/no-NO.rc | 1 - base/applications/mscutils/servman/lang/pl-PL.rc | 1 - base/applications/mscutils/servman/lang/ro-RO.rc | 1 - base/applications/mscutils/servman/lang/ru-RU.rc | 1 - base/applications/mscutils/servman/lang/sk-SK.rc | 1 - base/applications/mscutils/servman/lang/sq-AL.rc | 1 - base/applications/mscutils/servman/lang/sv-SE.rc | 1 - base/applications/mscutils/servman/lang/th-TH.rc | 1 - base/applications/mscutils/servman/lang/tr-TR.rc | 1 - base/applications/mscutils/servman/lang/uk-UA.rc | 1 - base/applications/mscutils/servman/lang/zh-CN.rc | 1 - base/applications/mscutils/servman/lang/zh-TW.rc | 1 - base/applications/mscutils/servman/precomp.h | 9 +-- base/applications/mscutils/servman/progress.c | 82 +++++++++++++++++++----- base/applications/mscutils/servman/start.c | 27 ++++++-- base/applications/mscutils/servman/stop.c | 31 ++++++--- 29 files changed, 138 insertions(+), 67 deletions(-) diff --git a/base/applications/mscutils/servman/control.c b/base/applications/mscutils/servman/control.c index 08b88037f32..890bac61ae8 100644 --- a/base/applications/mscutils/servman/control.c +++ b/base/applications/mscutils/servman/control.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control) @@ -27,6 +30,7 @@ DoControlService(LPWSTR ServiceName, DWORD MaxWait; DWORD ReqState, i; BOOL Result; + DWORD dwResult = ERROR_SUCCESS; /* Set the state we're interested in */ switch (Control) @@ -39,21 +43,23 @@ DoControlService(LPWSTR ServiceName, break; default: /* Unhandled control code */ - return FALSE; + DPRINT1("Unknown control command: 0x%X\n", Control); + return ERROR_INVALID_SERVICE_CONTROL; } hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (!hSCManager) return FALSE; + if (!hSCManager) return GetLastError(); hService = OpenServiceW(hSCManager, ServiceName, SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); - return FALSE; + return dwResult; } /* Send the control message to the service */ @@ -109,6 +115,8 @@ DoControlService(LPWSTR ServiceName, &BytesNeeded)) { /* Something went wrong... */ + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); break; } @@ -123,23 +131,33 @@ DoControlService(LPWSTR ServiceName, else { /* It's not, make sure we haven't exceeded our wait time */ - if(GetTickCount() >= StartTickCount + MaxWait) + if (GetTickCount() >= StartTickCount + MaxWait) { /* We have, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } } } + else + { + dwResult = GetLastError(); + } if (ServiceStatus.dwCurrentState == ReqState) { - Result = TRUE; + dwResult = ERROR_SUCCESS; } } + else + { + dwResult = GetLastError(); + } CloseServiceHandle(hService); CloseServiceHandle(hSCManager); - return Result; + return dwResult; } diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc b/base/applications/mscutils/servman/lang/bg-BG.rc index 9135db9b84c..c19437e1089 100644 --- a/base/applications/mscutils/servman/lang/bg-BG.rc +++ b/base/applications/mscutils/servman/lang/bg-BG.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управление на услугите" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/cs-CZ.rc b/base/applications/mscutils/servman/lang/cs-CZ.rc index 2b7dc964d75..8632cf698f0 100644 --- a/base/applications/mscutils/servman/lang/cs-CZ.rc +++ b/base/applications/mscutils/servman/lang/cs-CZ.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Ovldání služeb" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/de-DE.rc b/base/applications/mscutils/servman/lang/de-DE.rc index 0dbce992148..bb941ebd70f 100644 --- a/base/applications/mscutils/servman/lang/de-DE.rc +++ b/base/applications/mscutils/servman/lang/de-DE.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Dienststeuerung" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/el-GR.rc b/base/applications/mscutils/servman/lang/el-GR.rc index 8bf7a616617..4eb8a250bec 100644 --- a/base/applications/mscutils/servman/lang/el-GR.rc +++ b/base/applications/mscutils/servman/lang/el-GR.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/en-US.rc b/base/applications/mscutils/servman/lang/en-US.rc index 28f9896b168..272a73eb9f5 100644 --- a/base/applications/mscutils/servman/lang/en-US.rc +++ b/base/applications/mscutils/servman/lang/en-US.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/es-ES.rc b/base/applications/mscutils/servman/lang/es-ES.rc index 8c34490d9de..1bf14df0b79 100644 --- a/base/applications/mscutils/servman/lang/es-ES.rc +++ b/base/applications/mscutils/servman/lang/es-ES.rc @@ -235,7 +235,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Control de servicios" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/fr-FR.rc b/base/applications/mscutils/servman/lang/fr-FR.rc index 92e0d7fdd80..38cd92cfad9 100644 --- a/base/applications/mscutils/servman/lang/fr-FR.rc +++ b/base/applications/mscutils/servman/lang/fr-FR.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Contrôle du Service" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/he-IL.rc b/base/applications/mscutils/servman/lang/he-IL.rc index 459fb1e6a7b..af1c191532b 100644 --- a/base/applications/mscutils/servman/lang/he-IL.rc +++ b/base/applications/mscutils/servman/lang/he-IL.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "בקרת שירות" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/id-ID.rc b/base/applications/mscutils/servman/lang/id-ID.rc index 268fc672b6f..22e9b39807f 100644 --- a/base/applications/mscutils/servman/lang/id-ID.rc +++ b/base/applications/mscutils/servman/lang/id-ID.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Kontrol Layanan" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/it-IT.rc b/base/applications/mscutils/servman/lang/it-IT.rc index ec6c6d71784..8e6b295f31f 100644 --- a/base/applications/mscutils/servman/lang/it-IT.rc +++ b/base/applications/mscutils/servman/lang/it-IT.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Controllo dei servizi" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ja-JP.rc b/base/applications/mscutils/servman/lang/ja-JP.rc index aed6be21cfc..e21d46bdaab 100644 --- a/base/applications/mscutils/servman/lang/ja-JP.rc +++ b/base/applications/mscutils/servman/lang/ja-JP.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "サービスコントロール" FONT 9, "MS UI Gothic", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ko-KR.rc b/base/applications/mscutils/servman/lang/ko-KR.rc index 2f5b09eb470..84036c6fe01 100644 --- a/base/applications/mscutils/servman/lang/ko-KR.rc +++ b/base/applications/mscutils/servman/lang/ko-KR.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "서비스 컨트롤" FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/no-NO.rc b/base/applications/mscutils/servman/lang/no-NO.rc index 8eefc7dec00..851e88b05b1 100644 --- a/base/applications/mscutils/servman/lang/no-NO.rc +++ b/base/applications/mscutils/servman/lang/no-NO.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Tjeneste kontroll" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/pl-PL.rc b/base/applications/mscutils/servman/lang/pl-PL.rc index e1b4a08aeac..b96cce7d94a 100644 --- a/base/applications/mscutils/servman/lang/pl-PL.rc +++ b/base/applications/mscutils/servman/lang/pl-PL.rc @@ -242,7 +242,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Usługa kontrolna" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc b/base/applications/mscutils/servman/lang/ro-RO.rc index 838bc26bf9b..6740bedbb66 100644 --- a/base/applications/mscutils/servman/lang/ro-RO.rc +++ b/base/applications/mscutils/servman/lang/ro-RO.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Control servicii" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/ru-RU.rc b/base/applications/mscutils/servman/lang/ru-RU.rc index 537ba738bef..8f504b4d404 100644 --- a/base/applications/mscutils/servman/lang/ru-RU.rc +++ b/base/applications/mscutils/servman/lang/ru-RU.rc @@ -232,7 +232,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управление службами" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sk-SK.rc b/base/applications/mscutils/servman/lang/sk-SK.rc index 77b2c3b87ec..f5c88129fcf 100644 --- a/base/applications/mscutils/servman/lang/sk-SK.rc +++ b/base/applications/mscutils/servman/lang/sk-SK.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Service Control" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sq-AL.rc b/base/applications/mscutils/servman/lang/sq-AL.rc index bde90df05f5..4f9c936ed2e 100644 --- a/base/applications/mscutils/servman/lang/sq-AL.rc +++ b/base/applications/mscutils/servman/lang/sq-AL.rc @@ -237,7 +237,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Kontrolli i shërbimeve" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/sv-SE.rc b/base/applications/mscutils/servman/lang/sv-SE.rc index 37bec57e0b8..2cb32144080 100644 --- a/base/applications/mscutils/servman/lang/sv-SE.rc +++ b/base/applications/mscutils/servman/lang/sv-SE.rc @@ -239,7 +239,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Tjänst kontroll" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/th-TH.rc b/base/applications/mscutils/servman/lang/th-TH.rc index f46dd572817..23706f70e6a 100644 --- a/base/applications/mscutils/servman/lang/th-TH.rc +++ b/base/applications/mscutils/servman/lang/th-TH.rc @@ -240,7 +240,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "ตัวควบคุมบริการ" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/tr-TR.rc b/base/applications/mscutils/servman/lang/tr-TR.rc index 4c1c00b93d1..fad8766630b 100644 --- a/base/applications/mscutils/servman/lang/tr-TR.rc +++ b/base/applications/mscutils/servman/lang/tr-TR.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Hizmet Denetimi" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/uk-UA.rc b/base/applications/mscutils/servman/lang/uk-UA.rc index 54512dabfc0..a4fe3d509f7 100644 --- a/base/applications/mscutils/servman/lang/uk-UA.rc +++ b/base/applications/mscutils/servman/lang/uk-UA.rc @@ -240,7 +240,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "Управління службами" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/zh-CN.rc b/base/applications/mscutils/servman/lang/zh-CN.rc index ae578a2117b..df562a2a091 100644 --- a/base/applications/mscutils/servman/lang/zh-CN.rc +++ b/base/applications/mscutils/servman/lang/zh-CN.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "服务控制" FONT 9, "宋体", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/lang/zh-TW.rc b/base/applications/mscutils/servman/lang/zh-TW.rc index a29a41f31a6..27ca6c40bd5 100644 --- a/base/applications/mscutils/servman/lang/zh-TW.rc +++ b/base/applications/mscutils/servman/lang/zh-TW.rc @@ -234,7 +234,6 @@ IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "服務控制" FONT 9, "新細明體", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 diff --git a/base/applications/mscutils/servman/precomp.h b/base/applications/mscutils/servman/precomp.h index 5ec27109f61..d070bbc4dc3 100644 --- a/base/applications/mscutils/servman/precomp.h +++ b/base/applications/mscutils/servman/precomp.h @@ -7,9 +7,11 @@ #include <windef.h> #include <winbase.h> +#include <winerror.h> #include <wingdi.h> #include <winsvc.h> #include <wincon.h> + #include <shlobj.h> #include <commdlg.h> #include <strsafe.h> @@ -100,9 +102,9 @@ VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv); BOOL CreateListView(PMAIN_WND_INFO Info); /* start / stop / control */ -BOOL DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams); -BOOL DoStopService(LPWSTR ServiceName, HANDLE hProgress); -BOOL DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control); +DWORD DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams); +DWORD DoStopService(LPWSTR ServiceName, HANDLE hProgress); +DWORD DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control); /* progress.c */ #define DEFAULT_STEP 0 @@ -122,7 +124,6 @@ BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); BOOL GetServiceList(PMAIN_WND_INFO Info); - /* propsheet.c */ typedef struct _SERVICEPROPSHEET { diff --git a/base/applications/mscutils/servman/progress.c b/base/applications/mscutils/servman/progress.c index cf5fe784300..fa3a82a3ab5 100644 --- a/base/applications/mscutils/servman/progress.c +++ b/base/applications/mscutils/servman/progress.c @@ -26,6 +26,25 @@ typedef struct _PROGRESS_DATA } PROGRESS_DATA, *PPROGRESS_DATA; +VOID ShowError(DWORD dwLastError) +{ + LPWSTR lpMsg; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwLastError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMsg, + 0, NULL)) + { + return; + } + + MessageBoxW(NULL, lpMsg, NULL, MB_OK | MB_ICONERROR); + LocalFree(lpMsg); +} static VOID ResetProgressDialog(HWND hDlg, @@ -67,6 +86,7 @@ ResetProgressDialog(HWND hDlg, unsigned int __stdcall ActionThread(void* Param) { PPROGRESS_DATA ProgressData = (PPROGRESS_DATA)Param; + DWORD dwResult; if (ProgressData->Action == ACTION_START) { @@ -76,13 +96,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_START); /* Start the service */ - if (DoStartService(ProgressData->ServiceName, - ProgressData->hProgress, - ProgressData->Param)) + dwResult = DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + ProgressData->Param); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } else if (ProgressData->Action == ACTION_STOP || ProgressData->Action == ACTION_RESTART) { @@ -108,11 +133,16 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_STOP); /* Stop the requested service */ - if (DoStopService(ProgressData->ServiceName, - ProgressData->hProgress)) + dwResult = DoStopService(ProgressData->ServiceName, + ProgressData->hProgress); + if (dwResult == ERROR_SUCCESS) { CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } /* Move onto the next string */ while (*lpStr != L'\0') @@ -124,11 +154,16 @@ unsigned int __stdcall ActionThread(void* Param) ProgressData->ServiceName, IDS_PROGRESS_INFO_STOP); - if (DoStopService(ProgressData->ServiceName, - ProgressData->hProgress)) + dwResult = DoStopService(ProgressData->ServiceName, + ProgressData->hProgress); + if (dwResult == ERROR_SUCCESS) { CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } /* If this was a restart, we'll need to start the service back up */ @@ -140,13 +175,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_START); /* Start the service */ - if (DoStartService(ProgressData->ServiceName, - ProgressData->hProgress, - NULL)) + dwResult = DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + NULL); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } } else if (ProgressData->Action == ACTION_PAUSE) @@ -157,13 +197,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_PAUSE); /* Pause the service */ - if (DoControlService(ProgressData->ServiceName, - ProgressData->hProgress, - SERVICE_CONTROL_PAUSE)) + dwResult = DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_PAUSE); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } else if (ProgressData->Action == ACTION_RESUME) { @@ -173,13 +218,18 @@ unsigned int __stdcall ActionThread(void* Param) IDS_PROGRESS_INFO_RESUME); /* resume the service */ - if (DoControlService(ProgressData->ServiceName, - ProgressData->hProgress, - SERVICE_CONTROL_CONTINUE)) + dwResult = DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_CONTINUE); + if (dwResult == ERROR_SUCCESS) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); } + else + { + ShowError(dwResult); + } } diff --git a/base/applications/mscutils/servman/start.c b/base/applications/mscutils/servman/start.c index ac237e2d28b..eb931875c6f 100644 --- a/base/applications/mscutils/servman/start.c +++ b/base/applications/mscutils/servman/start.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams) @@ -29,6 +32,7 @@ DoStartService(LPWSTR ServiceName, BOOL bWhiteSpace = TRUE; LPWSTR lpChar; DWORD dwArgsCount = 0; + DWORD dwResult = ERROR_SUCCESS; LPCWSTR *lpArgsVector = NULL; if (lpStartParams != NULL) @@ -59,7 +63,7 @@ DoStartService(LPWSTR ServiceName, */ lpArgsVector = LocalAlloc(LMEM_FIXED, dwArgsCount * sizeof(LPCWSTR)); if (!lpArgsVector) - return FALSE; + return GetLastError(); /* Fill the arguments vector */ dwArgsCount = 0; @@ -91,9 +95,10 @@ DoStartService(LPWSTR ServiceName, SC_MANAGER_CONNECT); if (!hSCManager) { + dwResult = GetLastError(); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return FALSE; + return dwResult; } hService = OpenServiceW(hSCManager, @@ -101,10 +106,11 @@ DoStartService(LPWSTR ServiceName, SERVICE_START | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return FALSE; + return dwResult; } /* Start the service */ @@ -167,6 +173,8 @@ DoStartService(LPWSTR ServiceName, &BytesNeeded)) { /* Something went wrong... */ + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); break; } @@ -183,24 +191,29 @@ DoStartService(LPWSTR ServiceName, if (GetTickCount() >= StartTickCount + MaxWait) { /* We have, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } } } + else + { + dwResult = GetLastError(); + } if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { - Result = TRUE; + dwResult = ERROR_SUCCESS; } } CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return Result; + return dwResult; } diff --git a/base/applications/mscutils/servman/stop.c b/base/applications/mscutils/servman/stop.c index 50c0a376fb2..c4a346dd003 100644 --- a/base/applications/mscutils/servman/stop.c +++ b/base/applications/mscutils/servman/stop.c @@ -9,9 +9,12 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + #define MAX_WAIT_TIME 30000 -BOOL +DWORD DoStopService(_In_z_ LPWSTR ServiceName, _In_opt_ HANDLE hProgress) { @@ -22,21 +25,21 @@ DoStopService(_In_z_ LPWSTR ServiceName, DWORD StartTime; DWORD WaitTime; DWORD Timeout; - BOOL bRet = FALSE; - - + DWORD dwResult = ERROR_SUCCESS; + hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); - if (!hSCManager) return FALSE; + if (!hSCManager) return GetLastError(); hService = OpenServiceW(hSCManager, ServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (!hService) { + dwResult = GetLastError(); CloseServiceHandle(hSCManager); - return FALSE; + return dwResult; } if (hProgress) @@ -90,21 +93,31 @@ DoStopService(_In_z_ LPWSTR ServiceName, if (GetTickCount() - StartTime > Timeout) { /* Yep, give up */ + DPRINT1("Timeout\n"); + dwResult = ERROR_SERVICE_REQUEST_TIMEOUT; break; } } + else + { + dwResult = GetLastError(); + DPRINT1("QueryServiceStatusEx failed: %d\n", dwResult); + } } /* If the service is stopped, return TRUE */ if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) { - bRet = TRUE; + dwResult = ERROR_SUCCESS; } } + else + { + dwResult = GetLastError(); + } CloseServiceHandle(hService); - CloseServiceHandle(hSCManager); - return bRet; + return dwResult; }

1 0

[reactos] 01/01: [KDGDB] Fix GCC8 build
by Sylvain Deverre 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=140ec9d037ee60a0476f9… commit 140ec9d037ee60a0476f917c216e882165d0b6e3 Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Fri May 1 16:37:13 2020 +0200 Commit: Sylvain Deverre <deverre.sylv(a)gmail.com> CommitDate: Fri May 1 16:37:13 2020 +0200 [KDGDB] Fix GCC8 build --- drivers/base/kdgdb/gdb_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index e729beb37e1..3b898c46829 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -22,7 +22,7 @@ UINT_PTR gdb_dbg_tid; static inline KDSTATUS -LOOP_IF_SUCCESS(x) +LOOP_IF_SUCCESS(int x) { return (x == KdPacketReceived) ? (KDSTATUS)-1 : x; }

1 0

[reactos] 01/01: [CRT_APITEST] Implement wctomb() testcase (#2701)
by Bișoc George 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cb0bdaa0bd427cba21a8… commit 3cb0bdaa0bd427cba21a8288ad0a4d37b2743037 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri May 1 16:01:11 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 16:01:11 2020 +0200 [CRT_APITEST] Implement wctomb() testcase (#2701) --- .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/ntdll_crt_apitest.cmake | 1 + modules/rostests/apitests/crt/testlist.c | 2 + modules/rostests/apitests/crt/wctomb.c | 67 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index 768168681e8..f40c603c480 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -519,7 +519,7 @@ list(APPEND SOURCE_CRTDLL wcstombs.c wcstoul.c # wcsxfrm.c -# wctomb.c + wctomb.c # wprintf.c # wscanf.c ) diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 2e3aaf9f3fc..e53d3b4f6fc 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1255,7 +1255,7 @@ list(APPEND SOURCE_MSVCRT wcstoul.c # wcsxfrm.c # wctob -# wctomb.c + wctomb.c # wctomb_s # wprintf.c # wprintf_s.c diff --git a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake index 41322e1c338..7f923043068 100644 --- a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -123,6 +123,7 @@ list(APPEND SOURCE_NTDLL # wcstol.c wcstombs.c wcstoul.c + wctomb.c ) if(ARCH STREQUAL "i386") diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 3afeb450484..20587372301 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -26,6 +26,7 @@ extern void func_strtoul(void); extern void func_wcsnlen(void); extern void func_wcstombs(void); extern void func_wcstoul(void); +extern void func_wctomb(void); extern void func___getmainargs(void); extern void func_static_construct(void); @@ -44,6 +45,7 @@ const struct test winetest_testlist[] = { "strlen", func_strlen }, { "strtoul", func_strtoul }, { "wcstoul", func_wcstoul }, + { "wctomb", func_wctomb }, { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... diff --git a/modules/rostests/apitests/crt/wctomb.c b/modules/rostests/apitests/crt/wctomb.c new file mode 100644 index 00000000000..b72d6156329 --- /dev/null +++ b/modules/rostests/apitests/crt/wctomb.c @@ -0,0 +1,67 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for wctomb + * COPYRIGHT: Copyright 2020 Bișoc George <george.bisoc(a)reactos.org> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <locale.h> + +unsigned int cdecl ___lc_codepage_func(void); + +START_TEST(wctomb) +{ + int Length; + char *chDest; + char *loc; + unsigned int codepage = ___lc_codepage_func(); + wchar_t wchSrc[2] = {L'R', 0414}; // 0414 corresponds to a Russian character in Windows-1251 + + chDest = AllocateGuarded(sizeof(*chDest)); + if (!chDest) + { + skip("Buffer allocation failed!\n"); + return; + } + + /* Output the current locale of the system and codepage for comparison between ReactOS and Windows */ + loc = setlocale(LC_ALL, NULL); + printf("The current codepage of your system tested is (%u) and locale (%s).\n\n", codepage, loc); + + /* Do not give output to the caller */ + Length = wctomb(NULL, 0); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Do the same but expect a valid wide character argument this time */ + Length = wctomb(NULL, wchSrc[0]); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Don't return anything to the output even if conversion is impossible */ + Length = wctomb(NULL, wchSrc[1]); + ok(errno == 0, "The error number (errno) should be 0 even though an invalid character in current locale is given but got %d.\n", errno); + ok(Length == 0, "Expected no characters to be converted (because the output argument is refused) but got %d\n.", Length); + + /* Attempt to convert a character not possible in current locale */ + Length = wctomb(chDest, wchSrc[1]); + ok(Length == -1, "The conversion is not possible in current locale but got %d as returned value.\n", Length); + ok(errno == EILSEQ, "EILSEQ is expected in an illegal sequence conversion but got %d.\n", errno); + + /* Return a null wide character to the destination argument */ + Length = wctomb(chDest, 0); + ok(Length == 1, "Expected one character to be converted (the null character) but got %d.\n", Length); + ok_int(chDest[0], '\0'); + + /* Get the converted output and validate what we should get */ + Length = wctomb(chDest, wchSrc[0]); + ok(Length == 1, "Expected one character to be converted but got %d.\n", Length); + ok_int(chDest[0], 'R'); + + FreeGuarded(chDest); +}

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW] Get complexity of visible region in DxEngGetDCState (#2604)
by Oleg Dubinskiy 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855bf46399b0f3c852250… commit 855bf46399b0f3c852250cccf11fb655e536be78 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri May 1 16:57:11 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 15:57:11 2020 +0200 [WIN32SS][NTDDRAW] Get complexity of visible region in DxEngGetDCState (#2604) CORE-7733 Get the complexity of visible region in the DxEngGetDCState() function, according to its remarks. This implementation returns a number of rectangles that make up the region, similarly to as it done in REGION_Complexity() function: https://git.reactos.org/?p=reactos.git;a=blob;f=win32ss/gdi/ntgdi/region.c;… It is required by MS ddraw.dll when calling win32k/dxg functions during launching DirectDraw test or any DirectX 1 - 7 apps/games. --- win32ss/reactx/ntddraw/dxeng.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index f1c681f1e3f..24cb542643e 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -4,6 +4,7 @@ * FILE: win32ss/reactx/ntddraw/dxeng.c * PURPOSE: Implementation of DxEng functions * PROGRAMMERS: Magnus Olsen (magnus(a)greatlord.com) + * Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) */ #include <win32k.h> @@ -442,7 +443,7 @@ DxEngSetHdevData(HDEV hDev, * Return one of the type values * * @remarks. -* We do not have type 2 implemented yet +* none * *--*/ DWORD_PTR @@ -463,7 +464,8 @@ DxEngGetDCState(HDC hDC, retVal = (DWORD_PTR) pDC->fs & DC_FLAG_FULLSCREEN; break; case 2: - UNIMPLEMENTED; + /* Return the number of rectangles in the visible region. */ + retVal = (DWORD_PTR) pDC->prgnRao ? pDC->prgnRao->rdh.nCount : pDC->prgnVis->rdh.nCount; break; case 3: {

1 0

[reactos] 01/01: [OLE32][WINESYNC] Fix Wine's implementation of IMalloc.DidAlloc based from Wine 5.7 (#2662)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bd6b9b6c204c513a3756… commit 8bd6b9b6c204c513a37569c291198a8a5f214cb0 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 15:01:19 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 15:01:19 2020 +0200 [OLE32][WINESYNC] Fix Wine's implementation of IMalloc.DidAlloc based from Wine 5.7 (#2662) CORE-15262 This fixes the exceptions raised when calling "Scan folder" a second time in SUMo 5.10.16. The problem was reported to WineHQ : https://bugs.winehq.org/show_bug.cgi?id=48941 Import Wine commits by Nikolay Sivov, with the help of Doug Lyons: - https://source.winehq.org/git/wine.git/commit/08f4b6ee0a05fe27e56cb9777dce8… ole32: Fix IMalloc::DidAlloc() return value to reflect block validity. - https://source.winehq.org/git/wine.git/commit/1e3bc9f3a61a197e794cca07a59c9… ole32: Improve thread safety in DidAlloc(). - https://source.winehq.org/git/wine.git/commit/06d36b1adf1ae7b73a200d6a35a14… ole32: Fix spy callback arguments for IMalloc::GetSize(). --- dll/win32/ole32/ifs.c | 96 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/dll/win32/ole32/ifs.c b/dll/win32/ole32/ifs.c index ea03e9b0a28..91474267207 100644 --- a/dll/win32/ole32/ifs.c +++ b/dll/win32/ole32/ifs.c @@ -114,6 +114,20 @@ static BOOL AddMemoryLocation(LPVOID * pMem) return TRUE; } +static void** mallocspy_is_allocation_spyed(const void *mem) +{ + void **current = Malloc32.SpyedBlocks; + + while (*current != mem) + { + current++; + if (current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) + return NULL; + } + + return current; +} + static BOOL RemoveMemoryLocation(LPCVOID pMem) { LPVOID * Current; @@ -122,15 +136,9 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) return FALSE; - Current = Malloc32.SpyedBlocks; - - /* find the location */ - while (*Current != pMem) { - Current++; - if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) - return FALSE; /* not found */ - } - + if (!(Current = mallocspy_is_allocation_spyed(pMem))) + return FALSE; + /* location found */ Malloc32.SpyedAllocationsLeft--; /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ @@ -288,50 +296,64 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem) { - SIZE_T cb; - BOOL fSpyed = FALSE; + BOOL spyed_block = FALSE, spy_active = FALSE; + SIZE_T size; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreGetSize(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return (SIZE_T)-1; - cb = HeapSize(GetProcessHeap(),0,pv); + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block); + } - if(Malloc32.pSpy) { - cb = IMallocSpy_PostGetSize(Malloc32.pSpy, cb, fSpyed); - LeaveCriticalSection(&IMalloc32_SpyCS); - } + size = HeapSize(GetProcessHeap(), 0, mem); - return cb; + if (spy_active) + { + size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + return size; } /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - int didAlloc; + BOOL spyed_block = FALSE, spy_active = FALSE; + int did_alloc; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreDidAlloc(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return -1; - didAlloc = -1; + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); + } - if(Malloc32.pSpy) { - didAlloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, pv, fSpyed, didAlloc); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - return didAlloc; + did_alloc = HeapValidate(GetProcessHeap(), 0, mem); + + if (spy_active) + { + did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + + return did_alloc; } /******************************************************************************

1 0

[reactos] 01/01: [SYSDM] Virtual Memory panel : Complementary fix from PR #2597 (#2706)
by Kyle Katarn 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bee3b92ab0aa3250a7f3… commit 3bee3b92ab0aa3250a7f3e0bfa272a2cbf288e60 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 1 14:47:04 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 14:47:04 2020 +0200 [SYSDM] Virtual Memory panel : Complementary fix from PR #2597 (#2706) Fix all lang resources in order to reflect main changes from PR #2597 (16MB>2MB). To translators: Please sync the respective translations! CORE-12486 --- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 1ddf34112df..2d68c2f80ef 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата" IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на страниращия файл." IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на страниращия файл." - IDS_WARNINITIALRANGE "Началният размер на страниращия файл не трябва да е по-малък от 16 МБ и не трябва да надхвърля свободното пространство на избраното устройство." + IDS_WARNINITIALRANGE "Началният размер на страниращия файл не трябва да е по-малък от 2 МБ и не трябва да надхвърля свободното пространство на избраното устройство." IDS_WARNMAXIMUMRANGE "Върховият размер на страниращия файл не трябва да е по-малък от началния и не трябва да надвишава свободното пространство на избраното устройство" IDS_PAGEFILE_NONE "Няма" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 4b050490fa9..8455e8bccc6 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -338,7 +338,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů" IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost stránkovacího souboru." IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost stránkovacího souboru." - IDS_WARNINITIALRANGE "Počáteční velikost stránkovacího souboru nesmí být menší než 16 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." + IDS_WARNINITIALRANGE "Počáteční velikost stránkovacího souboru nesmí být menší než 2 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." IDS_WARNMAXIMUMRANGE "Maximální velikost stránkovacího souboru nesmí být menší než velikost počáteční, nesmí být větší než 4095 MB a nesmí překročit množství volného místa na zvolené diskové jednotce." IDS_PAGEFILE_NONE "Není" IDS_PAGEFILE_SYSTEM "Spravováno systémem" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index db65da075c7..f0aef399c43 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index efcb621f5b3..97e18528cbc 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." - IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht kleiner als 16 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." + IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht kleiner als 2 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht kleiner als die Anfangsgröße sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten." IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 9385be64acd..ee84b6e78dc 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Κανένα" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index c4dd645ca72..c6420f0db42 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 8957eac4fd1..a942a41037a 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet de sistema del Panel de control" IDS_WARNINITIALSIZE "Introduzca el tamaño inicial del archivo de paginación." IDS_WARNMAXIMUMSIZE "Introduzca el tamaño máximo del archivo de paginación." - IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser inferior a 16 MB y no puede exceder el espacio disponible en la unidad seleccionada." + IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser inferior a 2 MB y no puede exceder el espacio disponible en la unidad seleccionada." IDS_WARNMAXIMUMRANGE "El tamaño máximo del archivo de paginación no puede ser inferior al tamaño inicial y no puede exceder el espacio disponible en la unidad seleccionada." IDS_PAGEFILE_NONE "Ninguno" IDS_PAGEFILE_SYSTEM "Administrado por el sistema" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index f8e3bc06fd0..07efe6bdf9f 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "ללא" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 80483dd1df0..0b5f5aae3d4 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 15d1b056c91..e22b0b90b72 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet panel kontrol sistem" IDS_WARNINITIALSIZE "Masukkan nilai numerik untuk ukuran awal halaman berkas." IDS_WARNMAXIMUMSIZE "Masukkan nilai numerik untuk ukuran maksimum halaman berkas." - IDS_WARNINITIALRANGE "Ukuran awal halaman berkas tidak boleh lebih kecil dari 16 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." + IDS_WARNINITIALRANGE "Ukuran awal halaman berkas tidak boleh lebih kecil dari 2 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." IDS_WARNMAXIMUMRANGE "Ukuran maksimum halaman berkas tidak boleh lebih kecil dari ukuran awal, maupun lebih besar dari 4095 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih." IDS_PAGEFILE_NONE "Tidak ada" IDS_PAGEFILE_SYSTEM "Diatur Sistem" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 29a764ef582..a00de37622c 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." - IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere inferiore a 16 MB e non può superare lo spazio disponibile nell'unità selezionata." + IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere inferiore a 2 MB e non può superare lo spazio disponibile nell'unità selezionata." IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non può essere inferiore a quella iniziale e non può superare lo spazio disponibile nell'unità selezionata." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 677f5a134d5..aee2ec1fb9a 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "システムコントロールパネルアプレット" IDS_WARNINITIALSIZE "ページングファイルの初期サイズの数値を入力して下さい。" IDS_WARNMAXIMUMSIZE "ページングファイルの最大サイズの数値を入力して下さい。" - IDS_WARNINITIALRANGE "ページングファイルの初期サイズは16 MB以上でなければなりません。また、選択中のドライブの利用可能なサイズを超えてはいけません。" + IDS_WARNINITIALRANGE "ページングファイルの初期サイズは2 MB以上でなければなりません。また、選択中のドライブの利用可能なサイズを超えてはいけません。" IDS_WARNMAXIMUMRANGE "ページングファイルの最大サイズは初期サイズ以上でなければなりません。また、4095 MB か選択中のドライブの利用可能なサイズを超えてはいけません。" IDS_PAGEFILE_NONE "なし" IDS_PAGEFILE_SYSTEM "システム管理" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index e70ac03f5ed..934291f25d5 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index c4056c5cdf4..5f71288f883 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Ingen" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 995603d74fd..cf95dd31017 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System" IDS_WARNINITIALSIZE "Wprowadź wielkość dla początkowego rozmiaru pliku stronicowania." IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku stronicowania." - IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 16 MB i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." + IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 2 MB i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie może być mniejszy niż jego rozmiar początkowy i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie." IDS_PAGEFILE_NONE "Brak" IDS_PAGEFILE_SYSTEM "Kontrolowany przez system" diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 3fb1b775e04..e60a2c04413 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -337,7 +337,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Aplicação do painel de controle do sistema" IDS_WARNINITIALSIZE "Digite um valor numérico para o tamanho inicial do arquivo de paginação." IDS_WARNMAXIMUMSIZE "Digite um valor numérico para o tamanho máximo do arquivo de paginação." - IDS_WARNINITIALRANGE "O tamanho inicial do arquivo de paginação não deve ser menor que 16 MB e não deve exceder o espaço disponível na unidade seleccionada." + IDS_WARNINITIALRANGE "O tamanho inicial do arquivo de paginação não deve ser menor que 2 MB e não deve exceder o espaço disponível na unidade seleccionada." IDS_WARNMAXIMUMRANGE "O tamanho máximo do arquivo de paginação não deve ser menor que o tamanho inicial, não deve ser maior que 4095 MB e não deve exceder o espaço disponível na unidade seleccionada." IDS_PAGEFILE_NONE "Nenhum" IDS_PAGEFILE_SYSTEM "Sistema gerenciado" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 2aa603a7f13..b7c7503e2f0 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -342,7 +342,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Specificare valori de sistem" IDS_WARNINITIALSIZE "Introduceți o valoare numerică pentru dimensiunea inițială a fișierului de paginare." IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă a fișierului de paginare." - IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie să fie încadrată între 16 Mo și spațiul liber disponibil al unității selectate." + IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie să fie încadrată între 2 Mo și spațiul liber disponibil al unității selectate." IDS_WARNMAXIMUMRANGE "Dimensiunea maximă a fișierului de paginare trebuie să fie încadrată între dimensiunea inițială și spațiul liber disponibil al unității selectate." IDS_PAGEFILE_NONE "Nespecificat" IDS_PAGEFILE_SYSTEM "Gestionat de sistem" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 7000629b43d..d4c83cef76c 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки." - IDS_WARNINITIALRANGE "Начальный размер файла подкачки должен быть не меньше, чем 16 МБ и не должен превышать свободного места на выбранном диске." + IDS_WARNINITIALRANGE "Начальный размер файла подкачки должен быть не меньше, чем 2 МБ и не должен превышать свободного места на выбранном диске." IDS_WARNMAXIMUMRANGE "Максимальный размер файла подкачки должен быть не меньше, чем начальный размер, который не должен превышать свободного места на выбранном диске." IDS_PAGEFILE_NONE "Нет" IDS_PAGEFILE_SYSTEM "По выбору системы" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index be3f36416e7..4fd5ae9cc2d 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -341,7 +341,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "Žiadne" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 236b7f1b28a..50a28f8e79c 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -333,7 +333,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve" IDS_WARNINITIALSIZE "Futni një vlerë numerike për madhësinë fillestare e faqeve të dokumentave." IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e faqeve të dokumentave." - IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të jetë më e vogël se 16 MB dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." + IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të jetë më e vogël se 2 MB dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." IDS_WARNMAXIMUMRANGE "Madhësia maksimale e faqes së dokumenit nuk duhet të jetë më e vogël se madhësia e saj fillestare dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur." IDS_PAGEFILE_NONE "Asnjë" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 9be5289f81e..bc8fda48d72 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 63430f16333..2e8c44d6ed2 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -335,7 +335,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" IDS_WARNINITIALSIZE "Sayfalama kütüğünün başlangıç büyüklüğü için bir sayılık değer giriniz." IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık değer giriniz." - IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 16 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." + IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 2 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün en çok büyüklüğü, kendisinin başlangıç büyüklüğünden küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır." IDS_PAGEFILE_NONE "Yok" IDS_PAGEFILE_SYSTEM "Dizge Yönetimli" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 97c71b9f94b..32891bafcb5 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -341,7 +341,7 @@ BEGIN IDS_MESSAGEBOXTITLE "Елемент панелі керування" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження." IDS_WARNMAXIMUMSIZE "Введіть числове значення для максимального розміру файлу довантаження." - IDS_WARNINITIALRANGE "Початковий розмір файлу довантаження не повинен бути меншим 16 Мб і не повинен перевищувати об'єм вільного місця на обраному диску." + IDS_WARNINITIALRANGE "Початковий розмір файлу довантаження не повинен бути меншим 2 Мб і не повинен перевищувати об'єм вільного місця на обраному диску." IDS_WARNMAXIMUMRANGE "Максимальний розмір файлу довантаження не повинен бути меншим від початкового та не повинен перевищувати об'єм вільного місця на обраному диску." IDS_PAGEFILE_NONE "Немає" IDS_PAGEFILE_SYSTEM "За вибором системи" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 9ab291917ff..f86f20d9484 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -336,7 +336,7 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 16 MB，并且不得超过所选磁盘上的可用空间。" + IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 2 MB，并且不得超过所选磁盘上的可用空间。" IDS_WARNMAXIMUMRANGE "分页文件的最大大小不能小于其初始大小和不能超过所选磁盘上的可用空间。" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 0fc06abd34c..41b8aa1f44a 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -336,7 +336,7 @@ BEGIN IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。" - IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 16 MB，並且不得超過所選磁碟上的可用空間。" + IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 2 MB，並且不得超過所選磁碟上的可用空間。" IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁碟上的可用空間。" IDS_PAGEFILE_NONE "無" IDS_PAGEFILE_SYSTEM "系統已管理"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2020