Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 01/01: [NTOS/MM] Recognize AMD64 image in PeFmtCreateSection failure case

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98638cc2dfdde460ae499… commit 98638cc2dfdde460ae49941c76dd51f1b796a001 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 30 19:03:17 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 15 19:39:56 2019 +0200 [NTOS/MM] Recognize AMD64 image in PeFmtCreateSection failure case --- ntoskrnl/mm/section.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 56ffab8a2ad..a8d294578fe 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -364,6 +364,10 @@ l_ReadHeaderFromFile: #endif // _WIN64 break; +#ifndef _WIN64 + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + nStatus = STATUS_INVALID_IMAGE_WIN_64; +#endif default: DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); }

5 years, 7 months

[reactos] 01/01: [BASESRV] Strengthen default permissions for DOS devices

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e97b412a76d079380e0c1… commit e97b412a76d079380e0c1e60b050342e018c04ee Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed May 15 08:32:55 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed May 15 08:41:16 2019 +0200 [BASESRV] Strengthen default permissions for DOS devices This is linked to previous work done on DOS devices creation in basesrv. If this DWORD is not set (or 0), DOS devices will be created with an ACL that make the symlink readable by any and modifiable by any. With protection mode set, the symlink will be still readable by any but not modifiable by anyone but the owner. This should also affect some objects managed by session manager. By default, on W2K3, that protection mode is set. --- boot/bootdata/hivesys.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 68d23cff007..081352fc6dd 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1442,6 +1442,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ProtectionMode", 0x00010003, 0x00000001 ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000002,"\DosDevices\COM1"

5 years, 7 months

[reactos] 01/01: [MAGNIFY] Initialize the common controls as the program has a manifest

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a124ef38aa9ee9ff142f… commit 6a124ef38aa9ee9ff142f62cb897febe72df8f83 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun May 12 16:18:28 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue May 14 20:49:36 2019 +0200 [MAGNIFY] Initialize the common controls as the program has a manifest --- base/applications/magnify/CMakeLists.txt | 2 +- base/applications/magnify/magnifier.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/base/applications/magnify/CMakeLists.txt b/base/applications/magnify/CMakeLists.txt index ee7919e948c..271b4aad229 100644 --- a/base/applications/magnify/CMakeLists.txt +++ b/base/applications/magnify/CMakeLists.txt @@ -7,6 +7,6 @@ list(APPEND SOURCE add_rc_deps(magnify.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/magnify.ico) add_executable(magnify ${SOURCE} magnify.rc) set_module_type(magnify win32gui) -add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) +add_importlibs(magnify user32 gdi32 comctl32 advapi32 shell32 msvcrt kernel32) add_pch(magnify magnifier.h SOURCE) add_cd_file(TARGET magnify DESTINATION reactos/system32 FOR all) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index f8d63cfce45..cfca2519914 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -16,6 +16,7 @@ #include <winuser.h> #include <wingdi.h> #include <winnls.h> +#include <commctrl.h> #include <shellapi.h> #include <windowsx.h> #include <stdlib.h> @@ -77,6 +78,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { MSG msg; HACCEL hAccelTable; + INITCOMMONCONTROLSEX iccex; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); @@ -111,6 +113,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } } + /* Load the common controls */ + iccex.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccex.dwICC = ICC_STANDARD_CLASSES | ICC_WIN95_CLASSES; + InitCommonControlsEx(&iccex); SelectObject(hdcOffscreen, hbmpOld); DeleteObject (hbmpOffscreen);

5 years, 7 months

[reactos] 02/02: [FIND] Improvements / bug-fixes. (#1553)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a133609e774126c7077a… commit 7a133609e774126c7077a1c055efd44137c6f1c9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 12 01:05:53 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue May 14 20:37:46 2019 +0200 [FIND] Improvements / bug-fixes. (#1553) - Only include the strictly necessary headers. - Get rid of the dependency on shell and user DLLs. - fgetws() gets the string buffer size in number of characters. - We can use the CRT functions for lengths of the arguments etc. - The cFileName member of the WIN32_FIND_DATAW structure does not contain the full PATH to the enumerated file, but only its name. In order to use _wfopen(), build a full file path out of the directory part of the file specification and the full file name. - Simplify a ConPrintf() call to make it "atomic". - Fix the "confusion" lLineCount vs. lLineNumber vocable in the code. - Do not emit an extra newline after having displayed the results for a given file. - Uppercase the switches for performing the comparisons. - Send the errors to the StdErr stream. - Remove trailing whitespace. --- base/applications/cmdutils/find/CMakeLists.txt | 2 +- base/applications/cmdutils/find/find.c | 231 +++++++++++++++++-------- 2 files changed, 157 insertions(+), 76 deletions(-) diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt index 1df4d1b98df..e39eb506097 100644 --- a/base/applications/cmdutils/find/CMakeLists.txt +++ b/base/applications/cmdutils/find/CMakeLists.txt @@ -4,5 +4,5 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(find find.c find.rc) set_module_type(find win32cui UNICODE) target_link_libraries(find conutils ${PSEH_LIB}) -add_importlibs(find user32 msvcrt kernel32 shlwapi) +add_importlibs(find msvcrt kernel32) add_cd_file(TARGET find DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/find/find.c b/base/applications/cmdutils/find/find.c index 66cb2ef6245..9dd003fc07f 100644 --- a/base/applications/cmdutils/find/find.c +++ b/base/applications/cmdutils/find/find.c @@ -4,12 +4,19 @@ * PURPOSE: Prints all lines of a file that contain a string. * COPYRIGHT: Copyright 1994-2002 Jim Hall (jhall(a)freedos.org) * Copyright 2019 Paweł Cholewa (DaMcpg(a)protonmail.com) + * Copyright 2019 Hermes Belusca-Maito */ -#include <windows.h> #include <stdio.h> +#include <stdlib.h> + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <winuser.h> + #include <conutils.h> -#include <shlwapi.h> /* StrStrW and StrStrIW */ +#include <strsafe.h> #include "resource.h" @@ -21,65 +28,106 @@ static BOOL bDisplayLineNumbers = FALSE; static BOOL bIgnoreCase = FALSE; static BOOL bDoNotSkipOfflineFiles = FALSE; +/** + * @name StrStrCase + * @implemented + * + * Locates a substring inside a NULL-terminated wide string. + * + * @param[in] pszStr + * The NULL-terminated string to be scanned. + * + * @param[in] pszSearch + * The NULL-terminated string to search for. + * + * @param[in] bIgnoreCase + * TRUE if case has to be ignored, FALSE otherwise. + * + * @return + * Returns a pointer to the first occurrence of pszSearch in pszStr, + * or NULL if pszSearch does not appear in pszStr. If pszSearch points + * to a string of zero length, the function returns pszStr. + */ +static PWSTR +StrStrCase( + IN PCWSTR pszStr, + IN PCWSTR pszSearch, + IN BOOL bIgnoreCase) +{ + if (bIgnoreCase) + { + LCID LocaleId; + INT i, cch1, cch2; + + LocaleId = GetThreadLocale(); + + cch1 = wcslen(pszStr); + cch2 = wcslen(pszSearch); + + if (cch2 == 0) + return (PWSTR)pszStr; + + for (i = 0; i <= cch1 - cch2; ++i) + { + if (CompareStringW(LocaleId /* LOCALE_SYSTEM_DEFAULT */, + NORM_IGNORECASE /* | NORM_LINGUISTIC_CASING */, + pszStr + i, cch2, pszSearch, cch2) == CSTR_EQUAL) + { + return (PWSTR)(pszStr + i); + } + } + return NULL; + } + else + { + return wcsstr(pszStr, pszSearch); + } +} + /** * @name FindString * @implemented - * + * * Prints all lines of the stream that contain a string. - * - * @param pStream - * Stream to read from. - * - * @param szFilePath - * Filename to print in console. Can be NULL. - * - * @param szSearchedString - * String to search for. - * - * @return - * 0 if the string was found at least once, 1 otherwise. * + * @param[in] pStream + * The stream to read from. + * + * @param[in] pszFilePath + * The file name to print out. Can be NULL. + * + * @param[in] pszSearchString + * The NULL-terminated string to search for. + * + * @return + * 0 if the string was found at least once, 1 otherwise. */ -static int FindString(FILE* pStream, LPWSTR szFilePath, LPWSTR szSearchedString) +static int +FindString( + IN FILE* pStream, + IN PCWSTR pszFilePath OPTIONAL, + IN PCWSTR pszSearchString) { - WCHAR szLineBuffer[FIND_LINE_BUFFER_SIZE]; LONG lLineCount = 0; LONG lLineNumber = 0; BOOL bSubstringFound; int iReturnValue = 1; + WCHAR szLineBuffer[FIND_LINE_BUFFER_SIZE]; - if (szFilePath != NULL) + if (pszFilePath != NULL) { - /* Convert the filename to uppercase (for formatting) */ - CharUpperW(szFilePath); - /* Print the file's header */ - ConPrintf(StdOut, L"\n---------- %s", szFilePath); - - if (bCountLines) - { - ConPrintf(StdOut, L": "); - } - else - { - ConPrintf(StdOut, L"\n"); - } + ConPrintf(StdOut, L"\n---------- %s%s", + pszFilePath, bCountLines ? L": " : L"\n"); } /* Loop through every line in the file */ - while (fgetws(szLineBuffer, sizeof(szLineBuffer), pStream) != NULL) + // FIXME: What if the string we search for crosses the boundary of our szLineBuffer ? + while (fgetws(szLineBuffer, _countof(szLineBuffer), pStream) != NULL) { - lLineCount++; + ++lLineNumber; - if (bIgnoreCase) - { - bSubstringFound = StrStrIW(szLineBuffer, szSearchedString) != NULL; - } - else - { - bSubstringFound = StrStrW(szLineBuffer, szSearchedString) != NULL; - } - + bSubstringFound = (StrStrCase(szLineBuffer, pszSearchString, bIgnoreCase) != NULL); /* Check if this line can be counted */ if (bSubstringFound != bInvertSearch) @@ -88,14 +136,14 @@ static int FindString(FILE* pStream, LPWSTR szFilePath, LPWSTR szSearchedString) if (bCountLines) { - lLineNumber++; + ++lLineCount; } else { - /* Display the line on the screen */ + /* Display the line number if needed */ if (bDisplayLineNumbers) { - ConPrintf(StdOut, L"[%ld]", lLineCount); + ConPrintf(StdOut, L"[%ld]", lLineNumber); } ConPrintf(StdOut, L"%s", szLineBuffer); } @@ -105,13 +153,15 @@ static int FindString(FILE* pStream, LPWSTR szFilePath, LPWSTR szSearchedString) if (bCountLines) { /* Print the matching line count */ - ConPrintf(StdOut, L"%ld\n", lLineNumber); + ConPrintf(StdOut, L"%ld\n", lLineCount); } - else if (szFilePath != NULL && iReturnValue == 0) +#if 0 + else if (pszFilePath != NULL && iReturnValue == 0) { /* Print a newline for formatting */ ConPrintf(StdOut, L"\n"); } +#endif return iReturnValue; } @@ -121,14 +171,14 @@ int wmain(int argc, WCHAR* argv[]) int i; int iReturnValue = 2; int iSearchedStringIndex = -1; - BOOL bFoundFileParameter = FALSE; - - HANDLE hFindFileHandle; + HANDLE hFindFile; WIN32_FIND_DATAW FindData; - FILE* pOpenedFile; + PWCHAR ptr; + WCHAR szFullFilePath[MAX_PATH]; + /* Initialize the Console Standard Streams */ ConInitStdStreams(); if (argc == 1) @@ -139,49 +189,45 @@ int wmain(int argc, WCHAR* argv[]) } /* Parse the command line arguments */ - for (i = 1; i < argc; i++) + for (i = 1; i < argc; ++i) { /* Check if this argument contains a switch */ - if (lstrlenW(argv[i]) == 2 && argv[i][0] == L'/') + if (wcslen(argv[i]) == 2 && argv[i][0] == L'/') { - switch (argv[i][1]) + switch (towupper(argv[i][1])) { case L'?': ConResPuts(StdOut, IDS_USAGE); return 0; - case L'v': case L'V': bInvertSearch = TRUE; break; - case L'c': case L'C': bCountLines = TRUE; break; - case L'n': case L'N': bDisplayLineNumbers = TRUE; break; - case L'i': case L'I': bIgnoreCase = TRUE; break; default: /* Report invalid switch error */ - ConResPuts(StdOut, IDS_INVALID_SWITCH); + ConResPuts(StdErr, IDS_INVALID_SWITCH); return 2; } } - else if (lstrlenW(argv[i]) > 2 && argv[i][0] == L'/') + else if (wcslen(argv[i]) > 2 && argv[i][0] == L'/') { /* Check if this parameter is /OFF or /OFFLINE */ - if (lstrcmpiW(argv[i], L"/off") == 0 || lstrcmpiW(argv[i], L"/offline") == 0) + if (_wcsicmp(argv[i], L"/off") == 0 || _wcsicmp(argv[i], L"/offline") == 0) { bDoNotSkipOfflineFiles = TRUE; } else { /* Report invalid switch error */ - ConResPuts(StdOut, IDS_INVALID_SWITCH); + ConResPuts(StdErr, IDS_INVALID_SWITCH); return 2; } } @@ -202,28 +248,28 @@ int wmain(int argc, WCHAR* argv[]) if (iSearchedStringIndex == -1) { /* User didn't provide the string to search for, display program usage and exit */ - ConResPuts(StdOut, IDS_USAGE); + ConResPuts(StdErr, IDS_USAGE); return 2; } if (bFoundFileParameter) { /* After the command line arguments were parsed, iterate through them again to get the filenames */ - for (i = 1; i < argc; i++) + for (i = 1; i < argc; ++i) { /* If the value is a switch or the searched string, continue */ - if ((lstrlenW(argv[i]) > 0 && argv[i][0] == L'/') || i == iSearchedStringIndex) + if ((wcslen(argv[i]) > 0 && argv[i][0] == L'/') || i == iSearchedStringIndex) { continue; } - hFindFileHandle = FindFirstFileW(argv[i], &FindData); - if (hFindFileHandle == INVALID_HANDLE_VALUE) + hFindFile = FindFirstFileW(argv[i], &FindData); + if (hFindFile == INVALID_HANDLE_VALUE) { - ConResPrintf(StdOut, IDS_NO_SUCH_FILE, argv[i]); + ConResPrintf(StdErr, IDS_NO_SUCH_FILE, argv[i]); continue; } - + do { /* Check if the file contains offline attribute and should be skipped */ @@ -232,14 +278,49 @@ int wmain(int argc, WCHAR* argv[]) continue; } - pOpenedFile = _wfopen(FindData.cFileName, L"r"); + /* Skip directory */ + // FIXME: Implement recursivity? + if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + continue; + } + + /* + * Build the full file path from the file specification pattern. + * + * Note that we could use GetFullPathName() instead, however + * we want to keep compatibility with Windows' find.exe utility + * that does not use this function as it keeps the file name + * directly based on the pattern. + */ + ptr = wcsrchr(argv[i], L'\\'); // Check for last directory. + if (!ptr) + ptr = wcsrchr(argv[i], L':'); // Check for drive. + if (ptr) + { + /* The pattern contains a drive or directory part: keep it and concatenate the full file name */ + StringCchCopyNW(szFullFilePath, _countof(szFullFilePath), + argv[i], ptr + 1 - argv[i]); + StringCchCatW(szFullFilePath, _countof(szFullFilePath), + FindData.cFileName); + } + else + { + /* The pattern does not contain any drive or directory part: just copy the full file name */ + StringCchCopyW(szFullFilePath, _countof(szFullFilePath), + FindData.cFileName); + } + + // FIXME: Windows' find.exe supports searching inside binary files. + pOpenedFile = _wfopen(szFullFilePath, L"r"); if (pOpenedFile == NULL) { - ConResPrintf(StdOut, IDS_CANNOT_OPEN, FindData.cFileName); + ConResPrintf(StdErr, IDS_CANNOT_OPEN, szFullFilePath); continue; } - if (FindString(pOpenedFile, FindData.cFileName, argv[iSearchedStringIndex]) == 0) + /* NOTE: Convert the file path to uppercase for formatting */ + if (FindString(pOpenedFile, _wcsupr(szFullFilePath), argv[iSearchedStringIndex]) == 0) { iReturnValue = 0; } @@ -249,15 +330,15 @@ int wmain(int argc, WCHAR* argv[]) } fclose(pOpenedFile); - } while (FindNextFileW(hFindFileHandle, &FindData)); + } while (FindNextFileW(hFindFile, &FindData)); - FindClose(hFindFileHandle); + FindClose(hFindFile); } } else { FindString(stdin, NULL, argv[iSearchedStringIndex]); } - + return iReturnValue; }

5 years, 7 months

[reactos] 01/02: [FIND] Rewrite of the find utility. (#1553)

by Paweł Cholewa

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bd330cd8141c8e82febc… commit 1bd330cd8141c8e82febc797152f65d2519e5599 Author: Paweł Cholewa <DaMcpg(a)protonmail.com> AuthorDate: Sun May 5 00:39:14 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue May 14 20:37:38 2019 +0200 [FIND] Rewrite of the find utility. (#1553) This commit contains a complete rewrite of find console utility. The goal of it was to make the source code easier to maintain and to add a missing feature (/offline switch). Additional changes: * now the program operates on Unicode strings; * added conutils and shlwapi as program's libraries; * added IDS_INVALID_SWITCH string into resources; * modified IDS_USAGE string to include /offline switch description. https://ss64.com/nt/find.html was used for reference. --- base/applications/cmdutils/find/CMakeLists.txt | 7 +- base/applications/cmdutils/find/find.c | 427 +++++++++++++------------ base/applications/cmdutils/find/find.rc | 8 +- base/applications/cmdutils/find/lang/bg-BG.rc | 14 +- base/applications/cmdutils/find/lang/ca-ES.rc | 12 +- base/applications/cmdutils/find/lang/cs-CZ.rc | 12 +- base/applications/cmdutils/find/lang/de-DE.rc | 14 +- base/applications/cmdutils/find/lang/el-GR.rc | 12 +- base/applications/cmdutils/find/lang/en-US.rc | 12 +- base/applications/cmdutils/find/lang/es-ES.rc | 12 +- base/applications/cmdutils/find/lang/et-EE.rc | 12 +- base/applications/cmdutils/find/lang/fr-FR.rc | 12 +- base/applications/cmdutils/find/lang/it-IT.rc | 12 +- base/applications/cmdutils/find/lang/lt-LT.rc | 12 +- base/applications/cmdutils/find/lang/no-NO.rc | 12 +- base/applications/cmdutils/find/lang/pl-PL.rc | 12 +- base/applications/cmdutils/find/lang/pt-BR.rc | 12 +- base/applications/cmdutils/find/lang/ro-RO.rc | 12 +- base/applications/cmdutils/find/lang/ru-RU.rc | 4 +- base/applications/cmdutils/find/lang/sk-SK.rc | 12 +- base/applications/cmdutils/find/lang/sq-AL.rc | 12 +- base/applications/cmdutils/find/lang/sv-SE.rc | 12 +- base/applications/cmdutils/find/lang/tr-TR.rc | 12 +- base/applications/cmdutils/find/lang/uk-UA.rc | 12 +- base/applications/cmdutils/find/lang/zh-CN.rc | 12 +- base/applications/cmdutils/find/lang/zh-TW.rc | 12 +- base/applications/cmdutils/find/resource.h | 7 +- 27 files changed, 389 insertions(+), 332 deletions(-) diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt index 7431f5e17f6..1df4d1b98df 100644 --- a/base/applications/cmdutils/find/CMakeLists.txt +++ b/base/applications/cmdutils/find/CMakeLists.txt @@ -1,5 +1,8 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + add_executable(find find.c find.rc) -set_module_type(find win32cui) -add_importlibs(find user32 msvcrt kernel32) +set_module_type(find win32cui UNICODE) +target_link_libraries(find conutils ${PSEH_LIB}) +add_importlibs(find user32 msvcrt kernel32 shlwapi) add_cd_file(TARGET find DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/find/find.c b/base/applications/cmdutils/find/find.c index 7121f5f7d61..66cb2ef6245 100644 --- a/base/applications/cmdutils/find/find.c +++ b/base/applications/cmdutils/find/find.c @@ -1,256 +1,263 @@ -/* find.c */ - -/* Copyright (C) 1994-2002, Jim Hall <jhall(a)freedos.org> */ - -/* Adapted for ReactOS */ - /* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - - -/* This program locates a string in a text file and prints those lines - * that contain the string. Multiple files are clearly separated. + * PROJECT: ReactOS Find Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Prints all lines of a file that contain a string. + * COPYRIGHT: Copyright 1994-2002 Jim Hall (jhall(a)freedos.org) + * Copyright 2019 Paweł Cholewa (DaMcpg(a)protonmail.com) */ +#include <windows.h> #include <stdio.h> -#include <stdlib.h> -//#include <string.h> -//#include <ctype.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> - -//#include <io.h> -#include <dos.h> +#include <conutils.h> +#include <shlwapi.h> /* StrStrW and StrStrIW */ #include "resource.h" -/* Symbol definition */ -#define MAX_STR 1024 - -/* This function prints out all lines containing a substring. There are some - * conditions that may be passed to the function. +#define FIND_LINE_BUFFER_SIZE 4096 + +static BOOL bInvertSearch = FALSE; +static BOOL bCountLines = FALSE; +static BOOL bDisplayLineNumbers = FALSE; +static BOOL bIgnoreCase = FALSE; +static BOOL bDoNotSkipOfflineFiles = FALSE; + +/** + * @name FindString + * @implemented + * + * Prints all lines of the stream that contain a string. + * + * @param pStream + * Stream to read from. + * + * @param szFilePath + * Filename to print in console. Can be NULL. + * + * @param szSearchedString + * String to search for. + * + * @return + * 0 if the string was found at least once, 1 otherwise. * - * RETURN: If the string was found at least once, returns 1. - * If the string was not found at all, returns 0. */ -int -find_str (char *sz, FILE *p, int invert_search, - int count_lines, int number_output, int ignore_case) +static int FindString(FILE* pStream, LPWSTR szFilePath, LPWSTR szSearchedString) { - int i, length; - long line_number = 0, total_lines = 0; - char *c, temp_str[MAX_STR], this_line[MAX_STR]; - - /* Convert to upper if needed */ - if (ignore_case) - { - length = strlen (sz); - for (i = 0; i < length; i++) - sz[i] = toupper (sz[i]); - } + WCHAR szLineBuffer[FIND_LINE_BUFFER_SIZE]; + LONG lLineCount = 0; + LONG lLineNumber = 0; + BOOL bSubstringFound; + int iReturnValue = 1; - /* Scan the file until EOF */ - while (fgets (temp_str, MAX_STR, p) != NULL) + if (szFilePath != NULL) { - /* Remove the trailing newline */ - length = strlen (temp_str); - if (temp_str[length-1] == '\n') - { - temp_str[length-1] = '\0'; - } + /* Convert the filename to uppercase (for formatting) */ + CharUpperW(szFilePath); - /* Increment number of lines */ - line_number++; - strcpy (this_line, temp_str); + /* Print the file's header */ + ConPrintf(StdOut, L"\n---------- %s", szFilePath); - /* Convert to upper if needed */ - if (ignore_case) - { - for (i = 0; i < length; i++) - { - temp_str[i] = toupper (temp_str[i]); - } - } - - /* Locate the substring */ + if (bCountLines) + { + ConPrintf(StdOut, L": "); + } + else + { + ConPrintf(StdOut, L"\n"); + } + } - /* strstr() returns a pointer to the first occurrence in the - string of the substring */ - c = strstr (temp_str, sz); + /* Loop through every line in the file */ + while (fgetws(szLineBuffer, sizeof(szLineBuffer), pStream) != NULL) + { + lLineCount++; - if ( ((invert_search) ? (c == NULL) : (c != NULL)) ) - { - if (!count_lines) - { - if (number_output) - printf ("%ld:", line_number); + if (bIgnoreCase) + { + bSubstringFound = StrStrIW(szLineBuffer, szSearchedString) != NULL; + } + else + { + bSubstringFound = StrStrW(szLineBuffer, szSearchedString) != NULL; + } + - /* Print the line of text */ - puts (this_line); - } + /* Check if this line can be counted */ + if (bSubstringFound != bInvertSearch) + { + iReturnValue = 0; - total_lines++; - } /* long if */ - } /* while fgets */ + if (bCountLines) + { + lLineNumber++; + } + else + { + /* Display the line on the screen */ + if (bDisplayLineNumbers) + { + ConPrintf(StdOut, L"[%ld]", lLineCount); + } + ConPrintf(StdOut, L"%s", szLineBuffer); + } + } + } - if (count_lines) + if (bCountLines) { - /* Just show num. lines that contain the string */ - printf ("%ld\n", total_lines); + /* Print the matching line count */ + ConPrintf(StdOut, L"%ld\n", lLineNumber); + } + else if (szFilePath != NULL && iReturnValue == 0) + { + /* Print a newline for formatting */ + ConPrintf(StdOut, L"\n"); } - - /* RETURN: If the string was found at least once, returns 1. - * If the string was not found at all, returns 0. - */ - return (total_lines > 0 ? 1 : 0); + return iReturnValue; } -/* Show usage */ -void -usage (void) +int wmain(int argc, WCHAR* argv[]) { - WCHAR wszUsage[4096]; - char oemUsage[4096]; + int i; + int iReturnValue = 2; + int iSearchedStringIndex = -1; - LoadStringW (GetModuleHandleW (NULL), IDS_USAGE, wszUsage, sizeof(wszUsage) / sizeof(wszUsage[0])); - CharToOemW (wszUsage, oemUsage); - fputs (oemUsage, stdout); -} + BOOL bFoundFileParameter = FALSE; + HANDLE hFindFileHandle; + WIN32_FIND_DATAW FindData; -/* Main program */ -int -main (int argc, char **argv) -{ - char *opt, *needle = NULL; - int ret = 0; - WCHAR wszMessage[4096]; - char oemMessage[4096]; + FILE* pOpenedFile; - int invert_search = 0; /* flag to invert the search */ - int count_lines = 0; /* flag to whether/not count lines */ - int number_output = 0; /* flag to print line numbers */ - int ignore_case = 0; /* flag to be case insensitive */ + ConInitStdStreams(); - FILE *pfile; /* file pointer */ - int hfind; /* search handle */ - struct _finddata_t finddata; /* _findfirst, filenext block */ + if (argc == 1) + { + /* If no argument were provided by the user, display program usage and exit */ + ConResPuts(StdOut, IDS_USAGE); + return 0; + } - /* Scan the command line */ - while ((--argc) && (needle == NULL)) + /* Parse the command line arguments */ + for (i = 1; i < argc; i++) { - if (*(opt = *++argv) == '/') + /* Check if this argument contains a switch */ + if (lstrlenW(argv[i]) == 2 && argv[i][0] == L'/') { - switch (opt[1]) - { - case 'c': - case 'C': /* Count */ - count_lines = 1; - break; - - case 'i': - case 'I': /* Ignore */ - ignore_case = 1; - break; - - case 'n': - case 'N': /* Number */ - number_output = 1; - break; - - case 'v': - case 'V': /* Not with */ - invert_search = 1; - break; - - default: - usage (); - exit (2); /* syntax error .. return error 2 */ - break; - } + switch (argv[i][1]) + { + case L'?': + ConResPuts(StdOut, IDS_USAGE); + return 0; + case L'v': + case L'V': + bInvertSearch = TRUE; + break; + case L'c': + case L'C': + bCountLines = TRUE; + break; + case L'n': + case L'N': + bDisplayLineNumbers = TRUE; + break; + case L'i': + case L'I': + bIgnoreCase = TRUE; + break; + default: + /* Report invalid switch error */ + ConResPuts(StdOut, IDS_INVALID_SWITCH); + return 2; + } } - else + else if (lstrlenW(argv[i]) > 2 && argv[i][0] == L'/') { - /* Get the string */ - if (needle == NULL) - { - /* Assign the string to find */ - needle = *argv; - } - } - } - - /* Check for search string */ - if (needle == NULL) - { - /* No string? */ - usage (); - exit (1); + /* Check if this parameter is /OFF or /OFFLINE */ + if (lstrcmpiW(argv[i], L"/off") == 0 || lstrcmpiW(argv[i], L"/offline") == 0) + { + bDoNotSkipOfflineFiles = TRUE; + } + else + { + /* Report invalid switch error */ + ConResPuts(StdOut, IDS_INVALID_SWITCH); + return 2; + } + } + else + { + if (iSearchedStringIndex == -1) + { + iSearchedStringIndex = i; + } + else + { + /* There's a file specified in the parameters, no need to read from stdin */ + bFoundFileParameter = TRUE; + } + } } - /* Scan the files for the string */ - if (argc == 0) + if (iSearchedStringIndex == -1) { - ret = find_str (needle, stdin, invert_search, count_lines, - number_output, ignore_case); + /* User didn't provide the string to search for, display program usage and exit */ + ConResPuts(StdOut, IDS_USAGE); + return 2; } - while (--argc >= 0) + if (bFoundFileParameter) { - hfind = _findfirst (*++argv, &finddata); - if (hfind < 0) - { - /* We were not able to find a file. Display a message and - set the exit status. */ - LoadStringW (GetModuleHandleW (NULL), IDS_NO_SUCH_FILE, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); - CharToOemW (wszMessage, oemMessage); - fprintf (stderr, oemMessage, *argv); - } - else + /* After the command line arguments were parsed, iterate through them again to get the filenames */ + for (i = 1; i < argc; i++) { - /* repeat find next file to match the filemask */ - do + /* If the value is a switch or the searched string, continue */ + if ((lstrlenW(argv[i]) > 0 && argv[i][0] == L'/') || i == iSearchedStringIndex) + { + continue; + } + + hFindFileHandle = FindFirstFileW(argv[i], &FindData); + if (hFindFileHandle == INVALID_HANDLE_VALUE) { - /* We have found a file, so try to open it */ - if ((pfile = fopen (finddata.name, "r")) != NULL) - { - printf ("---------------- %s\n", finddata.name); - ret = find_str (needle, pfile, invert_search, count_lines, - number_output, ignore_case); - fclose (pfile); - } - else - { - LoadStringW (GetModuleHandleW (NULL), IDS_CANNOT_OPEN, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); - CharToOemW (wszMessage, oemMessage); - fprintf (stderr, oemMessage, - finddata.name); + ConResPrintf(StdOut, IDS_NO_SUCH_FILE, argv[i]); + continue; + } + + do + { + /* Check if the file contains offline attribute and should be skipped */ + if ((FindData.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE) && !bDoNotSkipOfflineFiles) + { + continue; + } + + pOpenedFile = _wfopen(FindData.cFileName, L"r"); + if (pOpenedFile == NULL) + { + ConResPrintf(StdOut, IDS_CANNOT_OPEN, FindData.cFileName); + continue; } - } - while (_findnext(hfind, &finddata) > 0); - } - _findclose(hfind); - } /* for each argv */ - /* RETURN: If the string was found at least once, returns 0. - * If the string was not found at all, returns 1. - * (Note that find_str.c returns the exact opposite values.) - */ - exit ( (ret ? 0 : 1) ); + if (FindString(pOpenedFile, FindData.cFileName, argv[iSearchedStringIndex]) == 0) + { + iReturnValue = 0; + } + else if (iReturnValue != 0) + { + iReturnValue = 1; + } + + fclose(pOpenedFile); + } while (FindNextFileW(hFindFileHandle, &FindData)); + + FindClose(hFindFileHandle); + } + } + else + { + FindString(stdin, NULL, argv[iSearchedStringIndex]); + } + + return iReturnValue; } diff --git a/base/applications/cmdutils/find/find.rc b/base/applications/cmdutils/find/find.rc index 92b8ae4ab26..71239582b07 100644 --- a/base/applications/cmdutils/find/find.rc +++ b/base/applications/cmdutils/find/find.rc @@ -2,9 +2,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Find Command" -#define REACTOS_STR_INTERNAL_NAME "find" -#define REACTOS_STR_ORIGINAL_FILENAME "find.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Find Command" +#define REACTOS_STR_INTERNAL_NAME "find" +#define REACTOS_STR_ORIGINAL_FILENAME "find.exe" #include <reactos/version.rc> /* UTF-8 */ @@ -77,4 +77,4 @@ #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif diff --git a/base/applications/cmdutils/find/lang/bg-BG.rc b/base/applications/cmdutils/find/lang/bg-BG.rc index 7f5950a4e06..f473225df28 100644 --- a/base/applications/cmdutils/find/lang/bg-BG.rc +++ b/base/applications/cmdutils/find/lang/bg-BG.rc @@ -2,12 +2,14 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_USAGE "FIND: Извежда всички редове във файла, които съдържат указания низ..\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""низ"" [ файл... ]\n\ - /C Брои колко реда съдържат низа\n\ - /I Пренебрегва ГлАвНОсТта\n\ - /N Брой показани редове, като се започва от 1\n\ - /V Извеждане на редовете, НЕсъдържащи низа." + IDS_USAGE "FIND: Извежда всички редове във файла, които съдържат указания низ.\n\n\ +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""низ"" [файл...]\n\ + /V Извеждане на редовете, НЕсъдържащи низа.\n\ + /C Брои колко реда съдържат низа.\n\ + /N Брой показани редове, като се започва от 1.\n\ + /I Пренебрегва ГлАвНОсТта.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Няма такъв файл\n" IDS_CANNOT_OPEN "FIND: %s: Отварянето на файла е невъзможно\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/ca-ES.rc b/base/applications/cmdutils/find/lang/ca-ES.rc index ef2b62adeec..ddc84debb6d 100644 --- a/base/applications/cmdutils/find/lang/ca-ES.rc +++ b/base/applications/cmdutils/find/lang/ca-ES.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""Cadena de caràcters"" [ file... ]\n\ - /C Conta el numero de linies que contenen la cadena de caràcters\n\ - /I Ignora majúscules i minúscules\n\ - /N Numero de linies mostrades, començant per la primera\n\ - /V Mostra les linies que no contenen la cadena de caràcters" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""Cadena de caràcters"" [file...]\n\ + /V Mostra les linies que no contenen la cadena de caràcters.\n\ + /C Conta el numero de linies que contenen la cadena de caràcters.\n\ + /N Numero de linies mostrades, començant per la primera.\n\ + /I Ignora majúscules i minúscules.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: No he trobat el fitxer\n" IDS_CANNOT_OPEN "FIND: %s: No puc obrir el fitxer\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/cs-CZ.rc b/base/applications/cmdutils/find/lang/cs-CZ.rc index 97818900852..3553fdb38cb 100644 --- a/base/applications/cmdutils/find/lang/cs-CZ.rc +++ b/base/applications/cmdutils/find/lang/cs-CZ.rc @@ -9,11 +9,13 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Zobrazí všechny řádky souboru obsahující hledaný řetězec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""řetězec"" [ soubor... ]\n\ - /C Zobrazí počet řádků obsahující řetězec.\n\ - /I Ignoruje velikost písmen.\n\ - /N Čísluje zobrazené řádky, začíná od 1.\n\ - /V Zobrazí všechny řádky, které NEobsahují zadaný řetěžec." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""řetězec"" [soubor...]\n\ + /V Zobrazí všechny řádky, které NEobsahují zadaný řetěžec.\n\ + /C Zobrazí počet řádků obsahující řetězec.\n\ + /N Čísluje zobrazené řádky, začíná od 1.\n\ + /I Ignoruje velikost písmen.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: Soubor %s nebyl nalezen.\n" IDS_CANNOT_OPEN "FIND: Soubor %s nelze otevřít!\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/de-DE.rc b/base/applications/cmdutils/find/lang/de-DE.rc index de8d09ea133..44ca8d33008 100644 --- a/base/applications/cmdutils/find/lang/de-DE.rc +++ b/base/applications/cmdutils/find/lang/de-DE.rc @@ -3,12 +3,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "Sucht in einer Datei nach einer Zeichenfolge.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""Zeichenfolge""\n\ - [[Laufwerk:][Pfad]Dateiname]]\n\ - /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ - /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ - /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ - /V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""Zeichenfolge""\n\ + [[Laufwerk:][Pfad]Dateiname[ ...]]\n\ + /V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten.\n\ + /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ + /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ + /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "Datei %s nicht gefunden\n" IDS_CANNOT_OPEN "Datei %s kann nicht geöffnet werden.\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/el-GR.rc b/base/applications/cmdutils/find/lang/el-GR.rc index 9bc2131d79e..8f700b6e3a2 100644 --- a/base/applications/cmdutils/find/lang/el-GR.rc +++ b/base/applications/cmdutils/find/lang/el-GR.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Εκτυπώνει όλες τις γραμμές ενός αρχείου που περιέχουν ένα αλφαριθμητικό.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""αλφαριθμητικό"" [ αρχείο... ]\n\ - /C Μέτρηση γραμμών που περιέχουν το αλφαριθμητικό\n\ - /I Αγνόηση κεφαλαίων\n\ - /N Εμφάνιση αριθμών στις εμφανιζόμενες γραμμές, ξεκινώντας από το 1\n\ - /V Εκτύπωση γραμμών που δεν περιέχουν το αλφαριθμητικό" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""αλφαριθμητικό"" [αρχείο...]\n\ + /V Εκτύπωση γραμμών που δεν περιέχουν το αλφαριθμητικό.\n\ + /C Μέτρηση γραμμών που περιέχουν το αλφαριθμητικό.\n\ + /N Εμφάνιση αριθμών στις εμφανιζόμενες γραμμές, ξεκινώντας από το 1.\n\ + /I Αγνόηση κεφαλαίων.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Δεν υπάρχει αυτό το αρχείο\n" IDS_CANNOT_OPEN "FIND: %s: Δεν ήταν δυνατό το άνοιγμα του αρχείου\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/en-US.rc b/base/applications/cmdutils/find/lang/en-US.rc index d78b0267f62..06a00da0a82 100644 --- a/base/applications/cmdutils/find/lang/en-US.rc +++ b/base/applications/cmdutils/find/lang/en-US.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN IDS_USAGE "FIND: Prints all lines of a file that contain a string.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ - /C Count the number of lines that contain string\n\ - /I Ignore case\n\ - /N Number the displayed lines, starting at 1\n\ - /V Print lines that do not contain the string" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""string"" [file...]\n\ + /V Print lines that do not contain the string.\n\ + /C Count the number of lines that contain the string.\n\ + /N Number the displayed lines, starting at 1.\n\ + /I Ignore case.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: No such file\n" IDS_CANNOT_OPEN "FIND: %s: Cannot open file\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/es-ES.rc b/base/applications/cmdutils/find/lang/es-ES.rc index ee65978dc45..14b736d5cf7 100644 --- a/base/applications/cmdutils/find/lang/es-ES.rc +++ b/base/applications/cmdutils/find/lang/es-ES.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""cadena"" [ fichero... ]\n\ - /C Cuenta el número de líneas que contienen la cadena de caracteres\n\ - /I Ignora mayúsculas y minúsculas\n\ - /N Numero de líneas a mostrar en pantalla, a partir de la primera\n\ - /V Muestra las líneas que no contienen la cadena de caracteres." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""cadena"" [fichero...]\n\ + /V Muestra las líneas que no contienen la cadena de caracteres.\n\ + /C Cuenta el número de líneas que contienen la cadena de caracteres.\n\ + /N Numero de líneas a mostrar en pantalla, a partir de la primera.\n\ + /I Ignora mayúsculas y minúsculas.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: No se encontró el fichero\n" IDS_CANNOT_OPEN "FIND: %s: No se pudo abrir el fichero\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/et-EE.rc b/base/applications/cmdutils/find/lang/et-EE.rc index 6a6b28ed3cf..25cc068d6ef 100644 --- a/base/applications/cmdutils/find/lang/et-EE.rc +++ b/base/applications/cmdutils/find/lang/et-EE.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Trükib kõik read failist, mis sisaldavad stringi.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ - /C Loenda arvuna stringi sisaldavaid ridu\n\ - /I Tõstutundetult\n\ - /N Nummerda kuvatud read alustades 1-st\n\ - /V Trüki read, mis ei sisalda stringi" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""string"" [file...]\n\ + /V Trüki read, mis ei sisalda stringi.\n\ + /C Loenda arvuna stringi sisaldavaid ridu.\n\ + /N Nummerda kuvatud read alustades 1-st.\n\ + /I Tõstutundetult.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Sellist faili ei leitud\n" IDS_CANNOT_OPEN "FIND: %s: Ei saa faili avada\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/fr-FR.rc b/base/applications/cmdutils/find/lang/fr-FR.rc index 4a47d1f5540..36329a4ede5 100644 --- a/base/applications/cmdutils/find/lang/fr-FR.rc +++ b/base/applications/cmdutils/find/lang/fr-FR.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Affiche toutes les lignes d'un fichier qui contiennent un morceau de texte.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""texte"" [ fichier... ]\n\ - /C Compte le nombre de lignes qui contiennent le texte\n\ - /I Insensible à la casse\n\ - /N Numérote les lignes affichées en commençant à 1\n\ - /V Affiche les lignes qui ne contiennent pas le texte" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""texte"" [fichier...]\n\ + /V Affiche les lignes qui ne contiennent pas le texte.\n\ + /C Compte le nombre de lignes qui contiennent le texte.\n\ + /N Numérote les lignes affichées en commençant à 1.\n\ + /I Insensible à la casse.\n\ + /OFF[LINE] Ne pas ignorer les fichiers ayant l'attribut hors-ligne." IDS_NO_SUCH_FILE "FIND: %s : fichier inexistant\n" IDS_CANNOT_OPEN "FIND: %s : impossible d'ouvrir le fichier\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/it-IT.rc b/base/applications/cmdutils/find/lang/it-IT.rc index 49d9b9d6e8c..ca1edaa69ff 100644 --- a/base/applications/cmdutils/find/lang/it-IT.rc +++ b/base/applications/cmdutils/find/lang/it-IT.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""stringa"" [ file... ]\n\ - /C Conta il numero di linee che contengono la stringa\n\ - /I Ignora maiuscole/minuscole\n\ - /N Numera le linee visualizzate a partire da 1\n\ - /V Visualizza le linee che non contengono la stringa" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""stringa"" [file...]\n\ + /V Visualizza le linee che non contengono la stringa.\n\ + /C Conta il numero di linee che contengono la stringa.\n\ + /N Numera le linee visualizzate a partire da 1.\n\ + /I Ignora maiuscole/minuscole.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: File non trovato\n" IDS_CANNOT_OPEN "FIND: %s: Impossibile aprire il file\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/lt-LT.rc b/base/applications/cmdutils/find/lang/lt-LT.rc index 4c9426f5b54..2d95ccb4b8c 100644 --- a/base/applications/cmdutils/find/lang/lt-LT.rc +++ b/base/applications/cmdutils/find/lang/lt-LT.rc @@ -12,11 +12,13 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Spausdina visas bylos eilutes, kuriose yra ieškomas tekstas.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""tekstas"" [ byla... ]\n\ - /C Skaičiuoti eilutes, kuriose yra ieškomas tekstas\n\ - /I Ignoruoti raidžių dydį\n\ - /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ - /V Spausdinti eilutes, kuriose nėra ieškomo teksto" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""tekstas"" [byla...]\n\ + /V Spausdinti eilutes, kuriose nėra ieškomo teksto.\n\ + /C Skaičiuoti eilutes, kuriose yra ieškomas tekstas.\n\ + /N Numeruoti vaizduojamas eilutes, pradedant nuo 1.\n\ + /I Ignoruoti raidžių dydį.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Tokios bylos nėra\n" IDS_CANNOT_OPEN "FIND: %s: Nepavyko atverti bylos\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/no-NO.rc b/base/applications/cmdutils/find/lang/no-NO.rc index aabcb2b0d42..8638bf51405 100644 --- a/base/applications/cmdutils/find/lang/no-NO.rc +++ b/base/applications/cmdutils/find/lang/no-NO.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FINN: Skriv alle linjene for filen som inneholder en streng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""streng"" [ fil... ]\n\ - /C Teller nummer av linjer som inneholder strenger\n\ - /I Ignorere sak\n\ - /N Nummer viste linjer, start med 1\n\ - /V Skriv linjer som ikke inneholder en streng" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""streng"" [fil...]\n\ + /V Skriv linjer som ikke inneholder en streng.\n\ + /C Teller nummer av linjer som inneholder strenger.\n\ + /N Nummer viste linjer, start med 1.\n\ + /I Ignorere sak.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FINN: %s: Ingen filer\n" IDS_CANNOT_OPEN "FINN: %s: Kan ikke åpne filen\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/pl-PL.rc b/base/applications/cmdutils/find/lang/pl-PL.rc index bf10a5ecbc9..a108973d50e 100644 --- a/base/applications/cmdutils/find/lang/pl-PL.rc +++ b/base/applications/cmdutils/find/lang/pl-PL.rc @@ -11,11 +11,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Wyświetla wszystkie linie danego pliku, zawierające szukany ciąg znaków.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ciąg znaków"" [ plik... ]\n\ - /C Oblicza w ilu liniach pojawił się szukany ciąg znaków\n\ - /I Ignoruje wielkość liter\n\ - /N Numeruje wyświetlane linie, zaczynając od 1\n\ - /V Wyświetla te linie, które nie zawierają szukanego ciągu znaków" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""ciąg znaków"" [plik...]\n\ + /V Wyświetla te linie, które nie zawierają szukanego ciągu znaków.\n\ + /C Oblicza w ilu liniach pojawił się szukany ciąg znaków.\n\ + /N Numeruje wyświetlane linie, zaczynając od 1.\n\ + /I Ignoruje wielkość liter.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Plik nie został znaleziony\n" IDS_CANNOT_OPEN "FIND: %s: Nie można otworzyć pliku\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/pt-BR.rc b/base/applications/cmdutils/find/lang/pt-BR.rc index d59bf5ca4e0..5ae45b35b89 100644 --- a/base/applications/cmdutils/find/lang/pt-BR.rc +++ b/base/applications/cmdutils/find/lang/pt-BR.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Localiza uma seqüência de texto em um ou mais arquivos.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""seqüência"" [ arquivo... ]\n\ - /C Exibe apenas o número de linhas que contêm a seqüência.\n\ - /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ - /N Exibe o número de cada linha, iniciando no 1.\n\ - /V Exibe todas as linhas que NÃO contêm a seqüência especificada." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""seqüência"" [arquivo...]\n\ + /V Exibe todas as linhas que NÃO contêm a seqüência especificada.\n\ + /C Exibe apenas o número de linhas que contêm a seqüência.\n\ + /N Exibe o número de cada linha, iniciando no 1.\n\ + /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Arquivo não encontrado\n" IDS_CANNOT_OPEN "FIND: %s: Não foi possível abrir o arquivo\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/ro-RO.rc b/base/applications/cmdutils/find/lang/ro-RO.rc index 5b35622b1cb..2a953f347dc 100644 --- a/base/applications/cmdutils/find/lang/ro-RO.rc +++ b/base/applications/cmdutils/find/lang/ro-RO.rc @@ -11,11 +11,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Tipărește toate rândurile unui fișier ce conțin un șir.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""șir"" [ fișier... ]\n\ - /C Numără liniile ce conțin șirul.\n\ - /I Ignoră diferențele între majuscule și minuscule.\n\ - /N Numără rândurile afișate, începând cu 1.\n\ - /V Tipărește rândurile ce nu conțin șirul." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""șir"" [fișier...]\n\ + /V Tipărește rândurile ce nu conțin șirul.\n\ + /C Numără liniile ce conțin șirul.\n\ + /N Numără rândurile afișate, începând cu 1.\n\ + /I Ignoră diferențele între majuscule și minuscule.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: Fișierul «%s» nu există!\n" IDS_CANNOT_OPEN "FIND: Fișierul «%s» nu poate fi deschis!\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/ru-RU.rc b/base/applications/cmdutils/find/lang/ru-RU.rc index 347e3d1387c..83061e886c0 100644 --- a/base/applications/cmdutils/find/lang/ru-RU.rc +++ b/base/applications/cmdutils/find/lang/ru-RU.rc @@ -3,14 +3,16 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "Поиск текстовой строки в одном или нескольких файлах.\n\n\ -FIND [/V] [/C] [/N] [/I] ""строка"" [[диск:][путь]имя_файла[ ...]]\n\ +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""строка"" [[диск:][путь]имя_файла[ ...]]\n\ /V Вывод всех строк, НЕ содержащих заданную строку.\n\ /C Вывод только общего числа строк, содержащих заданную строку.\n\ /N Вывод номеров отображаемых строк.\n\ /I Поиск без учета регистра символов.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set.\n\ ""строка"" Искомая строка.\n\ [диск:][путь]имя_файла\n\ Один или несколько файлов, в которых выполняется поиск." IDS_NO_SUCH_FILE "FIND: %s: Файл не существует.\n" IDS_CANNOT_OPEN "FIND: %s: Невозможно открыть файл.\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/sk-SK.rc b/base/applications/cmdutils/find/lang/sk-SK.rc index 4354eac9547..c6825a584fc 100644 --- a/base/applications/cmdutils/find/lang/sk-SK.rc +++ b/base/applications/cmdutils/find/lang/sk-SK.rc @@ -7,11 +7,13 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Zobrazí všetky riadky súboru obsahujúce hľadaný reťazec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""reťazec"" [ súbor... ]\n\ - /C Zobrazí počet riadkov, ktoré obsahujú reťazec.\n\ - /I Ignoruje veľkosť písmen.\n\ - /N Čísluje zobrazené riadky, začína od 1.\n\ - /V Zobrazí všetky riadky, ktoré neobsahujú hľadaný reťazec." +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""reťazec"" [súbor...]\n\ + /V Zobrazí všetky riadky, ktoré neobsahujú hľadaný reťazec.\n\ + /C Zobrazí počet riadkov, ktoré obsahujú reťazec.\n\ + /N Čísluje zobrazené riadky, začína od 1.\n\ + /I Ignoruje veľkosť písmen.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: Súbor %s sa nenašiel.\n" IDS_CANNOT_OPEN "FIND: Súbor %s sa nedá otvoriť.\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/sq-AL.rc b/base/applications/cmdutils/find/lang/sq-AL.rc index 0b1bc1aa645..6a010cccdd6 100644 --- a/base/applications/cmdutils/find/lang/sq-AL.rc +++ b/base/applications/cmdutils/find/lang/sq-AL.rc @@ -7,11 +7,13 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Printon të gjitha linjat e një skedari që përmbajnë një fije.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""fije"" [ file... ]\n\ - /C Numërimi i numerave e linjave që përmbajnë nje fije\n\ - /I Injorojnë çështjen\n\ - /N Shfaq numrin e linjave, duke filluar nga 1\n\ - /V Shfaq linjat e nuk permbajne nje fije" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""fije"" [file...]\n\ + /V Shfaq linjat e nuk permbajne nje fije.\n\ + /C Numërimi i numerave e linjave që përmbajnë nje fije.\n\ + /N Shfaq numrin e linjave, duke filluar nga 1.\n\ + /I Injorojnë çështjen.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Dokumenti nuk i gjet\n" IDS_CANNOT_OPEN "FIND: %s: E pamundur te hapet dokumenti\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/sv-SE.rc b/base/applications/cmdutils/find/lang/sv-SE.rc index 329a597bb6f..94d3c97410b 100644 --- a/base/applications/cmdutils/find/lang/sv-SE.rc +++ b/base/applications/cmdutils/find/lang/sv-SE.rc @@ -3,11 +3,13 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "FIND: Skriver ut alla rader i en fil som innehåller en sträng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""sträng"" [ fil... ]\n\ - /C Räkna antalet rader som innehåller en strängen\n\ - /I Ignorera skiftläge\n\ - /N Antal visade rader, börjar på 1\n\ - /V Skriver ut rader som inte innehåller strängen" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""sträng"" [fil...]\n\ + /V Skriver ut rader som inte innehåller strängen.\n\ + /C Räkna antalet rader som innehåller en strängen.\n\ + /N Antal visade rader, börjar på 1.\n\ + /I Ignorera skiftläge.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Ingen sorts fil\n" IDS_CANNOT_OPEN "FIND: %s: Kan inte öppna filen\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/tr-TR.rc b/base/applications/cmdutils/find/lang/tr-TR.rc index fd2c8a71e30..a97c4571df5 100644 --- a/base/applications/cmdutils/find/lang/tr-TR.rc +++ b/base/applications/cmdutils/find/lang/tr-TR.rc @@ -5,11 +5,13 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Bir dizgi içeren bir kütüğün tüm yataçlarını yazdırır.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""dizgi"" [ kütük... ]\n\ - /C Dizgi içeren yataç sayısını say\n\ - /I Büyük-küçük harfliği yok say\n\ - /N 1'den başlayan, görüntülenen yataç sayısı\n\ - /V Dizgi içermeyen yataçları yazdır" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""dizgi"" [kütük...]\n\ + /V Dizgi içermeyen yataçları yazdır.\n\ + /C Dizgi içeren yataç sayısını say.\n\ + /N 1'den başlayan, görüntülenen yataç sayısı.\n\ + /I Büyük-küçük harfliği yok say.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Böyle dosya yok\n" IDS_CANNOT_OPEN "FIND: %s: Kütük açılamıyor\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/uk-UA.rc b/base/applications/cmdutils/find/lang/uk-UA.rc index 82e57043b76..7e7643d0a24 100644 --- a/base/applications/cmdutils/find/lang/uk-UA.rc +++ b/base/applications/cmdutils/find/lang/uk-UA.rc @@ -11,11 +11,13 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "FIND: Виведення всіх рядків файлу, які містять рядок.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""рядок"" [ файл... ]\n\ - /C Порахувати кількість рядків, які містять рядок\n\ - /I Не враховувати регістр символів\n\ - /N Нумерувати рядки, які відображаються (починаючи з 1)\n\ - /V Виведення рядків, які не містять заданий рядок" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""рядок"" [файл...]\n\ + /V Виведення рядків, які не містять заданий рядок.\n\ + /C Порахувати кількість рядків, які містять рядок.\n\ + /N Нумерувати рядки, які відображаються (починаючи з 1).\n\ + /I Не враховувати регістр символів.\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: Файл не існує\n" IDS_CANNOT_OPEN "FIND: %s: Неможливо відкрити файл\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/zh-CN.rc b/base/applications/cmdutils/find/lang/zh-CN.rc index 4e394e8b74b..e3822f89a3d 100644 --- a/base/applications/cmdutils/find/lang/zh-CN.rc +++ b/base/applications/cmdutils/find/lang/zh-CN.rc @@ -5,11 +5,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN IDS_USAGE "FIND: 输出某文件中包含指定字符串的所有行。\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""字符串"" [ 文件... ]\n\ - /C 计算包含该字符串的行数\n\ - /I 忽略大小写\n\ - /N 从 1 开始为显示的行编号\n\ - /V 输出不包含该指定字符串的行" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""字符串"" [文件...]\n\ + /V 输出不包含该指定字符串的行。\n\ + /C 计算包含该字符串的行数。\n\ + /N 从 1 开始为显示的行编号。\n\ + /I 忽略大小写。\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: 没有这个文件\n" IDS_CANNOT_OPEN "FIND: %s: 无法打开文件\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/lang/zh-TW.rc b/base/applications/cmdutils/find/lang/zh-TW.rc index 55d618bf5c8..cd2c7b859d3 100644 --- a/base/applications/cmdutils/find/lang/zh-TW.rc +++ b/base/applications/cmdutils/find/lang/zh-TW.rc @@ -5,11 +5,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN IDS_USAGE "FIND: 輸出某檔中包含指定字串的所有行。\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] ""字串"" [ 文件... ]\n\ - /C 計算包含該字串的行數\n\ - /I 忽略大小寫\n\ - /N 從 1 開始為顯示的行編號\n\ - /V 輸出不包含該指定字串的行" +FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""字串"" [文件...]\n\ + /V 輸出不包含該指定字串的行。\n\ + /C 計算包含該字串的行數。\n\ + /N 從 1 開始為顯示的行編號。\n\ + /I 忽略大小寫。\n\ + /OFF[LINE] Do not skip files that have the offline attribute set." IDS_NO_SUCH_FILE "FIND: %s: 沒有這個檔\n" IDS_CANNOT_OPEN "FIND: %s: 無法開啟檔\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\n" END diff --git a/base/applications/cmdutils/find/resource.h b/base/applications/cmdutils/find/resource.h index 99e8f2d0472..2dba86fc14e 100644 --- a/base/applications/cmdutils/find/resource.h +++ b/base/applications/cmdutils/find/resource.h @@ -1,5 +1,6 @@ #pragma once -#define IDS_USAGE 1000 -#define IDS_NO_SUCH_FILE 1001 -#define IDS_CANNOT_OPEN 1002 +#define IDS_USAGE 1000 +#define IDS_NO_SUCH_FILE 1001 +#define IDS_CANNOT_OPEN 1002 +#define IDS_INVALID_SWITCH 1003

5 years, 7 months

[reactos] 01/01: [HIDCLASS] Implement IRP_MJ_WRITE

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a6eb70ff9376273424ea… commit 9a6eb70ff9376273424eab7110761fe4ec0625c7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue May 14 14:18:21 2019 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 14 14:37:22 2019 +0200 [HIDCLASS] Implement IRP_MJ_WRITE --- drivers/hid/hidclass/hidclass.c | 52 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hidclass/hidclass.c b/drivers/hid/hidclass/hidclass.c index 30d6f8d4091..40c31ed609f 100644 --- a/drivers/hid/hidclass/hidclass.c +++ b/drivers/hid/hidclass/hidclass.c @@ -801,11 +801,55 @@ HidClass_Write( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - ASSERT(FALSE); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + PIRP SubIrp; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + HID_XFER_PACKET XferPacket; + NTSTATUS Status; + ULONG Length; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + Length = IoStack->Parameters.Write.Length; + if (Length < 1) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + RtlZeroMemory(&XferPacket, sizeof(XferPacket)); + XferPacket.reportBufferLen = Length; + XferPacket.reportBuffer = Irp->UserBuffer; + XferPacket.reportId = XferPacket.reportBuffer[0]; + + CommonDeviceExtension = DeviceObject->DeviceExtension; + SubIrp = IoBuildDeviceIoControlRequest( + IOCTL_HID_WRITE_REPORT, + CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, + NULL, 0, + NULL, 0, + TRUE, + &Event, + &IoStatusBlock); + if (!SubIrp) + { + Irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + SubIrp->UserBuffer = &XferPacket; + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Status = IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, SubIrp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return Status; } NTSTATUS

5 years, 7 months

[reactos] 01/01: [NtUser] Fix Paint Messages

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2161dd85dc74346291648… commit 2161dd85dc743462916487366783389633a5a8f2 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon May 13 11:31:58 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon May 13 11:31:58 2019 -0500 [NtUser] Fix Paint Messages This is a HACK for forcing painting of non client areas. Paint code seems very restricted. See CORE-7166 & CORE-15934. --- win32ss/user/ntuser/winpos.c | 84 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 6c54f3c266..0eddff51cc 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1653,6 +1653,68 @@ WinPosFixupFlags(WINDOWPOS *WinPos, PWND Wnd) return TRUE; } +// +// This is a NC HACK fix for forcing painting of non client areas. +// Further troubleshooting in painting.c is required to remove this hack. +// See CORE-7166 & CORE-15934 +// +VOID +ForceNCPaintErase(PWND Wnd, HRGN hRgn, PREGION pRgn) +{ + HDC hDC; + PREGION RgnUpdate; + UINT RgnType; + BOOL Create = FALSE; + + if (Wnd->hrgnUpdate == NULL) + { + Wnd->hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); + Create = TRUE; + } + + if (Wnd->hrgnUpdate != HRGN_WINDOW) + { + RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); + if (RgnUpdate) + { + RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, pRgn, RGN_OR); + REGION_UnlockRgn(RgnUpdate); + if (RgnType == NULLREGION) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + Create = FALSE; + } + } + } + + IntSendNCPaint( Wnd, hRgn ); // Region can be deleted by the application. + + if (Wnd->hrgnUpdate) + { + hDC = UserGetDCEx( Wnd, + Wnd->hrgnUpdate, + DCX_CACHE|DCX_USESTYLE|DCX_INTERSECTRGN|DCX_KEEPCLIPRGN); + + Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + // Kill the loop, so Clear before we send. + if (!co_IntSendMessage(UserHMGetHandle(Wnd), WM_ERASEBKGND, (WPARAM)hDC, 0)) + { + Wnd->state |= (WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } + UserReleaseDC(Wnd, hDC, FALSE); + } + + if (Create) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + } +} + /* x and y are always screen relative */ BOOLEAN FASTCALL co_WinPosSetWindowPos( @@ -1862,6 +1924,14 @@ co_WinPosSetWindowPos( DceResetActiveDCEs(Window); // For WS_VISIBLE changes. + // Change or update, set send non-client paint flag. + if ( Window->style & WS_VISIBLE && + (WinPos.flags & SWP_STATECHANGED || (!(Window->state2 & WNDS2_WIN31COMPAT) && WinPos.flags & SWP_NOREDRAW ) ) ) + { + TRACE("Set WNDS_SENDNCPAINT %p\n",Window); + Window->state |= WNDS_SENDNCPAINT; + } + if (!(WinPos.flags & SWP_NOREDRAW)) { /* Determine the new visible region */ @@ -2018,7 +2088,7 @@ co_WinPosSetWindowPos( IntInvalidateWindows( Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } } - else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934 + else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. { if ( !PosChanged && !(WinPos.flags & SWP_DEFERERASE) && @@ -2035,7 +2105,13 @@ co_WinPosSetWindowPos( if ( !(pwnd->style & WS_CHILD) ) { - IntSendNCPaint(pwnd, HRGN_WINDOW); // Paint the whole frame. + HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + PREGION DcRgnObj = REGION_LockRgn(DcRgn); + TRACE("SWP_FRAMECHANGED win %p hRgn %p\n",pwnd, DcRgn); + IntGdiCombineRgn(DcRgnObj, VisBefore, NULL, RGN_COPY); + REGION_UnlockRgn(DcRgnObj); + ForceNCPaintErase(pwnd, DcRgn, DcRgnObj); + GreDeleteObject(DcRgn); } } } @@ -2106,8 +2182,8 @@ co_WinPosSetWindowPos( PWND Parent = Window->spwndParent; if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) { - TRACE("SWP_FRAMECHANGED Parent WS_CLIPCHILDREN\n"); - UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN); + TRACE("SWP_FRAMECHANGED Parent %p WS_CLIPCHILDREN %p\n",Parent,Window); + UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN); // NC should redraw here, see NC HACK fix. } }

5 years, 7 months

[reactos] 01/01: [APPVEYOR] Disable the clang-cl

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bcf43482b8121cdd31ea… commit 0bcf43482b8121cdd31ea582c0704c61be0e686f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 13 08:33:00 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 13 08:35:23 2019 +0200 [APPVEYOR] Disable the clang-cl The compiler hits an assert while building a file The two "officially" supported compilers are working though This will bring back green status for our CI on GitHub --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9abbb299ff..1c05af1dd2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,8 @@ environment: matrix: - BuildType: "msvc-x64" - BuildType: "msvc" - - BuildType: "clang-cl" -# - BuildType: vssolution +# - BuildType: "clang-cl" +# - BuildType: vssolution version: reactos.appveyor.{build} skip_branch_with_pr: true

5 years, 7 months

[reactos] 01/01: [POWERCFG] Show the hibernate page only if the S4 power state is available

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a65a2609196622f012275… commit a65a2609196622f012275316b7f9c2e244667975 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 12 23:52:08 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 12 23:52:08 2019 +0200 [POWERCFG] Show the hibernate page only if the S4 power state is available --- dll/cpl/powercfg/powercfg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 14f2e9ac49..f9c7b9f355 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -130,7 +130,10 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_AC, PowerSchemesDlgProc); } InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); - InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); + if (spc.SystemS4) + { + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); + } /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages);

5 years, 7 months

[reactos] 01/01: [POWERCFG] Add a separate power schemes dialog for ac-only systems

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c58a2163d76c930cfe8b6… commit c58a2163d76c930cfe8b6d829c683db1ce7e4748 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 12 23:48:36 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 12 23:48:36 2019 +0200 [POWERCFG] Add a separate power schemes dialog for ac-only systems The layout issues will be fixed by a future patch. --- dll/cpl/powercfg/lang/bg-BG.rc | 24 +++- dll/cpl/powercfg/lang/cs-CZ.rc | 24 +++- dll/cpl/powercfg/lang/de-DE.rc | 24 +++- dll/cpl/powercfg/lang/el-GR.rc | 24 +++- dll/cpl/powercfg/lang/en-US.rc | 24 +++- dll/cpl/powercfg/lang/es-ES.rc | 24 +++- dll/cpl/powercfg/lang/fr-FR.rc | 24 +++- dll/cpl/powercfg/lang/he-IL.rc | 24 +++- dll/cpl/powercfg/lang/id-ID.rc | 24 +++- dll/cpl/powercfg/lang/it-IT.rc | 24 +++- dll/cpl/powercfg/lang/ja-JP.rc | 24 +++- dll/cpl/powercfg/lang/nl-NL.rc | 24 +++- dll/cpl/powercfg/lang/no-NO.rc | 24 +++- dll/cpl/powercfg/lang/pl-PL.rc | 24 +++- dll/cpl/powercfg/lang/ro-RO.rc | 24 +++- dll/cpl/powercfg/lang/ru-RU.rc | 30 ++++- dll/cpl/powercfg/lang/sk-SK.rc | 24 +++- dll/cpl/powercfg/lang/sq-AL.rc | 24 +++- dll/cpl/powercfg/lang/th-TH.rc | 24 +++- dll/cpl/powercfg/lang/tr-TR.rc | 24 +++- dll/cpl/powercfg/lang/uk-UA.rc | 24 +++- dll/cpl/powercfg/lang/zh-CN.rc | 24 +++- dll/cpl/powercfg/lang/zh-TW.rc | 24 +++- dll/cpl/powercfg/powercfg.c | 22 ++-- dll/cpl/powercfg/powershemes.c | 250 +++++++++++++++-------------------------- dll/cpl/powercfg/resource.h | 13 ++- 26 files changed, 645 insertions(+), 198 deletions(-) diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc index 232a3fdf1a..7787455db4 100644 --- a/dll/cpl/powercfg/lang/bg-BG.rc +++ b/dll/cpl/powercfg/lang/bg-BG.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Наредби на захранването" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Наредби на захранването" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Изберете най- подходящата настройка за този компютър. Обърнете внимание, че промяната на долните настройки ще променят избраната наредба.", -1, 45, 13, 194, 36 + GROUPBOX "За&хранване", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Запис като...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Изтриване", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Неизвестно", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Изключване на &монитора:", IDC_MONITOR, 15, 140, 80, 20 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 15, 160, 80, 20 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Системата из&чаква:", IDC_STANDBY, 15, 180, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Системата за&спива:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Тревоги" diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index 47dfff878b..779e1b5e21 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schémata napájení" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Schémata napájení" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Vyberte napájecí schéma, které se nejvíce hodí pro tento počítač. Všechny změny nastavení se uloží do vybraného schématu.", -1, 37, 6, 209, 36 + GROUPBOX "&Schéma napájení", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Uložit jako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Neznámý", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Varování" diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc index 85c789a021..07a1948b5b 100644 --- a/dll/cpl/powercfg/lang/de-DE.rc +++ b/dll/cpl/powercfg/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 218 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Energieschemata" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Energieschemata" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Wählen Sie das Energieschema mit den am besten zu diesem Computer passenden Einstellungen. Bedenken Sie, dass die Einstellungen das unten ausgewählte Schema modifizieren.", -1, 45, 13, 194, 36 + GROUPBOX "&Energieschemata", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Unbekannt", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "&Monitor ausschalten:", IDC_MONITOR, 15, 145, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Festplatten ausschalten:", IDC_DISK, 15, 160, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Standby:", IDC_STANDBY, 15, 180, 55, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Ruhezustand:", IDC_HIBERNATE, 15, 195, 55, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarme" diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc index a27f5fce7d..5bb10ca281 100644 --- a/dll/cpl/powercfg/lang/el-GR.rc +++ b/dll/cpl/powercfg/lang/el-GR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Συνδυασμοί τροφοδοσίας" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Συνδυασμοί τροφοδοσίας" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 209, 36 + GROUPBOX "Σ&υνδυασμοί τροφοδοσίας", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Αποθήκευση ως...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Διαγραφή", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Άγνωστο", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Απενεργοποίηση &σκληρών δίσκων:", IDC_DISK, 13, 166, 84, 18 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ειδοποιήσεις" diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc index b37b408efa..c9d1f2dafd 100644 --- a/dll/cpl/powercfg/lang/en-US.rc +++ b/dll/cpl/powercfg/lang/en-US.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Power Schemes" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power Schemes" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 37, 6, 209, 36 + GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Save As...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Delete", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Turn off &monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System s&tandby:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarms" diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc index 042b4d83ac..b9ea2d1d32 100644 --- a/dll/cpl/powercfg/lang/es-ES.rc +++ b/dll/cpl/powercfg/lang/es-ES.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 262, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 262, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Combinaciones de energía" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 262, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Combinaciones de energía" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Seleccione la combinación de energía cuya configuración sea la más adecuada para su equipo. Tenga en cuenta que, si cambia la configuración siguiente, se modificará la combinación seleccionada.", -1, 37, 6, 209, 36 + GROUPBOX "C&ombinaciones de energía", -1, 6, 43, 250, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Desconocido ", IDC_GRPDETAIL, 6, 95, 250, 136 + LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 262, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarmas" diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc index 5d86976625..a57abdda3b 100644 --- a/dll/cpl/powercfg/lang/fr-FR.rc +++ b/dll/cpl/powercfg/lang/fr-FR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Profils d'alimentation" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profils d'alimentation" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Choisissez le profil d'alimentation le plus approprié pour cet ordinateur. Notez que modifier les réglages suivants modifiera le profil sélectionné.", -1, 45, 13, 194, 36 + GROUPBOX "P&rofils d'alimentation", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Inconnu", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 15, 145, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Éteindre les d&isques durs :", IDC_DISK, 15, 160, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mode s&tandby :", IDC_STANDBY, 15, 180, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mise en veille du système :", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarmes" diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc index 595e036cc9..b8cdec65ff 100644 --- a/dll/cpl/powercfg/lang/he-IL.rc +++ b/dll/cpl/powercfg/lang/he-IL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "תכניות צריכת חשמל" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תכניות צריכת חשמל" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 37, 6, 209, 36 + GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "מחק", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "מצב המתנה:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "התראות" diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc index 9478d1c45d..cd4fc2975d 100644 --- a/dll/cpl/powercfg/lang/id-ID.rc +++ b/dll/cpl/powercfg/lang/id-ID.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Skema Tenaga" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skema Tenaga" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Pilih skema tenaga dengan setelan paling benar untuk komputer ini. Catatan bahwa mengubah setelan di bawah akan mengubah skema yang dipilih.", -1, 45, 13, 194, 36 + GROUPBOX "Skema Tena&ga", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Tidak Dikenal", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Matikan &monitor:", IDC_MONITOR, 15, 145, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Matikan hard d&isks:", IDC_DISK, 15, 160, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistem s&tandby:", IDC_STANDBY, 15, 180, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarm" diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc index 119f2c8cb9..0752a8932f 100644 --- a/dll/cpl/powercfg/lang/it-IT.rc +++ b/dll/cpl/powercfg/lang/it-IT.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Gestione risparmio energia" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 176, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Gestione risparmio energia" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20 + LTEXT "Scegliere lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.", -1, 40, 8, 194, 36 + GROUPBOX "Schema di gestione dell'energia", -1, 8, 48, 240, 48 + COMBOBOX IDC_ENERGYLIST, 15, 61, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 101, 76, 75, 15, WS_DISABLED + PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 181, 76, 55, 15, WS_DISABLED + GROUPBOX "sconosciuto", IDC_GRPDETAIL, 8, 100, 240, 112 + LTEXT "Spegni il &monitor:", IDC_MONITOR, 16, 143, 80, 10 + COMBOBOX IDC_MONITORACLIST, 101, 141, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 16, 158, 80, 10 + COMBOBOX IDC_DISKACLIST, 101, 156, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Standby:", IDC_STANDBY, 16, 178, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 101, 176, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sospensione:", IDC_HIBERNATE, 16, 193, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 101, 191, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Allarmi" diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc index 2b2d0cd101..f2d45998d0 100644 --- a/dll/cpl/powercfg/lang/ja-JP.rc +++ b/dll/cpl/powercfg/lang/ja-JP.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "電源設定" FONT 9, "MS UI Gothic" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "電源設定" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 209, 36 + GROUPBOX "電源設定(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "名前を付けて保存(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "不明", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "システムスタンバイ(&T):", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "アラーム" diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc index bae8278f81..a129b748ed 100644 --- a/dll/cpl/powercfg/lang/nl-NL.rc +++ b/dll/cpl/powercfg/lang/nl-NL.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Energie schema's" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Energie schema's" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", -1, 45, 13, 194, 36 + GROUPBOX "&Energie schema's", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Onbekend", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 15, 145, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "V&aste schijven uitschakelen:", IDC_DISK, 15, 160, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Op stand-&by:", IDC_STANDBY, 15, 180, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "In slaapstand:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Waarschuwingen" diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc index 891f4e9de8..a8f122bb06 100644 --- a/dll/cpl/powercfg/lang/no-NO.rc +++ b/dll/cpl/powercfg/lang/no-NO.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Strømstyringsplan" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Strømstyringsplan" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Velg Strømstyringsplan med den mest passende innstilling for denne datamaskinen. Vær oppmerksom på å endre innstillingene under vil forandre valgte plan.", -1, 37, 6, 209, 36 + GROUPBOX "S&trømstyringsplan", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Lagre som...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Slett", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Ukjent", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarmer" diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index de7cb29f38..0ebaefcd0d 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schematy zasilania" FONT 8, "MS Shell Dlg" @@ -39,6 +39,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Schematy zasilania" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Wybierz schemat zasilana najbardziej pasujący do Twojego komputera. Miej na uwadze, że zmiany poniżej spowodują modyfikację wybranego schematu.", -1, 45, 13, 194, 36 + GROUPBOX "&Schematy zasilania", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Usuń", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "Nieznany", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 142, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 157, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernuje:", IDC_HIBERNATE, 15, 192, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ostrzeżenia" diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index a24f6f06c0..8e85332b4b 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Regim de consum" FONT 8, "MS Shell Dlg" @@ -36,6 +36,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Regim de consum" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Alegeți un regim de consum al energiei cât mai potrivit pentru dumneavoastră. Aveți în vedere că modificările aduse vor fi memorate în regimul curent.", -1, 37, 6, 209, 36 + GROUPBOX "&Regimuri de consum", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Păstrare…", IDC_SAVEAS_BTN, 124, 72, 55, 14, WS_DISABLED + PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Nespecificat", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarme" diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc index 4877cf2573..7c96be7151 100644 --- a/dll/cpl/powercfg/lang/ru-RU.rc +++ b/dll/cpl/powercfg/lang/ru-RU.rc @@ -2,12 +2,12 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Схемы управления питанием" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ACDC, IDI_ACDC, 5, 5, 32, 32 + ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32 LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 5, 194, 36 GROUPBOX "&Схемы управления питанием", -1, 7, 57, 240, 46 COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Схемы управления питанием" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32 + LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 5, 194, 36 + GROUPBOX "&Схемы управления питанием", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "Сохранить &как...", IDC_SAVEAS_BTN, 103, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 183, 85, 55, 15, WS_DISABLED + GROUPBOX "Нет данных", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "Отключить &монитор:", IDC_MONITOR, 15, 142, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Отключить &диски:", IDC_DISK, 15, 157, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Ждущий режим через:", IDC_STANDBY, 15, 177, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "С&пящий режим через:", IDC_HIBERNATE, 15, 192, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Уведомления" @@ -71,7 +93,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Дополнительно" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ACDC, IDI_ACDC, 5, 5, 32, 32 + ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32 LTEXT "Выберите желаемые параметры энергосбережения.", -1, 37, 5, 205, 20 GROUPBOX "Параметры", -1, 5, 35, 225, 55 AUTOCHECKBOX "&Всегда отображать значок на панели задач", IDC_SYSTRAYBATTERYMETER, 15, 48, 200, 10, WS_TABSTOP @@ -91,7 +113,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Спящий режим" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 32, 32 + ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 32, 32 LTEXT "При переходе в спящий режим компьютер переносит содержимое оперативной памяти на диск и выключается. При выходе из спящего режима компьютер возвращается в прежнее состояние.", -1, 37, 5, 195, 35 GROUPBOX "Спящий режим", -1, 5, 57, 235, 25 AUTOCHECKBOX "&Разрешить переход в спящий режим", IDC_HIBERNATEFILE, 10, 67, 210, 10, WS_TABSTOP diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc index f52c6c39e2..f203b8efb9 100644 --- a/dll/cpl/powercfg/lang/sk-SK.rc +++ b/dll/cpl/powercfg/lang/sk-SK.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schémy napájania" FONT 8, "MS Shell Dlg" @@ -39,6 +39,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Schémy napájania" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Vyberte schému napájania, ktorej nastavenie je najvhodnejšie pre tento počítač. Všimnite si, že zmenou nastavení v tomto okne sa zmení aj zvolená schéma.", -1, 37, 6, 209, 36 + GROUPBOX "&Schémy napájania", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Uložiť ako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Neznáme", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 210, 84, 18 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Signalizácie" diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc index 2859e71e66..afbe1ef091 100644 --- a/dll/cpl/powercfg/lang/sq-AL.rc +++ b/dll/cpl/powercfg/lang/sq-AL.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Skema e Energjisë" FONT 8, "MS Shell Dlg" @@ -36,6 +36,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skema e Energjisë" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Zgjidhni skemën energjisë me parametrat më të përshtatshme për këtë kompjuter. Vini re se ndryshimet e parametrave te më poshtëm do të ndryshojë skemën e zgjedhur.", -1, 37, 6, 209, 36 + GROUPBOX "Skema e Energjisë", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "i panjohur", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarme" diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc index c5a8979e2d..7404de106c 100644 --- a/dll/cpl/powercfg/lang/th-TH.rc +++ b/dll/cpl/powercfg/lang/th-TH.rc @@ -1,6 +1,6 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 250, 220 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Power Schemes" FONT 8, "MS Shell Dlg" @@ -31,6 +31,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power Schemes" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 45, 13, 194, 36 + GROUPBOX "P&ower schemes", -1, 7, 57, 240, 46 + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&บันทึกเป็น...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED + PUSHBUTTON "&ลบ", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED + GROUPBOX "ไม่ทราบค่า", IDC_GRPDETAIL, 7, 108, 240, 105 + LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 15, 145, 80, 10 + COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Turn off hard d&isks:", IDC_DISK, 15, 160, 80, 10 + COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System s&tandby:", IDC_STANDBY, 15, 180, 80, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernates:", IDC_HIBERNATE, 15, 195, 80, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarms" diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc index c1209bd8d3..96d61ce9d8 100644 --- a/dll/cpl/powercfg/lang/tr-TR.rc +++ b/dll/cpl/powercfg/lang/tr-TR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Güç Düzenleri" FONT 8, "MS Shell Dlg" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Güç Düzenleri" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. Aşağıdaki ayarların değiştirilmesi seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 209, 36 + GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Ayrı Sakla...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&Sil", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Bilinmiyor", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "G&östergeci Kapat:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sâ&bit Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Dizgeyi Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "D&izgeyi Anıkta Beklet:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Uyarılar" diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc index 91d7eb2f53..442301171b 100644 --- a/dll/cpl/powercfg/lang/uk-UA.rc +++ b/dll/cpl/powercfg/lang/uk-UA.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Схеми керування живленням" FONT 8, "MS Shell Dlg" @@ -39,6 +39,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Схеми керування живленням" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 209, 36 + GROUPBOX "&Схеми керування живленням", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "Зберегти &як...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Немає даних", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Сигналізація" diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index 1257571f99..9480303a3b 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "电源使用方案" FONT 9, "宋体" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "电源使用方案" +FONT 9, "宋体" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36 + GROUPBOX "电源使用方案(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "另存为(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "关闭监视器(&M):", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "关闭硬盘(&I):", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系统待机(&T):", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系统休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "警报" diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index 34e83fd26e..4f6874693c 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 +IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "電源使用方案" FONT 9, "新細明體" @@ -33,6 +33,28 @@ BEGIN COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "電源使用方案" +FONT 9, "新細明體" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36 + GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "另存爲(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "關閉監視器(&M):", IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "關閉硬碟(&I):", IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系統待機(&T):", IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "系統休眠(&H):", IDC_HIBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "警報" diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index be89004a2b..14f2e9ac49 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -115,13 +115,19 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.phpage = hpsp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); - if (GetPwrCapabilities(&spc)) + if (!GetPwrCapabilities(&spc)) { - if (spc.SystemBatteriesPresent) - { - InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); - } + return GetLastError(); + } + + if (spc.SystemBatteriesPresent) + { + InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_ACDC, PowerSchemesDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); + } + else + { + InitPropSheetPage(&psh, IDD_POWERSCHEMESPAGE_AC, PowerSchemesDlgProc); } InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); @@ -188,10 +194,10 @@ DllMain(HINSTANCE hinstDLL, { UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) + switch (dwReason) { case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: + DisableThreadLibraryCalls(hinstDLL); hApplet = hinstDLL; break; } diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index 1e164d9e85..3ef3abfc68 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -206,91 +206,27 @@ Pos_InitData( HWND hwndDlg) { SYSTEM_POWER_CAPABILITIES spc; -/* - RECT rectCtl, rectDlg, rectCtl2; - LONG movetop = 0; - LONG moveright = 0; - - if (GetWindowRect(hwndDlg,&rectDlg)) - { - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_SAT),&rectCtl2)) - { - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITOR),&rectCtl)) - { - movetop=rectCtl.top - rectCtl2.top; - MoveWindow(GetDlgItem(hwndDlg, IDC_MONITOR),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_DISK),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_DISK),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_STANDBY),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBY),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATE),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITORDCLIST),&rectCtl2)) - { - movetop=movetop-8; - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_MONITORACLIST),&rectCtl)) - { - moveright=rectCtl.right - rectCtl2.right; - MoveWindow(GetDlgItem(hwndDlg, IDC_MONITORACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_DISKACLIST),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_DISKACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top-movetop,rectCtl.right-rectCtl.left-moveright,rectCtl.bottom-rectCtl.top,FALSE); - } - } - if (GetWindowRect(GetDlgItem(hwndDlg, IDC_GRPDETAIL),&rectCtl)) - { - MoveWindow(GetDlgItem(hwndDlg, IDC_GRPDETAIL),rectCtl.left-rectDlg.left,rectCtl.top-rectDlg.top,rectCtl.right-rectCtl.left,rectCtl.bottom-rectCtl.top,FALSE); - } - } - } - } - } - } -*/ if (!GetPwrCapabilities(&spc)) { return FALSE; } - if (!spc.SystemBatteriesPresent) - { - ShowWindow(GetDlgItem(hwndDlg, IDC_SAT), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_IAC), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_SAC), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_IDC), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_SDC), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_DISKDCLIST), SW_HIDE); - } - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBY), (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), - ((spc.SystemS1 || spc.SystemS2 || spc.SystemS3) && spc.SystemBatteriesPresent) ? SW_SHOW : SW_HIDE); + if (spc.SystemBatteriesPresent) + ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), + (spc.SystemS1 || spc.SystemS2 || spc.SystemS3) ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATE), (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST), (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST), - (spc.HiberFilePresent && spc.SystemBatteriesPresent) ? SW_SHOW : SW_HIDE); + if (spc.SystemBatteriesPresent) + ShowWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST), + (spc.HiberFilePresent) ? SW_SHOW : SW_HIDE); return TRUE; } @@ -307,6 +243,7 @@ LoadConfig( TCHAR szTemp[MAX_PATH]; TCHAR szConfig[MAX_PATH]; PPOWER_POLICY pp; + HWND hwndCtrl; if (pScheme == NULL) { @@ -339,68 +276,52 @@ LoadConfig( for (i = 0; i < 16; i++) { - if (Sec[i] == pp->user.VideoTimeoutAc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORACLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.VideoTimeoutAc) { - SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - if (Sec[i] == pp->user.VideoTimeoutDc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORDCLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.VideoTimeoutDc) { - SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - if (Sec[i] == pp->user.SpindownTimeoutAc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKACLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.SpindownTimeoutAc) { - SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, - CB_SETCURSEL, - i - 2, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i - 2, 0); } - if (Sec[i] == pp->user.SpindownTimeoutDc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKDCLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.SpindownTimeoutDc) { - SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, - CB_SETCURSEL, - i - 2, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i - 2, 0); } - if (Sec[i] == pp->user.IdleTimeoutAc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYACLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.IdleTimeoutAc) { - SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - if (Sec[i] == pp->user.IdleTimeoutDc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYDCLIST); + if (hwndCtrl != NULL && Sec[i] == pp->user.IdleTimeoutDc) { - SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - if (Sec[i] == pp->mach.DozeS4TimeoutAc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST); + if (hwndCtrl != NULL && Sec[i] == pp->mach.DozeS4TimeoutAc) { - SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - if (Sec[i] == pp->mach.DozeS4TimeoutDc) + hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST); + if (hwndCtrl != NULL && Sec[i] == pp->mach.DozeS4TimeoutDc) { - SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST, - CB_SETCURSEL, - i, - (LPARAM)0); + SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } } @@ -462,9 +383,13 @@ Pos_InitPage(HWND hwndDlg) break; default: + hwnd = NULL; return; } + if (hwnd == NULL) + continue; + for (ifrom = imin; ifrom < (IDS_TIMEOUT15 + 1); ifrom++) { if (LoadString(hApplet, ifrom, szName, MAX_PATH)) @@ -507,80 +432,89 @@ Pos_SaveData( PPOWER_SCHEMES_PAGE_DATA pPageData) { PPOWER_SCHEME pScheme; + HWND hwndCtrl; INT tmp; pScheme = pPageData->pSelectedPowerScheme; - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORACLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.VideoTimeoutAc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.VideoTimeoutAc = Sec[tmp]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_MONITORDCLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.VideoTimeoutDc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.VideoTimeoutDc = Sec[tmp]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKACLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.SpindownTimeoutAc = Sec[tmp + 2]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.SpindownTimeoutAc = Sec[tmp + 2]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_DISKDCLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.SpindownTimeoutDc = Sec[tmp + 2]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.SpindownTimeoutDc = Sec[tmp + 2]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYACLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.IdleTimeoutAc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.IdleTimeoutAc = Sec[tmp]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_STANDBYDCLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.user.IdleTimeoutDc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.user.IdleTimeoutDc = Sec[tmp]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEACLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEACLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.mach.DozeS4TimeoutAc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.mach.DozeS4TimeoutAc = Sec[tmp]; + } } - tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_HIBERNATEDCLIST, - CB_GETCURSEL, - 0, - (LPARAM)0); - if (tmp > 0 && tmp < 16) + hwndCtrl = GetDlgItem(hwndDlg, IDC_HIBERNATEDCLIST); + if (hwndCtrl != NULL) { - pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp]; + tmp = (INT)SendMessage(hwndCtrl, CB_GETCURSEL, 0, 0); + if (tmp > 0 && tmp < 16) + { + pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp]; + } } if (SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy)) diff --git a/dll/cpl/powercfg/resource.h b/dll/cpl/powercfg/resource.h index 7227bd8d2b..b3a5095922 100644 --- a/dll/cpl/powercfg/resource.h +++ b/dll/cpl/powercfg/resource.h @@ -11,11 +11,13 @@ #define IDS_CONFIG1 53 #define IDS_CONFIG2 54 -#define IDD_PROPPAGEPOWERSCHEMES 70 -#define IDD_PROPPAGEALARMS 71 -#define IDD_PROPPAGEPOWERMETER 72 -#define IDD_PROPPAGEADVANCED 73 -#define IDD_PROPPAGEHIBERNATE 74 +#define IDD_POWERSCHEMESPAGE_ACDC 70 +#define IDD_POWERSCHEMESPAGE_AC 71 +#define IDD_PROPPAGEALARMS 72 +#define IDD_PROPPAGEPOWERMETER 73 +#define IDD_PROPPAGEADVANCED 74 +#define IDD_PROPPAGEHIBERNATE 75 +#define IDD_SAVEPOWERSCHEME 76 #define IDS_NOACTION 100 #define IDS_PowerActionNone1 114 @@ -107,7 +109,6 @@ #define IDC_DELETE_BTN 504 #define IDC_SAVEAS_BTN 505 -#define IDD_SAVEPOWERSCHEME 75 #define IDC_SCHEMENAME 620 #define IDS_ALPERTLOWENERGY 715

5 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2019