Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 01/03: [NTOS:MM] Do not chunk-read files marked with FO_RANDOM_ACCESS

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35c091adaf7ee70a57743… commit 35c091adaf7ee70a57743f29ab288e3ca0881366 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 16 11:27:19 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:MM] Do not chunk-read files marked with FO_RANDOM_ACCESS --- ntoskrnl/mm/section.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 3f364b49f4d..ea56635b72f 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1200,9 +1200,19 @@ MmMakeSegmentResident( if (!NT_SUCCESS(Status)) return Status; - RangeStart = Offset - (Offset % _64K); - if (RangeEnd % _64K) - RangeEnd += _64K - (RangeEnd % _64K); + /* If the file is not random access, read a 64K Chunk. */ + if (!FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) + { + RangeStart = Offset - (Offset % _64K); + if (RangeEnd % _64K) + RangeEnd += _64K - (RangeEnd % _64K); + } + else + { + RangeStart = Offset - (Offset % PAGE_SIZE); + if (RangeEnd % PAGE_SIZE) + RangeEnd += PAGE_SIZE - (RangeEnd % PAGE_SIZE); + } /* Clamp if needed */ if (!FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT))

3 years, 10 months

[reactos] 01/01: [BROWSEUI] Fix and small improvement (#3486)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f04890c2afdd8089e895d… commit f04890c2afdd8089e895dbc4f6aed6768b4d9b3a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 25 20:36:20 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 25 20:36:20 2021 +0900 [BROWSEUI] Fix and small improvement (#3486) Fix a mistake in CAutoComplete PR #3472 (6bfb76b) and improve. - Fix confusion between m_hwndEdit and hwndEdit. - Delete extra this-> codes. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index fed833e0fba..ffd14267d3e 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -134,14 +134,14 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (m_options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - if (!m_hwndEdit || !punkACL) + if (!hwndEdit || !punkACL) return E_INVALIDARG; - if (this->m_initialized) + if (m_initialized) { WARN("Autocompletion object is already initialized\n"); /* This->hwndEdit is set to NULL when the edit window is destroyed. */ - return this->m_hwndEdit ? E_FAIL : E_UNEXPECTED; + return m_hwndEdit ? E_FAIL : E_UNEXPECTED; } if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString, &m_enumstr)))) @@ -150,11 +150,11 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p return E_NOINTERFACE; } - this->m_hwndEdit = hwndEdit; - this->m_initialized = TRUE; + m_hwndEdit = hwndEdit; + m_initialized = TRUE; /* Keep at least one reference to the object until the edit window is destroyed. */ - this->AddRef(); + AddRef(); /* If another AutoComplete object was previously assigned to this edit control, release it but keep the same callback on the control, to avoid an infinite @@ -163,20 +163,20 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (prev && prev->m_initialized) { - this->m_wpOrigEditProc = prev->m_wpOrigEditProc; + m_wpOrigEditProc = prev->m_wpOrigEditProc; SetPropW(m_hwndEdit, autocomplete_propertyW, this); prev->m_wpOrigEditProc = NULL; prev->Release(); } else { - SetPropW(this->m_hwndEdit, autocomplete_propertyW, (HANDLE)this); - this->m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); + SetPropW(m_hwndEdit, autocomplete_propertyW, (HANDLE)this); + m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); } if (m_options & ACO_AUTOSUGGEST) { - this->CreateListbox(); + CreateListbox(); } if (pwzsRegKeyPath)

3 years, 10 months

[reactos] 01/01: [SDK][INCLUDE] Erase files of incorrect commit

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c14c9ca0d888562ec3004… commit c14c9ca0d888562ec300477e96cfaff81a03af97 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 25 09:21:13 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 25 09:21:13 2021 +0900 [SDK][INCLUDE] Erase files of incorrect commit Delete files at mistaken commit: https://github.com/reactos/reactos/commit/0efd7b97643c0a6a60d322e902de29e6d… rm sdk/include/host/cmake_install.cmake rm sdk/include/reactos/buildno.h rm sdk/include/reactos/version.h --- sdk/include/host/cmake_install.cmake | 34 ---------------------------------- sdk/include/reactos/buildno.h | 25 ------------------------- sdk/include/reactos/version.h | 27 --------------------------- 3 files changed, 86 deletions(-) diff --git a/sdk/include/host/cmake_install.cmake b/sdk/include/host/cmake_install.cmake deleted file mode 100644 index c63853082e7..00000000000 --- a/sdk/include/host/cmake_install.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Install script for directory: C:/Users/katahiromz/reactos-1/sdk/include/host - -# Set the install prefix -if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/REACTOS") -endif() -string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - if(BUILD_TYPE) - string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - else() - set(CMAKE_INSTALL_CONFIG_NAME "") - endif() - message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -endif() - -# Set the component getting installed. -if(NOT CMAKE_INSTALL_COMPONENT) - if(COMPONENT) - message(STATUS "Install component: \"${COMPONENT}\"") - set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - else() - set(CMAKE_INSTALL_COMPONENT) - endif() -endif() - -# Is this installation the result of a crosscompile? -if(NOT DEFINED CMAKE_CROSSCOMPILING) - set(CMAKE_CROSSCOMPILING "FALSE") -endif() - diff --git a/sdk/include/reactos/buildno.h b/sdk/include/reactos/buildno.h deleted file mode 100644 index d8f923d88be..00000000000 --- a/sdk/include/reactos/buildno.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Do not edit - Machine generated */ -#ifndef _INC_REACTOS_BUILDNO -#define _INC_REACTOS_BUILDNO - -#define KERNEL_VERSION_BUILD 20210222 -#define KERNEL_VERSION_BUILD_STR "20210222-0.4.15-dev-2073-ga6e3e8a" -#define KERNEL_VERSION_BUILD_RC "20210222-0.4.15-dev-2073-ga6e3e8a\0" - -#define KERNEL_VERSION_RC "0.4.15-x86-dev\0" -#define KERNEL_VERSION_STR "0.4.15-x86-dev" - -#define KERNEL_VERSION_REVISION_RC "0.4.15-dev-2073-ga6e3e8a\0" -#define KERNEL_VERSION_REVISION_STR "0.4.15-dev-2073-ga6e3e8a" - -#define KERNEL_VERSION_COMMIT_HASH "a6e3e8adf0ff581390dafc0bcf8f615c93d8c8b1" - -#define REACTOS_DLL_VERSION_MAJOR 42 -#define REACTOS_DLL_VERSION_RC "42.4.15-dev\0" -#define REACTOS_DLL_VERSION_STR "42.4.15-dev" - -#define REACTOS_COMPILER_NAME "GNU" -#define REACTOS_COMPILER_VERSION "8.4.0" - -#endif -/* EOF */ diff --git a/sdk/include/reactos/version.h b/sdk/include/reactos/version.h deleted file mode 100644 index 8d8015a86e0..00000000000 --- a/sdk/include/reactos/version.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/reactos/version.h.cmake - * PURPOSE: Defines the current version - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * REVISIONS: - * 1999-11-06 (ea) - * Moved from include/internal in include/reactos - * to be used by buildno. - * 2002-01-17 (ea) - * KERNEL_VERSION removed. Use - * reactos/buildno.h:KERNEL_VERSION_STR instead. - */ - -#ifndef __VERSION_H -#define __VERSION_H - -#define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 15 - -#define COPYRIGHT_YEAR "2021" - -#endif - -/* EOF */

3 years, 10 months

[reactos] 01/01: [SDK][INCLUDE] Strengthen and improve layout.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0efd7b97643c0a6a60d32… commit 0efd7b97643c0a6a60d322e902de29e6d851f2a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 25 09:12:47 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 25 09:12:47 2021 +0900 [SDK][INCLUDE] Strengthen and improve layout.h - Refreshing STATIC controls. - In LayoutInit function, if cLayouts parameter was negative, then don't use size grip. --- sdk/include/host/cmake_install.cmake | 34 +++++++++++++++++++++++++++++++ sdk/include/reactos/buildno.h | 25 +++++++++++++++++++++++ sdk/include/reactos/layout.h | 39 +++++++++++++++++++++++++++++++----- sdk/include/reactos/version.h | 27 +++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 5 deletions(-) diff --git a/sdk/include/host/cmake_install.cmake b/sdk/include/host/cmake_install.cmake new file mode 100644 index 00000000000..c63853082e7 --- /dev/null +++ b/sdk/include/host/cmake_install.cmake @@ -0,0 +1,34 @@ +# Install script for directory: C:/Users/katahiromz/reactos-1/sdk/include/host + +# Set the install prefix +if(NOT DEFINED CMAKE_INSTALL_PREFIX) + set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/REACTOS") +endif() +string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# Set the install configuration name. +if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + if(BUILD_TYPE) + string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" + CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") + else() + set(CMAKE_INSTALL_CONFIG_NAME "") + endif() + message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") +endif() + +# Set the component getting installed. +if(NOT CMAKE_INSTALL_COMPONENT) + if(COMPONENT) + message(STATUS "Install component: \"${COMPONENT}\"") + set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") + else() + set(CMAKE_INSTALL_COMPONENT) + endif() +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "FALSE") +endif() + diff --git a/sdk/include/reactos/buildno.h b/sdk/include/reactos/buildno.h new file mode 100644 index 00000000000..d8f923d88be --- /dev/null +++ b/sdk/include/reactos/buildno.h @@ -0,0 +1,25 @@ +/* Do not edit - Machine generated */ +#ifndef _INC_REACTOS_BUILDNO +#define _INC_REACTOS_BUILDNO + +#define KERNEL_VERSION_BUILD 20210222 +#define KERNEL_VERSION_BUILD_STR "20210222-0.4.15-dev-2073-ga6e3e8a" +#define KERNEL_VERSION_BUILD_RC "20210222-0.4.15-dev-2073-ga6e3e8a\0" + +#define KERNEL_VERSION_RC "0.4.15-x86-dev\0" +#define KERNEL_VERSION_STR "0.4.15-x86-dev" + +#define KERNEL_VERSION_REVISION_RC "0.4.15-dev-2073-ga6e3e8a\0" +#define KERNEL_VERSION_REVISION_STR "0.4.15-dev-2073-ga6e3e8a" + +#define KERNEL_VERSION_COMMIT_HASH "a6e3e8adf0ff581390dafc0bcf8f615c93d8c8b1" + +#define REACTOS_DLL_VERSION_MAJOR 42 +#define REACTOS_DLL_VERSION_RC "42.4.15-dev\0" +#define REACTOS_DLL_VERSION_STR "42.4.15-dev" + +#define REACTOS_COMPILER_NAME "GNU" +#define REACTOS_COMPILER_VERSION "8.4.0" + +#endif +/* EOF */ diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 5b310716168..7cddf11cd11 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS headers * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: The layout engine of resizable dialog boxes / windows - * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #pragma once #include <assert.h> @@ -41,6 +41,9 @@ _layout_ModifySystemMenu(LAYOUT_DATA *pData, BOOL bEnableResize) static __inline HDWP _layout_MoveGrip(LAYOUT_DATA *pData, HDWP hDwp OPTIONAL) { + if (!IsWindowVisible(pData->m_hwndGrip)) + return hDwp; + SIZE size = { GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL) }; const UINT uFlags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER; RECT rcClient; @@ -62,7 +65,7 @@ _layout_MoveGrip(LAYOUT_DATA *pData, HDWP hDwp OPTIONAL) } static __inline void -_layout_ShowGrip(LAYOUT_DATA *pData, BOOL bShow) +LayoutShowGrip(LAYOUT_DATA *pData, BOOL bShow) { if (!bShow) { @@ -135,6 +138,18 @@ _layout_ArrangeLayout(LAYOUT_DATA *pData) hDwp = _layout_MoveGrip(pData, hDwp); EndDeferWindowPos(hDwp); + + /* STATIC controls need refreshing. */ + for (iItem = 0; iItem < pData->m_cLayouts; ++iItem) + { + HWND hwndCtrl = pData->m_pLayouts[iItem].m_hwndCtrl; + WCHAR szClass[8]; + GetClassNameW(hwndCtrl, szClass, _countof(szClass)); + if (lstrcmpiW(szClass, L"STATIC") == 0) + { + InvalidateRect(hwndCtrl, NULL, TRUE); + } + } } static __inline void @@ -185,13 +200,14 @@ LayoutUpdate(HWND ignored1, LAYOUT_DATA *pData, LPCVOID ignored2, UINT ignored3) static __inline void LayoutEnableResize(LAYOUT_DATA *pData, BOOL bEnable) { - _layout_ShowGrip(pData, bEnable); + LayoutShowGrip(pData, bEnable); _layout_ModifySystemMenu(pData, bEnable); } static __inline LAYOUT_DATA * -LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) +LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, INT cLayouts) { + BOOL bShowGrip; SIZE_T cb; LAYOUT_DATA *pData = (LAYOUT_DATA *)HeapAlloc(GetProcessHeap(), 0, sizeof(LAYOUT_DATA)); if (pData == NULL) @@ -200,6 +216,16 @@ LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) return NULL; } + if (cLayouts < 0) /* NOTE: If cLayouts was negative, then don't show size grip */ + { + cLayouts = -cLayouts; + bShowGrip = FALSE; + } + else + { + bShowGrip = TRUE; + } + cb = cLayouts * sizeof(LAYOUT_INFO); pData->m_cLayouts = cLayouts; pData->m_pLayouts = (LAYOUT_INFO *)HeapAlloc(GetProcessHeap(), 0, cb); @@ -216,8 +242,11 @@ LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) assert(GetWindowLongPtrW(hwndParent, GWL_STYLE) & WS_SIZEBOX); pData->m_hwndParent = hwndParent; + pData->m_hwndGrip = NULL; - LayoutEnableResize(pData, TRUE); + if (bShowGrip) + LayoutShowGrip(pData, bShowGrip); + _layout_InitLayouts(pData); return pData; } diff --git a/sdk/include/reactos/version.h b/sdk/include/reactos/version.h new file mode 100644 index 00000000000..8d8015a86e0 --- /dev/null +++ b/sdk/include/reactos/version.h @@ -0,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/reactos/version.h.cmake + * PURPOSE: Defines the current version + * PROGRAMMER: David Welch (welch(a)mcmail.com) + * REVISIONS: + * 1999-11-06 (ea) + * Moved from include/internal in include/reactos + * to be used by buildno. + * 2002-01-17 (ea) + * KERNEL_VERSION removed. Use + * reactos/buildno.h:KERNEL_VERSION_STR instead. + */ + +#ifndef __VERSION_H +#define __VERSION_H + +#define KERNEL_VERSION_MAJOR 0 +#define KERNEL_VERSION_MINOR 4 +#define KERNEL_VERSION_PATCH_LEVEL 15 + +#define COPYRIGHT_YEAR "2021" + +#endif + +/* EOF */

3 years, 10 months

[reactos] 01/01: [TASKLIST] Implement tasklist command-line utility (#3440)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=633ece90258d09106ff5d… commit 633ece90258d09106ff5d0d01c85640b7dfba443 Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Feb 24 18:05:15 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 24 19:05:15 2021 +0900 [TASKLIST] Implement tasklist command-line utility (#3440) Add command-line program "tasklist" for ReactOS. It works fine on Windows as well. --- base/applications/cmdutils/CMakeLists.txt | 1 + base/applications/cmdutils/tasklist/CMakeLists.txt | 8 + base/applications/cmdutils/tasklist/lang/bg-BG.rc | 20 ++ base/applications/cmdutils/tasklist/lang/ca-ES.rc | 20 ++ base/applications/cmdutils/tasklist/lang/cs-CZ.rc | 20 ++ base/applications/cmdutils/tasklist/lang/de-DE.rc | 20 ++ base/applications/cmdutils/tasklist/lang/el-GR.rc | 20 ++ base/applications/cmdutils/tasklist/lang/en-US.rc | 20 ++ base/applications/cmdutils/tasklist/lang/es-ES.rc | 20 ++ base/applications/cmdutils/tasklist/lang/et-EE.rc | 20 ++ base/applications/cmdutils/tasklist/lang/fr-FR.rc | 20 ++ base/applications/cmdutils/tasklist/lang/it-IT.rc | 20 ++ base/applications/cmdutils/tasklist/lang/lt-LT.rc | 20 ++ base/applications/cmdutils/tasklist/lang/no-NO.rc | 20 ++ base/applications/cmdutils/tasklist/lang/pl-PL.rc | 20 ++ base/applications/cmdutils/tasklist/lang/pt-BR.rc | 20 ++ base/applications/cmdutils/tasklist/lang/ro-RO.rc | 20 ++ base/applications/cmdutils/tasklist/lang/ru-RU.rc | 20 ++ base/applications/cmdutils/tasklist/lang/sk-SK.rc | 20 ++ base/applications/cmdutils/tasklist/lang/sq-AL.rc | 20 ++ base/applications/cmdutils/tasklist/lang/sv-SE.rc | 20 ++ base/applications/cmdutils/tasklist/lang/tr-TR.rc | 20 ++ base/applications/cmdutils/tasklist/lang/uk-UA.rc | 20 ++ base/applications/cmdutils/tasklist/lang/zh-CN.rc | 20 ++ base/applications/cmdutils/tasklist/lang/zh-TW.rc | 20 ++ base/applications/cmdutils/tasklist/resource.h | 16 + base/applications/cmdutils/tasklist/tasklist.c | 335 +++++++++++++++++++++ base/applications/cmdutils/tasklist/tasklist.h | 29 ++ base/applications/cmdutils/tasklist/tasklist.rc | 80 +++++ 29 files changed, 929 insertions(+) diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index dd8a7ab2b06..43b10eb6c73 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -21,6 +21,7 @@ add_subdirectory(reg) add_subdirectory(schtasks) add_subdirectory(sort) add_subdirectory(taskkill) +add_subdirectory(tasklist) add_subdirectory(timeout) add_subdirectory(tree) add_subdirectory(whoami) diff --git a/base/applications/cmdutils/tasklist/CMakeLists.txt b/base/applications/cmdutils/tasklist/CMakeLists.txt new file mode 100644 index 00000000000..a0995d79652 --- /dev/null +++ b/base/applications/cmdutils/tasklist/CMakeLists.txt @@ -0,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(tasklist tasklist.c tasklist.rc) +set_module_type(tasklist win32cui UNICODE) +target_link_libraries(tasklist conutils ${PSEH_LIB}) +add_importlibs(tasklist msvcrt user32 kernel32 ntdll) +add_cd_file(TARGET tasklist DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/tasklist/lang/bg-BG.rc b/base/applications/cmdutils/tasklist/lang/bg-BG.rc new file mode 100644 index 00000000000..341da7be914 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/bg-BG.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/ca-ES.rc b/base/applications/cmdutils/tasklist/lang/ca-ES.rc new file mode 100644 index 00000000000..23626df83fb --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/ca-ES.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/cs-CZ.rc b/base/applications/cmdutils/tasklist/lang/cs-CZ.rc new file mode 100644 index 00000000000..08d67e6f556 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/cs-CZ.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/de-DE.rc b/base/applications/cmdutils/tasklist/lang/de-DE.rc new file mode 100644 index 00000000000..d4da3146480 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/de-DE.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/el-GR.rc b/base/applications/cmdutils/tasklist/lang/el-GR.rc new file mode 100644 index 00000000000..fadac1934c6 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/el-GR.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/en-US.rc b/base/applications/cmdutils/tasklist/lang/en-US.rc new file mode 100644 index 00000000000..7b9e4fdb50a --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/en-US.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/es-ES.rc b/base/applications/cmdutils/tasklist/lang/es-ES.rc new file mode 100644 index 00000000000..e0272ce79e2 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/es-ES.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/et-EE.rc b/base/applications/cmdutils/tasklist/lang/et-EE.rc new file mode 100644 index 00000000000..0bd164f5079 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/et-EE.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/fr-FR.rc b/base/applications/cmdutils/tasklist/lang/fr-FR.rc new file mode 100644 index 00000000000..8cb7f76e4cb --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/fr-FR.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/it-IT.rc b/base/applications/cmdutils/tasklist/lang/it-IT.rc new file mode 100644 index 00000000000..3f00e07d32d --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/it-IT.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/lt-LT.rc b/base/applications/cmdutils/tasklist/lang/lt-LT.rc new file mode 100644 index 00000000000..e67893e2ec8 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/lt-LT.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/no-NO.rc b/base/applications/cmdutils/tasklist/lang/no-NO.rc new file mode 100644 index 00000000000..c7422dfa78e --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/no-NO.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/pl-PL.rc b/base/applications/cmdutils/tasklist/lang/pl-PL.rc new file mode 100644 index 00000000000..f4df68a082c --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/pl-PL.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/pt-BR.rc b/base/applications/cmdutils/tasklist/lang/pt-BR.rc new file mode 100644 index 00000000000..66879279545 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/pt-BR.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/ro-RO.rc b/base/applications/cmdutils/tasklist/lang/ro-RO.rc new file mode 100644 index 00000000000..036983fd87a --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/ro-RO.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/ru-RU.rc b/base/applications/cmdutils/tasklist/lang/ru-RU.rc new file mode 100644 index 00000000000..ed72ca602b7 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/ru-RU.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/sk-SK.rc b/base/applications/cmdutils/tasklist/lang/sk-SK.rc new file mode 100644 index 00000000000..6dd000b022f --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/sk-SK.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/sq-AL.rc b/base/applications/cmdutils/tasklist/lang/sq-AL.rc new file mode 100644 index 00000000000..79a7f1581b2 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/sq-AL.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/sv-SE.rc b/base/applications/cmdutils/tasklist/lang/sv-SE.rc new file mode 100644 index 00000000000..7f9938e5cee --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/sv-SE.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/tr-TR.rc b/base/applications/cmdutils/tasklist/lang/tr-TR.rc new file mode 100644 index 00000000000..70723b7bfa6 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/tr-TR.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/uk-UA.rc b/base/applications/cmdutils/tasklist/lang/uk-UA.rc new file mode 100644 index 00000000000..75d9bef68d6 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/uk-UA.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/zh-CN.rc b/base/applications/cmdutils/tasklist/lang/zh-CN.rc new file mode 100644 index 00000000000..04f49dd27f5 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/zh-CN.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/lang/zh-TW.rc b/base/applications/cmdutils/tasklist/lang/zh-TW.rc new file mode 100644 index 00000000000..797b464fed4 --- /dev/null +++ b/base/applications/cmdutils/tasklist/lang/zh-TW.rc @@ -0,0 +1,20 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_USAGE, "Usage: TASKLIST [/?] [/NH]\n" + IDS_DESCRIPTION, "\n\ +Desciption:\ + This tool displays a list of currently running processes on\n\ + the machine.\n" + IDS_OPTION_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + IDS_INVALID_SYNTAX, "Error: Invalid syntax.\n" + IDS_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + IDS_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + IDS_OUT_OF_MEMORY, "Error: Out of memory.\n" + IDS_HEADER_IMAGENAME, "Image Name" + IDS_HEADER_PID, "PID" + IDS_HEADER_SESSION, "Session#" + IDS_HEADER_MEMUSAGE, "Mem Usage" + IDS_MEMORY_STR, "%s K" +END diff --git a/base/applications/cmdutils/tasklist/resource.h b/base/applications/cmdutils/tasklist/resource.h new file mode 100644 index 00000000000..3093a019f75 --- /dev/null +++ b/base/applications/cmdutils/tasklist/resource.h @@ -0,0 +1,16 @@ +#pragma once + +#define IDS_USAGE 1000 +#define IDS_DESCRIPTION 1001 +#define IDS_OPTION_TOO_MUCH 1002 +#define IDS_INVALID_SYNTAX 1003 +#define IDS_INVALID_OPTION 1004 +#define IDS_ENUM_FAILED 1005 +#define IDS_OUT_OF_MEMORY 1006 + +#define IDS_HEADER_IMAGENAME 1007 +#define IDS_HEADER_PID 1008 +#define IDS_HEADER_SESSION 1009 +#define IDS_HEADER_MEMUSAGE 1010 + +#define IDS_MEMORY_STR 1011 diff --git a/base/applications/cmdutils/tasklist/tasklist.c b/base/applications/cmdutils/tasklist/tasklist.c new file mode 100644 index 00000000000..4248e7204f1 --- /dev/null +++ b/base/applications/cmdutils/tasklist/tasklist.c @@ -0,0 +1,335 @@ +/* + * PROJECT: ReactOS Tasklist Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Displays a list of currently running processes on the computer. + * COPYRIGHT: Copyright 2021 He Yang (1160386205(a)qq.com) + */ + +#include "tasklist.h" + +// the strings in OptionList are the command-line options. +// should always correspond with the defines below, in sequence (except OPTION_INVALID) +static PCWSTR OptionList[] = { L"?", L"nh" }; + +#define OPTION_INVALID -1 +#define OPTION_HELP 0 +#define OPTION_NOHEADER 1 + +// the max string length PrintResString can handle +#define RES_STR_MAXLEN 64 + +// Print split line +VOID PrintSplitLine(UINT Length) +{ + for (; Length; Length--) + { + ConPuts(StdOut, L"="); + } +} + +// Print spaces +VOID PrintSpace(UINT Length) +{ + ConPrintf(StdOut, L"%*ls", (INT)Length, L""); +} + +// Print a string. +// if bAlignLeft == TRUE then aligned to left, otherwise aligned to right +// MaxWidth is the width for printing. +VOID PrintString(LPCWSTR String, UINT MaxWidth, BOOL bAlignLeft) +{ + ConPrintf(StdOut, bAlignLeft ? L"%-*.*ls" : L"%*.*ls", MaxWidth, MaxWidth, String); +} + +// Print a string from resource +// if bAlignLeft == TRUE then aligned to left, otherwise aligned to right +// MaxWidth is the width for printing. +// The string WILL be truncated if it's longer than RES_STR_MAXLEN +VOID PrintResString(HINSTANCE hInstance, UINT uID, UINT MaxWidth, BOOL bAlignLeft) +{ + if (!hInstance) + return; + + WCHAR StringBuffer[RES_STR_MAXLEN]; + LoadStringW(hInstance, uID, StringBuffer, _countof(StringBuffer)); + PrintString(StringBuffer, MaxWidth, bAlignLeft); +} + +// Print a number, aligned to right. +// MaxWidth is the width for printing. +// the number WILL NOT be truncated if it's longer than MaxWidth +VOID PrintNum(LONGLONG Number, UINT MaxWidth) +{ + ConPrintf(StdOut, L"%*lld", MaxWidth, Number); +} + +// Print memory size using KB as unit, with comma-separated number, aligned to right. +// MaxWidth is the width for printing. +// the number WILL be truncated if it's longer than MaxWidth +BOOL PrintMemory(SIZE_T MemorySizeByte, UINT MaxWidth, HINSTANCE hInstance) +{ + if (!hInstance) + return FALSE; + + SIZE_T MemorySize = MemorySizeByte >> 10; + + WCHAR NumberString[27] = { 0 }; // length 26 is enough to display ULLONG_MAX in decimal with comma, one more for zero-terminated. + C_ASSERT(sizeof(SIZE_T) <= 8); + + PWCHAR pNumberStr = NumberString; + + // calculate the length + UINT PrintLength = 0; + SIZE_T Tmp = MemorySize; + UINT Mod = 1; + + do + { + Tmp /= 10; + PrintLength++; + Mod *= 10; + } while (Tmp); + + for (UINT i = PrintLength; i; i--) + { + Mod /= 10; + *pNumberStr = L'0' + (MemorySize / Mod); + MemorySize %= Mod; + pNumberStr++; + + if (i != 1 && i % 3 == 1) + { + *pNumberStr = L','; + pNumberStr++; + } + } + + WCHAR FormatStr[RES_STR_MAXLEN]; + LoadStringW(hInstance, IDS_MEMORY_STR, FormatStr, _countof(FormatStr)); + + WCHAR String[RES_STR_MAXLEN + _countof(NumberString)] = { 0 }; + + StringCchPrintfW(String, _countof(String), FormatStr, NumberString); + PrintString(String, MaxWidth, FALSE); + + return TRUE; +} + +VOID PrintHeader(HINSTANCE hInstance) +{ + if (!hInstance) + return; + + PrintResString(hInstance, IDS_HEADER_IMAGENAME, COLUMNWIDTH_IMAGENAME, TRUE); + PrintSpace(1); + PrintResString(hInstance, IDS_HEADER_PID, COLUMNWIDTH_PID, FALSE); + PrintSpace(1); + PrintResString(hInstance, IDS_HEADER_SESSION, COLUMNWIDTH_SESSION, FALSE); + PrintSpace(1); + PrintResString(hInstance, IDS_HEADER_MEMUSAGE, COLUMNWIDTH_MEMUSAGE, FALSE); + + ConPuts(StdOut, L"\n"); + + PrintSplitLine(COLUMNWIDTH_IMAGENAME); + PrintSpace(1); + PrintSplitLine(COLUMNWIDTH_PID); + PrintSpace(1); + PrintSplitLine(COLUMNWIDTH_SESSION); + PrintSpace(1); + PrintSplitLine(COLUMNWIDTH_MEMUSAGE); + + ConPuts(StdOut, L"\n"); +} + +BOOL EnumProcessAndPrint(BOOL bNoHeader) +{ + // Call NtQuerySystemInformation for the process information + ULONG ProcessInfoBufferLength = 0; + ULONG ResultLength = 0; + PBYTE ProcessInfoBuffer = NULL; + + // Get the buffer size we need + NTSTATUS Status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ResultLength); + + // New process/thread might appear before we call for the actual data. + // Try to avoid this by retrying several times. + for (UINT Retry = 0; Retry < NT_SYSTEM_QUERY_MAX_RETRY; Retry++) + { + // (Re)allocate buffer + ProcessInfoBufferLength = ResultLength; + ResultLength = 0; + if (ProcessInfoBuffer) + { + PBYTE NewProcessInfoBuffer = HeapReAlloc(GetProcessHeap(), 0, + ProcessInfoBuffer, + ProcessInfoBufferLength); + if (NewProcessInfoBuffer) + { + ProcessInfoBuffer = NewProcessInfoBuffer; + } + else + { + // out of memory + ConResMsgPrintf(StdErr, 0, IDS_OUT_OF_MEMORY); + HeapFree(GetProcessHeap(), 0, ProcessInfoBuffer); + return FALSE; + } + } + else + { + ProcessInfoBuffer = HeapAlloc(GetProcessHeap(), 0, ProcessInfoBufferLength); + if (!ProcessInfoBuffer) + { + // out of memory + ConResMsgPrintf(StdErr, 0, IDS_OUT_OF_MEMORY); + return FALSE; + } + } + + // Query information + Status = NtQuerySystemInformation(SystemProcessInformation, + ProcessInfoBuffer, + ProcessInfoBufferLength, + &ResultLength); + if (Status != STATUS_INFO_LENGTH_MISMATCH) + { + break; + } + } + + if (!NT_SUCCESS(Status)) + { + // tried NT_SYSTEM_QUERY_MAX_RETRY times, or failed with some other reason + ConResMsgPrintf(StdErr, 0, IDS_ENUM_FAILED); + HeapFree(GetProcessHeap(), 0, ProcessInfoBuffer); + return FALSE; + } + + HINSTANCE hInstance = GetModuleHandleW(NULL); + assert(hInstance); + + ConPuts(StdOut, L"\n"); + + if (!bNoHeader) + { + PrintHeader(hInstance); + } + + PSYSTEM_PROCESS_INFORMATION pSPI; + pSPI = (PSYSTEM_PROCESS_INFORMATION)ProcessInfoBuffer; + while (pSPI) + { + PrintString(pSPI->UniqueProcessId ? pSPI->ImageName.Buffer : L"System Idle Process", COLUMNWIDTH_IMAGENAME, TRUE); + PrintSpace(1); + PrintNum((LONGLONG)(INT_PTR)pSPI->UniqueProcessId, COLUMNWIDTH_PID); + PrintSpace(1); + PrintNum((ULONGLONG)pSPI->SessionId, COLUMNWIDTH_SESSION); + PrintSpace(1); + PrintMemory(pSPI->WorkingSetSize, COLUMNWIDTH_MEMUSAGE, hInstance); + + ConPuts(StdOut, L"\n"); + + if (pSPI->NextEntryOffset == 0) + break; + pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->NextEntryOffset); + } + + HeapFree(GetProcessHeap(), 0, ProcessInfoBuffer); + return TRUE; +} + +INT GetOptionType(LPCWSTR szOption) +{ + if (szOption[0] != L'/' && szOption[0] != L'-') + { + return OPTION_INVALID; + } + szOption++; + + for (UINT i = 0; i < _countof(OptionList); i++) + { + if (!_wcsicmp(OptionList[i], szOption)) + { + return i; + } + } + return OPTION_INVALID; +} + +BOOL ProcessArguments(INT argc, WCHAR **argv) +{ + BOOL bHasHelp = FALSE, bHasNoHeader = FALSE; + + for (INT i = 1; i < argc; i++) + { + INT Option = GetOptionType(argv[i]); + + switch (Option) + { + case OPTION_HELP: + { + if (bHasHelp) + { + // -? already specified + ConResMsgPrintf(StdErr, 0, IDS_OPTION_TOO_MUCH, argv[i], 1); + ConResMsgPrintf(StdErr, 0, IDS_USAGE); + return FALSE; + } + bHasHelp = TRUE; + break; + } + case OPTION_NOHEADER: + { + if (bHasNoHeader) + { + // -nh already specified + ConResMsgPrintf(StdErr, 0, IDS_OPTION_TOO_MUCH, argv[i], 1); + ConResMsgPrintf(StdErr, 0, IDS_USAGE); + return FALSE; + } + bHasNoHeader = TRUE; + break; + } + case OPTION_INVALID: + default: + { + ConResMsgPrintf(StdErr, 0, IDS_INVALID_OPTION); + ConResMsgPrintf(StdErr, 0, IDS_USAGE); + return FALSE; + } + } + } + + if (bHasHelp) + { + if (argc > 2) // any arguments other than -? exists + { + ConResMsgPrintf(StdErr, 0, IDS_INVALID_SYNTAX); + ConResMsgPrintf(StdErr, 0, IDS_USAGE); + return FALSE; + } + else + { + ConResMsgPrintf(StdOut, 0, IDS_USAGE); + ConResMsgPrintf(StdOut, 0, IDS_DESCRIPTION); + return FALSE; + } + } + else + { + EnumProcessAndPrint(bHasNoHeader); + } + return TRUE; +} + +int wmain(int argc, WCHAR **argv) +{ + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + if (!ProcessArguments(argc, argv)) + { + return 1; + } + return 0; +} diff --git a/base/applications/cmdutils/tasklist/tasklist.h b/base/applications/cmdutils/tasklist/tasklist.h new file mode 100644 index 00000000000..1303a34375b --- /dev/null +++ b/base/applications/cmdutils/tasklist/tasklist.h @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Tasklist Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Displays a list of currently running processes on the computer. + * COPYRIGHT: Copyright 2020 He Yang (1160386205(a)qq.com) + */ + +#pragma once + +#include <stdio.h> +#include <stdlib.h> +#include <wchar.h> +#include <assert.h> + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntndk.h> +#include <strsafe.h> + +#include <conutils.h> + +#include "resource.h" + +#define NT_SYSTEM_QUERY_MAX_RETRY 5 + +#define COLUMNWIDTH_IMAGENAME 25 +#define COLUMNWIDTH_PID 8 +#define COLUMNWIDTH_SESSION 11 +#define COLUMNWIDTH_MEMUSAGE 12 diff --git a/base/applications/cmdutils/tasklist/tasklist.rc b/base/applications/cmdutils/tasklist/tasklist.rc new file mode 100644 index 00000000000..533a21bbc66 --- /dev/null +++ b/base/applications/cmdutils/tasklist/tasklist.rc @@ -0,0 +1,80 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tasklist Command" +#define REACTOS_STR_INTERNAL_NAME "tasklist" +#define REACTOS_STR_ORIGINAL_FILENAME "tasklist.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CA_ES + #include "lang/ca-ES.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_ET_EE + #include "lang/et-EE.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

3 years, 10 months

[reactos] 01/01: [BROWSEUI]Update PT translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9039de127caa5a74c945b… commit 9039de127caa5a74c945be5c08e7f41175ca7099 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Feb 24 00:38:48 2021 +0000 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Feb 24 07:23:39 2021 +0100 [BROWSEUI]Update PT translation --- dll/win32/browseui/lang/pt-PT.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 6c1cf775698..61e3f175a37 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -329,18 +329,18 @@ END STRINGTABLE BEGIN - IDS_SEARCH_RESULTS "Search Results" - IDS_SEARCHINVALID "'%1' is not a valid folder." - IDS_SEARCH_FOLDER "Searching %s" - IDS_SEARCH_FILES_FOUND "%u files found" - IDS_SEARCH_OPEN_FOLDER "Open Containing &Folder" - IDS_COL_NAME "Name" - IDS_COL_LOCATION "In Folder" - IDS_COL_RELEVANCE "Relevance" + IDS_SEARCH_RESULTS "Resultados da procura" + IDS_SEARCHINVALID "'%1' não é uma pasta válida." + IDS_SEARCH_FOLDER "A procurar %s" + IDS_SEARCH_FILES_FOUND "%u ficheiros encontrados" + IDS_SEARCH_OPEN_FOLDER "Abrir &pasta de destino" + IDS_COL_NAME "Nome" + IDS_COL_LOCATION "na pasta" + IDS_COL_RELEVANCE "Relevância" END STRINGTABLE BEGIN - IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TITLE "Explorador do ReactOS" + IDS_PARSE_ADDR_ERR_TEXT "O explorador do ReactOS não encontrou '%1'. Verifique a ortografia e tente novamente." END

3 years, 10 months

[reactos] 01/01: [BROWSEUI] Refactoring CAutoComplete Part 1 (#3472)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bfb76b68a7f8fe12b4fa… commit 6bfb76b68a7f8fe12b4fa4503b6225297108dd0c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 23 06:07:09 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 23 06:07:09 2021 +0900 [BROWSEUI] Refactoring CAutoComplete Part 1 (#3472) - Expand tabs to spaces in CAutoComplete.h. - Add m_ prefix to every member variable. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 214 +++++++++++++++++------------------ dll/win32/browseui/CAutoComplete.h | 81 ++++++------- 2 files changed, 148 insertions(+), 147 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index b18956b6547..fed833e0fba 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -3,7 +3,7 @@ * * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill - * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -47,15 +47,15 @@ static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t',' */ CAutoComplete::CAutoComplete() { - enabled = TRUE; - initialized = FALSE; - options = ACO_AUTOAPPEND; - wpOrigEditProc = NULL; - hwndListBox = NULL; - txtbackup = NULL; - quickComplete = NULL; - hwndEdit = NULL; - wpOrigLBoxProc = NULL; + m_enabled = TRUE; + m_initialized = FALSE; + m_options = ACO_AUTOAPPEND; + m_wpOrigEditProc = NULL; + m_hwndListBox = NULL; + m_txtbackup = NULL; + m_quickComplete = NULL; + m_hwndEdit = NULL; + m_wpOrigLBoxProc = NULL; } /************************************************************************** @@ -64,15 +64,15 @@ CAutoComplete::CAutoComplete() CAutoComplete::~CAutoComplete() { TRACE(" destroying IAutoComplete(%p)\n", this); - HeapFree(GetProcessHeap(), 0, quickComplete); - HeapFree(GetProcessHeap(), 0, txtbackup); - if (wpOrigEditProc) + HeapFree(GetProcessHeap(), 0, m_quickComplete); + HeapFree(GetProcessHeap(), 0, m_txtbackup); + if (m_wpOrigEditProc) { - SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)wpOrigEditProc); - RemovePropW(hwndEdit, autocomplete_propertyW); + SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)m_wpOrigEditProc); + RemovePropW(m_hwndEdit, autocomplete_propertyW); } - if (hwndListBox) - DestroyWindow(hwndListBox); + if (m_hwndListBox) + DestroyWindow(m_hwndListBox); } /****************************************************************************** @@ -84,7 +84,7 @@ HRESULT WINAPI CAutoComplete::Enable(BOOL fEnable) TRACE("(%p)->(%s)\n", this, (fEnable) ? "true" : "false"); - enabled = fEnable; + m_enabled = fEnable; return hr; } @@ -94,19 +94,19 @@ HRESULT WINAPI CAutoComplete::Enable(BOOL fEnable) */ void CAutoComplete::CreateListbox() { - HWND hwndParent = GetParent(hwndEdit); + HWND hwndParent = GetParent(m_hwndEdit); /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); + m_hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, + WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hwndParent, NULL, + (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); - if (hwndListBox) + if (m_hwndListBox) { - wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); - SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); + m_wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(m_hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); + SetWindowLongPtrW(m_hwndListBox, GWLP_USERDATA, (LONG_PTR)this); } } @@ -119,39 +119,39 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", this, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); - if (options & ACO_AUTOSUGGEST) + if (m_options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n"); - if (options & ACO_AUTOAPPEND) + if (m_options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n"); - if (options & ACO_SEARCH) + if (m_options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); - if (options & ACO_FILTERPREFIXES) + if (m_options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (options & ACO_USETAB) + if (m_options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n"); - if (options & ACO_UPDOWNKEYDROPSLIST) + if (m_options & ACO_UPDOWNKEYDROPSLIST) TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); - if (options & ACO_RTLREADING) + if (m_options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - if (!hwndEdit || !punkACL) + if (!m_hwndEdit || !punkACL) return E_INVALIDARG; - if (this->initialized) + if (this->m_initialized) { WARN("Autocompletion object is already initialized\n"); /* This->hwndEdit is set to NULL when the edit window is destroyed. */ - return this->hwndEdit ? E_FAIL : E_UNEXPECTED; + return this->m_hwndEdit ? E_FAIL : E_UNEXPECTED; } - if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString,&enumstr)))) + if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString, &m_enumstr)))) { TRACE("No IEnumString interface\n"); return E_NOINTERFACE; } - this->hwndEdit = hwndEdit; - this->initialized = TRUE; + this->m_hwndEdit = hwndEdit; + this->m_initialized = TRUE; /* Keep at least one reference to the object until the edit window is destroyed. */ this->AddRef(); @@ -159,22 +159,22 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p /* If another AutoComplete object was previously assigned to this edit control, release it but keep the same callback on the control, to avoid an infinite recursive loop in ACEditSubclassProc while the property is set to this object */ - CAutoComplete *prev = static_cast<CAutoComplete *>(GetPropW(hwndEdit, autocomplete_propertyW)); + CAutoComplete *prev = static_cast<CAutoComplete *>(GetPropW(m_hwndEdit, autocomplete_propertyW)); - if (prev && prev->initialized) + if (prev && prev->m_initialized) { - this->wpOrigEditProc = prev->wpOrigEditProc; - SetPropW(hwndEdit, autocomplete_propertyW, this); - prev->wpOrigEditProc = NULL; + this->m_wpOrigEditProc = prev->m_wpOrigEditProc; + SetPropW(m_hwndEdit, autocomplete_propertyW, this); + prev->m_wpOrigEditProc = NULL; prev->Release(); } else { - SetPropW( this->hwndEdit, autocomplete_propertyW, (HANDLE)this ); - this->wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); + SetPropW(this->m_hwndEdit, autocomplete_propertyW, (HANDLE)this); + this->m_wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(m_hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); } - if (options & ACO_AUTOSUGGEST) + if (m_options & ACO_AUTOSUGGEST) { this->CreateListbox(); } @@ -215,8 +215,8 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p res = RegQueryValueW(hKey, value, result, &len); if (res == ERROR_SUCCESS) { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); - wcscpy(quickComplete, result); + m_quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + wcscpy(m_quickComplete, result); } RegCloseKey(hKey); } @@ -231,13 +231,13 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p } } - if ((pwszQuickComplete) && (!quickComplete)) + if ((pwszQuickComplete) && (!m_quickComplete)) { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); + m_quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); - if (quickComplete) + if (m_quickComplete) { - wcscpy(quickComplete, pwszQuickComplete); + wcscpy(m_quickComplete, pwszQuickComplete); } else { @@ -258,7 +258,7 @@ HRESULT WINAPI CAutoComplete::GetOptions(DWORD *pdwFlag) TRACE("(%p) -> (%p)\n", this, pdwFlag); - *pdwFlag = options; + *pdwFlag = m_options; return hr; } @@ -272,9 +272,9 @@ HRESULT WINAPI CAutoComplete::SetOptions(DWORD dwFlag) TRACE("(%p) -> (0x%x)\n", this, dwFlag); - options = (AUTOCOMPLETEOPTIONS)dwFlag; + m_options = (AUTOCOMPLETEOPTIONS)dwFlag; - if ((options & ACO_AUTOSUGGEST) && hwndEdit && !hwndListBox) + if ((m_options & ACO_AUTOSUGGEST) && m_hwndEdit && !m_hwndListBox) CreateListbox(); return hr; @@ -335,25 +335,25 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM int cpt, height, sel; ULONG fetched; - if (!pThis->enabled) + if (!pThis->m_enabled) { - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + return CallWindowProcW(pThis->m_wpOrigEditProc, hwnd, uMsg, wParam, lParam); } switch (uMsg) { case CB_SHOWDROPDOWN: { - ShowWindow(pThis->hwndListBox, SW_HIDE); + ShowWindow(pThis->m_hwndListBox, SW_HIDE); }; break; case WM_KILLFOCUS: { - if ((pThis->options & ACO_AUTOSUGGEST) && ((HWND)wParam != pThis->hwndListBox)) + if ((pThis->m_options & ACO_AUTOSUGGEST) && ((HWND)wParam != pThis->m_hwndListBox)) { - ShowWindow(pThis->hwndListBox, SW_HIDE); + ShowWindow(pThis->m_hwndListBox, SW_HIDE); } - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + return CallWindowProcW(pThis->m_wpOrigEditProc, hwnd, uMsg, wParam, lParam); }; break; case WM_KEYUP: @@ -366,17 +366,17 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM { /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; - if (control && pThis->quickComplete) + if (control && pThis->m_quickComplete) { hwndQCText = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(pThis->quickComplete)+wcslen(hwndText))*sizeof(WCHAR)); - sel = swprintf(hwndQCText, pThis->quickComplete, hwndText); + (wcslen(pThis->m_quickComplete)+wcslen(hwndText))*sizeof(WCHAR)); + sel = swprintf(hwndQCText, pThis->m_quickComplete, hwndText); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); SendMessageW(hwnd, EM_SETSEL, 0, sel); HeapFree(GetProcessHeap(), 0, hwndQCText); } - ShowWindow(pThis->hwndListBox, SW_HIDE); + ShowWindow(pThis->m_hwndListBox, SW_HIDE); return 0; }; break; @@ -395,39 +395,39 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM is present but does not select anything. - if the listbox is visible, change the selection */ - if ( (pThis->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) - && (!IsWindowVisible(pThis->hwndListBox) && (! *hwndText)) ) + if ( (pThis->m_options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) + && (!IsWindowVisible(pThis->m_hwndListBox) && (! *hwndText)) ) { /* We must display all the entries */ displayall = TRUE; } else { - if (IsWindowVisible(pThis->hwndListBox)) + if (IsWindowVisible(pThis->m_hwndListBox)) { int count; - count = SendMessageW(pThis->hwndListBox, LB_GETCOUNT, 0, 0); + count = SendMessageW(pThis->m_hwndListBox, LB_GETCOUNT, 0, 0); /* Change the selection */ - sel = SendMessageW(pThis->hwndListBox, LB_GETCURSEL, 0, 0); + sel = SendMessageW(pThis->m_hwndListBox, LB_GETCURSEL, 0, 0); if (wParam == VK_UP) sel = ((sel-1) < 0) ? count-1 : sel-1; else sel = ((sel+1) >= count) ? -1 : sel+1; - SendMessageW(pThis->hwndListBox, LB_SETCURSEL, sel, 0); + SendMessageW(pThis->m_hwndListBox, LB_SETCURSEL, sel, 0); if (sel != -1) { WCHAR *msg; int len; - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); + len = SendMessageW(pThis->m_hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); if (msg) { - SendMessageW(pThis->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); + SendMessageW(pThis->m_hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(hwnd, EM_SETSEL, wcslen(msg), wcslen(msg)); @@ -440,8 +440,8 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM } else { - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pThis->txtbackup); - SendMessageW(hwnd, EM_SETSEL, wcslen(pThis->txtbackup), wcslen(pThis->txtbackup)); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pThis->m_txtbackup); + SendMessageW(hwnd, EM_SETSEL, wcslen(pThis->m_txtbackup), wcslen(pThis->m_txtbackup)); } } return 0; @@ -459,13 +459,13 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM // FALL THROUGH case VK_DELETE: { - if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) + if ((! *hwndText) && (pThis->m_options & ACO_AUTOSUGGEST)) { - ShowWindow(pThis->hwndListBox, SW_HIDE); - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + ShowWindow(pThis->m_hwndListBox, SW_HIDE); + return CallWindowProcW(pThis->m_wpOrigEditProc, hwnd, uMsg, wParam, lParam); } - if (pThis->options & ACO_AUTOAPPEND) + if (pThis->m_options & ACO_AUTOAPPEND) { DWORD b; SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); @@ -485,15 +485,15 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM ; } - SendMessageW(pThis->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(pThis->m_hwndListBox, LB_RESETCONTENT, 0, 0); - HeapFree(GetProcessHeap(), 0, pThis->txtbackup); + HeapFree(GetProcessHeap(), 0, pThis->m_txtbackup); - pThis->txtbackup = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(hwndText)+1)*sizeof(WCHAR)); + pThis->m_txtbackup = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(hwndText)+1)*sizeof(WCHAR)); - if (pThis->txtbackup) + if (pThis->m_txtbackup) { - wcscpy(pThis->txtbackup, hwndText); + wcscpy(pThis->m_txtbackup, hwndText); } else { @@ -504,56 +504,56 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM if ((!displayall) && (! *hwndText) ) break; - pThis->enumstr->Reset(); + pThis->m_enumstr->Reset(); filled = FALSE; size_t curlen = wcslen(hwndText); for(cpt = 0;;) { CComHeapPtr<OLECHAR> strs; - hr = pThis->enumstr->Next(1, &strs, &fetched); + hr = pThis->m_enumstr->Next(1, &strs, &fetched); if (hr != S_OK) break; if (!_wcsnicmp(hwndText, strs, curlen)) { - if (pThis->options & ACO_AUTOAPPEND && *hwndText) + if (pThis->m_options & ACO_AUTOAPPEND && *hwndText) { CComBSTR str((PCWSTR)strs); memcpy(str.m_str, hwndText, curlen * sizeof(WCHAR)); SetWindowTextW(hwnd, str); SendMessageW(hwnd, EM_SETSEL, curlen, str.Length()); - if (!(pThis->options & ACO_AUTOSUGGEST)) + if (!(pThis->m_options & ACO_AUTOSUGGEST)) break; } - if (pThis->options & ACO_AUTOSUGGEST) + if (pThis->m_options & ACO_AUTOSUGGEST) { - SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)(LPOLESTR)strs); + SendMessageW(pThis->m_hwndListBox, LB_ADDSTRING, 0, (LPARAM)(LPOLESTR)strs); filled = TRUE; cpt++; } } } - if (pThis->options & ACO_AUTOSUGGEST) + if (pThis->m_options & ACO_AUTOSUGGEST) { if (filled) { - height = SendMessageW(pThis->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(pThis->hwndListBox, LB_CARETOFF, 0, 0); + height = SendMessageW(pThis->m_hwndListBox, LB_GETITEMHEIGHT, 0, 0); + SendMessageW(pThis->m_hwndListBox, LB_CARETOFF, 0, 0); GetWindowRect(hwnd, &r); - SetParent(pThis->hwndListBox, HWND_DESKTOP); + SetParent(pThis->m_hwndListBox, HWND_DESKTOP); /* It seems that Windows XP displays 7 lines at most and otherwise displays a vertical scroll bar */ - SetWindowPos(pThis->hwndListBox, HWND_TOP, + SetWindowPos(pThis->m_hwndListBox, HWND_TOP, r.left, r.bottom + 1, r.right - r.left, min(height * 7, height * (cpt + 1)), SWP_SHOWWINDOW ); } else { - ShowWindow(pThis->hwndListBox, SW_HIDE); + ShowWindow(pThis->m_hwndListBox, SW_HIDE); } } @@ -569,7 +569,7 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM default: { - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + return CallWindowProcW(pThis->m_wpOrigEditProc, hwnd, uMsg, wParam, lParam); } } @@ -598,14 +598,14 @@ LRESULT APIENTRY CAutoComplete::ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM if (sel < 0) break; - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, 0); + len = SendMessageW(pThis->m_hwndListBox, LB_GETTEXTLEN, sel, 0); msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); if (msg) { SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, EM_SETSEL, 0, wcslen(msg)); + SendMessageW(pThis->m_hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); + SendMessageW(pThis->m_hwndEdit, EM_SETSEL, 0, wcslen(msg)); ShowWindow(hwnd, SW_HIDE); HeapFree(GetProcessHeap(), 0, msg); @@ -618,7 +618,7 @@ LRESULT APIENTRY CAutoComplete::ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM }; break; default: - return CallWindowProcW(pThis->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return CallWindowProcW(pThis->m_wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } return 0; } @@ -628,7 +628,7 @@ LRESULT APIENTRY CAutoComplete::ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM */ HRESULT STDMETHODCALLTYPE CAutoComplete::GetDropDownStatus(DWORD *pdwFlags, LPWSTR *ppwszString) { - BOOL dropped = IsWindowVisible(hwndListBox); + BOOL dropped = IsWindowVisible(m_hwndListBox); if (pdwFlags) *pdwFlags = (dropped ? ACDD_VISIBLE : 0); @@ -639,12 +639,12 @@ HRESULT STDMETHODCALLTYPE CAutoComplete::GetDropDownStatus(DWORD *pdwFlags, LPWS if (dropped) { - int sel = SendMessageW(hwndListBox, LB_GETCURSEL, 0, 0); + int sel = SendMessageW(m_hwndListBox, LB_GETCURSEL, 0, 0); if (sel >= 0) { - DWORD len = SendMessageW(hwndListBox, LB_GETTEXTLEN, sel, 0); + DWORD len = SendMessageW(m_hwndListBox, LB_GETTEXTLEN, sel, 0); *ppwszString = (LPWSTR)CoTaskMemAlloc((len+1)*sizeof(WCHAR)); - SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)*ppwszString); + SendMessageW(m_hwndListBox, LB_GETTEXT, sel, (LPARAM)*ppwszString); } } } diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index b45f418960b..7430307eef3 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -1,8 +1,9 @@ /* - * AutoComplete interfaces implementation. + * AutoComplete interfaces implementation. * - * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> - * Copyright 2009 Andrew Hill + * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> + * Copyright 2009 Andrew Hill + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,48 +24,48 @@ #define _AUTOCOMPLETE_H_ class CAutoComplete : - public CComCoClass<CAutoComplete, &CLSID_AutoComplete>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IAutoComplete2, - public IAutoCompleteDropDown, - public IEnumString + public CComCoClass<CAutoComplete, &CLSID_AutoComplete>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IAutoComplete2, + public IAutoCompleteDropDown, + public IEnumString { private: - BOOL enabled; - BOOL initialized; - HWND hwndEdit; - HWND hwndListBox; - WNDPROC wpOrigEditProc; - WNDPROC wpOrigLBoxProc; - WCHAR *txtbackup; - WCHAR *quickComplete; - CComPtr<IEnumString> enumstr; - AUTOCOMPLETEOPTIONS options; + BOOL m_enabled; + BOOL m_initialized; + HWND m_hwndEdit; + HWND m_hwndListBox; + WNDPROC m_wpOrigEditProc; + WNDPROC m_wpOrigLBoxProc; + LPWSTR m_txtbackup; // HeapAlloc'ed + LPWSTR m_quickComplete; // HeapAlloc'ed + CComPtr<IEnumString> m_enumstr; + AUTOCOMPLETEOPTIONS m_options; public: - CAutoComplete(); - ~CAutoComplete(); + CAutoComplete(); + ~CAutoComplete(); - static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - void CreateListbox(); + void CreateListbox(); - // IAutoComplete2 - virtual HRESULT WINAPI Enable(BOOL fEnable); - virtual HRESULT WINAPI Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete); - virtual HRESULT WINAPI GetOptions(DWORD *pdwFlag); - virtual HRESULT WINAPI SetOptions(DWORD dwFlag); + // IAutoComplete2 + virtual HRESULT WINAPI Enable(BOOL fEnable); + virtual HRESULT WINAPI Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete); + virtual HRESULT WINAPI GetOptions(DWORD *pdwFlag); + virtual HRESULT WINAPI SetOptions(DWORD dwFlag); - // IAutoCompleteDropDown - virtual HRESULT STDMETHODCALLTYPE GetDropDownStatus(DWORD *pdwFlags, LPWSTR *ppwszString); - virtual HRESULT STDMETHODCALLTYPE ResetEnumerator(); + // IAutoCompleteDropDown + virtual HRESULT STDMETHODCALLTYPE GetDropDownStatus(DWORD *pdwFlags, LPWSTR *ppwszString); + virtual HRESULT STDMETHODCALLTYPE ResetEnumerator(); - // IEnumString methods - virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched); - virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); - virtual HRESULT STDMETHODCALLTYPE Reset(); - virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppenum); + // IEnumString methods + virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched); + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); + virtual HRESULT STDMETHODCALLTYPE Reset(); + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppenum); DECLARE_REGISTRY_RESOURCEID(IDR_AUTOCOMPLETE) DECLARE_NOT_AGGREGATABLE(CAutoComplete) @@ -72,10 +73,10 @@ DECLARE_NOT_AGGREGATABLE(CAutoComplete) DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CAutoComplete) - COM_INTERFACE_ENTRY_IID(IID_IAutoComplete, IAutoComplete) - COM_INTERFACE_ENTRY_IID(IID_IAutoComplete2, IAutoComplete2) - COM_INTERFACE_ENTRY_IID(IID_IAutoCompleteDropDown, IAutoCompleteDropDown) - COM_INTERFACE_ENTRY_IID(IID_IEnumString, IEnumString) + COM_INTERFACE_ENTRY_IID(IID_IAutoComplete, IAutoComplete) + COM_INTERFACE_ENTRY_IID(IID_IAutoComplete2, IAutoComplete2) + COM_INTERFACE_ENTRY_IID(IID_IAutoCompleteDropDown, IAutoCompleteDropDown) + COM_INTERFACE_ENTRY_IID(IID_IEnumString, IEnumString) END_COM_MAP() };

3 years, 10 months

[reactos] 01/01: [FREELDR] DetectPnpBios(): Add 'i' to ERR() debug print (#3465)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=205b6e56c8e62a9877a07… commit 205b6e56c8e62a9877a0773d74bfe845c6e2ef66 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Feb 22 19:10:27 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 22 21:10:27 2021 +0300 [FREELDR] DetectPnpBios(): Add 'i' to ERR() debug print (#3465) Addendum to 17990b2 (r73617). CORE-12623 --- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 2 +- boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index c0893049aaf..6b2ee3d7508 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -273,7 +273,7 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) if (PnpBufferSize + DeviceNode->Size > PnpBufferSizeLimit) { - ERR("Buffer too small! Ignoring remaining device nodes.\n"); + ERR("Buffer too small! Ignoring remaining device nodes. (i = %d)\n", i); break; } diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c index 457981c5fde..f0e2c1c0d43 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98hw.c @@ -1150,7 +1150,7 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) if (PnpBufferSize + DeviceNode->Size > PnpBufferSizeLimit) { - ERR("Buffer too small! Ignoring remaining device nodes.\n"); + ERR("Buffer too small! Ignoring remaining device nodes. (i = %d)\n", i); break; }

3 years, 10 months

[reactos] 01/01: [OPENGL32] Fix Red and Green Color Swap (#3478)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=834394abd9008a0ff53fb… commit 834394abd9008a0ff53fb04359746d4b3200512b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Feb 22 10:45:33 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 22 17:45:33 2021 +0100 [OPENGL32] Fix Red and Green Color Swap (#3478) CORE-16221 --- dll/opengl/opengl32/swimpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/opengl/opengl32/swimpl.c b/dll/opengl/opengl32/swimpl.c index 7f2808d1b0e..ec008b54e16 100644 --- a/dll/opengl/opengl32/swimpl.c +++ b/dll/opengl/opengl32/swimpl.c @@ -1241,7 +1241,7 @@ static void read_color_span_##__bpp(GLcontext* ctx, { \ Buffer -= __pixel_size; \ UNPACK_COLOR_##__bpp(GET_PIXEL_##__bpp((__type*)Buffer), \ - &blue[n], &green[n], &red[n]); \ + &red[n], &green[n], &blue[n]); \ alpha[n] = 0; \ } \ } @@ -1294,7 +1294,7 @@ static void read_color_pixels_##__bpp(GLcontext* ctx, BYTE *Buffer = fb->BackBuffer + y[n] * WIDTH_BYTES_ALIGN32(fb->width, __bpp) \ + x[n] * __pixel_size; \ UNPACK_COLOR_##__bpp(GET_PIXEL_##__bpp((__type*)Buffer), \ - &blue[n], &green[n], &red[n]); \ + &red[n], &green[n], &blue[n]); \ alpha[n] = 0; \ } \ } \

3 years, 10 months

[reactos] 01/01: [USETUP] Display the "check the FS" section as a MUI page (#3474)

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=950f78635a3ecee7b31e1… commit 950f78635a3ecee7b31e17cb94dcf1457c079df9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Feb 22 16:48:03 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 22 16:48:03 2021 +0100 [USETUP] Display the "check the FS" section as a MUI page (#3474) --- base/setup/usetup/lang/bg-BG.h | 36 ++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/bn-BD.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/cs-CZ.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/da-DK.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/de-DE.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/el-GR.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/en-US.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/es-ES.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/et-EE.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/eu-ES.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/fr-FR.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/he-IL.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/hu-HU.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/id-ID.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/it-IT.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/ja-JP.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/lt-LT.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/ms-MY.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/nl-NL.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/pl-PL.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/pt-BR.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/pt-PT.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/ro-RO.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/ru-RU.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/sk-SK.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/sq-AL.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/sv-SE.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/tr-TR.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/uk-UA.h | 37 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/mui.h | 1 - base/setup/usetup/usetup.c | 5 ++--- 31 files changed, 1016 insertions(+), 62 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 06fe37aecf8..010cbb78359 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1339,6 +1339,36 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = } }; +static MUI_ENTRY bgBGCheckFSEntries[] = +{ + { + 4, + 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\222\245\347\245 \257\340\256\242\245\340\252\240 \255\240 \250\247\241\340\240\255\250\357 \244\357\253.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\217\256\347\240\252\240\251\342\245...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGInstallDirectoryEntries[] = { { @@ -2113,6 +2143,10 @@ MUI_PAGE bgBGPages[] = FORMAT_PARTITION_PAGE, bgBGFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + bgBGCheckFSEntries + }, { DELETE_PARTITION_PAGE, bgBGDeletePartitionEntries @@ -2199,8 +2233,6 @@ MUI_STRING bgBGStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "\221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 \242\352\340\345\343 \244\357\253"}, - {STRING_CHECKINGPART, - "\222\245\347\245 \257\340\256\242\245\340\252\240 \255\240 \250\247\241\340\240\255\250\357 \244\357\253."}, {STRING_CONTINUE, "ENTER = \217\340\256\244\352\253\246\240\242\240\255\245"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index fd2632e75dd..9c6ea7a80ea 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1329,6 +1329,37 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = } }; +static MUI_ENTRY bnBDCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup is now checking the selected partition.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDInstallDirectoryEntries[] = { { @@ -2100,6 +2131,10 @@ MUI_PAGE bnBDPages[] = FORMAT_PARTITION_PAGE, bnBDFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + bnBDCheckFSEntries + }, { DELETE_PARTITION_PAGE, bnBDDeletePartitionEntries @@ -2184,8 +2219,6 @@ MUI_STRING bnBDStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, - {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, {STRING_CONTINUE, "ENTER = Continue"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index f4d6193b360..fc680399fc2 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1337,6 +1337,37 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = } }; +static MUI_ENTRY csCZCheckFSEntries[] = +{ + { + 4, + 3, + " Instalace ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalace nyn\241 kontroluje zvolen\354 odd\241l.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\254ekejte, pros\241m...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZInstallDirectoryEntries[] = { { @@ -2108,6 +2139,10 @@ MUI_PAGE csCZPages[] = FORMAT_PARTITION_PAGE, csCZFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + csCZCheckFSEntries + }, { DELETE_PARTITION_PAGE, csCZDeletePartitionEntries @@ -2192,8 +2227,6 @@ MUI_STRING csCZStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalace nakop\241ruje ReactOS na odd\241l"}, - {STRING_CHECKINGPART, - "Instalace nyn\241 kontroluje zvolen\354 odd\241l."}, {STRING_CONTINUE, "ENTER = Pokra\237ovat"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 364b65fdf2a..aa29e1f774c 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1331,6 +1331,37 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = } }; +static MUI_ENTRY daDKCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Installationen tjekker den valgte partition.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Vent...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKInstallDirectoryEntries[] = { { @@ -2103,6 +2134,10 @@ MUI_PAGE daDKPages[] = FORMAT_PARTITION_PAGE, daDKFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + daDKCheckFSEntries + }, { DELETE_PARTITION_PAGE, daDKDeletePartitionEntries @@ -2187,8 +2222,6 @@ MUI_STRING daDKStrings[] = "Den nye partition er endnu ikke blevet formateret."}, {STRING_INSTALLONPART, "Installationen installere ReactOS p\206 partitionen"}, - {STRING_CHECKINGPART, - "Installationen tjekker den valgte partition."}, {STRING_CONTINUE, "ENTER = Forts\221t"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 3bcf9f53356..c595845dbde 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1331,6 +1331,37 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = } }; +static MUI_ENTRY deDECheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Die ausgew\204hlte Partition wird \201berpr\201ft.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Bitte warten...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDEInstallDirectoryEntries[] = { { @@ -2105,6 +2136,10 @@ MUI_PAGE deDEPages[] = FORMAT_PARTITION_PAGE, deDEFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + deDECheckFSEntries + }, { DELETE_PARTITION_PAGE, deDEDeletePartitionEntries @@ -2189,8 +2224,6 @@ MUI_STRING deDEStrings[] = "Die neue Partition ist noch nicht formatiert."}, {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, - {STRING_CHECKINGPART, - "Die ausgew\204hlte Partition wird \201berpr\201ft."}, {STRING_CONTINUE, "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 53d1310a000..f626aa78386 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1346,6 +1346,37 @@ static MUI_ENTRY elGRFormatPartitionEntries[] = } }; +static MUI_ENTRY elGRCheckFSEntries[] = +{ + { + 4, + 3, + " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\206 \234\232\241\230\253\341\251\253\230\251\236 \234\242\342\232\256\234\240 \253\351\250\230 \253\246 \234\247\240\242\234\232\243\342\244\246 partition.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\217\230\250\230\241\230\242\351 \247\234\250\240\243\342\244\234\253\234...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRInstallDirectoryEntries[] = { { @@ -2116,6 +2147,10 @@ MUI_PAGE elGRPages[] = FORMAT_PARTITION_PAGE, elGRFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + elGRCheckFSEntries + }, { DELETE_PARTITION_PAGE, elGRDeletePartitionEntries @@ -2202,8 +2237,6 @@ MUI_STRING elGRStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup install ReactOS onto Partition"}, - {STRING_CHECKINGPART, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \234\242\342\232\256\234\240 \253\351\250\230 \253\246 \234\247\240\242\234\232\243\342\244\246 partition."}, {STRING_CONTINUE, "ENTER = \221\254\244\342\256\234\240\230"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 5c86e6b9951..e71eaa80534 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1329,6 +1329,37 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = } }; +static MUI_ENTRY enUSCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup is now checking the selected partition.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSInstallDirectoryEntries[] = { { @@ -2100,6 +2131,10 @@ MUI_PAGE enUSPages[] = FORMAT_PARTITION_PAGE, enUSFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + enUSCheckFSEntries + }, { DELETE_PARTITION_PAGE, enUSDeletePartitionEntries @@ -2184,8 +2219,6 @@ MUI_STRING enUSStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, - {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, {STRING_CONTINUE, "ENTER = Continue"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 414acb71579..35d0cabc9c1 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1335,6 +1335,37 @@ static MUI_ENTRY esESFormatPartitionEntries[] = } }; +static MUI_ENTRY esESCheckFSEntries[] = +{ + { + 4, + 3, + " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "El instalador est\240 comprobando la Partici\242n seleccionada.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Espere un momento...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESInstallDirectoryEntries[] = { { @@ -2106,6 +2137,10 @@ MUI_PAGE esESPages[] = FORMAT_PARTITION_PAGE, esESFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + esESCheckFSEntries + }, { DELETE_PARTITION_PAGE, esESDeletePartitionEntries @@ -2190,8 +2225,6 @@ MUI_STRING esESStrings[] = "La Partici\242n nueva todav\241a no ha sido formateada."}, {STRING_INSTALLONPART, "El instalador est\240 instalando ReactOS en la Partici\242n"}, - {STRING_CHECKINGPART, - "El instalador est\240 comprobando la Partici\242n seleccionada."}, {STRING_CONTINUE, "INTRO = Continuar"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 835c3411137..581ffe97e3e 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1332,6 +1332,37 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = } }; +static MUI_ENTRY etEECheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldus ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Valitud partitsiooni kontrollitakse.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Palun oota...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEEInstallDirectoryEntries[] = { { @@ -2101,6 +2132,10 @@ MUI_PAGE etEEPages[] = FORMAT_PARTITION_PAGE, etEEFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + etEECheckFSEntries + }, { DELETE_PARTITION_PAGE, etEEDeletePartitionEntries @@ -2186,8 +2221,6 @@ MUI_STRING etEEStrings[] = "Uus partitsioon on veel vormindamata."}, {STRING_INSTALLONPART, "ReactOS paigaldatakse partitsioonile"}, - {STRING_CHECKINGPART, - "Valitud partitsiooni kontrollitakse."}, {STRING_CONTINUE, "ENTER = J\204tka"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 7c9c1e29f31..da8ffe3804a 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1330,6 +1330,37 @@ static MUI_ENTRY euESFormatPartitionEntries[] = } }; +static MUI_ENTRY euESCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalazioa ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalazioa ikusi du partizio aukertatutan.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Itxaron mesedez...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY euESInstallDirectoryEntries[] = { { @@ -2101,6 +2132,10 @@ MUI_PAGE euESPages[] = FORMAT_PARTITION_PAGE, euESFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + euESCheckFSEntries + }, { DELETE_PARTITION_PAGE, euESDeletePartitionEntries @@ -2185,8 +2220,6 @@ MUI_STRING euESStrings[] = "Oraindik partizio berria ez dago formatuta."}, {STRING_INSTALLONPART, "Instalazioa ReactOS instalatu du partizio barruan"}, - {STRING_CHECKINGPART, - "Instalazioa ikusi du partizio aukertatutan."}, {STRING_CONTINUE, "SARTU = Jarraitu"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 5e3a8711387..17a3e90e2c2 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1366,6 +1366,37 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = } }; +static MUI_ENTRY frFRCheckFSEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup v\202rifie la partition s\202lectionn\202e.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Veuillez patienter...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRInstallDirectoryEntries[] = { { @@ -2137,6 +2168,10 @@ MUI_PAGE frFRPages[] = FORMAT_PARTITION_PAGE, frFRFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + frFRCheckFSEntries + }, { DELETE_PARTITION_PAGE, frFRDeletePartitionEntries @@ -2221,8 +2256,6 @@ MUI_STRING frFRStrings[] = "La nouvelle partition n'est pas encore format\202e."}, {STRING_INSTALLONPART, "Setup installe ReactOS sur la partition"}, - {STRING_CHECKINGPART, - "Setup v\202rifie la partition s\202lectionn\202e."}, {STRING_CONTINUE, "ENTR\220E = Continuer"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index a12dcc5edb2..2f8ea935012 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1333,6 +1333,37 @@ static MUI_ENTRY heILFormatPartitionEntries[] = } }; +static MUI_ENTRY heILCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + ".\204\230\207\201\220\231 \204\226\211\207\216\204 \232\200 \232\227\203\205\201 \205\211\231\213\222 \204\220\227\232\204\204 \232\211\220\213\232", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "...\217\211\232\216\204\214 \200\220", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILInstallDirectoryEntries[] = { { @@ -2102,6 +2133,10 @@ MUI_PAGE heILPages[] = FORMAT_PARTITION_PAGE, heILFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + heILCheckFSEntries + }, { DELETE_PARTITION_PAGE, heILDeletePartitionEntries @@ -2186,8 +2221,6 @@ MUI_STRING heILStrings[] = ".\232\214\207\232\205\200\216 \200\214 \217\211\211\203\222 \204\231\203\207\204 \204\226\211\207\216\204"}, {STRING_INSTALLONPART, "\204\226\211\207\216 \214\222 ReactOS \232\200 \204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232"}, - {STRING_CHECKINGPART, - ".\204\230\207\201\220\231 \204\226\211\207\216\204 \232\200 \232\227\203\205\201 \205\211\231\213\222 \204\220\227\232\204\204 \232\211\220\213\232"}, {STRING_CONTINUE, "\212\231\216\204 = ENTER"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 57e72b146d6..9d3d8b3abed 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1223,6 +1223,37 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = } }; +static MUI_ENTRY huHUCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "A telep\241t\213 most ellen\213rzi a kijel\224lt part\241ci\242t.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "K\202rem v\240rjon...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY huHUInstallDirectoryEntries[] = { { @@ -1991,6 +2022,10 @@ MUI_PAGE huHUPages[] = FORMAT_PARTITION_PAGE, huHUFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + huHUCheckFSEntries + }, { DELETE_PARTITION_PAGE, huHUDeletePartitionEntries @@ -2075,8 +2110,6 @@ MUI_STRING huHUStrings[] = "Az \243j part\241ci\242 m\202g nincs form\240zva."}, {STRING_INSTALLONPART, "A telep\241t\213 az al\240bbi part\241ci\242ra telep\241ti a ReactOS-t:"}, - {STRING_CHECKINGPART, - "A telep\241t\213 most ellen\213rzi a kijel\224lt part\241ci\242t."}, {STRING_CONTINUE, "ENTER = Folytat\240s"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index fe23c7148cd..3a751b34c12 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1329,6 +1329,37 @@ static MUI_ENTRY idIDFormatPartitionEntries[] = } }; +static MUI_ENTRY idIDCheckFSEntries[] = +{ + { + 4, + 3, + " Penyetelan ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Penyetelan sekarang memeriksa partisi terpilih.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Mohon tunggu...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY idIDInstallDirectoryEntries[] = { { @@ -2100,6 +2131,10 @@ MUI_PAGE idIDPages[] = FORMAT_PARTITION_PAGE, idIDFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + idIDCheckFSEntries + }, { DELETE_PARTITION_PAGE, idIDDeletePartitionEntries @@ -2184,8 +2219,6 @@ MUI_STRING idIDStrings[] = "Partisi baru ini belum diformat."}, {STRING_INSTALLONPART, "Penyetelan memasang ReactOS pada Partisi"}, - {STRING_CHECKINGPART, - "Penyetelan sekarang memeriksa partisi terpilih."}, {STRING_CONTINUE, "ENTER = Lanjut"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index c87f3993d41..8041b37c394 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1335,6 +1335,37 @@ static MUI_ENTRY itITFormatPartitionEntries[] = } }; +static MUI_ENTRY itITCheckFSEntries[] = +{ + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup sta controllando la partizione selezionata.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Attendere...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITInstallDirectoryEntries[] = { { @@ -2106,6 +2137,10 @@ MUI_PAGE itITPages[] = FORMAT_PARTITION_PAGE, itITFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + itITCheckFSEntries + }, { DELETE_PARTITION_PAGE, itITDeletePartitionEntries @@ -2190,8 +2225,6 @@ MUI_STRING itITStrings[] = "La nuova partizione non \x8A stata ancora formattata."}, {STRING_INSTALLONPART, "Il setup installer\x85 ReactOS sulla partitione"}, - {STRING_CHECKINGPART, - "Setup sta controllando la partizione selezionata."}, {STRING_CONTINUE, "INVIO = Continua"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index b2836e6d0ea..dd0c2357b00 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1332,6 +1332,37 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = } }; +static MUI_ENTRY jaJPCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\276\257\304\261\257\314\337\312 \276\335\300\270 \273\332\300 \312\337\260\303\250\274\256\335\246 \271\335\273 \274\303\262\317\275\241", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\265\317\301 \270\300\336\273\262...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPInstallDirectoryEntries[] = { { @@ -2103,6 +2134,10 @@ MUI_PAGE jaJPPages[] = FORMAT_PARTITION_PAGE, jaJPFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + jaJPCheckFSEntries + }, { DELETE_PARTITION_PAGE, jaJPDeletePartitionEntries @@ -2189,8 +2224,6 @@ MUI_STRING jaJPStrings[] = "\261\300\327\274\262 \312\337\260\303\250\274\256\335 \312 \317\300\336 \314\253\260\317\257\304 \273\332\303 \262\317\276\335\241"}, {STRING_INSTALLONPART, "\276\257\304\261\257\314\337\312 ReactOS\246 \312\337\260\303\250\274\256\335 \274\336\256\263\306 \262\335\275\304\260\331\274\317\275\241"}, - {STRING_CHECKINGPART, - "\276\257\304\261\257\314\337\312 \276\335\300\270 \273\332\300 \312\337\260\303\250\274\256\335\246 \271\335\273 \274\303\262\317\275\241"}, {STRING_CONTINUE, "ENTER = \277\336\257\272\263"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 0a1ad3bf4ea..5bcd70c25a2 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1340,6 +1340,37 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = } }; +static MUI_ENTRY ltLTCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup is now checking the selected partition.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTInstallDirectoryEntries[] = { { @@ -2111,6 +2142,10 @@ MUI_PAGE ltLTPages[] = FORMAT_PARTITION_PAGE, ltLTFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + ltLTCheckFSEntries + }, { DELETE_PARTITION_PAGE, ltLTDeletePartitionEntries @@ -2195,8 +2230,6 @@ MUI_STRING ltLTStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, - {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, {STRING_CONTINUE, "ENTER = Continue"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index e0de99c669b..7a04d9bb2d1 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1321,6 +1321,37 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = } }; +static MUI_ENTRY msMYCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Persediaan ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Persediaan kini sedang menyemak sekatan yang dipilih.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Sila tunggu...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYInstallDirectoryEntries[] = { { @@ -2085,6 +2116,10 @@ MUI_PAGE msMYPages[] = FORMAT_PARTITION_PAGE, msMYFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + msMYCheckFSEntries + }, { DELETE_PARTITION_PAGE, msMYDeletePartitionEntries @@ -2169,8 +2204,6 @@ MUI_STRING msMYStrings[] = "Partition baru tidak diformat lagi."}, {STRING_INSTALLONPART, "Persediaan memasang ReactOS ke Partition"}, - {STRING_CHECKINGPART, - "Persediaan kini sedang menyemak sekatan yang dipilih."}, {STRING_CONTINUE, "ENTER = Teruskan"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 35969d809b4..8a3e1adf135 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1344,6 +1344,37 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = } }; +static MUI_ENTRY nlNLCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup controleert nu de geselecteerde partitie.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Een ogenblik geduld...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLInstallDirectoryEntries[] = { { @@ -2125,6 +2156,10 @@ MUI_PAGE nlNLPages[] = FORMAT_PARTITION_PAGE, nlNLFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + nlNLCheckFSEntries + }, { DELETE_PARTITION_PAGE, nlNLDeletePartitionEntries @@ -2211,8 +2246,6 @@ MUI_STRING nlNLStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installeert ReactOS op Partitie"}, - {STRING_CHECKINGPART, - "Setup controleert nu de geselecteerde partitie."}, {STRING_CONTINUE, "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 33dccfe2359..97e27d10776 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1340,6 +1340,37 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = } }; +static MUI_ENTRY plPLCheckFSEntries[] = +{ + { + 4, + 3, + " Instalator ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalator sprawdza wybran\245 partycj\251.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Prosz\251 czeka\206...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLInstallDirectoryEntries[] = { { @@ -2108,6 +2139,10 @@ MUI_PAGE plPLPages[] = FORMAT_PARTITION_PAGE, plPLFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + plPLCheckFSEntries + }, { DELETE_PARTITION_PAGE, plPLDeletePartitionEntries @@ -2192,8 +2227,6 @@ MUI_STRING plPLStrings[] = "Nowa partycja nie jest jeszcze sformatowana."}, {STRING_INSTALLONPART, "Instalator kopiuje pliki systemu na wybran\245 partycj\251."}, - {STRING_CHECKINGPART, - "Instalator sprawdza wybran\245 partycj\251."}, {STRING_CONTINUE, "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 94a52be50fb..50d59d8ddbb 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1346,6 +1346,37 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] = } }; +static MUI_ENTRY ptBRCheckFSEntries[] = +{ + { + 4, + 3, + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "O instalador est\240 verificando a parti\207\306o selecionada.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRInstallDirectoryEntries[] = { { @@ -2138,6 +2169,10 @@ MUI_PAGE ptBRPages[] = FORMAT_PARTITION_PAGE, ptBRFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + ptBRCheckFSEntries + }, { DELETE_PARTITION_PAGE, ptBRDeletePartitionEntries @@ -2224,8 +2259,6 @@ MUI_STRING ptBRStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "O instalador instala o ReactOS na parti\207\306o"}, - {STRING_CHECKINGPART, - "O instalador est\240 verificando a parti\207\306o selecionada."}, {STRING_CONTINUE, "ENTER=Continuar"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 42b38912341..bd5eaa9ea13 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1346,6 +1346,37 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] = } }; +static MUI_ENTRY ptPTCheckFSEntries[] = +{ + { + 4, + 3, + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "O instalador est\240 a verificar a parti\207\306o seleccionada.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptPTInstallDirectoryEntries[] = { { @@ -2123,6 +2154,10 @@ MUI_PAGE ptPTPages[] = FORMAT_PARTITION_PAGE, ptPTFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + ptPTCheckFSEntries + }, { DELETE_PARTITION_PAGE, ptPTDeletePartitionEntries @@ -2208,8 +2243,6 @@ MUI_STRING ptPTStrings[] = "A nova parti\207\306o ainda n\306o est\240 formatada."}, {STRING_INSTALLONPART, "O instalador instala o ReactOS na parti\207\306o"}, - {STRING_CHECKINGPART, - "O instalador est\240 a verificar a parti\207\306o seleccionada."}, {STRING_CONTINUE, "ENTER=Continuar"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index bb60547c18f..84455496dbb 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1361,6 +1361,37 @@ static MUI_ENTRY roROFormatPartitionEntries[] = } }; +static MUI_ENTRY roROCheckFSEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Programul de instalare verific\343 acum parti\376ia aleas\343.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "A\272tepta\376i...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROInstallDirectoryEntries[] = { { @@ -2146,6 +2177,10 @@ MUI_PAGE roROPages[] = FORMAT_PARTITION_PAGE, roROFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + roROCheckFSEntries + }, { DELETE_PARTITION_PAGE, roRODeletePartitionEntries @@ -2230,8 +2265,6 @@ MUI_STRING roROStrings[] = "Noua parti\376ie \356nc\343 nu a fost formatat\343."}, {STRING_INSTALLONPART, "ReactOS va fi instalat pe parti\376ia"}, - {STRING_CHECKINGPART, - "Programul de instalare verific\343 acum parti\376ia aleas\343."}, {STRING_CONTINUE, "ENTER = Continuare"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 07a933ebe26..65d55e58a3e 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1352,6 +1352,37 @@ static MUI_ENTRY ruRUFormatPartitionEntries[] = } }; +static MUI_ENTRY ruRUCheckFSEntries[] = +{ + { + 4, + 3, + " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \257\340\256\242\245\340\357\245\342 \242\353\241\340\240\255\255\353\251 \340\240\247\244\245\253.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\217\256\246\240\253\343\251\341\342\240, \257\256\244\256\246\244\250\342\245...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRUInstallDirectoryEntries[] = { { @@ -2123,6 +2154,10 @@ MUI_PAGE ruRUPages[] = FORMAT_PARTITION_PAGE, ruRUFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + ruRUCheckFSEntries + }, { DELETE_PARTITION_PAGE, ruRUDeletePartitionEntries @@ -2207,8 +2242,6 @@ MUI_STRING ruRUStrings[] = "\215\256\242\353\251 \340\240\247\244\245\253 \255\245 \256\342\344\256\340\254\240\342\250\340\256\242\240\255."}, {STRING_INSTALLONPART, "ReactOS \343\341\342\240\255\240\242\253\250\242\240\245\342\341\357 \255\240 \340\240\247\244\245\253:"}, - {STRING_CHECKINGPART, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \257\340\256\242\245\340\357\245\342 \242\353\241\340\240\255\255\353\251 \340\240\247\244\245\253."}, {STRING_CONTINUE, "ENTER = \217\340\256\244\256\253\246\250\342\354"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 356e67c897d..7d37ba38531 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1338,6 +1338,37 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = } }; +static MUI_ENTRY skSKCheckFSEntries[] = +{ + { + 4, + 3, + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "In\347tal\240tor teraz skontroluje vybran\243 oblas\234.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Po\237kajte, pros\241m ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKInstallDirectoryEntries[] = { { @@ -2112,6 +2143,10 @@ MUI_PAGE skSKPages[] = FORMAT_PARTITION_PAGE, skSKFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + skSKCheckFSEntries + }, { DELETE_PARTITION_PAGE, skSKDeletePartitionEntries @@ -2198,8 +2233,6 @@ MUI_STRING skSKStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "In\347tal\240tor nain\347taluje syst\202m ReactOS na oblas\234"}, - {STRING_CHECKINGPART, - "In\347tal\240tor teraz skontroluje vybran\243 oblas\234."}, {STRING_CONTINUE, "ENTER = Pokra\237ova\234"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 0af0a33b066..7e0c1b7795f 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1336,6 +1336,37 @@ static MUI_ENTRY sqALFormatPartitionEntries[] = } }; +static MUI_ENTRY sqALCheckFSEntries[] = +{ + { + 4, + 3, + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Instalimi tani \211sht\211 duke kontrolluar particionin e p\211rzgjedhur.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Ju lutem prisni...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALInstallDirectoryEntries[] = { { @@ -2113,6 +2144,10 @@ MUI_PAGE sqALPages[] = FORMAT_PARTITION_PAGE, sqALFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + sqALCheckFSEntries + }, { DELETE_PARTITION_PAGE, sqALDeletePartitionEntries @@ -2199,8 +2234,6 @@ MUI_STRING sqALStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalimi i ReactOS ne Particion"}, - {STRING_CHECKINGPART, - "Instalimi tani \211sht\211 duke kontrolluar particionin e p\211rzgjedhur."}, {STRING_CONTINUE, "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index e88feaa8ee7..3c87c2992aa 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1338,6 +1338,37 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = } }; +static MUI_ENTRY svSECheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Setup unders\224ker nu den valda partitionen.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "Var v\204nlig v\204nta...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSEInstallDirectoryEntries[] = { { @@ -2109,6 +2140,10 @@ MUI_PAGE svSEPages[] = FORMAT_PARTITION_PAGE, svSEFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + svSECheckFSEntries + }, { DELETE_PARTITION_PAGE, svSEDeletePartitionEntries @@ -2195,8 +2230,6 @@ MUI_STRING svSEStrings[] = "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installerar ReactOS till Partitionen"}, - {STRING_CHECKINGPART, - "Setup unders\224ker nu den valda partitionen."}, {STRING_CONTINUE, "ENTER = Forts\204tt"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 5d58b79a70c..229416e336a 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1313,6 +1313,37 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = } }; +static MUI_ENTRY trTRCheckFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "Kur, \237imdi se\207ili b\224l\201m\201 g\224zden ge\207iriyor.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "L\201tfen bekleyiniz...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRInstallDirectoryEntries[] = { { @@ -2077,6 +2108,10 @@ MUI_PAGE trTRPages[] = FORMAT_PARTITION_PAGE, trTRFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + trTRCheckFSEntries + }, { DELETE_PARTITION_PAGE, trTRDeletePartitionEntries @@ -2161,8 +2196,6 @@ MUI_STRING trTRStrings[] = "Yeni b\224l\201m daha bi\207imlendirilmemi\237."}, {STRING_INSTALLONPART, "Kur, ReactOS'u b\224l\201m \201zerine kurar."}, - {STRING_CHECKINGPART, - "Kur, \237imdi se\207ili b\224l\201m\201 g\224zden ge\207iriyor."}, {STRING_CONTINUE, "ENTER = S\201rd\201r"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 0105c9dfa3b..d242e3d1d70 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1337,6 +1337,37 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = } }; +static MUI_ENTRY ukUACheckFSEntries[] = +{ + { + 4, + 3, + " \202\341\342\240\255\256\242\253\245\255\255\357 ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC + }, + { + 6, + 8, + "\202\341\342\240\255\256\242\253\356\242\240\347 \257\245\340\245\242i\340\357\363 \242\250\241\340\240\255\250\251 \340\256\247\244i\253.", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 0, + 0, + "\201\343\244\354-\253\240\341\252\240, \247\240\347\245\252\240\251\342\245...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUAInstallDirectoryEntries[] = { { @@ -2109,6 +2140,10 @@ MUI_PAGE ukUAPages[] = FORMAT_PARTITION_PAGE, ukUAFormatPartitionEntries }, + { + CHECK_FILE_SYSTEM_PAGE, + ukUACheckFSEntries + }, { DELETE_PARTITION_PAGE, ukUADeletePartitionEntries @@ -2195,8 +2230,6 @@ MUI_STRING ukUAStrings[] = "\215\256\242\250\251 \340\256\247\244i\253 \255\245 \242i\244\344\256\340\254\240\342\256\242\240\255\256."}, {STRING_INSTALLONPART, "ReactOS \242\341\342\240\255\256\242\253\356\363\342\354\341\357 \255\240 \340\256\247\244i\253"}, - {STRING_CHECKINGPART, - "\202\341\342\240\255\256\242\253\356\242\240\347 \257\245\340\245\242i\340\357\363 \242\250\241\340\240\255\250\251 \340\256\247\244i\253."}, {STRING_CONTINUE, "ENTER = \217\340\256\244\256\242\246\250\342\250"}, {STRING_QUITCONTINUE, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index bb158c72bf5..9b35c0736f8 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -124,7 +124,6 @@ MUISetStyledText( #define STRING_NONFORMATTEDSYSTEMPART 62 #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 -#define STRING_CHECKINGPART 11 #define STRING_CONTINUE 12 #define STRING_QUITCONTINUE 13 #define STRING_REBOOTCOMPUTER 14 diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index e1bc3884f96..f1fc3a03753 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3157,6 +3157,8 @@ CheckFileSystemPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; CHAR Buffer[MAX_PATH]; + MUIDisplayPage(CHECK_FILE_SYSTEM_PAGE); + if (PartitionList == NULL) { /* FIXME: show an error dialog */ @@ -3170,9 +3172,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n", PartEntry->PartitionType, (*PartEntry->FileSystem ? PartEntry->FileSystem : L"n/a"));

3 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2021