Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [CONUTILS] Use the currently active console codepage to output text to files. If you want to output UTF-8 run "chcp 65001" before. CORE-12122
by Hermès Bélusca-Maïto 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b3fd31bc55ddb2185a64… commit 2b3fd31bc55ddb2185a64c33bf2dd8b753de44e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 5 01:36:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 5 01:37:30 2018 +0200 [CONUTILS] Use the currently active console codepage to output text to files. If you want to output UTF-8 run "chcp 65001" before. CORE-12122 --- sdk/lib/conutils/outstream.c | 34 +++++++++++++++++++--------------- sdk/lib/conutils/stream.c | 20 +++++++++----------- sdk/lib/conutils/stream.h | 14 ++++---------- sdk/lib/conutils/stream_private.h | 2 +- 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index a36a5ddaa2..645452f3ef 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -103,7 +103,7 @@ ConWrite( // if (IsConsoleHandle(Stream->hHandle)) if (Stream->IsConsole) { - // TODO: Check if (ConStream->Mode == WideText or UTF16Text) ?? + // TODO: Check if (Stream->Mode == WideText or UTF16Text) ?? /* * This code is inspired from _cputws, in particular from the fact that, @@ -136,15 +136,15 @@ ConWrite( * * Implementation NOTE: * MultiByteToWideChar (resp. WideCharToMultiByte) are equivalent to - * OemToCharBuffW (resp. CharToOemBuffW), but the latters uselessly - * depend on user32.dll, while MultiByteToWideChar and WideCharToMultiByte - * only need kernel32.dll. + * OemToCharBuffW (resp. CharToOemBuffW), but these latter functions + * uselessly depend on user32.dll, while MultiByteToWideChar and + * WideCharToMultiByte only need kernel32.dll. */ if ((Stream->Mode == WideText) || (Stream->Mode == UTF16Text)) { #ifndef _UNICODE // UNICODE means that TCHAR == WCHAR == UTF-16 - /* Convert from the current process/thread's codepage to UTF-16 */ - WCHAR *buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + /* Convert from the current process/thread's code page to UTF-16 */ + PWCHAR buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); if (!buffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -200,18 +200,22 @@ ConWrite( } else if ((Stream->Mode == UTF8Text) || (Stream->Mode == AnsiText)) { - CHAR *buffer; + UINT CodePage; + PCHAR buffer; /* - * Resolve the codepage cache if it was not assigned yet - * (only if the stream is in ANSI mode; in UTF8 mode the - * codepage was already set to CP_UTF8). + * Resolve the current code page if it has not been assigned yet + * (we do this only if the stream is in ANSI mode; in UTF8 mode + * the code page is always set to CP_UTF8). Otherwise use the + * current stream's code page. */ if (/*(Stream->Mode == AnsiText) &&*/ (Stream->CodePage == INVALID_CP)) - Stream->CodePage = GetConsoleOutputCP(); // CP_ACP, CP_OEMCP + CodePage = GetConsoleOutputCP(); // CP_ACP, CP_OEMCP + else + CodePage = Stream->CodePage; #ifdef _UNICODE // UNICODE means that TCHAR == WCHAR == UTF-16 - /* Convert from UTF-16 to either UTF-8 or ANSI, using stream codepage */ + /* Convert from UTF-16 to either UTF-8 or ANSI, using the stream code page */ // NOTE: MB_LEN_MAX defined either in limits.h or in stdlib.h . buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * MB_LEN_MAX); if (!buffer) @@ -219,14 +223,14 @@ ConWrite( SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } - len = WideCharToMultiByte(Stream->CodePage, 0, + len = WideCharToMultiByte(CodePage, 0, szStr, len, buffer, len * MB_LEN_MAX, NULL, NULL); szStr = (PVOID)buffer; #else /* - * Convert from the current process/thread's codepage to either - * UTF-8 or ANSI, using stream codepage. + * Convert from the current process/thread's code page to either + * UTF-8 or ANSI, using the stream code page. * We need to perform a double conversion, by going through UTF-16. */ // TODO! diff --git a/sdk/lib/conutils/stream.c b/sdk/lib/conutils/stream.c index 0b137ea2f7..7246453df4 100644 --- a/sdk/lib/conutils/stream.c +++ b/sdk/lib/conutils/stream.c @@ -73,9 +73,6 @@ static int ConToCRTMode[] = _O_U16TEXT, // UTF16Text (UTF16 without BOM; translated) _O_U8TEXT, // UTF8Text (UTF8 without BOM; translated) }; -#endif - -#ifdef USE_CRT /* * See http://archives.miloush.net/michkap/archive/2008/03/18/8306597.html @@ -83,7 +80,7 @@ static int ConToCRTMode[] = * for more details. */ -// NOTE: May the translated mode be cached somehow? +// NOTE1: May the translated mode be cached somehow? // NOTE2: We may also call IsConsoleHandle to directly set the mode to // _O_U16TEXT if it's ok?? // NOTE3: _setmode returns the previous mode, or -1 if failure. @@ -99,16 +96,17 @@ do { \ #else /* defined(USE_CRT) */ /* - * We set Stream->CodePage to INVALID_CP (= -1) to signal that the codepage + * We set Stream->CodePage to INVALID_CP (== -1) to signal that the code page * is either not assigned (if the mode is Binary, WideText, or UTF16Text), or - * is not cached yet (if the mode is AnsiText). In this latter case the cache - * is resolved inside ConWrite. Finally, if the mode is UTF8Text, the codepage - * cache is set to CP_UTF8. - * The codepage cache can be reset by an explicit call to CON_STREAM_SET_MODE + * is not cached (if the mode is AnsiText). In this latter case the code page + * is resolved inside ConWrite. Finally, if the mode is UTF8Text, the code page + * cache is always set to CP_UTF8. + * The code page cache can be reset by an explicit call to CON_STREAM_SET_MODE * (i.e. by calling ConStreamSetMode, or by reinitializing the stream with * ConStreamInit(Ex)). * - * NOTE: the magic value could not be '0' since it is reserved for CP_ACP. + * NOTE: the reserved values are: 0 (CP_ACP), 1 (CP_OEMCP), 2 (CP_MACCP), + * 3 (CP_THREAD_ACP), 42 (CP_SYMBOL), 65000 (CP_UTF7) and 65001 (CP_UTF8). */ #define CON_STREAM_SET_MODE(Stream, Mode, CacheCodePage) \ do { \ @@ -229,7 +227,7 @@ ConStreamSetCacheCodePage( return FALSE; /* - * Keep the original stream mode but set the correct file codepage + * Keep the original stream mode but set the correct file code page * (will be reset only if Mode == AnsiText). */ Mode = Stream->Mode; diff --git a/sdk/lib/conutils/stream.h b/sdk/lib/conutils/stream.h index 8a2746af5c..031ae56d30 100644 --- a/sdk/lib/conutils/stream.h +++ b/sdk/lib/conutils/stream.h @@ -113,20 +113,14 @@ do { \ } while(0) #endif /* defined(USE_CRT) */ -#ifdef _UNICODE /* - * Use UTF8 by default for file output, because this mode is back-compatible - * with ANSI, and it displays nice on terminals that support UTF8 by default - * (not many terminals support UTF16 on the contrary). + * Use ANSI by default for file output, with no cached code page. + * Note that setting the stream mode to AnsiText and the code page value + * to CP_UTF8 sets the stream to UTF8 mode, and has the same effect as if + * the stream mode UTF8Text had been specified instead. */ -#define ConInitStdStreams() \ - ConInitStdStreamsAndMode(UTF8Text, INVALID_CP) - /* Note that here the cache code page is unused */ -#else -/* Use ANSI by default for file output */ #define ConInitStdStreams() \ ConInitStdStreamsAndMode(AnsiText, INVALID_CP) -#endif /* defined(_UNICODE) */ /* Stream translation modes */ BOOL diff --git a/sdk/lib/conutils/stream_private.h b/sdk/lib/conutils/stream_private.h index 6b801dfb23..181cf77fc3 100644 --- a/sdk/lib/conutils/stream_private.h +++ b/sdk/lib/conutils/stream_private.h @@ -46,7 +46,7 @@ typedef struct _CON_STREAM * when 'hHandle' refers to a file or a pipe. */ CON_STREAM_MODE Mode; - UINT CodePage; // Used to convert UTF-16 text to some ANSI codepage. + UINT CodePage; // Used to convert UTF-16 text to some ANSI code page. #endif /* defined(USE_CRT) */ } CON_STREAM, *PCON_STREAM;

1 0

01/01: [DESK.CPL] Fix a Clang-Cl warning about "LogPixels"
by Serge Gautherie 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=444553c7f0d11a2ab5a1c… commit 444553c7f0d11a2ab5a1c95211ab24c2201b5cd8 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 19:10:57 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 4 22:02:48 2018 +0200 [DESK.CPL] Fix a Clang-Cl warning about "LogPixels" "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- dll/cpl/desk/general.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/desk/general.c b/dll/cpl/desk/general.c index 0858c16f97..e5891a02cf 100644 --- a/dll/cpl/desk/general.c +++ b/dll/cpl/desk/general.c @@ -32,8 +32,8 @@ InitFontSizeList(HWND hWnd) dwSize = MAX_PATH; dwType = REG_DWORD; - if (!RegQueryValueEx(hKey, _T("LogPixels"), NULL, - &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, &dwType, + (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS) { dwValue = 0; }

1 0

01/01: [UMPNPMGR] Fix a Clang-Cl warning about "CSConfigFlags"
by Serge Gautherie 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ca037d5f6a285730f2f9… commit 5ca037d5f6a285730f2f9ddfecb3125899d4bd9b Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 06:15:37 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 4 22:02:24 2018 +0200 [UMPNPMGR] Fix a Clang-Cl warning about "CSConfigFlags" "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- base/services/umpnpmgr/umpnpmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index e86047785a..de64057afb 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -2423,12 +2423,12 @@ PNP_HwProfFlags( else { dwSize = sizeof(DWORD); - if (!RegQueryValueExW(hDeviceKey, - L"CSConfigFlags", - NULL, - NULL, - (LPBYTE)pulValue, - &dwSize) != ERROR_SUCCESS) + if (RegQueryValueExW(hDeviceKey, + L"CSConfigFlags", + NULL, + NULL, + (LPBYTE)pulValue, + &dwSize) != ERROR_SUCCESS) { *pulValue = 0; }

1 0

02/02: [ZIPFLDR] Add German translation
by Robert Naumann 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6cebe736a2b99a713f8d… commit d6cebe736a2b99a713f8df6a0c63a273eaa30609 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Fri May 4 21:32:12 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri May 4 21:34:09 2018 +0200 [ZIPFLDR] Add German translation --- dll/shellext/zipfldr/lang/de-DE.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 4 +++ 2 files changed, 75 insertions(+) diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc new file mode 100644 index 0000000000..8c507b7a62 --- /dev/null +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: German (Germany) resource translation + * COPYRIGHT: Copyright 2018 Robert Naumann + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ziel auswählen" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien.",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Durchsuchen...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Kennwort",IDC_PASSWORD,174,66,54,14 + LTEXT "Extrahieren...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extrahieren abgeschlossen" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,6,12,222,18 + LTEXT "Zielverzeichnis",IDC_DESTDIR,6,36,222,8 + CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "Abschließen drücken um fortzufahren.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ersetzen von Dateien bestätigen" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Ja",IDYES,6,36,62,14 + PUSHBUTTON "Abbrechen",IDCANCEL,204,36,62,14 + PUSHBUTTON "Alle",IDYESALL,72,36,62,14 + PUSHBUTTON "&Nein",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" + IDS_COL_TYPE "Dateityp" + IDS_COL_COMPRSIZE "Komprimierte Größe" + IDS_COL_PASSWORD "Kennwort" + IDS_COL_SIZE "Größe" + IDS_COL_RATIO "Rate" + IDS_COL_DATE_MOD "Änderungsdatum" + IDS_YES "Ja" + IDS_NO "Nein" + + IDS_WIZ_TITLE "Extrahier-Assistent" + IDS_WIZ_DEST_TITLE "Ziel auswählen" + IDS_WIZ_DEST_SUBTITLE "Dateien im ZIP-Archiv werden auf den von Ihnen hier angegebenen Pfad extrahiert." + IDS_WIZ_COMPL_TITLE "Extrahieren abgeschlossen" + IDS_WIZ_COMPL_SUBTITLE "Die Dateien des ZIP-Archives wurden extrahiert." + IDS_WIZ_BROWSE_TITLE "Wählen Sie ein Ziel zum extrahieren der Dateien." + + IDS_OVERWRITEFILE_TEXT "Dieser Ordner enthält bereits eine Datei '%1'.\nMöchten Sie die existierende Datei ersetzen?" + + IDS_MENUITEM "&Alle Extrahieren..." + IDS_HELPTEXT "Ordnerinhalt extrahieren" + IDS_FRIENDLYNAME "ZIP-komprimierter Ordner" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 593ad3efa5..5f39bfd7e1 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -18,6 +18,10 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" /* UTF-8 */ #pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

01/02: [DRWTSN32] Add German translation
by Robert Naumann 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f9c961b41e127515d920… commit 9f9c961b41e127515d920352c6b19f2657abc362 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Fri May 4 21:31:48 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri May 4 21:34:09 2018 +0200 [DRWTSN32] Add German translation --- base/applications/drwtsn32/drwtsn32.rc | 3 +++ base/applications/drwtsn32/lang/de-DE.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index 07c449cf18..8698a3a9fc 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -19,6 +19,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif diff --git a/base/applications/drwtsn32/lang/de-DE.rc b/base/applications/drwtsn32/lang/de-DE.rc new file mode 100644 index 0000000000..6587f1721c --- /dev/null +++ b/base/applications/drwtsn32/lang/de-DE.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: de-DE resource file + * COPYRIGHT: Copyright 2018 Robert Naumann + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_APP_TITLE "ReactOS Fehlerberichterstattung" + IDS_USER_ALERT_MESSAGE "Die Anwendung %ls ist abgestürzt. Informationen über den Absturz wurden hier abgespeichert:\r\n\r\n%ls" +END

1 0

01/01: [NTFS] Fix 2 Clang-Cl warnings about CurrentKey->IndexEntry->Flags
by Serge Gautherie 04 May '18

04 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b893124a20b8024a26d79… commit b893124a20b8024a26d794a4d1867845ca3493e4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 06:03:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 4 08:08:45 2018 +0200 [NTFS] Fix 2 Clang-Cl warnings about CurrentKey->IndexEntry->Flags "warning: logical not is only applied to the left hand side of this bitwise operator [-Wlogical-not-parentheses]" CORE-14306 --- drivers/filesystems/ntfs/btree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index 35a6eb6cd0..a702e25b33 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -1257,7 +1257,7 @@ UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, } // Is the Index Entry large enough to store the VCN? - if (!CurrentKey->IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + if (!BooleanFlagOn(CurrentKey->IndexEntry->Flags, NTFS_INDEX_ENTRY_NODE)) { // Allocate memory for the larger index entry PINDEX_ENTRY_ATTRIBUTE NewEntry = ExAllocatePoolWithTag(NonPagedPool, @@ -1357,7 +1357,7 @@ UpdateIndexNode(PDEVICE_EXTENSION DeviceExt, } // Is the Index Entry large enough to store the VCN? - if (!CurrentKey->IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + if (!BooleanFlagOn(CurrentKey->IndexEntry->Flags, NTFS_INDEX_ENTRY_NODE)) { // Allocate memory for the larger index entry PINDEX_ENTRY_ATTRIBUTE NewEntry = ExAllocatePoolWithTag(NonPagedPool,

1 0

01/01: [REACTOS] Update simplified chinese translation (#529)
by Wexpo Lyu 03 May '18

03 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8a3f0eeee398d557defa… commit b8a3f0eeee398d557defa6d17d92c10b31ba3b81 Author: Wexpo Lyu <laosb(a)lns.unihubs.com> AuthorDate: Thu May 3 17:53:19 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 3 11:53:19 2018 +0200 [REACTOS] Update simplified chinese translation (#529) Minor updates fixing grammar, spacing and typos. --- base/setup/reactos/lang/zh-CN.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index e39e197745..94a265ae45 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -6,7 +6,7 @@ CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN LTEXT "欢迎使用 ReactOS 安装程序。", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 + LTEXT "您不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17 END @@ -16,9 +16,9 @@ CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "修复或更新已安装的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8 END @@ -106,24 +106,24 @@ BEGIN LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 20, 50, 277, 10 LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "请从光盘驱动器取出任何光盘。然后，点击完成重启您的电脑。", IDC_STATIC, 10, 180, 297, 20 + LTEXT "请从光盘驱动器取出所有光盘。然后点击完成来重启您的电脑。", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS 安装程序" - IDS_TYPESUBTITLE "选择安装类型。" - IDS_DEVICETITLE "设置基本设备。" + IDS_TYPESUBTITLE "选择安装类型" + IDS_DEVICETITLE "设置基本设备" IDS_DEVICESUBTITLE "指定显示和键盘设置。" IDS_DRIVETITLE "设置安装分区和系统文件夹" - IDS_DRIVESUBTITLE "设置安装分区，系统文件夹和引导程序。" - IDS_PROCESSTITLE "设置分区，复制文件并安装系统" + IDS_DRIVESUBTITLE "设置安装分区、系统文件夹和引导程序" + IDS_PROCESSTITLE "设置分区、复制文件并安装系统" IDS_PROCESSSUBTITLE "建立并格式化分区，复制文件，安装并设置引导程序" IDS_RESTARTTITLE "第一阶段安装完成" IDS_RESTARTSUBTITLE "第一阶段安装已经完成，重新启动进行第二阶段安装" IDS_SUMMARYTITLE "安装概要" - IDS_SUMMARYSUBTITLE "正是安装前列出安装属性以供检查" - IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要在一次运行安装程序来安装 ReactOS。确定退出？" + IDS_SUMMARYSUBTITLE "安装程序将会执行的内容，以供参考" + IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要再次运行安装程序来安装 ReactOS。确定退出？" IDS_ABORTSETUP2 "终止安装？" IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'\n安装程序无法继续。" IDS_CAPTION "ReactOS 安装程序"

1 0

01/01: [CMAKE] USE_CLANG_CL: Add "-Wno-parentheses-equality"
by Serge Gautherie 03 May '18

03 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7326dc03b65c08e5bb254… commit 7326dc03b65c08e5bb2548434859bcbd29e76f80 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Apr 20 23:26:39 2018 +0200 Commit: Thomas Faber <18138474+ThFabba(a)users.noreply.github.com> CommitDate: Thu May 3 08:12:17 2018 +0200 [CMAKE] USE_CLANG_CL: Add "-Wno-parentheses-equality" Silence some "code style" warnings. CORE-14306 --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 1559677fb4..01d933f73f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -97,8 +97,8 @@ endif() add_compile_flags("/w14115") if(USE_CLANG_CL) - add_compile_flags_language("-nostdinc -Wno-multichar -Wno-char-subscripts -Wno-microsoft-enum-forward-reference -Wno-pragma-pack -Wno-microsoft-anon-tag -Wno-unknown-pragmas" "C") - add_compile_flags_language("-nostdinc -Wno-multichar -Wno-char-subscripts -Wno-microsoft-enum-forward-reference -Wno-pragma-pack -Wno-microsoft-anon-tag -Wno-unknown-pragmas" "CXX") + add_compile_flags_language("-nostdinc -Wno-multichar -Wno-char-subscripts -Wno-microsoft-enum-forward-reference -Wno-pragma-pack -Wno-microsoft-anon-tag -Wno-parentheses-equality -Wno-unknown-pragmas" "C") + add_compile_flags_language("-nostdinc -Wno-multichar -Wno-char-subscripts -Wno-microsoft-enum-forward-reference -Wno-pragma-pack -Wno-microsoft-anon-tag -Wno-parentheses-equality -Wno-unknown-pragmas" "CXX") endif() # Debugging

1 0

01/01: [ADVAPI32] Fix 2 TRACE() format copypastas.
by Serge Gautherie 03 May '18

03 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c312fe7e10d0e5970c64… commit 8c312fe7e10d0e5970c64ab150b76b3e99866f09 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Apr 23 14:33:29 2018 +0200 Commit: Thomas Faber <18138474+ThFabba(a)users.noreply.github.com> CommitDate: Thu May 3 08:10:43 2018 +0200 [ADVAPI32] Fix 2 TRACE() format copypastas. --- dll/win32/advapi32/service/sctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 9b9c3487ff..8b28b2bffa 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -674,7 +674,7 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, UNICODE_STRING ServiceNameU; SERVICE_STATUS_HANDLE hServiceStatus; - TRACE("RegisterServiceCtrlHandlerA(%s %p %p)\n", + TRACE("RegisterServiceCtrlHandlerA(%s %p)\n", debugstr_a(lpServiceName), lpHandlerProc); RtlInitAnsiString(&ServiceNameA, lpServiceName); @@ -704,7 +704,7 @@ RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, { PACTIVE_SERVICE Service; - TRACE("RegisterServiceCtrlHandlerW(%s %p %p)\n", + TRACE("RegisterServiceCtrlHandlerW(%s %p)\n", debugstr_w(lpServiceName), lpHandlerProc); Service = ScLookupServiceByServiceName(lpServiceName);

1 0

01/01: [NTOSKRNL] Optimize a bit deferred writes.
by Pierre Schweitzer 02 May '18

02 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65e29b4b1f3ba0360c2fb… commit 65e29b4b1f3ba0360c2fb30b5c3a38d1ffb784e2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed May 2 23:30:10 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed May 2 23:33:45 2018 +0200 [NTOSKRNL] Optimize a bit deferred writes. In the lazy writer run, first post items that are queued for this. Only then, start executing deferred writes if any. If there were any, reschedule immediately a lazy writer run, to keep Cc warm and to make it unqueue write faster in case of high IOs situation. To make second lazy writer run happen faster, we keep our state active to use short delay (1s) instead of standard idle (3s). --- ntoskrnl/cc/lazywrite.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index ddb7bc42c3..8cb5adb2e7 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -152,12 +152,6 @@ CcLazyWriteScan(VOID) DPRINT("Lazy writer done (%d)\n", Count); } - /* If we have deferred writes, try them now! */ - if (!IsListEmpty(&CcDeferredWrites)) - { - CcPostDeferredWrites(); - } - /* Post items that were due for end of run */ while (!IsListEmpty(&ToPost)) { @@ -166,10 +160,22 @@ CcLazyWriteScan(VOID) CcPostWorkQueue(WorkItem, &CcRegularWorkQueue); } - /* We're no longer active */ - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); - LazyWriter.ScanActive = FALSE; - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + /* If we have deferred writes, try them now! */ + if (!IsListEmpty(&CcDeferredWrites)) + { + CcPostDeferredWrites(); + /* Reschedule immediately a lazy writer run + * Keep us active to have short idle delay + */ + CcScheduleLazyWriteScan(FALSE); + } + else + { + /* We're no longer active */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + LazyWriter.ScanActive = FALSE; + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + } } VOID CcScheduleLazyWriteScan(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs