[0.4.3] * Update the release type.

svn path=/branches/ros-branch-0_4_3/; revision=73222

reactos/CMakeLists.txt

@@ -16,11 +16,6 @@ if(POLICY CMP0051)
     cmake_policy(SET CMP0051 NEW)
 endif()
 
-if(POLICY CMP0058)
-    # Ninja requires custom command byproducts to be explicit
-    cmake_policy(SET CMP0058 OLD)
-endif()
-
 project(REACTOS)
 
 # Versioning
@@ -40,6 +35,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+set(CMAKE_SKIP_INSTALL_RULES ON)
 
 if(NOT DEFINED NEW_STYLE_BUILD)
     set(NEW_STYLE_BUILD TRUE)
@@ -110,9 +106,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
-            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         else()
-            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         endif()
     endif()
 

reactos/base/applications/atactl/atactl.cpp

@@ -91,14 +91,14 @@ void print_help() {
            "    will switch device at Scsi2, bus 1, taget_id 1 to UDMA0 mode\n"
            "  atactl -h -d 30 c1:b0:d0:l0 \n"
            "    will hide Master (d0:l0) device on secondary (c1:b0) IDE channel\n"
-           "    and lock i/o on this channel for 30 seconds to ensure safety\n"
+           "    and lock i/o on this channel for 30 seconds to ensure safity\n"
            "    of removal process"
            "------\n"
            "Device address format:\n"
            "\n"
            "s<controller id> number of controller in system. Is assigned during hardware\n"
            "                   detection. Usually s0/s1 are ATA Pri/Sec.\n"
-           "                   Note, due do NT internal design ATA controllers are represented\n"
+           "                   Note, due do NT internal desing ATA controllers are represented\n"
            "                   as SCSI controllers.\n"
            "b<bus id>        For ATA controllers it is channel number.\n"
            "                   Note, usually onboard controller is represented as 2 legacy\n"
@@ -1283,7 +1283,7 @@ ata_scan(
         to.WaitForPhysicalLink = lock;
         to.Flags = unhide ? UNIATA_ADD_FLAGS_UNHIDE : 0;
 
-        printf("Scanning bus for new devices.\n");
+        printf("Scaning bus for new devices.\n");
         if(lock) {
             printf("You have %d seconds to connect device.\n", lock);
         }

reactos/base/applications/cacls/CMakeLists.txt

@@ -3,6 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(cacls cacls.c cacls.rc)
 set_module_type(cacls win32cui UNICODE)
-target_link_libraries(cacls conutils ${PSEH_LIB})
+target_link_libraries(cacls conutils_stream ${PSEH_LIB})
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
 add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)

reactos/base/applications/cacls/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -26,8 +26,8 @@ CACLS nume_fișier [/T] [/E] [/C] [/G utilizator:acces [...]]\n\
                                         C  De modificare (scriere)\n\
                                         F  Deplin\n\
    /D utilizator        Interzice accesul pentru utilizatorul specificat.\n\
-Utilizând metacaractere pot fi specificate mai multe fișiere.\n\
-În aceiași comandă pot fi specificați mai mulți utilizatori.\n\n\
+Se pot specifica mai multe fișiere utilizând metacaractere.\n\
+Pot fi specificați mai mulți utilizatori în aceiași comandă.\n\n\
 Abrevieri:\n\
    CI - Moștenire container.\n\
         ACE moștenită de directoare.\n\

reactos/base/applications/calc/help.txt

@@ -331,7 +331,7 @@ It deletes the current calculation and all sub expressions.
 Shortcut from keyboard: ESC
 
 F-E
-It enables or it disables the fixed scientific notation.
+It enables or it disables the fixed scietific notation.
 Shortcut from keyboard: V
 
 0 1 2 3 4 5 6 7 8 9

reactos/base/applications/calc/rpn.c

@@ -314,7 +314,7 @@ void run_operator(calc_node_t *result,
             calc.is_nan = TRUE;
     } else {
         operator_list[operation].op_i(&dc, &da, &db);
-        /* apply final limiter to result */
+        /* apply final limitator to result */
         apply_int_mask(&dc);
     }
 

reactos/base/applications/calc/rpn_mpfr.c

@@ -300,7 +300,7 @@ void run_operator(calc_node_t *result,
             operator_list[operation].op_f(&result->number, &a->number, &b->number);
     } else {
         operator_list[operation].op_i(&result->number, &a->number, &b->number);
-        /* apply final limiter to result */
+        /* apply final limitator to result */
         apply_int_mask(&result->number);
     }
 }

reactos/base/applications/calc/utl.c

@@ -11,7 +11,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         break;
     case IDC_RADIO_DEC:
 /*
- * Modified from 17 to 16 for fixing this bug:
+ * Modifed from 17 to 16 for fixing this bug:
  * 14+14+6.3+6.3= 40.5999999 instead of 40.6
  * So, it's probably better to leave the least
  * significant digit out of the display.
@@ -25,7 +25,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
             TCHAR *ptr, *dst;
 
             ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
-            /* format string ensures there is a '.': */
+            /* format sring ensures there is a '.': */
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

reactos/base/applications/calc/whatsnew.txt

@@ -34,7 +34,7 @@
 * Corrected precision underflow/overflow when working with trigonometric functions.
 * cbrt() function is not used if compiling into ReactOS build system.
 * Resources are moved into /res directory.
-* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukrainian.
+* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukraianian.
 * Decimal precision of number with standard layout has been limited to 16 digits because the output display is smaller here (GMP version only).
 * Fixed buffer overflow with function update_lcd_display().
 * The decimal point is now preserved when switching to temporary scientific notation.

reactos/base/applications/calc/winmain.c

@@ -212,8 +212,8 @@ static const function_table_t function_table[] = {
     { IDC_BUTTON_DMS,  MODIFIER_INV,              1, rpn_dec2dms, rpn_dms2dec, NULL,     NULL      },
     { IDC_BUTTON_FE,   0,                         1, run_fe,      NULL,        NULL,     NULL      },
     { IDC_BUTTON_DAT,  0,                         1, run_dat_sta, NULL,        NULL,     NULL,     },
-    { IDC_BUTTON_MP,   MODIFIER_INV|NO_CHAIN,     1, run_mp,      run_mm,      NULL,     NULL,     },
-    { IDC_BUTTON_MS,   MODIFIER_INV|NO_CHAIN,     1, run_ms,      run_mw,      NULL,     NULL,     },
+    { IDC_BUTTON_MP,   MODIFIER_INV,              1, run_mp,      run_mm,      NULL,     NULL,     },
+    { IDC_BUTTON_MS,   MODIFIER_INV,              1, run_ms,      run_mw,      NULL,     NULL,     },
     { IDC_BUTTON_CANC, NO_CHAIN,                  0, run_canc,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_RIGHTPAR, NO_CHAIN,              1, run_rpar,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_LEFTPAR,  NO_CHAIN,              0, run_lpar,    NULL,        NULL,     NULL,     },
@@ -435,7 +435,7 @@ KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 static void update_lcd_display(HWND hwnd)
 {
     /*
-     * multiply size of calc.buffer by 2 because it may
+     * muliply size of calc.buffer by 2 because it may
      * happen that separator is used between each digit.
      * Also added little additional space for dot and '\0'.
      */

reactos/base/applications/charmap/settings.c

@@ -58,7 +58,7 @@ extern void LoadSettings(void)
     if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
     {
         TCHAR szBuffer[MAX_PATH];
-        DWORD dwAdvancedChecked;
+        DWORD dwAdvanChecked;
         unsigned long type = REG_DWORD, size = 1024;
 
         /* Restore last selected font */
@@ -89,9 +89,9 @@ extern void LoadSettings(void)
             }
         }
 
-        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
+        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size);
 
-        if(dwAdvancedChecked == TRUE)
+        if(dwAdvanChecked == TRUE)
             SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
 
     RegCloseKey(hKey);

reactos/base/applications/charmap_new/GridView.cpp

@@ -69,7 +69,7 @@ CGridView::SetFont(
     )
 {
 
-    // Create a temporary container for the new font
+    // Create a temperary container for the new font
     CurrentFont NewFont = { 0 };
     NewFont.FontName = FontName;
 
@@ -224,7 +224,7 @@ CGridView::OnSize(
                  SWP_NOZORDER | SWP_SHOWWINDOW);
 
     // Get the client area we can draw on. The position we set above includes
-    // a scrollbar which we obviously can't draw on. GetClientRect gives us
+    // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us
     // the size without the scroll, and it's more efficient than getting the
     // scroll metrics and calculating the size from that
     RECT ClientRect;

reactos/base/applications/charmap_new/charmap.cpp

@@ -1,7 +1,8 @@
 /*
-* PROJECT:     ReactOS Character Map
+* PROJECT:     ReactOS Device Managment
 * LICENSE:     GPL - See COPYING in the top level directory
-* FILE:        base/applications/charmap/charmap.cpp
+* FILE:        base/applications/mscutils/devmgmt/devmgmt.c
+* PURPOSE:     Bootstrap for the device manager
 * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
 */
 

reactos/base/applications/clipbrd/scrollutils.c

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.c
- * PURPOSE:         Scrolling related helper functions.
+ * PURPOSE:         Scrolling releated helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/clipbrd/scrollutils.h

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.h
- * PURPOSE:         Scrolling related helper functions.
+ * PURPOSE:         Scrolling releated helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/cmdutils/clip/CMakeLists.txt

@@ -3,6 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(clip clip.c clip.rc)
 set_module_type(clip win32cui UNICODE)
-target_link_libraries(clip conutils ${PSEH_LIB})
+target_link_libraries(clip conutils_stream ${PSEH_LIB})
 add_importlibs(clip advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET clip DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/comp/CMakeLists.txt

@@ -3,6 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(comp comp.c comp.rc)
 set_module_type(comp win32cui UNICODE)
-target_link_libraries(comp conutils ${PSEH_LIB})
+target_link_libraries(comp conutils_stream ${PSEH_LIB})
 add_importlibs(comp msvcrt kernel32)
 add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/comp/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
@@ -11,9 +11,9 @@ COMP [/L] [/A] [data1] [data2]\n\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 poate fi găsit/deschis fișierul: %s\n"
-    IDS_COMPARING "%s este comparat cu %s...\n"
-    IDS_FILESIZEERROR "Eroare la determinarea dimensiunii fișierului: %s\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"

reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt

@@ -7,6 +7,6 @@ add_message_headers(ANSI evtmsgstr.mc)
 add_executable(eventcreate eventcreate.c eventcreate.rc)
 set_module_type(eventcreate win32cui UNICODE)
 add_dependencies(eventcreate evtmsgstr)
-target_link_libraries(eventcreate conutils ${PSEH_LIB})
+target_link_libraries(eventcreate conutils_stream ${PSEH_LIB})
 add_importlibs(eventcreate advapi32 msvcrt kernel32)
 add_cd_file(TARGET eventcreate DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/eventcreate/eventcreate.rc

@@ -21,9 +21,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif

reactos/base/applications/cmdutils/eventcreate/lang/ro-RO.rc

@@ -1,71 +0,0 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
-
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_USAGE "Tastați «EVENTCREATE /?» pentru informații de utilizare.\n"
-    IDS_HELP "\n\
-EVENTCREATE [/S calculator [/U [domeniu\\]nume [/P parolă]]]\n\
-            /ID id_eveniment {[/L nume_jurnal] | [/SO sursă]}\n\
-            /T tip /C categorie /D descriere\n\
-\n\
-Descriere:\n\
-    Acest instrument oferă unui administrator crearea unui eveniment\n\
-    particular într-un jurnal de evenimente specificat.\n\
-\n\
-Parametri:\n\
-    /S  calculator        Specifică sistemul la care se face conectarea.\n\
-\n\
-    /U  [domeniu\\]nume    Numele contului de utilizator sub care va fi\n\
-                          executată comanda.\n\
-\n\
-    /P  [parolă]          Specifică parola contului de utilizator.\n\
-                          Va fi cerută la prompt în cazul omiterii.\n\
-\n\
-    /L  nume_jurnal       Specifică numele jurnalului în care evenimentul va fi\n\
-                          creat. Numele valide sunt:\n\
-                          Application, System, Security\n\
-                          (ultimul este rezervat doar pentru contul SYSTEM).\n\
-\n\
-    /SO sursă             Specifică numele sursei utilizate pentru eveniment.\n\
-                          (Dacă nu e specificat, numele implicit al sursei va\n\
-                           fi «eventcreate».)\n\
-                          O sursă validă poate fi orice șir de caractere și ar\n\
-                          trebui să reprezinte aplicația sau evenimentul care\n\
-                          generează evenimentul.\n\
-\n\
-    /T  tip               Specifică tipul de eveniment creat.\n\
-                          Tipurile valide sunt: SUCCESS, ERROR, WARNING,\n\
-                          INFORMATION.\n\
-\n\
-    /C  categorie         Specifică categoria de eveniment (ca număr întreg).\n\
-\n\
-    /ID id_eveniment      Specifică numărul de identificare pentru eveniment.\n\
-                          Acesta trebuie să fie un număr între 0 și 65535.\n\
-\n\
-    /D  descriere         Specifică o descriere pentru evenimentul nou creat.\n\
-\n\
-    /?                    Afișează acest manual de utilizare.\n\
-"
-    IDS_INVALIDSWITCH "Parametru eronat - «%s».\n"
-    IDS_BADSYNTAX_0 "Comandă cu sintaxă eronată.\n"
-    IDS_BADSYNTAX_1 "Comandă cu sintaxă eronată. Opțiunea «%s» necesită o valoare.\n"
-    IDS_BADSYNTAX_2 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» nu poate fi omisă.\n"
-    IDS_BADSYNTAX_3 "Comandă cu sintaxă eronată. Valoarea «%s» nu este permisă pentru opțiunea «%s».\n"
-    IDS_BADSYNTAX_4 "Comandă cu sintaxă eronată. Valoarea dată nu poate fi specificată pentru opțiunea «%s».\n"
-    IDS_BADSYNTAX_5 "Comandă cu sintaxă eronată. Opțiunea «%s» nu este permisă mai mult de %lu ori.\n"
-    IDS_BADSYNTAX_6 "Comandă cu sintaxă eronată. Opțiunea obligatorie «%s» a fost omisă.\n"
-    // IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» este în afara domeniului permis.\n"
-    IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» trebuie să fie între %d și %d.\n"
-
-    IDS_LOG_NOT_FOUND "Jurnalul «%s» nu există. Evenimentul nu poate fi creat.\n"
-    IDS_SOURCE_NOCREATE "Sursa nu poate fi creată deoarece numele de jurnal nu este specificat.\nUtilizați parametrul /L pentru a specifica un nume de jurnal.\n"
-    IDS_SOURCE_EXISTS "Sursa deja există în jurnalul «%s» și nu poate fi duplicată.\n"
-    IDS_SOURCE_NOT_CUSTOM "Parametrul de sursă este utilizat pentru a identifica scripturi/aplicații particularizate (nicidecum aplicații instalate).\n"
-
-    IDS_SUCCESS_1   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s».\n"
-    IDS_SUCCESS_2   "Operație realizată: un eveniment de tip «%s» a fost creat cu sursa «%s».\n"
-    IDS_SUCCESS_3   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s» cu sursa «%s».\n"
-    IDS_SWITCH_UNIMPLEMENTED "Opțiunea «%s» nu este acceptată deocamdată!\n"
-END

reactos/base/applications/cmdutils/help/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(cmd_help help.c help.rc)
 set_module_type(cmd_help win32cui UNICODE)
-target_link_libraries(cmd_help conutils ${PSEH_LIB})
+target_link_libraries(cmd_help conutils_stream ${PSEH_LIB})
 add_importlibs(cmd_help msvcrt kernel32)
 set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help")
 add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/help/lang/en-US.rc

@@ -38,7 +38,7 @@ FREE     (free) disc space.\n\
 GOTO     Directs the ReactOS command interpreter to a labeled line in\n\
          a batch program.\n\
 HELP     Provides Help information for ReactOS commands.\n\
-HISTORY  Lists all commands which have been used.\n\
+HISTORY  List all commands which has been used\n\
 IF       Performs conditional processing in batch programs.\n\
 LABEL    Creates, changes, or deletes the volume label of a disk.\n\
 MD       Creates a directory.\n\

reactos/base/applications/cmdutils/mode/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(mode mode.c mode.rc)
 set_module_type(mode win32cui UNICODE)
-target_link_libraries(mode conutils ${PSEH_LIB})
+target_link_libraries(mode conutils_stream ${PSEH_LIB})
 add_importlibs(mode user32 msvcrt kernel32)
 set_target_properties(mode PROPERTIES SUFFIX ".com")
 add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/mode/lang/ro-RO.rc

@@ -1,75 +0,0 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_USAGE "Configurează dispozitive de sistem.\n\n\
-Interogarea stării unui dispozitiv:\n\
-    MODE [dispozitiv] [/STATUS]\n\n\
-Configurarea portului serial:\n\
-    MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
-                 [to=on|off] [xon=on|off] [odsr=on|off]\n\
-                 [octs=on|off] [dtr=on|off|hs]\n\
-                 [rts=on|off|hs|tg] [idsr=on|off]\n\n\
-Redirecția portului paralel:\n\
-    MODE LPTn[:]=COMm[:]\n\n\
-Selecția unui cod de pagină:\n\
-    MODE CON[:] CP SELECT=yyy\n\n\
-Starea codului de pagină:\n\
-    MODE CON[:] CP [/STATUS]\n\n\
-Modul de afișare:\n\
-    MODE CON[:] [COLS=c] [LINES=n]\n\n\
-Rata de repetiție la menținerea unei taste apăsate:\n\
-    MODE CON[:] [RATE=r DELAY=d]\n"
-
-    IDS_QUERY_SERIAL_FOUND "    Depistat dispozitiv la portul serial - %s\n"
-    IDS_QUERY_PRINTER_FOUND "    Depistat dispozitiv de imprimare - %s\n"
-    IDS_QUERY_PARALLEL_FOUND "    Depistat dispozitiv la portul paralel - %s\n"
-    IDS_QUERY_DOSDEV_FOUND "    Depistat dispozitiv de tip DOS - %s\n"
-    // IDS_QUERY_MISC_FOUND "    Found other device - %s\n"
-
-    // IDS_QUERY_DEVICE_FOUND "    Found %s device - %s\n"
-    // IDS_SERIAL  "serial"
-    // IDS_PRINTER "parallel"
-    // IDS_OTHER   "other"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_DEVICE_STATUS_HEADER "Starea pentru dispozitivul %s:"
-
-    IDS_COM_STATUS_BAUD             "    Rata de modulare:  %ld\n"
-    IDS_COM_STATUS_PARITY           "    Paritate:          %s\n"
-    IDS_COM_STATUS_DATA_BITS        "    Biți de date:      %d\n"
-    IDS_COM_STATUS_STOP_BITS        "    Biți delimitori:   %s\n"
-    IDS_COM_STATUS_TIMEOUT          "    Timp de expirare:  %s\n"
-    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:          %s\n"
-    IDS_COM_STATUS_CTS_HANDSHAKING  "    Inițiere CTS:      %s\n"
-    IDS_COM_STATUS_DSR_HANDSHAKING  "    Inițiere DSR:      %s\n"
-    IDS_COM_STATUS_DSR_SENSITIVITY  "    Senzitivitate DSR: %s\n"
-    IDS_COM_STATUS_DTR_CIRCUIT      "    Circuit DTR:       %s\n"
-    IDS_COM_STATUS_RTS_CIRCUIT      "    Circuit RTS:       %s\n"
-
-    IDS_CONSOLE_STATUS_LINES    "    Linii:             %d\n"
-    IDS_CONSOLE_STATUS_COLS     "    Coloane:           %d\n"
-    IDS_CONSOLE_KBD_DELAY       "    Întârziere taste:  %ld\n"
-    IDS_CONSOLE_KBD_RATE        "    Rată taste:        %ld\n"
-    IDS_CONSOLE_CODEPAGE        "    Cod de pagină:     %d\n"
-
-    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Ieșirea de imprimantă nu este redirecționată.\n"
-    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Ieșirea de imprimantă este redirecționată către portul %s.\n"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ERROR_QUERY_DEVICES "EROARE: Dispozitivul DOS (0x%lx) nu poate fi interogat.\n"
-    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) a returnat un formular nerecunoscut %s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "EROARE: Parametru nevalid - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "EROARE: Nume eronat de dispozitiv - %s (0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "EROARE: Nu poate fi determinată starea dispozitivului COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "EROARE: Nu poate fi schimbată starea pentru dispozitivul COM%d:\n"
-    IDS_ERROR_INVALID_PARITY_BITS "EROARE: Valoare eronată pentru biții de paritate %d:\n"
-    IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori %d:\n"
-    IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n"
-END

reactos/base/applications/cmdutils/mode/lang/ru-RU.rc

@@ -1,67 +0,0 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_USAGE "Настройка системных устройств.\n\n\
-Состояние устройства:   MODE [device] [/STATUS]\n\
-Последовательный порт:  MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
-                                     [to=on|off] [xon=on|off] [odsr=on|off]\n\
-                                     [octs=on|off] [dtr=on|off|hs]\n\
-                                     [rts=on|off|hs|tg] [idsr=on|off]\n\
-Переадресация печати:   MODE LPTn[:]=COMm[:]\n\
-Выбор кодовой страницы: MODE CON[:] CP SELECT=yyy\n\
-Вывод кодовой страницы: MODE CON[:] CP [/STATUS]\n\
-Режим работы экрана:    MODE CON[:] [COLS=c] [LINES=n]\n\
-Ввод с клавиатуры:      MODE CON[:] [RATE=r DELAY=d]\n"
-
-    IDS_QUERY_SERIAL_FOUND "    Найдено последовательное устройство - %s\n"
-    IDS_QUERY_PRINTER_FOUND "    Найдено устройство печати - %s\n"
-    IDS_QUERY_PARALLEL_FOUND "    Найдено параллельное устройство - %s\n"
-    IDS_QUERY_DOSDEV_FOUND "    Найдено устройство DOS - %s\n"
-    // IDS_QUERY_MISC_FOUND "    Найдено другое устройство - %s\n"
-
-    // IDS_QUERY_DEVICE_FOUND "    Найдено %s устройство - %s\n"
-    // IDS_SERIAL  "последовательное"
-    // IDS_PRINTER "параллельное"
-    // IDS_OTHER   "другое"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_DEVICE_STATUS_HEADER "Состояние устройства %s:"
-
-    IDS_COM_STATUS_BAUD             "    Скорость:              %ld\n"
-    IDS_COM_STATUS_PARITY           "    Четность:              %s\n"
-    IDS_COM_STATUS_DATA_BITS        "    Биты данных:           %d\n"
-    IDS_COM_STATUS_STOP_BITS        "    Стоповые биты:         %s\n"
-    IDS_COM_STATUS_TIMEOUT          "    Таймаут:               %s\n"
-    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:              %s\n"
-    IDS_COM_STATUS_CTS_HANDSHAKING  "    Синхронизация CTS:     %s\n"
-    IDS_COM_STATUS_DSR_HANDSHAKING  "    Синхронизация DSR:     %s\n"
-    IDS_COM_STATUS_DSR_SENSITIVITY  "    Чувствительность DSR:  %s\n"
-    IDS_COM_STATUS_DTR_CIRCUIT      "    Цепь DTR:              %s\n"
-    IDS_COM_STATUS_RTS_CIRCUIT      "    Цепь RTS:              %s\n"
-
-    IDS_CONSOLE_STATUS_LINES    "    Строки:                %d\n"
-    IDS_CONSOLE_STATUS_COLS     "    Столбцы:               %d\n"
-    IDS_CONSOLE_KBD_DELAY       "    Скорость клавиатуры:   %ld\n"
-    IDS_CONSOLE_KBD_RATE        "    Задержка клавиатуры:   %ld\n"
-    IDS_CONSOLE_CODEPAGE        "    Кодовая страница:      %d\n"
-
-    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Вывод принтера не переадресован.\n"
-    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Вывод принтера переадресован на последовательный порт %s.\n"
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
-    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form %s.\n"
-    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
-    IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n"
-    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n"
-    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n"
-    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n"
-    IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
-    IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
-    IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
-END

reactos/base/applications/cmdutils/mode/mode.rc

@@ -18,9 +18,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif

reactos/base/applications/cmdutils/more/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(more more.c more.rc)
 set_module_type(more win32cui UNICODE)
-target_link_libraries(more conutils ${PSEH_LIB})
+target_link_libraries(more conutils_pager ${PSEH_LIB})
 add_importlibs(more advapi32 user32 msvcrt kernel32)
 set_target_properties(more PROPERTIES SUFFIX ".com")
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/reg/lang/ro-RO.rc

@@ -15,7 +15,7 @@ STRINGTABLE
     STRING_SUCCESS, "Operația a fost îndeplinită cu succes\n"
     STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
     STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n"
-    STRING_NO_REMOTE, "Eroare: Nu pot fi adăugate chei într-un calculator la distanță\n"
+    STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"
     STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n"
     STRING_UNSUPPORTED_TYPE, "Eroare: Tip nerecunoscut\n"
     STRING_MISSING_INTEGER, "reg: Opțiunea [/d] trebuie să fie urmată de un număr valid întreg\n"
@@ -31,12 +31,12 @@ STRINGTABLE
     STRING_DELETE_VALUEALL, "Sigur doriți ștergerea tuturor valorilor de registru din «%1»?"
     STRING_DELETE_SUBKEY, "Sigur doriți ștergerea cheii de registru «%1»?"
     STRING_INVALID_STRING, "reg: Opțiunea [/d] trebuie urmată de un șir valid\n"
-    STRING_VALUEALL_FAILED, "reg: Nu au putut fi șterse toate valorile de registru din «%1». A survenit o eroare neașteptată.\n"
-    STRING_GENERAL_FAILURE, "reg: Operația specificată nu a putut fi efectuată. A survenit o eroare neașteptată.\n"
+    STRING_VALUEALL_FAILED, "reg: Nu se pot șterge toate valorile de registru din «%1». A survenit o eroare neașteptată.\n"
+    STRING_GENERAL_FAILURE, "reg: Nu se poate completa operația specificată. A survenit o eroare neașteptată.\n"
     STRING_MATCHES_FOUND, "Căutare efectuată. Numărul de potriviri găsite: %1!d!\n"
     STRING_INVALID_SYNTAX, "reg: Sintaxă nerespectată. "
     STRING_INVALID_OPTION, "reg: Opțiune nevalidă [%1]. "
     STRING_REG_HELP, "Tastați «REG /?» pentru mai multe informații.\n"
     STRING_FUNC_HELP, "Tastați «REG %1 /?» pentru mai multe informații.\n"
-    STRING_VALUE_NOT_SET, "(valoare nealocată)"
+    STRING_VALUE_NOT_SET, "(value not set)"
 }

reactos/base/applications/cmdutils/taskkill/lang/ro-RO.rc

@@ -14,8 +14,8 @@ STRINGTABLE
     STRING_CLOSE_PROC_SRCH, "Către fereastra procesului «%1» cu PID %2!u! a fost emis un mesaj de închidere.\n"
     STRING_TERM_PID_SEARCH, "Procesul cu PID %1!u! a fost oprit în mod forțat.\n"
     STRING_TERM_PROC_SEARCH, "Procesul «%1» cu PID %2!u! a fost oprit în mod forțat.\n"
-    STRING_SEARCH_FAILED, "Eroare: Procesul «%1» nu poate fi găsit.\n"
-    STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n"
+    STRING_SEARCH_FAILED, "Eroare: Nu se poate găsi procesul «%1».\n"
+    STRING_ENUM_FAILED, "Eroare: Nu se poate enumera lista de procese.\n"
     STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n"
     STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n"
 }

reactos/base/applications/cmdutils/tree/CMakeLists.txt

@@ -1,9 +1,6 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
-
 add_executable(tree tree.c tree.rc)
 set_module_type(tree win32cui UNICODE)
-target_link_libraries(tree conutils ${PSEH_LIB})
-add_importlibs(tree msvcrt kernel32)
 set_target_properties(tree PROPERTIES SUFFIX ".com")
+add_importlibs(tree user32 msvcrt kernel32)
 add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/tree/tree.c

@@ -1,30 +1,45 @@
-/*
+/*
  * PROJECT:     ReactOS
  * LICENSE:     GNU GPLv2 only as published by the Free Software Foundation
- * PURPOSE:     Implements tree.com command similar to Windows
+ * PURPOSE:     Implements tree.com functionality similar to Windows
  * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala@hotmail.com)
  */
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <windef.h>
 #include <winbase.h>
-
-#include <conutils.h>
+#include <winuser.h>
 
 #include "resource.h"
 
 #define STR_MAX 2048
 
-static VOID GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine);
+static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine);
 
-/* If this flag is set to true, files will also be listed within the folder structure */
+/* if this flag is set to true, files will also be listed */
 BOOL bShowFiles = FALSE;
 
-/* If this flag is true, ASCII characters will be used instead of UNICODE ones */
+/* if this flag is true, ASCII characters will be used instead of UNICODE ones */
 BOOL bUseAscii = FALSE;
 
+/*
+ * This takes strings from a resource string table
+ * and outputs it to the console.
+ */
+VOID PrintResourceString(INT resID, ...)
+{
+    WCHAR tmpBuffer[STR_MAX];
+    CHAR tmpBufferA[STR_MAX];
+    va_list arg_ptr;
+
+    va_start(arg_ptr, resID);
+    LoadStringW(GetModuleHandle(NULL), resID, tmpBuffer, STR_MAX);
+    CharToOemW(tmpBuffer, tmpBufferA);
+    vfprintf(stdout, tmpBufferA, arg_ptr);
+    va_end(arg_ptr);
+}
+
 /**
 * @name: HasSubFolder
 *
@@ -32,20 +47,20 @@ BOOL bUseAscii = FALSE;
 * Must specify folder name
 *
 * @return
-* true if folder has sub-folders, else will return false
+* true if folder has sub folders, else will return false
 */
-static BOOL HasSubFolder(PCWSTR strPath1)
+static BOOL HasSubFolder(const wchar_t *strPath1)
 {
     BOOL ret = FALSE;
-    WIN32_FIND_DATAW FindFileData;
+    WIN32_FIND_DATA FindFileData;
     HANDLE hFind = NULL;
-    static WCHAR strPath[STR_MAX] = L"";
+    static wchar_t strPath[STR_MAX] = L"";
     ZeroMemory(strPath, sizeof(strPath));
 
     wcscat(strPath, strPath1);
     wcscat(strPath, L"\\*.");
 
-    hFind = FindFirstFileW(strPath, &FindFileData);
+    hFind = FindFirstFile(strPath, &FindFileData);
     do
     {
         if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -56,11 +71,11 @@ static BOOL HasSubFolder(PCWSTR strPath1)
                 continue;
             }
 
-            ret = TRUE;  // Sub-folder found
+            ret = TRUE;  //found subfolder
             break;
         }
     }
-    while (FindNextFileW(hFind, &FindFileData));
+    while (FindNextFile(hFind, &FindFileData));
 
     FindClose(hFind);
     return ret;
@@ -85,22 +100,22 @@ static BOOL HasSubFolder(PCWSTR strPath1)
  * @return
  * void
  */
-static VOID DrawTree(PCWSTR strPath,
-                     const WIN32_FIND_DATAW* arrFolder,
+static void DrawTree(const wchar_t* strPath,
+                     const WIN32_FIND_DATA *arrFolder,
                      const size_t szArr,
                      UINT width,
-                     PCWSTR prevLine,
+                     const wchar_t *prevLine,
                      BOOL drawfolder)
 {
     BOOL bHasSubFolder = HasSubFolder(strPath);
     UINT i = 0;
 
-    /* This will format the spaces required for correct formatting */
+    /* this will format the spaces required for correct formatting */
     for (i = 0; i < szArr; ++i)
     {
-        PWSTR consoleOut = (PWSTR)malloc(STR_MAX * sizeof(WCHAR));
+        wchar_t *consoleOut = (wchar_t*)malloc(sizeof(wchar_t) * STR_MAX);
         UINT j = 0;
-        static WCHAR str[STR_MAX];
+        static wchar_t str[STR_MAX];
 
         /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */
         //wcscpy_s(consoleOut, STR_MAX, L"");
@@ -110,14 +125,15 @@ static VOID DrawTree(PCWSTR strPath,
 
         for (j = 0; j < width - 1; ++j)
         {
-            /* If the previous line has '├' or '│' then the current line will
+            /* if the previous line has '├' or '│' then the current line will
                add '│' to continue the connecting line */
-            if (prevLine[j] == L'\x251C' || prevLine[j] == L'\x2502' ||
-                prevLine[j] == L'+' || prevLine[j] == L'|')
+            if ((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 ||
+                (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|')
             {
                 if (!bUseAscii)
                 {
-                    wcscat(consoleOut, L"\x2502");
+                    wchar_t a[] = {179, 0};
+                    wcscat(consoleOut, a);
                 }
                 else
                 {
@@ -134,27 +150,27 @@ static VOID DrawTree(PCWSTR strPath,
         {
             if (drawfolder)
             {
-                /* Add '├───Folder name' (\xC3\xC4\xC4\xC4 or \x251C\x2500\x2500\x2500) */
+                /* will add '├───Folder name */
                 if (bUseAscii)
-                    swprintf(str, L"+---%s", arrFolder[i].cFileName);
+                    wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName);
                 else
-                    swprintf(str, L"\x251C\x2500\x2500\x2500%s", arrFolder[i].cFileName);
+                    wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
             }
             else
             {
                 if (bHasSubFolder)
                 {
-                    /* Add '│   FileName' (\xB3 or \x2502) */
-                    // This line is added to connect the below-folder sub-structure
+                    /* will add '│   FileNamw'  //thie line is added to connect
+                       the belowfolder sub structure */
                     if (bUseAscii)
-                        swprintf(str, L"|   %s", arrFolder[i].cFileName);
+                        wsprintf(str,L"|   %s", (wchar_t*)arrFolder[i].cFileName);
                     else
-                        swprintf(str, L"\x2502   %s", arrFolder[i].cFileName);
+                        wsprintf(str,L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
                 }
                 else
                 {
-                    /* Add '    FileName' */
-                    swprintf(str, L"    %s", arrFolder[i].cFileName);
+                    /* will add '    FileNamw' */
+                    wsprintf(str,L"     %s", (wchar_t*)arrFolder[i].cFileName);
                 }
             }
         }
@@ -162,44 +178,44 @@ static VOID DrawTree(PCWSTR strPath,
         {
             if (drawfolder)
             {
-                /* '└───Folder name' (\xC0\xC4\xC4\xC4 or \x2514\x2500\x2500\x2500) */
+                /* '└───Folder name' */
                 if (bUseAscii)
-                    swprintf(str, L"\\---%s", arrFolder[i].cFileName);
+                    wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName);
                 else
-                    swprintf(str, L"\x2514\x2500\x2500\x2500%s", arrFolder[i].cFileName);
+                    wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
             }
             else
             {
                 if (bHasSubFolder)
                 {
-                    /* '│   FileName' (\xB3 or \x2502) */
+                    /* '│   FileName' */
                     if (bUseAscii)
-                        swprintf(str, L"|   %s", arrFolder[i].cFileName);
+                        wsprintf(str, L"|   %s", (wchar_t*)arrFolder[i].cFileName);
                     else
-                        swprintf(str, L"\x2502   %s", arrFolder[i].cFileName);
+                        wsprintf(str, L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
                 }
                 else
                 {
                     /* '    FileName' */
-                    swprintf(str, L"    %s", arrFolder[i].cFileName);
+                    wsprintf(str, L"     %s", (wchar_t*)arrFolder[i].cFileName);
                 }
             }
         }
 
         wcscat(consoleOut, str);
-        ConPrintf(StdOut, L"%s\n", consoleOut);
+        wprintf(L"%s\n", consoleOut);
 
         if (drawfolder)
         {
-            PWSTR str = (PWSTR)malloc(STR_MAX * sizeof(WCHAR));
-            ZeroMemory(str, STR_MAX * sizeof(WCHAR));
+          wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t));
+          ZeroMemory(str, STR_MAX * sizeof(wchar_t));
 
-            wcscat(str, strPath);
-            wcscat(str, L"\\");
-            wcscat(str, arrFolder[i].cFileName);
-            GetDirectoryStructure(str, width + 4, consoleOut);
+          wcscat(str, strPath);
+          wcscat(str, L"\\");
+          wcscat(str, arrFolder[i].cFileName);
+          GetDirectoryStructure(str, width + 4, consoleOut);
 
-            free(str);
+          free(str);
         }
         free(consoleOut);
     }
@@ -219,27 +235,27 @@ static VOID DrawTree(PCWSTR strPath,
  * @return
  * void
  */
-static VOID
-GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
+static void
+GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
 {
-    WIN32_FIND_DATAW FindFileData;
+    WIN32_FIND_DATA FindFileData;
     HANDLE hFind = NULL;
     //DWORD err = 0;
-    /* Fill up with names of all sub-folders */
-    WIN32_FIND_DATAW *arrFolder = NULL;
+    /* will fill up with names of all sub folders */
+    WIN32_FIND_DATA *arrFolder = NULL;
     UINT arrFoldersz = 0;
-    /* Fill up with names of all sub-folders */
-    WIN32_FIND_DATAW *arrFile = NULL;
+    /* will fill up with names of all sub folders */
+    WIN32_FIND_DATA *arrFile = NULL;
     UINT arrFilesz = 0;
 
     ZeroMemory(&FindFileData, sizeof(FindFileData));
 
     {
-        static WCHAR tmp[STR_MAX] = L"";
+        static wchar_t tmp[STR_MAX] = L"";
         ZeroMemory(tmp, sizeof(tmp));
         wcscat(tmp, strPath);
         wcscat(tmp, L"\\*.*");
-        hFind = FindFirstFileW(tmp, &FindFileData);
+        hFind = FindFirstFile(tmp, &FindFileData);
         //err = GetLastError(); 
     }
 
@@ -255,7 +271,7 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
                 continue;
 
             ++arrFoldersz;
-            arrFolder = (WIN32_FIND_DATAW*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData));
+            arrFolder = (WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData));
 
             if (arrFolder == NULL)
                 exit(-1);
@@ -266,7 +282,7 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
         else
         {
             ++arrFilesz;
-            arrFile = (WIN32_FIND_DATAW*)realloc(arrFile, arrFilesz * sizeof(FindFileData));
+            arrFile = (WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData));
 
             if(arrFile == NULL)
                 exit(-1);
@@ -274,17 +290,17 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
             arrFile[arrFilesz - 1] = FindFileData;
         }
     }
-    while (FindNextFileW(hFind, &FindFileData));
+    while (FindNextFile(hFind, &FindFileData));
 
     FindClose(hFind);
 
     if (bShowFiles)
     {
-        /* Will free(arrFile) */
+        /* will free(arrFile) */
         DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE);
     }
 
-    /* Will free(arrFile) */
+    /* will free(arrFile) */
     DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE);
 
     free(arrFolder);
@@ -298,21 +314,18 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
 * @return
 * error /success value
 */
-int wmain(int argc, WCHAR* argv[])
+int wmain( int argc, wchar_t *argv[])
 {
     DWORD dwSerial = 0;
-    WCHAR t = 0;
-    PWSTR strPath = NULL;
+    wchar_t t = 0;
+    wchar_t *strPath = NULL;
     DWORD sz = 0;
-    //PWSTR context = NULL;
-    PWSTR driveLetter = NULL;
+    //wchar_t *context = NULL;
+    wchar_t *driveLetter = NULL;
 
     int i;
 
-    /* Initialize the Console Standard Streams */
-    ConInitStdStreams();
-
-    /* Parse the command line */
+    /* parse the command line */
     for (i = 1; i < argc; ++i)
     {
         if (argv[i][0] == L'-' || argv[i][0] == L'/')
@@ -320,51 +333,49 @@ int wmain(int argc, WCHAR* argv[])
             switch (towlower(argv[i][1]))
             {
                 case L'?':
-                    /* Print help and exit after */
-                    ConResPuts(StdOut, IDS_USAGE);
+                    /* will print help and exit after */
+                    PrintResourceString(IDS_USAGE);
                     return 0;
-
                 case L'f':
+                    /* if set to true, will populate all the files within the folder structure */
                     bShowFiles = TRUE;
                     break;
-
                 case L'a':
                     bUseAscii = TRUE;
                     break;
-
                 default:
                     break;
             }
         }
         else
         {
-            /* This must be path to some folder */
+            /* this must be path to some folder */
 
-            /* Set the current directory for this executable */
+            /* will set the current directory for this executable */
             BOOL b = SetCurrentDirectoryW(argv[i]);
             if (b == FALSE)
             {
-                ConResPuts(StdOut, IDS_NO_SUBDIRECTORIES);
+                PrintResourceString(IDS_NO_SUBDIRECTORIES);
                 return 1;
             }
         }
     }
 
-    ConResPuts(StdOut, IDS_FOLDER_PATH);
+    PrintResourceString(IDS_FOLDER_PATH);
 
-    GetVolumeInformationW(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0);
-    ConResPrintf(StdOut, IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff);
+    GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0);
+    PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff);
 
     /* get the buffer size */
-    sz = GetCurrentDirectoryW(1, &t);
+    sz = GetCurrentDirectory(1, &t);
     /* must not return before calling delete[] */
-    strPath = (PWSTR)malloc(sz * sizeof(WCHAR));
+    strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz);
 
     /* get the current directory */
-    GetCurrentDirectoryW(sz, strPath);
+    GetCurrentDirectory(sz, strPath);
 
     /* get the drive letter , must not return before calling delete[] */
-    driveLetter = (PWSTR)malloc(sz * sizeof(WCHAR));
+    driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz);
 
     /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */
     //wcscpy_s(driveLetter,sz,strPath);
@@ -372,15 +383,15 @@ int wmain(int argc, WCHAR* argv[])
     wcscpy(driveLetter, strPath);
     wcstok(driveLetter, L":");
 
-    ConPrintf(StdOut, L"%s:.\n", driveLetter);
+    wprintf(L"%s:.\n", driveLetter);
 
     free(driveLetter);
 
-    /* get the sub-directories within this current folder */
+    /* get the sub directories within this current folder */
     GetDirectoryStructure(strPath, 1, L"          ");
 
     free(strPath);
-    ConPuts(StdOut, L"\n");
+    wprintf(L"\n");
 
     return 0;
 }

reactos/base/applications/cmdutils/whoami/CMakeLists.txt

@@ -1,8 +1,5 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
-
 add_executable(whoami whoami.c whoami.rc)
 set_module_type(whoami win32cui UNICODE)
-target_link_libraries(whoami conutils ${PSEH_LIB})
 add_importlibs(whoami user32 secur32 advapi32 msvcrt kernel32)
 add_cd_file(TARGET whoami DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc

@@ -1,4 +1,3 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
@@ -30,8 +29,8 @@ BEGIN
     IDS_UNKNOWN_DESCRIPTION "???"
     IDS_STATE_ENABLED "Activat"
     IDS_STATE_DISABLED "Dezactivat"
-    IDS_ERROR_UPN "EROARE: Numele Principal al Utilizatorului (UPN) nu poate fi obținut deoarece\n utilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
-    IDS_ERROR_FQDN "EROARE: Numele Complet Distinctiv Calificat (FQDN) nu poate fi obținut\ndeoarece utilizatorul actualmente autentificat nu este un un utilizator\nde domeniu.\n"
+    IDS_ERROR_UPN "EROARE: Nu se poate obține Numele Principal al Utilizatorului (UPN) deoarece\n utilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
+    IDS_ERROR_FQDN "EROARE: Nu se poate obține Numele Complet Distinctiv Calificat (FQDN) deoarece\nutilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
     IDS_ERROR_VALUEXPECTED "EROARE: Sintaxă eronată. Este așteptată o valoare pentru «/fo».\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_ERROR_VALUENOTALLOWED "EROARE: Sintaxă eronată. Valoarea «%s» nu este permisă pentru opțiunea «/fo».\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_ERROR_1TIMES "EROARE: Sintaxă eronată. Utilizarea opțiunii «%s» nu este permisă mai mult de o\nsingură dată.\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
@@ -40,8 +39,8 @@ BEGIN
     IDS_ERROR_NH_LIST "EROARE: Opțiunea /NH nu poate fi utilizată în formatul LIST.\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_HELP "DESCRIERE:\n\
   Afișează informațiile de utilizator, de grup, și de privilegii pentru un\n\
-  utilizator autentificat local. Dacă nu sunt furnizate argumente, vor fi\n\
-  afișate numele și domeniul utilizatorului curent.\n\
+  utilizator autentificat local. Dacă nu sunt furnizate argumente, se vor afișa\n\
+  numele și domeniul utilizatorului curent.\n\
   \n\
   Formatele disponibile pentru opțiunea «/fo» sunt «csv», «list», și «table».\n\
   Argumentul «/nh» ascunde anteturile. Datele sunt implicit afișate tabelar.\n\

reactos/base/applications/cmdutils/whoami/whoami.c

@@ -6,16 +6,69 @@
  * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
  */
 
+
 #define SECURITY_WIN32
 #include <security.h>
 #include <sddl.h>
-#include <strsafe.h>
 
-#include <conutils.h>
+#include <strsafe.h>
 
 #include "resource.h"
 
-#define wprintf(...) ConPrintf(StdOut, ##__VA_ARGS__)
+
+/* Unicode (W) to ANSI OEM wrapper function, as console and Unicode don't mix well, sigh */
+static void WhoamiOemConversion_printf(const WCHAR *lpSourceFormatW, ...)
+{
+    CHAR  *lpBufferA = NULL;
+    WCHAR *lpBufferW = NULL;
+
+    UINT Size;
+    va_list Args;
+
+    /* first let's find out the final output'ed length of the wprintf routine */
+    va_start(Args, lpSourceFormatW);
+
+    Size = _vscwprintf(lpSourceFormatW, Args);
+
+    va_end(Args);
+
+    /* allocate a proportional memory chunk taking into account the char width */
+    lpBufferW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(WCHAR));
+
+    if (!lpBufferW)
+        return;
+
+    /* do wprintf to this newly allocated buffer of ours */
+    va_start(Args, lpSourceFormatW);
+
+    _vsnwprintf(lpBufferW, Size, lpSourceFormatW, Args);
+
+    va_end(Args);
+
+    /* allocate a similarly sized buffer for the ANSI/OEM version of our string */
+    lpBufferA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(CHAR));
+
+    if (!lpBufferA)
+    {
+        HeapFree(GetProcessHeap(), 0, lpBufferW);
+        return;
+    }
+
+    /* convert our Unicode/Wide char string into a proper ANSI/OEM
+       string that our console may understand, at least in theory */
+    CharToOemBuffW(lpBufferW,
+                   lpBufferA,
+                   Size);
+
+    /* print the converted OEM string into the console's output and call it a day */
+    printf("%s", lpBufferA);
+
+    /* clean everything up */
+    HeapFree(GetProcessHeap(), 0, lpBufferW);
+    HeapFree(GetProcessHeap(), 0, lpBufferA);
+}
+
+#define wprintf WhoamiOemConversion_printf
 
 BOOL NoHeader = FALSE;
 UINT NoHeaderArgCount = 0;
@@ -141,6 +194,7 @@ void WhoamiPrintHeader(int HeaderId)
     while (Length--)
         wprintf(L"-");
 
+    /* _putws seems to be broken in ReactOS' CRT ??? */
     wprintf(L"\n\n");
 }
 
@@ -664,15 +718,12 @@ int WhoamiPriv(void)
 
 int wmain(int argc, WCHAR* argv[])
 {
-    #define WAM_USER   1<<0
-    #define WAM_GROUPS 1<<1
-    #define WAM_PRIV   1<<2
-
     INT i;
     BYTE WamBit = 0;
 
-    /* Initialize the Console Standard Streams */
-    ConInitStdStreams();
+    #define WAM_USER   1<<0
+    #define WAM_GROUPS 1<<1
+    #define WAM_PRIV   1<<2
 
 
     /* * * * * * * * * * * * * * * *

reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc

@@ -5,7 +5,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 STRINGTABLE
 {
     STRING_CMDLINE_NOT_SUPPORTED, "Eroare: Comandă nerecunoscută.\n"
-    STRING_ALIAS_NOT_FOUND, "Eroare: Alias necunoscut.\n"
+    STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate găsi alias.\n"
     STRING_INVALID_QUERY, "Eroare: Cerere nevalidă.\n"
     STRING_INVALID_PATH, "Conținutul din «PATH» este sintactic nevalid.\n"
 }

reactos/base/applications/cmdutils/xcopy/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -10,7 +10,7 @@ STRINGTABLE
     STRING_COPY,     "%1!d! fișier(e) copiat(e)\n"
     STRING_QISDIR,   "«%1» este un nume de fișier sau un director\ndin destinație?\n(F - Fișier, D - Director)\n"
     STRING_SRCPROMPT,"%1? (Da|Nu)\n"
-    STRING_OVERWRITE,"Suprascrieți %1? (Da|Nu|Toate)\n"
+    STRING_OVERWRITE,"Se suprascrie %1? (Da|Nu|Toate)\n"
     STRING_COPYFAIL, "Copierea «%1» în «%2» a eșuat cu cod de retur %3!d!\n"
     STRING_OPENFAIL, "Deschiderea «%1» a eșuat\n"
     STRING_READFAIL, "Citirea «%1» a eșuat\n"
@@ -28,7 +28,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \nCu:\n\
 \n\
-[/I]  Creează director dacă destinația nu există și copiază două sau\n\
+[/I]  Creează director dacă destinația nu există și se copiază două sau\n\
 \tmai multe fișiere.\n\
 [/S]  Copiază directoarele și subdirectoarele.\n\
 [/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale.\n\

reactos/base/applications/dxdiag/lang/ro-RO.rc

@@ -256,5 +256,5 @@ BEGIN
     IDS_DMUSIC_DLS "DLS de suport"
     IDS_DMUSIC_EXT "Extern"
     IDS_DMUSIC_PORT "Port implicit"
-    IDS_DDDISABLE_MSG "Accelerările fizice DirectDraw vor fi dezactivate pentru toate dispozitivele.\nDoriți să continuați?\n"
+    IDS_DDDISABLE_MSG "Se vor dezactiva toate accelerările fizice DirectDraw pentru toate dispozitivele.\nDoriți să continuați?\n"
 END

reactos/base/applications/dxdiag/sound.c

@@ -73,7 +73,7 @@ IsDriverWHQL(LPWSTR szFileName)
     /* get the driver's cat file */
     if (!GetCatFileFromDriverPath(szFileName, szCatFile))
     {
-        /* driver has no cat so it's definitely not WHQL signed */
+        /* driver has no cat so its definately not WHQL signed */
         return FALSE;
     }
 
@@ -126,7 +126,7 @@ SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription)
                     SetDlgItemInt(hwndDlg, IDC_STATIC_DSOUND_PRODUCTID, waveOut.wPid, FALSE);
                     /* set the vendor id */
                     SetDlgItemInt(hwndDlg, IDC_STATIC_DSOUND_VENDORID, waveOut.wMid, FALSE);
-                    /* check if it's a WDM audio driver */
+                    /* check if its a wdm audio driver */
                     if (waveOut.wPid == MM_MSFT_WDMAUDIO_WAVEOUT)
                         SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_TYPE, WM_SETTEXT, 0, (LPARAM)L"WDM");
 

reactos/base/applications/fltmc/lang/en-US.rc

@@ -20,7 +20,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_PRIV      "Failed to set the driver load privilege (0x%X)\n"
+    IDS_ERROR_PRIV      "Failed to set the driver load privilige (0x%X)\n"
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"

reactos/base/applications/fltmc/lang/ro-RO.rc

@@ -1,28 +1,27 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "\nComenzi valide:\n\
-               load        Încarcă un modul-pilot de tip filtru\n\
-               unload      Descarcă un modul-pilot de tip filtru\n\
-               filters     Afișează filtrele înregistrate acum în sistem\n\n"
+    IDS_USAGE "\nValid commands :\n\
+               load        Loads a Filter driver\n\
+               unload      Unloads a Filter driver\n\
+               filters     Lists the Filters currently registered in the system\n\n"
 
-    IDS_USAGE_LOAD      "Încarcă un modul-pilot de tip filtru\n"
-    IDS_USAGE_UNLOAD    "Descarcă un modul-pilot de tip filtru\n"
-    IDS_USAGE_FILTERS   "Afișează toate filtrele înregistrate\n"
+    IDS_USAGE_LOAD      "Loads a filter driver\n"
+    IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
+    IDS_USAGE_FILTERS   "Lists all registered filters\n"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_DISPLAY_FILTERS1    "Nume de filtru                  Num Instanțe     Altitudine  Cadru\n"
-    IDS_DISPLAY_FILTERS2    "Nume de filtru                  Num Instanțe    Cadru\n"
+    IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
+    IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_PRIV      "Eșec la instituirea dreptului de încărcare pentru modulul-pilot (0x%X)\n"
-    IDS_ERROR_FILTERS   "Eșec la afișarea filtrelor (0x%X)\n"
-    IDS_ERROR_LOAD      "Eșec la încărcarea filtrului (0x%X)\n"
-    IDS_ERROR_UNLOAD    "Eșec la descărcarea filtrului (0x%X)\n"
+    IDS_ERROR_PRIV      "Failed to set the driver load privilige (0x%X)\n"
+    IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
+    IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
+    IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
 END

reactos/base/applications/fontview/display.c

@@ -94,7 +94,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
 	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
 	y += tm.tmHeight + SPACING1;
 
-	/* Draw a separation Line */
+	/* Draw a seperation Line */
 	SelectObject(hDC, GetStockObject(BLACK_PEN));
 	MoveToEx(hDC, 0, y, NULL);
 	LineTo(hDC, 10000, y);
@@ -117,7 +117,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
 	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
-	/* Draw a separation Line */
+	/* Draw a seperation Line */
 	SelectObject(hDC, GetStockObject(BLACK_PEN));
 	MoveToEx(hDC, 0, y, NULL);
 	LineTo(hDC, 10000, y);

reactos/base/applications/fontview/fontview.c

@@ -204,7 +204,7 @@ WinMain (HINSTANCE hThisInstance,
 
 	/* The class is registered, let's create the main window */
 	hMainWnd = CreateWindowExW(
-				0,						/* Extended possibilities for variation */
+				0,						/* Extended possibilites for variation */
 				g_szFontViewClassName,	/* Classname */
 				g_ExtLogFontW.elfFullName,/* Title Text */
 				WS_OVERLAPPEDWINDOW,	/* default window */

reactos/base/applications/fontview/lang/ro-RO.rc

@@ -11,7 +11,7 @@ BEGIN
     IDS_ERROR "Eroare"
     IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația."
     IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat."
-    IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată."
+    IDS_ERROR_NOCLASS "Nu s-a putut inițializa clasa de ferestre."
     IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
 Fonturi de tip TrueType (*.ttf)\0*.ttf\0\
 Fonturi de tip OpenType (*.otf)\0*.otf\0\

reactos/base/applications/games/solitaire/solgame.cpp

@@ -414,7 +414,7 @@ void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked)
         SetPlayTimer();
 
         //stackobj.MoveCards(pDest, 1, true);
-        //use the SimulateDrag function, because we get the
+        //use the SimulateDrag funcion, because we get the
         //AddProc callbacks called for us on the destination stacks...
         bAutoroute = true;
         stackobj.SimulateDrag(pDest, 1, true);

reactos/base/applications/kbswitch/kbswitch.c

@@ -174,7 +174,7 @@ GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength)
         RegCloseKey(hKey);
     }
 
-    // Look for a substitute of this layout
+    // Look for a substitude of this layout
     if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
         dwBufLen = sizeof(szTempLCID);

reactos/base/applications/logoff/CMakeLists.txt

@@ -3,6 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 add_executable(logoff logoff.c logoff.rc)
 set_module_type(logoff win32cui UNICODE)
-target_link_libraries(logoff conutils ${PSEH_LIB})
+target_link_libraries(logoff conutils_stream ${PSEH_LIB})
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all)

reactos/base/applications/magnify/lang/en-US.rc

@@ -60,7 +60,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14
     ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20
-    LTEXT "Magnifier is intended to provide a minimum level of functionality for users with slight visual impairments. Most users with visual impairments will need a magnification utility with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33
+    LTEXT "Magnifier is intended to provide a minimum level of functionality for users with slight visual impairments. Most users with visual impairments will need a magnification utility with higher funcionality for daily use.", IDC_STATIC, 36, 7, 207, 33
     CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END

reactos/base/applications/magnify/lang/ro-RO.rc

@@ -10,9 +10,9 @@ BEGIN
     POPUP "&Fișier"
     BEGIN
         MENUITEM "I&eșire", IDM_EXIT
-        MENUITEM "&Opțiuni…", IDM_OPTIONS
+        MENUITEM "&Opțiuni", IDM_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "&Despre…", IDM_ABOUT
+        MENUITEM "&Despre", IDM_ABOUT
     END
 END
 

reactos/base/applications/mplay32/lang/ro-RO.rc

@@ -35,7 +35,7 @@ BEGIN
     END
     POPUP "Aj&utor"
     BEGIN
-        MENUITEM "&Despre…", IDM_ABOUT
+        MENUITEM "&Despre", IDM_ABOUT
     END
 END
 
@@ -53,18 +53,18 @@ BEGIN
     IDS_MODE_UNKNOWN "Nespecificat"
     IDS_MODE_OPEN "Deschis"
     IDS_MODE_STOP "Oprit"
-    IDS_MODE_PLAY "În lectură"
+    IDS_MODE_PLAY "În curs"
     IDS_MODE_PAUSE "Întrerupt"
-    IDS_MODE_RECORD "Înregistrare"
-    IDS_MODE_SEEK "Derulare"
+    IDS_MODE_RECORD "Se înregistrează"
+    IDS_MODE_SEEK "Se caută"
     IDS_MODE_NOT_READY "Nepregătit"
     IDS_ALL_TYPES_FILTER "Toate admisibile"
     IDS_TOOLTIP_PLAY "Redare conținut multimedia"
-    IDS_TOOLTIP_STOP "Oprire lectură"
-    IDS_TOOLTIP_EJECT "Scoatere"
+    IDS_TOOLTIP_STOP "Oprirea lecturii"
+    IDS_TOOLTIP_EJECT "Scoate"
     IDS_TOOLTIP_BACKWARD "Salt la precedent"
-    IDS_TOOLTIP_SEEKBACK "Derulare înapoi"
-    IDS_TOOLTIP_SEEKFORW "Derulare înainte"
+    IDS_TOOLTIP_SEEKBACK "Derulează înapoi"
+    IDS_TOOLTIP_SEEKFORW "Derulează înainte"
     IDS_TOOLTIP_FORWARD "Salt la următor"
     IDS_TOOLTIP_PAUSE "Întrerupere"
     IDS_APPTITLE "Lector multimedia"

reactos/base/applications/mplay32/mplay32.c

@@ -1061,14 +1061,14 @@ BuildFileFilterAndDeviceMenu(VOID)
         /* Add the description */
         StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szFriendlyName, szExtensionList);
 
-        /* Skip one char to separate the description from the filter mask */
+        /* Skip one char to seperate the description from the filter mask */
         c++;
         uSizeRemain -= sizeof(*c);
 
         /* Append the filter mask */
         StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0);
 
-        /* Skip another char to separate the elements of the filter mask */
+        /* Skip another char to seperate the elements of the filter mask */
         c++;
         uSizeRemain -= sizeof(*c);
     }
@@ -1096,7 +1096,7 @@ BuildFileFilterAndDeviceMenu(VOID)
     /* Add the default (all files) description */
     StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szDefaultFilter, szExtensionList);
 
-    /* Skip one char to separate the description from the filter mask */
+    /* Skip one char to seperate the description from the filter mask */
     c++;
     uSizeRemain -= sizeof(*c);
 
@@ -1122,7 +1122,7 @@ Failure:
     /* Add the default (all files) description */
     StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szDefaultFilter, szDefaultExtension);
 
-    /* Skip one char to separate the description from the filter mask */
+    /* Skip one char to seperate the description from the filter mask */
     c++;
     uSizeRemain -= sizeof(*c);
 

reactos/base/applications/msconfig_new/lang/ro-RO.rc

@@ -187,7 +187,7 @@ END
 
 IDD_REQUIRED_SERVICES_DISABLING_DIALOG DIALOGEX 0, 0, 237, 62
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Programul configurator de sistem" // "Program de configurare sistem"
+CAPTION "Configuratorul de sistem" // "Program de configurare sistem"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Î&nchide", IDOK, 180, 41, 50, 14
@@ -198,8 +198,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MSCONFIG            "Programul configurator de sistem"
-    IDS_MSCONFIG_2          "Configurator de sistem"
+    IDS_MSCONFIG            "Programul configurației de sistem"
+    IDS_MSCONFIG_2          "Configurația de sistem"
     IDS_ABOUT               "&Despre…\tShift+F1"
 END
 

reactos/base/applications/msconfig_new/srvpage.cpp

@@ -735,15 +735,15 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
             {
                 case IDC_BTN_SERVICES_ACTIVATE:
                 {
-                    BOOL bAreThereMods = FALSE;
+                    BOOL bAreThereModifs = FALSE;
 
                     int index = -1; // From the beginning.
                     while ((index = ListView_GetNextItem(hServicesListCtrl, index, LVNI_ALL)) != -1)
                     {
-                        bAreThereMods = ValidateItem(index, TRUE, FALSE) || bAreThereMods; // The order is verrrrrry important !!!!
+                        bAreThereModifs = ValidateItem(index, TRUE, FALSE) || bAreThereModifs; // The order is verrrrrry important !!!!
                     }
 
-                    if (bAreThereMods)
+                    if (bAreThereModifs)
                     {
                         Update_Btn_States(hDlg);
                         PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
@@ -754,15 +754,15 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
                 case IDC_BTN_SERVICES_DEACTIVATE:
                 {
-                    BOOL bAreThereMods = FALSE;
+                    BOOL bAreThereModifs = FALSE;
 
                     int index = -1; // From the beginning.
                     while ((index = ListView_GetNextItem(hServicesListCtrl, index, LVNI_ALL)) != -1)
                     {
-                        bAreThereMods = ValidateItem(index, FALSE, FALSE) || bAreThereMods; // The order is verrrrrry important !!!!
+                        bAreThereModifs = ValidateItem(index, FALSE, FALSE) || bAreThereModifs; // The order is verrrrrry important !!!!
                     }
 
-                    if (bAreThereMods)
+                    if (bAreThereModifs)
                     {
                         Update_Btn_States(hDlg);
                         PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
@@ -927,7 +927,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
                                 if (lpServiceConfig->dwStartType == SERVICE_DISABLED) // We have a disabled service which is becoming to be enabled.
                                 {
-                                    // 3a- Retrieve the properties of the disabled service from the registry.
+                                    // 3a- Retrive the properties of the disabled service from the registry.
                                     RegistryDisabledServiceItemParams params = {};
 
                                     QUERY_REGISTRY_KEYS_TABLE KeysQueryTable[2] = {};

reactos/base/applications/mscutils/devmgmt/devmgmt.c

@@ -1,5 +1,5 @@
 /*
- * PROJECT:     ReactOS Device Management
+ * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/devmgmt/devmgmt.c
  * PURPOSE:     Bootstrap for the device manager

reactos/base/applications/mscutils/eventvwr/eventvwr.c

@@ -340,7 +340,7 @@ GetMessageStringFromDll(
              * and we did not pass the flag FORMAT_MESSAGE_IGNORE_INSERTS, and the
              * message string expected too many inserts.
              * In this last case only, we can call again FormatMessage but ignore
-             * explicitly the inserts. The string that we will return to the user
+             * explicitely the inserts. The string that we will return to the user
              * will not be pre-formatted.
              */
             if (((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) || lpMsgBuf) &&

reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc

@@ -6,7 +6,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc

@@ -6,7 +6,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc

@@ -8,9 +8,9 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
-        MENUITEM "&Alle Ereignisse löschen", IDM_CLEAR_EVENTS
+        MENUITEM "Alle E&reignisse löschen", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
         MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
@@ -148,7 +148,7 @@ STRINGTABLE
 BEGIN
     IDS_EVENTLOG_ERROR_TYPE "Fehler"
     IDS_EVENTLOG_WARNING_TYPE "Warnung"
-    IDS_EVENTLOG_INFORMATION_TYPE "Information"
+    IDS_EVENTLOG_INFORMATION_TYPE "Informationen"
     IDS_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich"
     IDS_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen"
     IDS_EVENTLOG_SUCCESS "Erfolgreich"

reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/en-US.rc

@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc

@@ -6,15 +6,15 @@ IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Journal"
     BEGIN
-        MENUITEM "&Ouvrir...", IDM_OPEN_EVENTLOG
+        MENUITEM "Ouvrir...", IDM_OPEN_EVENTLOG
         MENUITEM "Enregistrer le fichier journal &sous...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Fermer", IDM_CLOSE_EVENTLOG
+        MENUITEM "Fermer", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "&Effacer tous les événements", IDM_CLEAR_EVENTS
         MENUITEM "&Renommer\tF2", IDM_RENAME_EVENTLOG
-        MENUITEM "&Propriétés du Journal...", IDM_EVENTLOG_SETTINGS
+        MENUITEM "Propriétés du &Journal...", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
-        MENUITEM "&Quitter", IDM_EXIT
+        MENUITEM "Quitter", IDM_EXIT
     END
     POPUP "&Affichage"
     BEGIN
@@ -148,7 +148,7 @@ STRINGTABLE
 BEGIN
     IDS_EVENTLOG_ERROR_TYPE "Erreur"
     IDS_EVENTLOG_WARNING_TYPE "Avertissement"
-    IDS_EVENTLOG_INFORMATION_TYPE "Information"
+    IDS_EVENTLOG_INFORMATION_TYPE "Informations"
     IDS_EVENTLOG_AUDIT_SUCCESS "Succès de l'audit"
     IDS_EVENTLOG_AUDIT_FAILURE "Échec de l'audit"
     IDS_EVENTLOG_SUCCESS "Succès"

reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG
         MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "Clear all Events (&L)", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc

@@ -8,10 +8,10 @@ BEGIN
     BEGIN
         MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG
         MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG
-        MENUITEM "Close(&C)", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
-        MENUITEM "Rename(&R)\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
         MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "종료(&X)", IDM_EXIT

reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc

@@ -6,7 +6,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc

@@ -10,7 +10,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "W&yczyść wszystkie zdarzenia", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc

@@ -9,28 +9,28 @@ IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Jurnal"
     BEGIN
-        MENUITEM "&Deschidere…", IDM_OPEN_EVENTLOG
+        MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "&Păstrare jurnal de evenimente ca…", IDM_SAVE_EVENTLOG
-        MENUITEM "Î&nchide", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "Înlăt&ură toate evenimentele", IDM_CLEAR_EVENTS
-        MENUITEM "&Redenumire\tF2", IDM_RENAME_EVENTLOG
-        MENUITEM "&Configurare jurnal…", IDM_EVENTLOG_SETTINGS
+        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", IDM_EXIT
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "După vârstă &crescător", IDM_LIST_NEWEST
-        MENUITEM "După vârstă &descrescător", IDM_LIST_OLDEST
+        MENUITEM "&Newest first", IDM_LIST_NEWEST
+        MENUITEM "&Oldest first", IDM_LIST_OLDEST
         MENUITEM SEPARATOR
-        MENUITEM "&Detalii…\tEnter", IDM_EVENT_DETAILS
+        MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS
         MENUITEM SEPARATOR
         MENUITEM "Împ&rospătare\tF5", IDM_REFRESH
     END
     POPUP "&Opțiuni"
     BEGIN
-        MENUITEM "&Afișează detalii de eveniment", IDM_SHOW_EVENT_DETAILS_VIEW
+        MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW
     END
     POPUP "Aj&utor"
     BEGIN
@@ -95,40 +95,40 @@ END
 
 IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Generale"
+CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "N&ume afișat:", IDC_STATIC, 7, 9, 60, 8
+    LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8
     EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Nume de ju&rnal:", IDC_STATIC, 7, 25, 60, 8
+    LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8
     EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Fiși&er de jurnal:", IDC_STATIC, 7, 41, 60, 8
+    LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8
     EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Dimensiune:", IDC_STATIC, 7, 57, 60, 8
+    LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8
     EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Creat:", IDC_STATIC, 7, 69, 60, 8
+    LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8
     EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Modificat:", IDC_STATIC, 7, 81, 60, 8
+    LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8
     EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Accessat:", IDC_STATIC, 7, 93, 60, 8
+    LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8
     EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "Dimensiune jurnal", IDC_STATIC, 7, 106, 238, 99
-    LTEXT "Dimensiune ma&ximă pentru jurnal:", IDC_STATIC, 17, 122, 58, 8
+    GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99
+    LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8
     EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14
-    LTEXT "Kio", IDC_STATIC, 130, 122, 20, 8
-    LTEXT "Când dimensiunea maximă este atinsă:", IDC_STATIC, 17, 140, 219, 8
-    CONTROL "Suprascrie evenimentele cân&d este necesar", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10
-    CONTROL "Suprascrie evenimentele mai &vechi de", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 155, 10
-    EDITTEXT IDC_EDIT_EVENTS_AGE, 175, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP
+    LTEXT "KB", IDC_STATIC, 130, 122, 20, 8
+    LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8
+    CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10
+    CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10
+    EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
-            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 104, 165, 10, 14
-    LTEXT "zile", IDC_STATIC, 215, 168, 20, 8
-    CONTROL "Inter&zice suprascrierea\n(gestiune manuală de jurnal)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20
-    PUSHBUTTON "&Opțiuni implicite", IDC_RESTOREDEFAULTS, 166, 183, 70, 14
-    AUTOCHECKBOX "Conexiune de &bandă limitată", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10
-    PUSHBUTTON "&Curăță jurnal", ID_CLEARLOG, 195, 213, 50, 14
+            UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14
+    LTEXT "days", IDC_STATIC, 162, 168, 20, 8
+    CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20
+    PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14
+    AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10
+    PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14
 END
 
 STRINGTABLE
@@ -136,13 +136,13 @@ BEGIN
     IDS_COPYRIGHT "Drept de autor (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
     IDS_APP_TITLE "Observator de evenimente"
     IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\"
-    IDS_STATUS_MSG "%s are %lu (de) eveniment(e) (afișate: %lu)"
-    IDS_LOADING_WAIT "Jurnal de evenimente în încărcare. Așteptați…"
-    IDS_NO_ITEMS "Nu există elemente de afișat." // "No events in this log."
-    IDS_EVENTLOG_SYSTEM "Jurnale de sistem"
-    IDS_EVENTLOG_APP "Jurnale de aplicație"
-    IDS_EVENTLOG_USER "Jurnale de utilizator"
-    IDS_EVENTSTRINGIDNOTFOUND "Descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ) nu a fost găsită. Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n"
+    IDS_STATUS_MSG "%s are %lu eveniment(e) (listed: %lu)"
+    IDS_LOADING_WAIT "Se încarcă jurnalul de evenimentele. Așteptați…"
+    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
+    IDS_EVENTLOG_SYSTEM "System Logs"
+    IDS_EVENTLOG_APP "Application Logs"
+    IDS_EVENTLOG_USER "User Logs"
+    IDS_EVENTSTRINGIDNOTFOUND "Nu se poate găsi descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ). Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n"
     IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?"
     IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0"
 END
@@ -160,7 +160,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BYTES_FORMAT "octeți" // "%s bytes"
+    IDS_BYTES_FORMAT "bytes" // "%s bytes"
     // "%1!ls! (%2!ls! bytes)"
 END
 

reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Открыть...", IDM_OPEN_EVENTLOG
         MENUITEM "Сохранить &журнал событий как...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Закрыть", IDM_CLOSE_EVENTLOG
+        MENUITEM "Закрыть", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "Очистить &все события", IDM_CLEAR_EVENTS
         MENUITEM "&Переименовать\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc

@@ -11,7 +11,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc

@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc

@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "&Aç...", IDM_OPEN_EVENTLOG
         MENUITEM "&Olay Kaydını Ayrı Sakla...", IDM_SAVE_EVENTLOG
-        MENUITEM "Ka&pat", IDM_CLOSE_EVENTLOG
+        MENUITEM "Kapat", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "&Tüm Olayları Sil", IDM_CLEAR_EVENTS
         MENUITEM "&Yeniden Alandır\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc

@@ -8,7 +8,7 @@ BEGIN
     BEGIN
         MENUITEM "&Open...", IDM_OPEN_EVENTLOG
         MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
         MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG

reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc

@@ -8,10 +8,10 @@ BEGIN
     BEGIN
         MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG
         MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG
-        MENUITEM "Close(&C)", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "清除所有事件(&L)", IDM_CLEAR_EVENTS
-        MENUITEM "Rename(&R)\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
         MENUITEM "Log Settings...(&T)", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "退出(&X)", IDM_EXIT

reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc

@@ -8,10 +8,10 @@ BEGIN
     BEGIN
         MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG
         MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG
-        MENUITEM "Close(&C)", IDM_CLOSE_EVENTLOG
+        MENUITEM "Close", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "清除所有事件(&L)", IDM_CLEAR_EVENTS
-        MENUITEM "Rename(&R)\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
         MENUITEM "Log Settings...(&T)", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "退出(&X)", IDM_EXIT

reactos/base/applications/mscutils/servman/dependencies_tv1.c

@@ -183,7 +183,7 @@ TV1_Initialize(PSERVICEPROPSHEET pDlgInfo,
 {
     BOOL bRet = FALSE;
 
-    /* Associate the imagelist with TV1 */
+    /* Accociate the imagelist with TV1 */
     pDlgInfo->hDependsTreeView1 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE1);
     if (!pDlgInfo->hDependsTreeView1)
     {

reactos/base/applications/mscutils/servman/dependencies_tv2.c

@@ -179,7 +179,7 @@ TV2_Initialize(PSERVICEPROPSHEET pDlgInfo,
 {
     BOOL bRet = FALSE;
 
-    /* Associate the imagelist with TV2 */
+    /* Accociate the imagelist with TV2 */
     pDlgInfo->hDependsTreeView2 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE2);
     if (!pDlgInfo->hDependsTreeView2)
     {

reactos/base/applications/mscutils/servman/export.c

@@ -9,7 +9,8 @@
 
 #include "precomp.h"
 
-#include <cderr.h>
+//#include <commdlg.h>
+//#include <cderr.h>
 
 static DWORD
 GetTextFromListView(PMAIN_WND_INFO Info,

reactos/base/applications/mscutils/servman/lang/en-US.rc

@@ -280,9 +280,9 @@ BEGIN
     IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service"
     IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service"
     IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
-    IDS_CREATE_SUCCESS "Service Created Successfully"
-    IDS_DELETE_SUCCESS "Service Deleted Successfully"
-    IDS_CREATE_REQ "Fields marked with an\nasterisk are mandatory"
+    IDS_CREATE_SUCCESS "Service Created Succesfully"
+    IDS_DELETE_SUCCESS "Service Deleted Succesfully"
+    IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory"
     IDS_DELETE_STOP "You must manually stop the service before deleting!"
 END
 

reactos/base/applications/mscutils/servman/lang/ro-RO.rc

@@ -100,59 +100,59 @@ BEGIN
     LTEXT "Tip lansare:", IDC_STATIC, 6, 108, 53, 11
     LTEXT "Stare serviciu:", IDC_STATIC, 4, 138, 53, 11
     LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
-    LTEXT "Aici pot fi specificați parametrii de pornire aplicabili lansării serviciului.", IDC_STATIC, 6, 177, 240, 15
+    LTEXT "Aici se pot specifica parametrii de pornire aplicabili lansării serviciului.", IDC_STATIC, 6, 177, 240, 15
     LTEXT "Parametri de pornire:", IDC_STATIC, 6, 200, 68, 11
     EDITTEXT IDC_START_PARAM, 78, 199, 168, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Mo&dificare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_LOGON DIALOGEX 6, 6, 253, 232
-CAPTION "Autentificare"
+CAPTION "Log On"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP
 BEGIN
-    LTEXT "Autentificat ca:", IDC_STATIC, 7, 7, 238, 8
-    AUTORADIOBUTTON "&Cont de sistem local", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Acest c&ont:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE
-    AUTOCHECKBOX "Per&mite serviciului să interacționeze cu aplicațiile de birou", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE
+    LTEXT "Log on as:", IDC_STATIC, 7, 7, 238, 8
+    AUTORADIOBUTTON "&Local System account", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&This account:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE
+    AUTOCHECKBOX "Allo&w service to interact with desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE
     EDITTEXT IDC_LOGON_ACCOUNTNAME, 72, 50, 103, 14, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Spe&cificare…", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    LTEXT "&Parolă:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
+    PUSHBUTTON "&Browse...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Password:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
     EDITTEXT IDC_LOGON_PASSWORD1, 72, 68, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Confi&rmarea parolei:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
+    LTEXT "&Confirm password:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
     EDITTEXT IDC_LOGON_PASSWORD2, 72, 86, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Acest serviciu poate fi activat sau dezactivat pentru următoarele profile ale dispozitivelor:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "You can enable or disable this service for the hardware profiles listed below:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
     CONTROL "", IDC_LOGON_HWPROFILE, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 124, 238, 65
-    PUSHBUTTON "&Activează", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
-    PUSHBUTTON "&Dezactivoază", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Enable", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Disable", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
 END
 
 IDD_RECOVERY DIALOGEX 6, 6, 253, 232
-CAPTION "Recuperare"
+CAPTION "Recovery"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP
 BEGIN
-    LTEXT "Determinați răspunsul sistemului dacă acest serviciu cade.", IDC_STATIC, 7, 7, 238, 8
-    LTEXT "&Prima cădere:", IDC_STATIC, 7, 24, 92, 8
+    LTEXT "Select the computer's response if this service fails.", IDC_STATIC, 7, 7, 238, 8
+    LTEXT "&First failure:", IDC_STATIC, 7, 24, 92, 8
     COMBOBOX IDC_FIRST_FAILURE, 104, 22, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "A &doua cădere:", IDC_STATIC, 7, 41, 92, 8
+    LTEXT "&Second failure:", IDC_STATIC, 7, 41, 92, 8
     COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "Alte căderi:", IDC_STATIC, 7, 58, 92, 8
+    LTEXT "Subsequent failures:", IDC_STATIC, 7, 58, 92, 8
     COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "&Ropornire contor după:", IDC_STATIC, 7, 75, 72, 8
+    LTEXT "Reset fail c&ounter after:", IDC_STATIC, 7, 75, 72, 8
     EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT "zile", IDC_STATIC, 150, 75, 95, 8
-    LTEXT "Repornire ser&viciu după:", IDC_RESTART_TEXT1, 7, 92, 92, 8
+    LTEXT "days", IDC_STATIC, 150, 75, 95, 8
+    LTEXT "Restart ser&vice after:", IDC_RESTART_TEXT1, 7, 92, 92, 8
     EDITTEXT IDC_RESTART_TIME, 104, 90, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT "minute", IDC_RESTART_TEXT2, 150, 92, 95, 8
-    GROUPBOX "Execare program", IDC_RUN_GROUPBOX, 7, 108, 238, 80
-    LTEXT "Pr&ogram:", IDC_RUN_TEXT1, 14, 121, 168, 8
+    LTEXT "minutes", IDC_RESTART_TEXT2, 150, 92, 95, 8
+    GROUPBOX "Run program", IDC_RUN_GROUPBOX, 7, 108, 238, 80
+    LTEXT "&Program:", IDC_RUN_TEXT1, 14, 121, 168, 8
     EDITTEXT IDC_PROGRAM, 14, 131, 165, 14
-    PUSHBUTTON "Spe&cificare…", IDC_BROWSE_PROGRAM, 180, 131, 58, 14
-    LTEXT "Para&metrii liniei de comandă:", IDC_RUN_TEXT2, 14, 155, 108, 8
+    PUSHBUTTON "&Browse...", IDC_BROWSE_PROGRAM, 180, 131, 58, 14
+    LTEXT "&Command line parameters:", IDC_RUN_TEXT2, 14, 155, 108, 8
     EDITTEXT IDC_PARAMETERS, 128, 152, 110, 14
-    AUTOCHECKBOX "&Adaugă contorul căderilor la sfârșitul liniei de comandă (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE
-    PUSHBUTTON "Opți&unile de repornire a calculatorului…", IDC_RESTART_OPTIONS, 116, 197, 129, 14
+    AUTOCHECKBOX "Append fail count to &end of command line (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE
+    PUSHBUTTON "&Restart Computer Options...", IDC_RESTART_OPTIONS, 116, 197, 129, 14
 END
 
 IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225
@@ -281,10 +281,10 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_PROGRESS_INFO_START "Este încearcată pornirea următorului serviciu"
-    IDS_PROGRESS_INFO_STOP "Este încearcată oprirea următorului serviciu"
-    IDS_PROGRESS_INFO_PAUSE "Este încearcată întreruperea următorului serviciu"
-    IDS_PROGRESS_INFO_RESUME "Este încearcată reluarea următorului serviciu"
+    IDS_PROGRESS_INFO_START "Se încearcă pornirea următorului serviciu"
+    IDS_PROGRESS_INFO_STOP "Se încearcă oprirea următorului serviciu"
+    IDS_PROGRESS_INFO_PAUSE "Se încearcă întreruperea următorului serviciu"
+    IDS_PROGRESS_INFO_RESUME "Se încearcă reluarea următorului serviciu"
     IDS_CREATE_SUCCESS "Serviciu creat cu succes"
     IDS_DELETE_SUCCESS "Serviciu eliminat cu succes"
     IDS_CREATE_REQ "Câmpurile cu\nasterisc sunt obligatorii"
@@ -336,14 +336,14 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ACTION "Nici o acțiune"
-    IDS_RESTART_SERVICE "Repornește serviciul"
-    IDS_RUN_PROGRAM "Execută un program"
-    IDS_RESTART_COMPUTER "Ropornește calculatorul"
+    IDS_NO_ACTION "Take no action"
+    IDS_RESTART_SERVICE "Restart the Service"
+    IDS_RUN_PROGRAM "Run a Program"
+    IDS_RESTART_COMPUTER "Restart the Computer"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_NOT_SAME_PASSWORD "Parolele nu sunt identice!"
-    IDS_INVALID_PASSWORD "Introduceți o parolă validă!"
+    IDS_NOT_SAME_PASSWORD "The Passwords are not the same!"
+    IDS_INVALID_PASSWORD "Enter a valid Password!"
 END

reactos/base/applications/mscutils/servman/misc.c

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/servman/misc.c
- * PURPOSE:     miscellaneous functions
+ * PURPOSE:     miscallanous functions
  * COPYRIGHT:   Copyright 2005 Thomas Weidenmueller <w3seek@reactos.org>
  *              Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *

reactos/base/applications/mscutils/servman/precomp.h

@@ -1,6 +1,9 @@
 #ifndef __SERVMAN_PRECOMP_H
 #define __SERVMAN_PRECOMP_H
 
+#if 0
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -11,9 +14,13 @@
 #include <winsvc.h>
 #include <wincon.h>
 #include <shlobj.h>
-#include <commdlg.h>
 #include <strsafe.h>
-
+#else
+#include <windows.h>
+#include <commctrl.h>
+#include <process.h>
+#include <strsafe.h>
+#endif
 #include "resource.h"
 
 #ifdef _MSC_VER

reactos/base/applications/mscutils/servman/progress.c

@@ -9,8 +9,6 @@
 
 #include "precomp.h"
 
-#include <process.h>
-
 #define PROGRESS_RANGE      20
 #define PROGRESS_STEP_MAX   15
 

reactos/base/applications/mspaint/lang/ro-RO.rc

@@ -18,19 +18,19 @@ BEGIN
         MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE
         MENUITEM "Păst&rare în…", IDM_FILESAVEAS
         MENUITEM SEPARATOR
-        MENUITEM "Din aparat media…", IDM_FILEFROMSCANNERORCAMERA
+        MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA
         MENUITEM SEPARATOR
         MENUITEM "Pre&vizionează pagina", IDM_FILEPAGEVIEW
         MENUITEM "C&onfigurare pagină…", IDM_FILEPAGESETUP
         MENUITEM "I&mprimă…\tCtrl+P", IDM_FILEPRINT
         MENUITEM SEPARATOR
-        MENUITEM "Transmite…", IDM_FILESEND
+        MENUITEM "Send...", IDM_FILESEND
         MENUITEM SEPARATOR
         MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE
         MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED
         MENUITEM "Decor de birou (e&xtins)", IDM_FILEASWALLPAPERSTRETCHED
         MENUITEM SEPARATOR
-        MENUITEM "Cel mai recent fișier", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED
+        MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "I&eșire\tAlt+F4", IDM_FILEEXIT
     END
@@ -218,7 +218,7 @@ BEGIN
     IDS_TOOLTIP15 "Oval"
     IDS_TOOLTIP16 "Dreptunghi rotunjit"
     IDS_ALLFILES "Orice fișier"
-    IDS_ALLPICTUREFILES "Toate fișierele imagine"
+    IDS_ALLPICTUREFILES "All Picture Files"
     IDS_FILESIZE "%d octeți"
     IDS_PRINTRES "%d x %d pixeli pe metru"
     IDS_INTNUMBERS "Introduceți doar numere întregi!"

reactos/base/applications/mspaint/registry.cpp

@@ -35,15 +35,23 @@ static void ReadFileHistory(CRegKey &key, LPCTSTR lpName, CString &strFile)
     strFile.ReleaseBuffer();
 }
 
-void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::WallpaperStyle style)
+void RegistrySettings::SetWallpaper(LPCTSTR szFileName, DWORD dwStyle, DWORD dwTile)
 {
+    if ((dwStyle > 2) || (dwTile > 2))
+        return;
+
     CRegKey desktop;
     if (desktop.Open(HKEY_CURRENT_USER, _T("Control Panel\\Desktop")) == ERROR_SUCCESS)
     {
+        CString strStyle, strTile;
+
         desktop.SetStringValue(_T("Wallpaper"), szFileName);
 
-        desktop.SetStringValue(_T("WallpaperStyle"), (style == RegistrySettings::STRETCHED) ? _T("2") : _T("1"));
-        desktop.SetStringValue(_T("TileWallpaper"), (style == RegistrySettings::TILED) ? _T("1") : _T("0"));
+        strStyle.Format(_T("%lu"), dwStyle);
+        strTile.Format(_T("%lu"), dwTile);
+
+        desktop.SetStringValue(_T("WallpaperStyle"), strStyle);
+        desktop.SetStringValue(_T("TileWallpaper"), strTile);
     }
 
     SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE);

reactos/base/applications/mspaint/registry.h

@@ -30,13 +30,7 @@ public:
     CString strFile3;
     CString strFile4;
 
-    enum WallpaperStyle {
-        TILED,
-        CENTERED,
-        STRETCHED
-    };
-
-    static void SetWallpaper(LPCTSTR szFileName, WallpaperStyle style);
+    static void SetWallpaper(LPCTSTR szFileName, DWORD dwStyle, DWORD dwTile);
 
     void Load();
     void Store();

reactos/base/applications/mspaint/winproc.cpp

@@ -451,13 +451,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
                 GlobalFree(pd.hDevNames);
             break;
         case IDM_FILEASWALLPAPERPLANE:
-            RegistrySettings::SetWallpaper(filepathname, RegistrySettings::TILED);
+            RegistrySettings::SetWallpaper(filepathname, 1, 1);
             break;
         case IDM_FILEASWALLPAPERCENTERED:
-            RegistrySettings::SetWallpaper(filepathname, RegistrySettings::CENTERED);
+            RegistrySettings::SetWallpaper(filepathname, 1, 0);
             break;
         case IDM_FILEASWALLPAPERSTRETCHED:
-            RegistrySettings::SetWallpaper(filepathname, RegistrySettings::STRETCHED);
+            RegistrySettings::SetWallpaper(filepathname, 2, 0);
             break;
         case IDM_FILE1:
         {
@@ -645,7 +645,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
             break;
         case IDM_FORMATICONBAR:
             textEditWindow.ShowWindow(textEditWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW);
-            break;
+
         case IDM_VIEWSHOWGRID:
             showGrid = !showGrid;
             imageArea.Invalidate(FALSE);

reactos/base/applications/mstsc/CMakeLists.txt

@@ -30,11 +30,10 @@ list(APPEND SOURCE
     uimain.h
     precomp.h)
 
-add_definitions(-DWITH_SSL)
 file(GLOB mstsc_rc_deps res/*.*)
 add_rc_deps(rdc.rc ${mstsc_rc_deps})
 add_executable(mstsc ${SOURCE} rdc.rc)
 set_module_type(mstsc win32gui UNICODE)
-add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 crypt32 secur32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
+add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
 add_pch(mstsc precomp.h SOURCE)
 add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all)

reactos/base/applications/mstsc/bitmap.c

@@ -17,8 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* three separate function for speed when decompressing the bitmaps
-   when modifying one function make the change in the others
+/* three seperate function for speed when decompressing the bitmaps
+   when modifing one function make the change in the others
    jay.sorg@gmail.com */
 
 /* indent is confused by this file */

reactos/base/applications/mstsc/cache.c

@@ -33,7 +33,7 @@ extern int g_pstcache_fd[];
 /*
  * TODO: Test for optimal value of BUMP_COUNT. TO_TOP gives lowest cpu utilisation but using
  * a positive value will hopefully result in less frequently used bitmaps having a greater chance
- * of being evicted from the cache, and thereby reducing the need to load bitmaps from disk.
+ * of being evicted from the cache, and therby reducing the need to load bitmaps from disk.
  * (Jeroen)
  */
 #define BUMP_COUNT 40

reactos/base/applications/mstsc/connectdialog.c

@@ -156,7 +156,7 @@ LoadUsernameHint(HWND hDlg, INT iCur)
 
 
 static VOID
-FillServerAddressCombo(PINFO pInfo)
+FillServerAddesssCombo(PINFO pInfo)
 {
     HKEY hKey;
     WCHAR KeyName[] = L"Software\\Microsoft\\Terminal Server Client\\Default";
@@ -325,7 +325,7 @@ GeneralOnInit(HWND hwnd,
                             0);
     }
 
-    FillServerAddressCombo(pInfo);
+    FillServerAddesssCombo(pInfo);
     ReLoadGeneralPage(pInfo);
 }
 
@@ -1244,7 +1244,7 @@ DlgProc(HWND hDlg,
                                     szBuffer,
                                     sizeof(szBuffer) / sizeof(WCHAR)))
                     {
-                        lf.lfHeight = 20;
+                        lf.lfHeight = 24;
                         lf.lfCharSet = OEM_CHARSET;
                         lf.lfQuality = DEFAULT_QUALITY;
                         lf.lfWeight = FW_MEDIUM;
@@ -1282,7 +1282,7 @@ DlgProc(HWND hDlg,
                                     szBuffer,
                                     sizeof(szBuffer) / sizeof(WCHAR)))
                     {
-                        lf.lfHeight = 24;
+                        lf.lfHeight = 30;
                         lf.lfCharSet = OEM_CHARSET;
                         lf.lfQuality = DEFAULT_QUALITY;
                         lf.lfWeight = FW_EXTRABOLD;

reactos/base/applications/mstsc/constants.h

@@ -131,12 +131,12 @@ enum MCS_PDU_TYPE
 #define LICENCE_SIGNATURE_SIZE	16
 
 #define LICENCE_TAG_REQUEST                     0x01
-#define LICENCE_TAG_PLATFORM_CHALLENGE          0x02
+#define LICENCE_TAG_PLATFORM_CHALLANGE          0x02
 #define LICENCE_TAG_NEW_LICENCE                 0x03
 #define LICENCE_TAG_UPGRADE_LICENCE             0x04
 #define LICENCE_TAG_LICENCE_INFO                0x12
 #define LICENCE_TAG_NEW_LICENCE_REQUEST         0x13
-#define LICENCE_TAG_PLATFORM_CHALLENGE_RESPONSE 0x15
+#define LICENCE_TAG_PLATFORM_CHALLANGE_RESPONSE 0x15
 #define LICENCE_TAG_ERROR_ALERT                 0xff
 
 #define BB_CLIENT_USER_NAME_BLOB	0x000f
@@ -323,7 +323,7 @@ enum RDP_INPUT_DEVICE
 #define RDP_INFO_AUTOLOGON 	      0x00000008
 #define RDP_INFO_UNICODE              0x00000010
 #define RDP_INFO_MAXIMIZESHELL        0x00000020
-#define RDP_INFO_COMPRESSION	      0x00000080	/* mppc compression with 8kB history buffer */
+#define RDP_INFO_COMPRESSION	      0x00000080	/* mppc compression with 8kB histroy buffer */
 #define RDP_INFO_ENABLEWINDOWSKEY     0x00000100
 #define RDP_INFO_COMPRESSION2	      0x00000200	/* rdp5 mppc compression with 64kB history buffer */
 #define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000

reactos/base/applications/mstsc/licence.c

@@ -199,9 +199,9 @@ licence_process_request(STREAM s)
 	licence_send_new_licence_request(null_data, null_data, g_username, g_hostname);
 }
 
-/* Send a platform challenge response packet */
+/* Send a platform challange response packet */
 static void
-licence_send_platform_challenge_response(uint8 * token, uint8 * crypt_hwid, uint8 * signature)
+licence_send_platform_challange_response(uint8 * token, uint8 * crypt_hwid, uint8 * signature)
 {
 	uint32 sec_flags = SEC_LICENCE_NEG;
 	uint16 length = 58;
@@ -209,7 +209,7 @@ licence_send_platform_challenge_response(uint8 * token, uint8 * crypt_hwid, uint
 
 	s = sec_init(sec_flags, length + 2);
 
-	out_uint8(s, LICENCE_TAG_PLATFORM_CHALLENGE_RESPONSE);
+	out_uint8(s, LICENCE_TAG_PLATFORM_CHALLANGE_RESPONSE);
 	out_uint8(s, ((g_rdp_version >= RDP_V5) ? 3 : 2));	/* version */
 	out_uint16_le(s, length);
 
@@ -227,9 +227,9 @@ licence_send_platform_challenge_response(uint8 * token, uint8 * crypt_hwid, uint
 	sec_send(s, sec_flags);
 }
 
-/* Parse a platform challenge request packet */
+/* Parse an platform challange request packet */
 static RD_BOOL
-licence_parse_platform_challenge(STREAM s, uint8 ** token, uint8 ** signature)
+licence_parse_platform_challange(STREAM s, uint8 ** token, uint8 ** signature)
 {
 	uint16 tokenlen;
 
@@ -248,9 +248,9 @@ licence_parse_platform_challenge(STREAM s, uint8 ** token, uint8 ** signature)
 	return s_check_end(s);
 }
 
-/* Process a platform challenge packet */
+/* Process a platform challange  packet */
 static void
-licence_process_platform_challenge(STREAM s)
+licence_process_platform_challange(STREAM s)
 {
 	uint8 *in_token = NULL, *in_sig;
 	uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
@@ -260,7 +260,7 @@ licence_process_platform_challenge(STREAM s)
 	void * crypt_key;
 
 	/* Parse incoming packet and save the encrypted token */
-	licence_parse_platform_challenge(s, &in_token, &in_sig);
+	licence_parse_platform_challange(s, &in_token, &in_sig);
 	memcpy(out_token, in_token, LICENCE_TOKEN_SIZE);
 
 	/* Decrypt the token. It should read TEST in Unicode. */
@@ -281,7 +281,7 @@ licence_process_platform_challenge(STREAM s)
 	ssl_rc4_crypt(crypt_key, (char *)hwid, (char *)crypt_hwid, LICENCE_HWID_SIZE);
 	ssl_rc4_info_delete(crypt_key);
 
-	licence_send_platform_challenge_response(out_token, crypt_hwid, out_sig);
+	licence_send_platform_challange_response(out_token, crypt_hwid, out_sig);
 }
 
 /* Process a new licence packet */
@@ -343,7 +343,7 @@ licence_process_error_alert(STREAM s)
 		return;
 	}
 
-	/* handle error codes, for now, just report them */
+	/* handle error codes, for now, jsut report them */
 	switch (error_code)
 	{
 		case 0x6:	// ERR_NO_LICENSE_SERVER
@@ -363,7 +363,7 @@ licence_process_error_alert(STREAM s)
 			break;
 	}
 
-	/* handle error codes, for now, just report them */
+	/* handle error codes, for now, jsut report them */
 	switch (error_info)
 	{
 		default:
@@ -393,8 +393,8 @@ licence_process(STREAM s)
 			licence_process_request(s);
 			break;
 
-		case LICENCE_TAG_PLATFORM_CHALLENGE:
-			licence_process_platform_challenge(s);
+		case LICENCE_TAG_PLATFORM_CHALLANGE:
+			licence_process_platform_challange(s);
 			break;
 
 		case LICENCE_TAG_NEW_LICENCE:

reactos/base/applications/mstsc/precomp.h

@@ -25,7 +25,7 @@
 #define RDP_INFO_AUTOLOGON            0x00000008
 #define RDP_INFO_UNICODE              0x00000010
 #define RDP_INFO_MAXIMIZESHELL        0x00000020
-#define RDP_INFO_COMPRESSION          0x00000080 /* mppc compression with 8kB history buffer */
+#define RDP_INFO_COMPRESSION          0x00000080 /* mppc compression with 8kB histroy buffer */
 #define RDP_INFO_ENABLEWINDOWSKEY     0x00000100
 #define RDP_INFO_COMPRESSION2         0x00000200 /* rdp5 mppc compression with 64kB history buffer */
 #define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000

reactos/base/applications/mstsc/rdesktop.h

@@ -191,7 +191,7 @@
         ((tvp)->tv_sec = (tvp)->tv_usec = 0)
 #endif
 
-/* If configure does not define the endianness, try
+/* If configure does not define the endianess, try
    to find it out */
 #if !defined(L_ENDIAN) && !defined(B_ENDIAN)
 #if __BYTE_ORDER == __LITTLE_ENDIAN

reactos/base/applications/mstsc/rdp.c

@@ -395,8 +395,8 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
 			2 + len_program +	/* AlternateShell */
 			2 + len_directory +	/* WorkingDir */
 			/* size of TS_EXTENDED_INFO_PACKET */
-			2 +	/* clientAddressFamily */
-			2 +	/* cbClientAddress */
+			2 +	/* clientAdressFamily */
+			2 +	/* cbClientAdress */
 			len_ip +	/* clientAddress */
 			2 +	/* cbClientDir */
 			len_dll +	/* clientDir */

reactos/base/applications/mstsc/secure.c

@@ -1011,7 +1011,7 @@ sec_recv(uint8 * rdpver)
 					{
 						/* for some reason the PDU and the length seem to be swapped.
 						   This isn't good, but we're going to do a byte for byte
-						   swap.  So the first four values appear as: 00 04 XX YY,
+						   swap.  So the first foure value appear as: 00 04 XX YY,
 						   where XX YY is the little endian length. We're going to
 						   use 04 00 as the PDU type, so after our swap this will look
 						   like: XX YY 04 00 */
@@ -1074,7 +1074,7 @@ sec_connect(char *server, char *username, char *domain, char *password, RD_BOOL
 	mcs_data.p = mcs_data.data = (uint8 *) xmalloc(mcs_data.size);
 	sec_out_mcs_data(&mcs_data, selected_proto);
 
-	/* finalize the MCS connect sequence */
+	/* finialize the MCS connect sequence */
 	if (!mcs_connect_finalize(&mcs_data))
 		return False;