Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71601: [COMP] - Fix the output of localized strings (and use the "well-known" PrintResourceString function already used in all the other cmdtools) - Unconditionally increase the number o...
by hbelusca＠svn.reactos.org 09 Jun '16

09 Jun '16

Author: hbelusca Date: Thu Jun 9 19:20:35 2016 New Revision: 71601 URL: http://svn.reactos.org/svn/reactos?rev=71601&view=rev Log: [COMP] - Fix the output of localized strings (and use the "well-known" PrintResourceString function already used in all the other cmdtools) - Unconditionally increase the number of lines & the offset when performing the comparison. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/comp/resource.h Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 19:20:35 2016 @@ -24,43 +24,48 @@ * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) */ -#include <windows.h> -#include <tchar.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> +// #include <string.h> +// #include <wchar.h> #include <assert.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #include "resource.h" #define STRBUF 1024 -VOID ResPrint(INT res_no, ...) -{ - TCHAR * res_string; - va_list vargs; - - va_start(vargs, res_no); - - if (LoadString(GetModuleHandle(NULL), res_no, (TCHAR*)&res_string, 0)) - { - _vtprintf(res_string, vargs); - } +VOID PrintResourceString(INT resID, ...) +{ + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; + + va_list args; + va_start(args, resID); + + if (LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, ARRAYSIZE(bufSrc))) + vswprintf(bufFormatted, bufSrc, args); else - { - _tprintf(_T("Resource loading error!")); - } - - va_end(vargs); + swprintf(bufFormatted, L"Resource loading error!"); + + CharToOemW(bufFormatted, bufFormattedOem); + fputs(bufFormattedOem, stdout); + + va_end(args); } /* getline: read a line, return length */ -INT GetBuff(PBYTE buff, FILE *in) +INT GetBuff(PBYTE buff, FILE* in) { return fread(buff, sizeof(BYTE), STRBUF, in); } -INT FileSize(FILE * fd) +INT FileSize(FILE* fd) { INT result = -1; if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1) @@ -74,11 +79,11 @@ /* Print program usage */ VOID Usage(VOID) { - ResPrint(IDS_HELP); -} - - -int _tmain (int argc, TCHAR *argv[]) + PrintResourceString(IDS_HELP); +} + + +int wmain (int argc, WCHAR* argv[]) { INT i; @@ -89,41 +94,41 @@ INT BufLen1, BufLen2; PBYTE Buff1 = NULL; PBYTE Buff2 = NULL; - TCHAR File1[_MAX_PATH + 1], // File paths + WCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; BOOL bAscii = FALSE, // /A switch bLineNos = FALSE; // /L switch - UINT LineNumber; - UINT Offset; + UINT LineNumber; + UINT Offset; INT FileSizeFile1; INT FileSizeFile2; INT NumberOfOptions = 0; INT FilesOK = 1; - INT Status = EXIT_SUCCESS; + INT Status = EXIT_SUCCESS; /* Parse command line for options */ for (i = 1; i < argc; i++) { - if (argv[i][0] == _T('/')) + if (argv[i][0] == L'/') { switch (argv[i][1]) { - case _T('A'): + case L'A': bAscii = TRUE; NumberOfOptions++; break; - case _T('L'): + case L'L': bLineNos = TRUE; NumberOfOptions++; break; - case _T('?'): + case L'?': Usage(); return EXIT_SUCCESS; default: - ResPrint(IDS_INVALIDSWITCH, argv[i][1]); + PrintResourceString(IDS_INVALIDSWITCH, argv[i][1]); Usage(); return EXIT_FAILURE; } @@ -132,19 +137,19 @@ if (argc - NumberOfOptions == 3) { - _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); - _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); + wcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); + wcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); } else { - ResPrint(IDS_BADSYNTAX); + PrintResourceString(IDS_BADSYNTAX); return EXIT_FAILURE; } Buff1 = (PBYTE)malloc(STRBUF); if (Buff1 == NULL) { - _tprintf(_T("Can't get free memory for Buff1\n")); + wprintf(L"Can't get free memory for Buff1\n"); Status = EXIT_FAILURE; goto Cleanup; } @@ -152,31 +157,30 @@ Buff2 = (PBYTE)malloc(STRBUF); if (Buff2 == NULL) { - _tprintf(_T("Can't get free memory for Buff2\n")); - Status = EXIT_FAILURE; - goto Cleanup; - } - - if ((fp1 = _tfopen(File1, _T("rb"))) == NULL) - { - ResPrint(IDS_FILEERROR, File1); - Status = EXIT_FAILURE; - goto Cleanup; - } - if ((fp2 = _tfopen(File2, _T("rb"))) == NULL) - { - ResPrint(IDS_FILEERROR, File2); - Status = EXIT_FAILURE; - goto Cleanup; - } - - - ResPrint(IDS_COMPARING, File1, File2); + wprintf(L"Can't get free memory for Buff2\n"); + Status = EXIT_FAILURE; + goto Cleanup; + } + + if ((fp1 = _wfopen(File1, L"rb")) == NULL) + { + PrintResourceString(IDS_FILEERROR, File1); + Status = EXIT_FAILURE; + goto Cleanup; + } + if ((fp2 = _wfopen(File2, L"rb")) == NULL) + { + PrintResourceString(IDS_FILEERROR, File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + PrintResourceString(IDS_COMPARING, File1, File2); FileSizeFile1 = FileSize(fp1); if (FileSizeFile1 == -1) { - ResPrint(IDS_FILESIZEERROR, File1); + PrintResourceString(IDS_FILESIZEERROR, File1); Status = EXIT_FAILURE; goto Cleanup; } @@ -184,14 +188,14 @@ FileSizeFile2 = FileSize(fp2); if (FileSizeFile2 == -1) { - ResPrint(IDS_FILESIZEERROR, File2); + PrintResourceString(IDS_FILESIZEERROR, File2); Status = EXIT_FAILURE; goto Cleanup; } if (FileSizeFile1 != FileSizeFile2) { - ResPrint(IDS_SIZEDIFFERS); + PrintResourceString(IDS_SIZEDIFFERS); Status = EXIT_FAILURE; goto Cleanup; } @@ -205,7 +209,7 @@ if (ferror(fp1) || ferror(fp2)) { - ResPrint(IDS_READERROR); + PrintResourceString(IDS_READERROR); Status = EXIT_FAILURE; goto Cleanup; } @@ -223,34 +227,34 @@ /* Reporting here a mismatch */ if (bLineNos) { - ResPrint(IDS_MISMATCHLINE, LineNumber); + PrintResourceString(IDS_MISMATCHLINE, LineNumber); } else { - ResPrint(IDS_MISMATCHOFFSET, Offset); + PrintResourceString(IDS_MISMATCHOFFSET, Offset); } if (bAscii) { - ResPrint(IDS_ASCIIDIFF, 1, Buff1[i]); - ResPrint(IDS_ASCIIDIFF, 2, Buff2[i]); + PrintResourceString(IDS_ASCIIDIFF, 1, Buff1[i]); + PrintResourceString(IDS_ASCIIDIFF, 2, Buff2[i]); } else { - ResPrint(IDS_HEXADECIMALDIFF, 1, Buff1[i]); - ResPrint(IDS_HEXADECIMALDIFF, 2, Buff2[i]); - } - - Offset++; - - if (Buff1[i] == '\n') - LineNumber++; + PrintResourceString(IDS_HEXADECIMALDIFF, 1, Buff1[i]); + PrintResourceString(IDS_HEXADECIMALDIFF, 2, Buff2[i]); + } } - } + + Offset++; + + if (Buff1[i] == '\n') + LineNumber++; + } } if (FilesOK) - ResPrint(IDS_MATCH); + PrintResourceString(IDS_MATCH); Cleanup: if (fp2) Modified: trunk/reactos/base/applications/cmdutils/comp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] Thu Jun 9 19:20:35 2016 @@ -1,4 +1,6 @@ #pragma once + +#define RC_STRING_MAX_SIZE 4096 #define IDS_HELP 100 #define IDS_INVALIDSWITCH 101

1 0

[hbelusca] 71600: [COMP] - Localize comp.exe. Patch + romanian translation by Stefan Fulea. - French translation by Hermès Bélusca. CORE-11060
by hbelusca＠svn.reactos.org 09 Jun '16

09 Jun '16

Author: hbelusca Date: Thu Jun 9 19:01:47 2016 New Revision: 71600 URL: http://svn.reactos.org/svn/reactos?rev=71600&view=rev Log: [COMP] - Localize comp.exe. Patch + romanian translation by Stefan Fulea. - French translation by Hermès Bélusca. CORE-11060 Added: trunk/reactos/base/applications/cmdutils/comp/lang/ trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/comp/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/comp/comp.rc Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -1,5 +1,5 @@ add_executable(comp comp.c comp.rc) -set_module_type(comp win32cui) -add_importlibs(comp msvcrt kernel32) +set_module_type(comp win32cui UNICODE) +add_importlibs(comp user32 msvcrt kernel32) add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -31,7 +31,28 @@ #include <string.h> #include <assert.h> +#include "resource.h" + #define STRBUF 1024 + +VOID ResPrint(INT res_no, ...) +{ + TCHAR * res_string; + va_list vargs; + + va_start(vargs, res_no); + + if (LoadString(GetModuleHandle(NULL), res_no, (TCHAR*)&res_string, 0)) + { + _vtprintf(res_string, vargs); + } + else + { + _tprintf(_T("Resource loading error!")); + } + + va_end(vargs); +} /* getline: read a line, return length */ INT GetBuff(PBYTE buff, FILE *in) @@ -53,12 +74,7 @@ /* Print program usage */ VOID Usage(VOID) { - _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" - "COMP [/L] [/A] [data1] [data2]\n\n" - " data1 Specifies location and name of first file to compare.\n" - " data2 Specifies location and name of second file to compare.\n" - " /A Display differences in ASCII characters.\n" - " /L Display line numbers for differences.\n")); + ResPrint(IDS_HELP); } @@ -88,26 +104,26 @@ /* Parse command line for options */ for (i = 1; i < argc; i++) { - if (argv[i][0] == '/') + if (argv[i][0] == _T('/')) { switch (argv[i][1]) { - case 'A': + case _T('A'): bAscii = TRUE; NumberOfOptions++; break; - case 'L': + case _T('L'): bLineNos = TRUE; NumberOfOptions++; break; - case '?': + case _T('?'): Usage(); return EXIT_SUCCESS; default: - _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + ResPrint(IDS_INVALIDSWITCH, argv[i][1]); Usage(); return EXIT_FAILURE; } @@ -121,7 +137,7 @@ } else { - _tprintf(_T("Bad command line syntax\n")); + ResPrint(IDS_BADSYNTAX); return EXIT_FAILURE; } @@ -141,26 +157,26 @@ goto Cleanup; } - if ((fp1 = fopen(File1, "rb")) == NULL) - { - _tprintf(_T("Can't find/open file: %s\n"), File1); - Status = EXIT_FAILURE; - goto Cleanup; - } - if ((fp2 = fopen(File2, "rb")) == NULL) - { - _tprintf(_T("Can't find/open file: %s\n"), File2); - Status = EXIT_FAILURE; - goto Cleanup; - } - - - _tprintf(_T("Comparing %s and %s...\n"), File1, File2); + if ((fp1 = _tfopen(File1, _T("rb"))) == NULL) + { + ResPrint(IDS_FILEERROR, File1); + Status = EXIT_FAILURE; + goto Cleanup; + } + if ((fp2 = _tfopen(File2, _T("rb"))) == NULL) + { + ResPrint(IDS_FILEERROR, File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + + ResPrint(IDS_COMPARING, File1, File2); FileSizeFile1 = FileSize(fp1); if (FileSizeFile1 == -1) { - _tprintf(_T("Can't determine size of file: %s\n"), File1); + ResPrint(IDS_FILESIZEERROR, File1); Status = EXIT_FAILURE; goto Cleanup; } @@ -168,14 +184,14 @@ FileSizeFile2 = FileSize(fp2); if (FileSizeFile2 == -1) { - _tprintf(_T("Can't determine size of file: %s\n"), File2); + ResPrint(IDS_FILESIZEERROR, File2); Status = EXIT_FAILURE; goto Cleanup; } if (FileSizeFile1 != FileSizeFile2) { - _tprintf(_T("Files are different sizes.\n")); + ResPrint(IDS_SIZEDIFFERS); Status = EXIT_FAILURE; goto Cleanup; } @@ -189,7 +205,7 @@ if (ferror(fp1) || ferror(fp2)) { - _tprintf(_T("Files read error.\n")); + ResPrint(IDS_READERROR); Status = EXIT_FAILURE; goto Cleanup; } @@ -207,22 +223,22 @@ /* Reporting here a mismatch */ if (bLineNos) { - _tprintf(_T("Compare error at LINE %d\n"), LineNumber); + ResPrint(IDS_MISMATCHLINE, LineNumber); } else { - _tprintf(_T("Compare error at OFFSET %d\n"), Offset); + ResPrint(IDS_MISMATCHOFFSET, Offset); } if (bAscii) { - _tprintf(_T("file1 = %c\n"), Buff1[i]); - _tprintf(_T("file2 = %c\n"), Buff2[i]); + ResPrint(IDS_ASCIIDIFF, 1, Buff1[i]); + ResPrint(IDS_ASCIIDIFF, 2, Buff2[i]); } else { - _tprintf(_T("file1 = %X\n"), Buff1[i]); - _tprintf(_T("file2 = %X\n"), Buff2[i]); + ResPrint(IDS_HEXADECIMALDIFF, 1, Buff1[i]); + ResPrint(IDS_HEXADECIMALDIFF, 2, Buff2[i]); } Offset++; @@ -234,7 +250,7 @@ } if (FilesOK) - _tprintf(_T("Files compare OK\n")); + ResPrint(IDS_MATCH); Cleanup: if (fp2) Modified: trunk/reactos/base/applications/cmdutils/comp/comp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -1,5 +1,23 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility" #define REACTOS_STR_INTERNAL_NAME "comp" #define REACTOS_STR_ORIGINAL_FILENAME "comp.exe" #include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,23 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_HELP "Compares the contents of two files or sets of files.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Specifies location and name of first file to compare.\n\ + data2 Specifies location and name of second file to compare.\n\ + /A Display differences in ASCII characters (default: hexadecimal).\n\ + /L Display line numbers for differences.\n" + IDS_INVALIDSWITCH "Invalid switch - /%c\n" + IDS_BADSYNTAX "Bad command line syntax\n" + IDS_FILEERROR "Cannot find/open file: %s\n" + IDS_COMPARING "Comparing %s and %s...\n" + IDS_FILESIZEERROR "Cannot determine size of file: %s\n" + IDS_SIZEDIFFERS "Files are different sizes.\n" + IDS_READERROR "Files read error.\n" + IDS_MISMATCHLINE "Compare error at LINE %d\n" + IDS_MISMATCHOFFSET "Compare error at OFFSET 0x%X\n" + IDS_ASCIIDIFF "file%d = %c\n" + IDS_HEXADECIMALDIFF "file%d = %X\n" + IDS_MATCH "Files compare OK\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,23 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_HELP "Compare le contenu de deux fichiers ou ensembles de fichiers.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 SpÃ©cifie l'emplacement et le nom du premier fichier Ã comparer.\n\ + data2 SpÃ©cifie l'emplacement et le nom du second fichier Ã comparer.\n\ + /A Affiche les diffÃ©rences en caractÃ¨res ASCII (dÃ©faut: hexadÃ©cimal).\n\ + /L Affiche les numÃ©ros de ligne des diffÃ©rences.\n" + IDS_INVALIDSWITCH "ParamÃ¨tre invalide - /%c\n" + IDS_BADSYNTAX "Syntaxe incorrecte\n" + IDS_FILEERROR "Impossible de trouver/ouvrir le fichier : %s\n" + IDS_COMPARING "Comparaison de %s et %s...\n" + IDS_FILESIZEERROR "Ne peut pas dÃ©terminer la taille du fichier : %s\n" + IDS_SIZEDIFFERS "Les fichiers sont de taille diffÃ©rente.\n" + IDS_READERROR "Erreur lors de la lecture des fichiers.\n" + IDS_MISMATCHLINE "Erreur de comparaison Ã LIGNE %d\n" + IDS_MISMATCHOFFSET "Erreur de comparaison Ã OFFSET 0x%X\n" + IDS_ASCIIDIFF "fichier%d = %c\n" + IDS_HEXADECIMALDIFF "fichier%d = %X\n" + IDS_MATCH "Comparaison des fichiers OK\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,24 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HELP "ComparÄ conÈinuturile a douÄ fiÈiere sau grupuri de fiÈiere.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Calea Èi numele primului fiÈier de comparat.\n\ + data2 Calea Èi numele celui de-al doilea fiÈier de comparat.\n\ + /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (default: hexadecimal).\n\ + /L AfiÈeazÄ numÄrul liniei pentru diferenÈe.\n" + IDS_INVALIDSWITCH "Parametru nevalid - /%c\n" + IDS_BADSYNTAX "SintaxÄ eronatÄ\n" + IDS_FILEERROR "Nu se poate gÄsi/deschide fiÈierul: %s\n" + IDS_COMPARING "Se comparÄ %s Èi %s...\n" + IDS_FILESIZEERROR "Nu se poate determina dimensiunea fiÈierului: %s\n" + IDS_SIZEDIFFERS "FiÈierele au dimensiuni diferite.\n" + IDS_READERROR "Eroare la citirea fiÈierelor.\n" + IDS_MISMATCHLINE "DiferenÈÄ identificatÄ la linia %d\n" + IDS_MISMATCHOFFSET "DiferenÈÄ identificatÄ la poziÈia 0x%X\n" + IDS_ASCIIDIFF "fiÈier%d = %c\n" + IDS_HEXADECIMALDIFF "fiÈier%d = %X\n" + IDS_MATCH "FiÈierele sunt identice\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,15 @@ +#pragma once + +#define IDS_HELP 100 +#define IDS_INVALIDSWITCH 101 +#define IDS_BADSYNTAX 102 +#define IDS_FILEERROR 103 +#define IDS_COMPARING 104 +#define IDS_FILESIZEERROR 105 +#define IDS_SIZEDIFFERS 106 +#define IDS_READERROR 107 +#define IDS_MISMATCHLINE 108 +#define IDS_MISMATCHOFFSET 109 +#define IDS_ASCIIDIFF 110 +#define IDS_HEXADECIMALDIFF 111 +#define IDS_MATCH 112 Propchange: trunk/reactos/base/applications/cmdutils/comp/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71599: [COMP] - The comparison buffers contain bytes, not (T)CHARs. Pointed out by Stefan Fulea in CORE-11060. - Remove a now unnecessary comment header "history" line since we have SVN ...
by hbelusca＠svn.reactos.org 09 Jun '16

09 Jun '16

Author: hbelusca Date: Thu Jun 9 18:43:36 2016 New Revision: 71599 URL: http://svn.reactos.org/svn/reactos?rev=71599&view=rev Log: [COMP] - The comparison buffers contain bytes, not (T)CHARs. Pointed out by Stefan Fulea in CORE-11060. - Remove a now unnecessary comment header "history" line since we have SVN for that instead. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 18:43:36 2016 @@ -22,9 +22,6 @@ * FILE: base/applications/cmdutils/comp/comp.c * PURPOSE: Compares the contents of two files * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * GM 25/09/05 Created - * */ #include <windows.h> @@ -37,9 +34,9 @@ #define STRBUF 1024 /* getline: read a line, return length */ -INT GetBuff(char *buff, FILE *in) -{ - return fread(buff, 1, STRBUF, in); +INT GetBuff(PBYTE buff, FILE *in) +{ + return fread(buff, sizeof(BYTE), STRBUF, in); } INT FileSize(FILE * fd) @@ -74,8 +71,8 @@ FILE *fp2 = NULL; INT BufLen1, BufLen2; - PTCHAR Buff1 = NULL; - PTCHAR Buff2 = NULL; + PBYTE Buff1 = NULL; + PBYTE Buff2 = NULL; TCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; BOOL bAscii = FALSE, // /A switch @@ -128,14 +125,15 @@ return EXIT_FAILURE; } - Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + Buff1 = (PBYTE)malloc(STRBUF); if (Buff1 == NULL) { _tprintf(_T("Can't get free memory for Buff1\n")); - return EXIT_FAILURE; - } - - Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + Status = EXIT_FAILURE; + goto Cleanup; + } + + Buff2 = (PBYTE)malloc(STRBUF); if (Buff2 == NULL) { _tprintf(_T("Can't get free memory for Buff2\n")); @@ -239,15 +237,15 @@ _tprintf(_T("Files compare OK\n")); Cleanup: + if (fp2) + fclose(fp2); if (fp1) fclose(fp1); - if (fp2) - fclose(fp2); - + + if (Buff2) + free(Buff2); if (Buff1) free(Buff1); - if (Buff2) - free(Buff2); return Status; }

1 0

[jimtabor] 71598: [User32] - Patch by Jared Smudde : Set text background the same color as the rectangle. - Adapted by Hermès Bélusca-Maïto. Themes, see CORE-11364.
by jimtabor＠svn.reactos.org 09 Jun '16

09 Jun '16

Author: jimtabor Date: Thu Jun 9 02:50:13 2016 New Revision: 71598 URL: http://svn.reactos.org/svn/reactos?rev=71598&view=rev Log: [User32] - Patch by Jared Smudde : Set text background the same color as the rectangle. - Adapted by Hermès Bélusca-Maïto. Themes, see CORE-11364. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Thu Jun 9 02:50:13 2016 @@ -238,7 +238,7 @@ dcFont = SelectObject(dialogDC, dialogFont); SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); - SetBkColor(dialogDC, GetSysColor(COLOR_BTNFACE)); + SetBkMode(dialogDC, TRANSPARENT); textRC.top = itemsH; textRC.left = 8;

1 0

[hbelusca] 71597: Well no need to initialize "Ret" if we overwrite immediately its old value.
by hbelusca＠svn.reactos.org 08 Jun '16

08 Jun '16

Author: hbelusca Date: Wed Jun 8 23:08:59 2016 New Revision: 71597 URL: http://svn.reactos.org/svn/reactos?rev=71597&view=rev Log: Well no need to initialize "Ret" if we overwrite immediately its old value. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Wed Jun 8 23:08:59 2016 @@ -1359,7 +1359,7 @@ UINT iPoint, PPOINTL Point) { - BOOL Ret = TRUE; + BOOL Ret; POINTL SafePoint; if (!Point)

1 0

[hbelusca] 71596: [WIN32K:NTGDI]: Remove redundant code.
by hbelusca＠svn.reactos.org 08 Jun '16

08 Jun '16

Author: hbelusca Date: Wed Jun 8 23:07:32 2016 New Revision: 71596 URL: http://svn.reactos.org/svn/reactos?rev=71596&view=rev Log: [WIN32K:NTGDI]: Remove redundant code. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Wed Jun 8 23:07:32 2016 @@ -1341,7 +1341,7 @@ _In_ HDC hdc, _Out_ LPSIZE lpSize) { - return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); + return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); } BOOL @@ -1350,7 +1350,7 @@ _In_ HDC hdc, _Out_ LPSIZE lpSize) { - return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); + return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); } BOOL APIENTRY @@ -1360,10 +1360,7 @@ PPOINTL Point) { BOOL Ret = TRUE; - DC *pdc; POINTL SafePoint; - SIZE Size; - PSIZEL pszlViewportExt; if (!Point) { @@ -1371,50 +1368,7 @@ return FALSE; } - pdc = DC_LockDc(hDC); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - switch (iPoint) - { - case GdiGetViewPortExt: - pszlViewportExt = DC_pszlViewportExt(pdc); - SafePoint.x = pszlViewportExt->cx; - SafePoint.y = pszlViewportExt->cy; - break; - - case GdiGetWindowExt: - SafePoint.x = pdc->pdcattr->szlWindowExt.cx; - SafePoint.y = pdc->pdcattr->szlWindowExt.cy; - break; - - case GdiGetViewPortOrg: - SafePoint = pdc->pdcattr->ptlViewportOrg; - break; - - case GdiGetWindowOrg: - SafePoint = pdc->pdcattr->ptlWindowOrg; - break; - - case GdiGetDCOrg: - SafePoint = pdc->ptlDCOrig; - break; - - case GdiGetAspectRatioFilter: - DC_vGetAspectRatioFilter(pdc, &Size); - SafePoint.x = Size.cx; - SafePoint.y = Size.cy; - break; - - default: - EngSetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; - break; - } - + Ret = GreGetDCPoint(hDC, iPoint, &SafePoint); if (Ret) { _SEH2_TRY @@ -1429,7 +1383,6 @@ _SEH2_END; } - DC_UnlockDc(pdc); return Ret; }

1 0

[hbelusca] 71595: [SHELL32]: Run dialog box: FillList was ANSI, now it's UNICODE! Partly rewrite Wine code.
by hbelusca＠svn.reactos.org 08 Jun '16

08 Jun '16

Author: hbelusca Date: Wed Jun 8 21:53:34 2016 New Revision: 71595 URL: http://svn.reactos.org/svn/reactos?rev=71595&view=rev Log: [SHELL32]: Run dialog box: FillList was ANSI, now it's UNICODE! Partly rewrite Wine code. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Wed Jun 8 21:53:34 2016 @@ -33,8 +33,8 @@ typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); -static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; -static void FillList (HWND, char *, BOOL) ; +static INT_PTR CALLBACK RunDlgProc(HWND, UINT, WPARAM, LPARAM); +static void FillList(HWND, LPWSTR, BOOL); /************************************************************************* @@ -393,26 +393,26 @@ // SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); - FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); + FillList(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); EnableOkButtonFromEditContents(hwnd); - SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)); + SetFocus(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH)); return TRUE; case WM_COMMAND: - switch (LOWORD (wParam)) + switch (LOWORD(wParam)) { case IDOK: { int ic; - HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); - if ((ic = GetWindowTextLengthW (htxt))) + HWND htxt = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); + if ((ic = GetWindowTextLengthW(htxt))) { WCHAR *psz, *parent = NULL; SHELLEXECUTEINFOW sei; - ZeroMemory (&sei, sizeof(sei)); + ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); - psz = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR)); + psz = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR)); if (psz) { @@ -438,19 +438,18 @@ return TRUE; } - /* FillList is still ANSI */ - GetWindowTextA (htxt, (LPSTR)psz, ic + 1); - FillList (htxt, (LPSTR)psz, FALSE); + GetWindowTextW(htxt, psz, ic + 1); + FillList(htxt, psz, FALSE); HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, parent); - EndDialog (hwnd, 0); + EndDialog(hwnd, 0); } } } case IDCANCEL: - EndDialog (hwnd, 0); + EndDialog(hwnd, 0); return TRUE; case IDC_RUNDLG_BROWSE: @@ -466,17 +465,17 @@ LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwnd; ofn.lpstrFilter = filter; ofn.lpstrFile = szFName; - ofn.nMaxFile = 1023; + ofn.nMaxFile = _countof(szFName) - 1; ofn.lpstrTitle = szCaption; ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.lpstrInitialDir = prfdp->lpstrDirectory; - if (NULL == (hComdlg = LoadLibraryExW (comdlg32W, NULL, 0)) || - NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameW"))) + if (NULL == (hComdlg = LoadLibraryExW(comdlg32W, NULL, 0)) || + NULL == (ofnProc = (LPFNOFN)GetProcAddress(hComdlg, "GetOpenFileNameW"))) { ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_RUNDLG_BROWSE_ERROR), NULL, MB_OK | MB_ICONERROR); @@ -485,14 +484,14 @@ if (ofnProc(&ofn)) { - SetFocus(GetDlgItem (hwnd, IDOK)); - SetWindowTextW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName); - SendMessageW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + SetFocus(GetDlgItem(hwnd, IDOK)); + SetWindowTextW(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), szFName); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); EnableOkButtonFromEditContents(hwnd); - SetFocus (GetDlgItem (hwnd, IDOK)); + SetFocus(GetDlgItem(hwnd, IDOK)); } - FreeLibrary (hComdlg); + FreeLibrary(hComdlg); return TRUE; } @@ -510,145 +509,207 @@ return FALSE; } -/* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */ -/* fShowDefault ignored if pszLatest != NULL */ -static void FillList(HWND hCb, char *pszLatest, BOOL fShowDefault) -{ - HKEY hkey ; -/* char szDbgMsg[256] = "" ; */ - char *pszList = NULL, *pszCmd = NULL, cMatch = 0, cMax = 0x60, szIndex[2] = "-" ; - DWORD icList = 0, icCmd = 0 ; - UINT Nix ; - - SendMessageA (hCb, CB_RESETCONTENT, 0, 0) ; - - if (ERROR_SUCCESS != RegCreateKeyExA ( - HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU", - 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL)) - MessageBoxA (hCb, "Unable to open registry key !", "Nix", MB_OK) ; - - RegQueryValueExA (hkey, "MRUList", NULL, NULL, NULL, &icList) ; - - if (icList > 0) - { - pszList = (char *)HeapAlloc( GetProcessHeap(), 0, icList) ; +/* + * This function grabs the MRU list from the registry and fills the combo-list + * for the "Run" dialog above. fShowDefault is ignored if pszLatest != NULL. + */ +static void FillList(HWND hCb, LPWSTR pszLatest, BOOL fShowDefault) +{ + HKEY hkey; + WCHAR *pszList = NULL, *pszCmd = NULL, *pszTmp = NULL, cMatch = 0, cMax = 0x60; + WCHAR szIndex[2] = L"-"; + DWORD dwType, icList = 0, icCmd = 0; + LRESULT lRet; + UINT Nix; + + SendMessageW(hCb, CB_RESETCONTENT, 0, 0); + + lRet = RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU", + 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to open or create the RunMRU key, error %d\n", GetLastError()); + return; + } + + lRet = RegQueryValueExW(hkey, L"MRUList", NULL, &dwType, NULL, &icList); + if (lRet == ERROR_SUCCESS && dwType == REG_SZ && icList > sizeof(WCHAR)) + { + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icList); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icList); + goto Continue; + } + pszList[0] = L'\0'; + + lRet = RegQueryValueExW(hkey, L"MRUList", NULL, NULL, (LPBYTE)pszList, &icList); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to grab MRUList, error %d\n", GetLastError()); + pszList[0] = L'\0'; + } + } + else + { +Continue: + icList = sizeof(WCHAR); + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icList); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icList); + RegCloseKey(hkey); + return; + } + pszList[0] = L'\0'; + } + + /* Convert the number of bytes from MRUList into number of characters (== number of indices) */ + icList /= sizeof(WCHAR); + + for (Nix = 0; Nix < icList - 1; Nix++) + { + if (pszList[Nix] > cMax) + cMax = pszList[Nix]; + + szIndex[0] = pszList[Nix]; + + lRet = RegQueryValueExW(hkey, szIndex, NULL, &dwType, NULL, &icCmd); + if (lRet != ERROR_SUCCESS || dwType != REG_SZ) + { + TRACE("Unable to grab size of index, error %d\n", GetLastError()); + continue; + } + + if (pszCmd) + { + pszTmp = (WCHAR*)HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd); + if (!pszTmp) + { + TRACE("HeapReAlloc failed to reallocate %d bytes\n", icCmd); + continue; + } + pszCmd = pszTmp; + } + else + { + pszCmd = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icCmd); + if (!pszCmd) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icCmd); + continue; + } + } + + lRet = RegQueryValueExW(hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to grab index, error %d\n", GetLastError()); + continue; + } + + /* + * Generally the command string will end up with "\\1". + * Find the last backslash in the string and NULL-terminate. + * Windows does not seem to check for what comes next, so that + * a command of the form: + * c:\\my_dir\\myfile.exe + * will be cut just after "my_dir", whereas a command of the form: + * c:\\my_dir\\myfile.exe\\1 + * will be cut just after "myfile.exe". + */ + pszTmp = wcsrchr(pszCmd, L'\\'); + if (pszTmp) + *pszTmp = L'\0'; + + /* + * In the following we try to add pszLatest to the MRU list. + * We suppose that our caller has already correctly allocated + * the string with enough space for us to append a "\\1". + * + * FIXME: TODO! (At the moment we don't append it!) + */ + + if (pszLatest) + { + if (wcsicmp(pszCmd, pszLatest) == 0) + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszCmd); + SetWindowTextW(hCb, pszCmd); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + + cMatch = pszList[Nix]; + memmove(&pszList[1], pszList, Nix * sizeof(WCHAR)); + pszList[0] = cMatch; + continue; + } + } + + if (icList - 1 != 26 || icList - 2 != Nix || cMatch || pszLatest == NULL) + { + SendMessageW(hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd); + if (!Nix && fShowDefault) + { + SetWindowTextW(hCb, pszCmd); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + } + } + else + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest); + SetWindowTextW(hCb, pszLatest); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + + cMatch = pszList[Nix]; + memmove(&pszList[1], pszList, Nix * sizeof(WCHAR)); + pszList[0] = cMatch; + szIndex[0] = cMatch; + RegSetValueExW(hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, (wcslen(pszLatest) + 1) * sizeof(WCHAR)); + } + } + + if (!cMatch && pszLatest != NULL) + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest); + SetWindowTextW(hCb, pszLatest); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + + cMatch = ++cMax; if (pszList) { - if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, (LPBYTE)pszList, &icList)) - MessageBoxA (hCb, "Unable to grab MRUList !", "Nix", MB_OK); + pszTmp = (WCHAR*)HeapReAlloc(GetProcessHeap(), 0, pszList, (++icList) * sizeof(WCHAR)); + if (!pszTmp) + { + TRACE("HeapReAlloc failed to reallocate enough bytes\n"); + goto Cleanup; + } + pszList = pszTmp; } else { - TRACE("HeapAlloc failed to allocate %d bytes\n", icList); - } - } - else - { - icList = 1 ; - pszList = (char *)HeapAlloc( GetProcessHeap(), 0, icList) ; - pszList[0] = 0 ; - } - - for (Nix = 0 ; Nix < icList - 1 ; Nix++) - { - if (pszList[Nix] > cMax) - cMax = pszList[Nix] ; - - szIndex[0] = pszList[Nix] ; - - if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, NULL, &icCmd)) - MessageBoxA (hCb, "Unable to grab size of index", "Nix", MB_OK) ; - if( pszCmd ) - pszCmd = (char *)HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ; - else - pszCmd = (char *)HeapAlloc(GetProcessHeap(), 0, icCmd) ; - if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd)) - MessageBoxA (hCb, "Unable to grab index", "Nix", MB_OK) ; - - if (NULL != pszLatest) - { - if (!lstrcmpiA(pszCmd, pszLatest)) - { - /* - sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszCmd) ; - SetWindowTextA (hCb, pszCmd) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = pszList[Nix] ; - memmove (&pszList[1], pszList, Nix) ; - pszList[0] = cMatch ; - continue ; - } - } - - if (26 != icList - 1 || icList - 2 != Nix || cMatch || NULL == pszLatest) - { - /* - sprintf (szDbgMsg, "Happily appending (%d).\n", Nix) ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd) ; - if (!Nix && fShowDefault) - { - SetWindowTextA (hCb, pszCmd) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - } - } - else - { - /* - sprintf (szDbgMsg, "Doing loop thing.\n") ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest) ; - SetWindowTextA (hCb, pszLatest) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = pszList[Nix] ; - memmove (&pszList[1], pszList, Nix) ; - pszList[0] = cMatch ; - szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; - } - } - - if (!cMatch && NULL != pszLatest) - { - /* - sprintf (szDbgMsg, "Simply inserting (increasing list).\n") ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest) ; - SetWindowTextA (hCb, pszLatest) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = ++cMax ; - if (pszList) - pszList = (char *)HeapReAlloc(GetProcessHeap(), 0, pszList, ++icList) ; - else - pszList = (char *)HeapAlloc(GetProcessHeap(), 0, ++icList) ; - - if (pszList) - { - memmove (&pszList[1], pszList, icList - 1) ; - pszList[0] = cMatch ; - szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; - } - else - { - TRACE("HeapAlloc or HeapReAlloc failed to allocate enough bytes\n"); - } - } - - RegSetValueExA (hkey, "MRUList", 0, REG_SZ, (LPBYTE)pszList, strlen (pszList) + 1) ; - - HeapFree( GetProcessHeap(), 0, pszCmd) ; - HeapFree( GetProcessHeap(), 0, pszList) ; + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (++icList) * sizeof(WCHAR)); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate enough bytes\n"); + goto Cleanup; + } + } + + memmove(&pszList[1], pszList, (icList - 1) * sizeof(WCHAR)); + pszList[0] = cMatch; + szIndex[0] = cMatch; + RegSetValueExW(hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, (wcslen(pszLatest) + 1) * sizeof(WCHAR)); + } + +Cleanup: + RegSetValueExW(hkey, L"MRUList", 0, REG_SZ, (LPBYTE)pszList, (wcslen(pszList) + 1) * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, pszCmd); + HeapFree(GetProcessHeap(), 0, pszList); + + RegCloseKey(hkey); }

1 0

[zhu] 71594: TCP handshake working in driver and properly reported up to user programs. The port is not closed properly, however.
by zhu＠svn.reactos.org 08 Jun '16

08 Jun '16

Author: zhu Date: Wed Jun 8 19:26:53 2016 New Revision: 71594 URL: http://svn.reactos.org/svn/reactos?rev=71594&view=rev Log: TCP handshake working in driver and properly reported up to user programs. The port is not closed properly, however. Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -142,6 +142,24 @@ } static +err_t +lwip_tcp_accept_callback( + void *arg, + struct tcp_pcb *newpcb, + err_t err) +{ + PIRP Irp; + + DPRINT1("lwIP TCP Accept Callback\n"); + + Irp = (PIRP)arg; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return ERR_OK; +} + +static u8_t lwip_raw_ReceiveDatagram_callback( void *arg, @@ -184,6 +202,24 @@ pbuf_free(p); return Result; +} + +static +err_t +lwip_tcp_Connected_callback( + void *arg, + struct tcp_pcb *tpcb, + err_t err) +{ + PIRP Irp; + + DPRINT1("lwIP TCP Connected Callback\n"); + + Irp = (PIRP)arg; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return ERR_OK; } NTSTATUS @@ -248,9 +284,10 @@ struct netif* lwip_netif = netif_list; ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + ip4_addr_set_u32(&IpAddr, Address->in_addr); while (lwip_netif) { + DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) { break; @@ -260,7 +297,7 @@ if (!lwip_netif) { - DPRINT1("Cound not find an interface for address 0x08x\n", AddressFile->Address.in_addr); + DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_ADDRESS; } @@ -288,8 +325,13 @@ switch (Protocol) { case IPPROTO_TCP: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - break; + AddressFile->lwip_tcp_pcb = tcp_new(); + break; + } case IPPROTO_UDP: { ip_addr_t IpAddr; @@ -441,6 +483,301 @@ ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); } +/* implementation in testing */ +NTSTATUS +TcpIpConnect( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + PTDI_REQUEST_KERNEL_CONNECT Parameters; + PTRANSPORT_ADDRESS RemoteTransportAddress; + + struct sockaddr *SocketAddressRemote; + struct sockaddr_in *SocketAddressInRemote; + + err_t lwip_err; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really a connection file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + DPRINT1("File object not an address file\n"); + return STATUS_FILE_INVALID; + } + + AddressFile = IrpSp->FileObject->FsContext; + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + Parameters = (PTDI_REQUEST_KERNEL_CONNECT)&IrpSp->Parameters; + + RemoteTransportAddress = Parameters->RequestConnectionInformation->RemoteAddress; + + SocketAddressRemote = (struct sockaddr *)&RemoteTransportAddress->Address[0]; + SocketAddressInRemote = (struct sockaddr_in *)&SocketAddressRemote->sa_data; + + DPRINT1("\n Remote Address\n Address: %08x\n Port: %04x\n", + SocketAddressInRemote->sin_addr.s_addr, + SocketAddressInRemote->sin_port); + DPRINT1("\n Local Address\n Address: %08x\n Port: %04x\n", + AddressFile->lwip_tcp_pcb->local_ip, + AddressFile->lwip_tcp_pcb->local_port); + + lwip_err = tcp_connect(AddressFile->lwip_tcp_pcb, + (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, + SocketAddressInRemote->sin_port, + lwip_tcp_Connected_callback); + DPRINT1("lwip error %d\n", lwip_err); + switch (lwip_err) + { + case (ERR_VAL) : + { + return STATUS_INVALID_PARAMETER; + } + case (ERR_ISCONN) : + { + return STATUS_CONNECTION_ACTIVE; + } + case (ERR_RTE) : + { + /* several errors look right here */ + return STATUS_NETWORK_UNREACHABLE; + } + case (ERR_BUF) : + { + /* use correct error once NDIS errors are included + this return value means local port unavailable */ + return STATUS_ADDRESS_ALREADY_EXISTS; + } + case (ERR_USE) : + { + /* STATUS_CONNECTION_ACTIVE maybe? */ + return STATUS_ADDRESS_ALREADY_EXISTS; + } + case (ERR_MEM) : + { + return STATUS_NO_MEMORY; + } + case (ERR_OK) : + { + DPRINT1("lwip ERR_OK\n"); + tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + break; + } + default : + { + /* unknown return value */ + DPRINT1("lwip unknown return code\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + return STATUS_PENDING; +} + +/* Implementation in testing */ +NTSTATUS +TcpIpAssociateAddress( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + ADDRESS_FILE *BindTo; + PTDI_REQUEST_KERNEL_ASSOCIATE RequestInfo; + PFILE_OBJECT FileObject; + + err_t lwip_err; + NTSTATUS Status; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + /* Get address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_ASSOCIATE_ADDRESS for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + RequestInfo = (PTDI_REQUEST_KERNEL_ASSOCIATE)&IrpSp->Parameters; + + Status = ObReferenceObjectByHandle( + RequestInfo->AddressHandle, + 0, + *IoFileObjectType, + KernelMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Reference by handle failed with status 0x%08x\n", Status); + return Status; + } + + if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) + { + DPRINT1("File object is not an address file\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + BindTo = FileObject->FsContext; + if (BindTo->Protocol != IPPROTO_TCP) + { + DPRINT1("TCP socket association with non-TCP handle\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + + DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", + BindTo->Address.sin_port, + BindTo->Address.in_addr); + + /* Finally calling into lwip to perform socket bind */ + lwip_err = tcp_bind( + AddressFile->lwip_tcp_pcb, + (ip_addr_t *)&BindTo->Address.in_addr, + BindTo->Address.sin_port); + + DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", + lwip_err, + AddressFile->lwip_tcp_pcb->local_ip, + AddressFile->lwip_tcp_pcb->local_port, + AddressFile->lwip_tcp_pcb->remote_ip, + AddressFile->lwip_tcp_pcb->remote_port); + if (lwip_err != ERR_OK) + { + switch (lwip_err) + { + case (ERR_BUF) : + { + /* Not actually sure which error I should return here + ERR_BUF means the port is already taken + fix when I figure out how to use NDIS errors */ + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + case (ERR_VAL) : + { + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + case (ERR_USE) : + { + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + default : + { + break; + } + } + } + ip_set_option(AddressFile->lwip_tcp_pcb, SOF_BROADCAST); + + Status = STATUS_SUCCESS; +LEAVE: + return Status; +} + + +/* Implementation in testing */ +NTSTATUS +TcpIpDisassociateAddress( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + + err_t lwip_err; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + lwip_err = tcp_close(AddressFile->lwip_tcp_pcb); + switch (lwip_err) + { + case ERR_MEM : + return STATUS_NO_MEMORY; + case ERR_OK : + break; + default : + DPRINT1("Unexpected lwIP error\n"); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + +/* Implementation in testing */ +NTSTATUS +TcpIpListen( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + + struct tcp_pcb *lpcb; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + /* Get address file */ + AddressFile = IrpSp->FileObject->FsContext; + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_LISTEN for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + /* Call down into lwip to initiate a listen */ + lpcb = tcp_listen(AddressFile->lwip_tcp_pcb); + DPRINT1("lwip tcp_listen returned\n"); + if (lpcb == NULL) + { + /* tcp_listen returning NULL can mean + either INVALID_ADDRESS or NO_MEMORY + if SO_REUSE is enabled in lwip options */ + DPRINT1("lwip tcp_listen error\n"); + return STATUS_NO_MEMORY; + } + else + { + AddressFile->lwip_tcp_pcb = lpcb; + } + + tcp_accept(AddressFile->lwip_tcp_pcb, lwip_tcp_accept_callback); + tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + + return STATUS_PENDING; +} NTSTATUS TcpIpReceiveDatagram( Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -14,6 +14,7 @@ { struct raw_pcb* lwip_raw_pcb; struct udp_pcb* lwip_udp_pcb; + struct tcp_pcb* lwip_tcp_pcb; }; } ADDRESS_FILE; @@ -31,6 +32,25 @@ TcpIpCloseAddress( _Inout_ ADDRESS_FILE* AddressFile ); + +NTSTATUS +TcpIpConnect( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpAssociateAddress( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpDisassociateAddress( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpListen( + _Inout_ PIRP Irp); NTSTATUS TcpIpReceiveDatagram( Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -7,7 +7,7 @@ #include "precomp.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* DriverEntry, DriverUnload and dispatch routines declaration */ @@ -264,14 +264,30 @@ } case TDI_CONNECTION_CONTEXT_LENGTH: + { + PTA_IP_ADDRESS Address; + if (strncmp(&FileInfo->EaName[0], TdiConnectionContext, TDI_CONNECTION_CONTEXT_LENGTH) != 0) { DPRINT1("TCPIP: Should maybe open file %*s.\n", FileInfo->EaNameLength, &FileInfo->EaName[0]); return STATUS_INVALID_PARAMETER; } DPRINT1("Should create a connection!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + + Address = (PTA_IP_ADDRESS)(&FileInfo->EaName[FileInfo->EaNameLength + 1]); + + /* Get the protocol this address will be created for. */ + Protocol = ProtocolFromIrp(DeviceObject, IrpSp); + if (Protocol == (IPPROTO)-1) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* All good. */ + Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); + break; + } default: DPRINT1("TCPIP: Should open file %*s.\n", FileInfo->EaNameLength, &FileInfo->EaName[0]); @@ -372,14 +388,14 @@ break; case TDI_LISTEN: - DPRINT1("TCPIP: TDI_LISTEN!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("TCPIP: TDI_LISTEN!\n"); + Status = TcpIpListen(Irp); + break; case TDI_CONNECT: DPRINT1("TCPIP: TDI_CONNECT!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + Status = TcpIpConnect(Irp); + break; case TDI_DISCONNECT: DPRINT1("TCPIP: TDI_DISCONNECT!\n"); @@ -387,13 +403,13 @@ break; case TDI_ASSOCIATE_ADDRESS: - DPRINT1("TCPIP: TDI_ASSOCIATE_ADDRESS!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("TCPIP: TDI_ASSOCIATE_ADDRESS\n"); + Status = TcpIpAssociateAddress(Irp); + break; case TDI_DISASSOCIATE_ADDRESS: DPRINT1("TCPIP: TDI_DISASSOCIATE_ADDRESS!\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = TcpIpDisassociateAddress(Irp); break; case TDI_QUERY_INFORMATION: @@ -474,7 +490,7 @@ break; } - DPRINT("TCPIP dispatched with status 0x%08x.\n", Status); + //DPRINT("TCPIP dispatched with status 0x%08x.\n", Status); Irp->IoStatus.Status = Status; if (Status == STATUS_PENDING) Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -23,6 +23,7 @@ #include <lwip/raw.h> #include <lwip/snmp.h> #include <lwip/tcpip.h> +#include <lwip/tcp.h> #include <lwip/udp.h> #include <netif/etharp.h>

1 0

[hbelusca] 71593: [CONSRV] Only add a history entry if console echo is enabled. This ensures that anything sent to the console when echo is disabled (e.g. binary data, or secrets like passwords...)...
by hbelusca＠svn.reactos.org 08 Jun '16

08 Jun '16

Author: hbelusca Date: Wed Jun 8 00:27:25 2016 New Revision: 71593 URL: http://svn.reactos.org/svn/reactos?rev=71593&view=rev Log: [CONSRV] Only add a history entry if console echo is enabled. This ensures that anything sent to the console when echo is disabled (e.g. binary data, or secrets like passwords...) does not remain stored in memory. Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Wed Jun 8 00:27:25 2016 @@ -60,7 +60,7 @@ LineInputSetPos(PCONSRV_CONSOLE Console, UINT Pos) { - if (Pos != Console->LinePos && GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + if (Pos != Console->LinePos && (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT)) { PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; SHORT OldCursorX = Buffer->CursorPosition.X; @@ -95,7 +95,7 @@ if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) return; ActiveBuffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer; - /* Make sure there's always enough room for ending \r\n */ + /* Make sure there is always enough room for ending \r\n */ if (NewSize + 2 > Console->LineMaxSize) return; @@ -182,7 +182,7 @@ { case VK_ESCAPE: { - /* Clear entire line */ + /* Clear the entire line */ LineInputSetPos(Console, 0); LineInputEdit(Console, Console->LineSize, 0, NULL); @@ -197,7 +197,7 @@ case VK_HOME: { - /* Move to start of line. With CTRL, erase everything left of cursor */ + /* Move to start of line. With CTRL, erase everything left of cursor. */ LineInputSetPos(Console, 0); if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) LineInputEdit(Console, Pos, 0, NULL); @@ -206,7 +206,7 @@ case VK_END: { - /* Move to end of line. With CTRL, erase everything right of cursor */ + /* Move to end of line. With CTRL, erase everything right of cursor. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); else @@ -216,7 +216,7 @@ case VK_LEFT: { - /* Move left. With CTRL, move to beginning of previous word */ + /* Move to the left. With CTRL, move to beginning of previous word. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; @@ -233,7 +233,7 @@ case VK_RIGHT: case VK_F1: { - /* Move right. With CTRL, move to beginning of next word */ + /* Move to the right. With CTRL, move to beginning of next word. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; @@ -262,7 +262,7 @@ case VK_DELETE: { - /* Remove character to right of cursor */ + /* Remove one character to right of cursor */ if (Pos != Console->LineSize) LineInputEdit(Console, 1, 0, NULL); return; @@ -270,14 +270,14 @@ case VK_PRIOR: { - /* Recall first history entry */ + /* Recall the first history entry */ LineInputRecallHistory(Console, ExeName, -((WORD)-1)); return; } case VK_NEXT: { - /* Recall last history entry */ + /* Recall the last history entry */ LineInputRecallHistory(Console, ExeName, +((WORD)-1)); return; } @@ -286,8 +286,8 @@ case VK_F5: { /* - * Recall previous history entry. On first time, actually recall the - * current (usually last) entry; on subsequent times go back. + * Recall the previous history entry. On first time, actually recall + * the current (usually last) entry; on subsequent times go back. */ LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); Console->LineUpPressed = TRUE; @@ -296,14 +296,14 @@ case VK_DOWN: { - /* Recall next history entry */ + /* Recall the next history entry */ LineInputRecallHistory(Console, ExeName, +1); return; } case VK_F3: { - /* Recall remainder of current history entry */ + /* Recall the remainder of the current history entry */ HistoryGetCurrentEntry(Console, ExeName, &Entry); if (Pos * sizeof(WCHAR) < Entry.Length) { @@ -356,7 +356,7 @@ PHISTORY_BUFFER Hist; INT HistPos; - /* Search for history entries starting with input. */ + /* Search for history entries starting with input */ Hist = HistoryCurrentBuffer(Console, ExeName); if (!Hist || Hist->NumEntries == 0) return; @@ -403,10 +403,12 @@ * OK, we deal with normal keys, we can continue... */ - if (KeyEvent->uChar.UnicodeChar == L'\b' && GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) - { - /* backspace handling - if processed input enabled then we handle it here - * otherwise we treat it like a normal char. */ + if (KeyEvent->uChar.UnicodeChar == L'\b' && (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT)) + { + /* + * Backspace handling - if processed input enabled then we handle it + * here, otherwise we treat it like a normal character. + */ if (Pos > 0) { LineInputSetPos(Console, Pos - 1); @@ -415,9 +417,18 @@ } else if (KeyEvent->uChar.UnicodeChar == L'\r') { - Entry.Length = Entry.MaximumLength = Console->LineSize * sizeof(WCHAR); - Entry.Buffer = Console->LineBuffer; - HistoryAddEntry(Console, ExeName, &Entry); + /* + * Only add a history entry if console echo is enabled. This ensures + * that anything sent to the console when echo is disabled (e.g. + * binary data, or secrets like passwords...) does not remain stored + * in memory. + */ + if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + { + Entry.Length = Entry.MaximumLength = Console->LineSize * sizeof(WCHAR); + Entry.Buffer = Console->LineBuffer; + HistoryAddEntry(Console, ExeName, &Entry); + } /* TODO: Expand aliases */ DPRINT1("TODO: Expand aliases\n"); @@ -434,10 +445,10 @@ /* * Add \n if processed input. There should usually be room for it, - * but an exception to the rule exists: the buffer could have been + * but an exception to the rule exists: the buffer could have been * pre-filled with LineMaxSize - 1 characters. */ - if (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT && + if ((GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) && Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n';

1 0

[hbelusca] 71592: [DHCPSVC]: It's a service, move it in the correct directory.
by hbelusca＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: hbelusca Date: Tue Jun 7 23:14:58 2016 New Revision: 71592 URL: http://svn.reactos.org/svn/reactos?rev=71592&view=rev Log: [DHCPSVC]: It's a service, move it in the correct directory. Added: trunk/reactos/base/services/dhcpcsvc/ - copied from r71591, trunk/reactos/dll/win32/dhcpcsvc/ Removed: trunk/reactos/dll/win32/dhcpcsvc/ Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Tue Jun 7 23:14:58 2016 @@ -1,5 +1,6 @@ add_subdirectory(audiosrv) +add_subdirectory(dhcpcsvc) add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(schedsvc) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Jun 7 23:14:58 2016 @@ -36,7 +36,6 @@ add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(devmgr) -add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(esent) add_subdirectory(faultrep)

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