[CMAKE]

- Sync with trunk r51050.

svn path=/branches/cmake-bringup/; revision=51154

base/applications/charmap/charmap.c

@@ -133,57 +133,96 @@ ChangeMapFont(HWND hDlg)
     }
 }
 
+// Copy collected characters into the clipboard
+static
+void
+CopyCharacters(HWND hDlg)
+{
+    HWND hText = GetDlgItem(hDlg, IDC_TEXTBOX);
+    DWORD dwStart, dwEnd;
 
+    // Acquire selection limits
+    SendMessage(hText, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
+
+    // Test if the whose text is unselected
+    if(dwStart == dwEnd) {
+        
+        // Select the whole text
+        SendMessageW(hText, EM_SETSEL, 0, -1);
+
+        // Copy text
+        SendMessageW(hText, WM_COPY, 0, 0);
+
+        // Restore previous values
+        SendMessageW(hText, EM_SETSEL, (WPARAM)dwStart, (LPARAM)dwEnd);
+
+    } else {
+
+        // Copy text
+        SendMessageW(hText, WM_COPY, 0, 0);
+    }
+}
+
+// Recover charset for the given font
+static
+BYTE
+GetFontMetrics(HWND hWnd, HFONT hFont)
+{
+    TEXTMETRIC tmFont;
+    HGDIOBJ    hOldObj;
+    HDC        hDC;
+
+    hDC = GetDC(hWnd);
+    hOldObj = SelectObject(hDC, hFont);
+    GetTextMetrics(hDC, &tmFont);
+    SelectObject(hDC, hOldObj);
+    ReleaseDC(hWnd, hDC);
+
+    return tmFont.tmCharSet;
+}
+
+// Select a new character
 static
 VOID
-AddCharToSelection(HWND hText,
+AddCharToSelection(HWND hDlg, WCHAR ch)
-                   WCHAR ch)
 {
-    LPWSTR lpText;
+    HWND    hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-    INT Len = GetWindowTextLength(hText);
+    HWND    hText = GetDlgItem(hDlg, IDC_TEXTBOX);
+    HFONT   hFont;
+    LOGFONT lFont;
+    CHARFORMAT cf;
 
-    if (Len != 0)
+    // Retrieve current character selected
+    if (ch == 0)
     {
-        lpText = HeapAlloc(GetProcessHeap(),
+        ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
-                           0,
+        if (!ch)
-                           (Len + 2) * sizeof(WCHAR));
+            return;
-
-        if (lpText)
-        {
-            LPWSTR lpStr = lpText;
-
-            SendMessageW(hText,
-                         WM_GETTEXT,
-                         Len + 1,
-                         (LPARAM)lpStr);
-
-            lpStr += Len;
-            *lpStr = ch;
-            lpStr++;
-            *lpStr = L'\0';
-
-            SendMessageW(hText,
-                         WM_SETTEXT,
-                         0,
-                         (LPARAM)lpText);
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpText);
     }
-    }
-    else
-    {
-        WCHAR szText[2];
 
-        szText[0] = ch;
+    // Retrieve current selected font
-        szText[1] = L'\0';
+    hFont = (HFONT)SendMessage(hMap, FM_GETHFONT, 0, 0);
 
-        SendMessageW(hText,
+    // Recover LOGFONT structure from hFont
-                     WM_SETTEXT,
+    if (!GetObject(hFont, sizeof(LOGFONT), &lFont))
-                     0,
+        return;
-                     (LPARAM)szText);
+
-    }
+    // Recover font properties of Richedit control
+    ZeroMemory(&cf, sizeof(cf));
+    cf.cbSize = sizeof(cf);
+    SendMessage(hText, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+
+    // Apply properties of the new font
+    cf.bCharSet = GetFontMetrics(hText, hFont);
+
+    // Update font name
+    wcscpy(cf.szFaceName, lFont.lfFaceName);
+
+    // Update font properties
+    SendMessage(hText, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+
+    // Send selected character to Richedit
+    SendMessage(hText, WM_CHAR, (WPARAM)ch, 0);
 }
 
 
@@ -204,6 +243,7 @@ DlgProc(HWND hDlg,
         case WM_INITDIALOG:
         {
             HMENU hSysMenu;
+            DWORD evMask;
 
             hSmIcon = LoadImageW(hInstance,
                                  MAKEINTRESOURCEW(IDI_ICON),
@@ -256,6 +296,12 @@ DlgProc(HWND hDlg,
                                 lpAboutText);
                 }
             }
+
+            // Configure Richedi control for sending notification changes.
+            evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0);
+            evMask |= ENM_CHANGE;
+            SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask);
+
             return TRUE;
         }
 
@@ -264,41 +310,39 @@ DlgProc(HWND hDlg,
             switch(LOWORD(wParam))
             {
                 case IDC_FONTMAP:
-                {
                     switch (HIWORD(wParam))
                     {
                         case FM_SETCHAR:
-                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                            AddCharToSelection(hDlg, LOWORD(lParam));
-                                               LOWORD(lParam));
                             break;
                     }
-                }
                     break;
 
                 case IDC_FONTCOMBO:
-                {
                     if (HIWORD(wParam) == CBN_SELCHANGE)
                     {
                         ChangeMapFont(hDlg);
                     }
-                }
                     break;
 
                 case IDC_SELECT:
-                {
+                    AddCharToSelection(hDlg, 0);
-                    WCHAR ch;
+                    break;
-                    HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-
-                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
-
-                    if (ch)
-                    {
-                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                           ch);
-                    }
 
+                case IDC_TEXTBOX:
+                    switch (HIWORD(wParam)) {
+                    case EN_CHANGE:
+                        if (GetWindowTextLength(GetDlgItem(hDlg, IDC_TEXTBOX)) == 0)
+                            EnableWindow(GetDlgItem(hDlg, IDC_COPY), FALSE);
+                        else
+                            EnableWindow(GetDlgItem(hDlg, IDC_COPY), TRUE);
                         break;
                     }
+                    break;
+
+                case IDC_COPY:
+                    CopyCharacters(hDlg);
+                    break;
 
                 case IDOK:
                     if (hSmIcon)
@@ -347,6 +391,7 @@ wWinMain(HINSTANCE hInst,
 {
     INITCOMMONCONTROLSEX iccx;
     INT Ret = 1;
+    HMODULE hRichEd20;
 
     hInstance = hInst;
 
@@ -355,12 +400,18 @@ wWinMain(HINSTANCE hInst,
     InitCommonControlsEx(&iccx);
 
     if (RegisterMapClasses(hInstance))
+    {
+        hRichEd20 = LoadLibraryW(L"RICHED20.DLL");
+
+        if (hRichEd20 != NULL)
         {
             Ret = DialogBoxW(hInstance,
                              MAKEINTRESOURCEW(IDD_CHARMAP),
                              NULL,
                              DlgProc) >= 0;
 
+            FreeLibrary(hRichEd20);
+        }
         UnregisterMapClasses(hInstance);
     }
 

base/applications/charmap/charmap.rc

@@ -1,5 +1,6 @@
 #include <windows.h>
 #include <commctrl.h>
+#include <richedit.h>
 #include "resource.h"
 
 

base/applications/charmap/lang/bg-BG.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Ïîìîù", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Çíàöè çà çàïîìíÿíå:", IDC_STATIC, 3, 188, 75, 9
-  EDITTEXT       IDC_TEXTBOX, 79, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Èçáîð", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Çàïîìíÿíå", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Ðaçøèðåí èçãëåä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/ca-ES.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Ajuda", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Caràcters a copiar :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copia", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Vista avançada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/cs-CZ.rc

@@ -15,7 +15,7 @@ BEGIN
   PUSHBUTTON    "Nápovìda", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Znaky ke zkopírování:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Oznaèit", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopírovat", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Pokroèilé zobrazení", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/de-DE.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Hilfe", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Zeichenauswahl:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Auswählen", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Erweiterte Ansicht", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/el-GR.rc

@@ -12,7 +12,7 @@ BEGIN
     CONTROL         "",IDC_FONTMAP,"FontMapWnd",WS_VSCROLL | WS_TABSTOP,20,
                     22,266,156
     LTEXT           "×áñáêôÞñåò ðñïò áíôéãñáöÞ :",IDC_STATIC,6,184,66,17
-    EDITTEXT        IDC_TEXTBOX,74,186,114,13
+    CONTROL         "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
     DEFPUSHBUTTON   "ÅðéëïãÞ",IDC_SELECT,194,186,44,13
     PUSHBUTTON      "ÁíôéãñáöÞ",IDC_COPY,242,186,44,13,WS_DISABLED
 END

base/applications/charmap/lang/en-US.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Help", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Characters to copy:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/es-ES.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Ayuda", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Caracteres a copiar :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copiar", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Vista Avanzada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/fr-FR.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Aide", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Caractères à copier :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Sélectionner", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Vue avancée", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/id-ID.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Bantuan", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Karakter untuk di-copy :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Pilih", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/it-IT.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Aiuto", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Caratteri da copiare :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Visualizzazione avanzata", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/ja-JP.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "ヘルプ", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "コピーする文字:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "選択", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "コピー", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "詳細表\示", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/ko-KR.rc

@@ -13,7 +13,7 @@ BEGIN
   PUSHBUTTON    "도움말", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "복사할 문자:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "선택", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "복사", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "확장 모드", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/lt-LT.rc

@@ -19,7 +19,7 @@ BEGIN
   PUSHBUTTON    "Pagalba", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9
-  EDITTEXT       IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/nl-NL.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Help", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Te kopiëren tekens:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecteren", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopiëren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Geavanceerde weergave", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/no-NO.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Hjelp", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Kopier følgende tegn:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/pl-PL.rc

@@ -16,7 +16,7 @@ BEGIN
   PUSHBUTTON    "Pomo&c", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "&Znaki do skopiowania:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "&Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Widok z&aawansowany", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/pt-BR.rc

@@ -10,7 +10,7 @@ BEGIN
   PUSHBUTTON    "Aj&uda", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Caracteres a serem copiados :", IDC_STATIC, 6, 183, 66, 17
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecionar", IDC_SELECT, 194, 186, 46, 13
   PUSHBUTTON    "Copiar", IDC_COPY, 244, 186, 46, 13, WS_DISABLED
   //AUTOCHECKBOX  "Modo de exibição avançado", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/ru-RU.rc

@@ -12,7 +12,7 @@ BEGIN
   PUSHBUTTON    "Ñïðàâêà", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Êîïèðîâàòü ñèìâîë:", IDC_STATIC, 6, 188, 95, 9
-  EDITTEXT       IDC_TEXTBOX, 80, 186, 109, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Êîïèðîâàòü", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/sk-SK.rc

@@ -19,7 +19,7 @@ BEGIN
   PUSHBUTTON    "&Pomocník", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Kopírova<76> &znaky:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "&Vybra<72>", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "&Kopírova<76>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "R&ozšírené zobrazenie", IDC_ADVVIEW, 10, 204, 75, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/uk-UA.rc

@@ -18,7 +18,7 @@ BEGIN
   PUSHBUTTON    "Äîâ³äêà", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Äëÿ êîï³þâàííÿ :", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Êîï³þâàòè", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Ðîçøèðåíèé âèãëÿä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/zh-CN.rc

@@ -12,7 +12,7 @@ BEGIN
   PUSHBUTTON    "说明", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "待复制的字符:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "选择", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "复制", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/lang/zh-TW.rc

@@ -12,7 +12,7 @@ BEGIN
   PUSHBUTTON    "說明", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "待複製的字符：", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "選擇", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "複製", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP

base/applications/charmap/map.c

@@ -529,6 +529,9 @@ MapWndProc(HWND hwnd,
             return infoPtr->pActiveCell->ch;
         }
 
+        case FM_GETHFONT:
+            return (LRESULT)infoPtr->hFont;
+
         case WM_PAINT:
         {
             OnPaint(infoPtr,

base/applications/charmap/precomp.h

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <windows.h>
 #include <commctrl.h>
+#include <richedit.h>
 #include "resource.h"
 
 #define XCELLS 20
@@ -15,6 +16,7 @@
 #define FM_SETFONT  (WM_USER + 1)
 #define FM_GETCHAR  (WM_USER + 2)
 #define FM_SETCHAR  (WM_USER + 3)
+#define FM_GETHFONT (WM_USER + 4)
 
 extern HINSTANCE hInstance;
 

base/applications/cmdutils/xcopy/Es.rc

@@ -0,0 +1,80 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Spanish language support
+ *
+ * Copyright (C) 2007 Jeisson T.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "xcopy.h"
+
+LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n"
+    STRING_INVPARM,  "Parametro invalido '%s' -  Use xcopy /? para obtener ayuda\n"
+    STRING_PAUSE,    "Unde <enter> para iniciar la copia\n"
+    STRING_SIMCOPY,  "%d archivo(s) seran copiado(s)\n"
+    STRING_COPY,     "%d archivo(s) copiado(s)\n"
+    STRING_QISDIR,   "Es '%s' un nombre de archivo o de directorio\n\
+                     en el punto de destino?\n\
+                     (F - Archivo, D - Directorio)\n"
+    STRING_SRCPROMPT,"%s? (Si|No)\n"
+    STRING_OVERWRITE,"Destruir y escribir encima %s? (Si|No|Todo)\n"
+    STRING_COPYFAIL, "La copia de '%s' a '%s' ha faillecido con r/c %d\n"
+    STRING_OPENFAIL, "Impossible de abrir '%s'\n"
+    STRING_READFAIL, "Hubo un error durante la lectura de '%s'\n"
+    STRING_YES_CHAR, "S"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"A"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Copia los archivos o directorios fuentes a un destino\n\
+\n\
+Sintaxis:\n\
+XCOPY fuente [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+En la cual:\n\
+\n\
+[/I]  Asuma el directorio si el destino no existe y copia dos o\n\
+\tmas archivos\n\
+[/S]  Copia directorios y subdirectorios\n\
+[/E]  Copia directorios y subdirectorios, incluyendo las que estan vacias\n\
+[/Q]  No mostrar la lista de los nombres de los archivos durante la copia (silencioso)\n\
+[/F]  Mostrar todas las fuentes y todos los destinos durante la copia.\n\
+[/L]  Simular la operacion, mostrando los nombres de archivos que seran copiados\n\
+[/W]  Preguntar antes de iniciar la operacion de copia\n\
+[/T]  Crear una estructura de repertorios vacios pero no copia los archivos\n\
+[/Y]  No pide confirmacion cuando sobreescribe sobre los archivos\n\
+[/-Y] Pide confirmacion cuando sobreescribe los archivos\n\
+[/P]  Pregunta al usuario ante de copiar cada archivo fuente\n\
+[/N]  Copiar usando los nombres cortos\n\
+[/U]  Copia solamente los archivos que ya existent en el punto de destino\n\
+[/R]  Sobreescribir los archivos en lectura unica\n\
+[/H]  Incluir los archivos escondidos y los del systema en la copia\n\
+[/C]  Siempre continuar mismo si un error occure en la copia\n\
+[/A]  Copia solamente archivos con el attributo de archivo definido\n\
+[/M]  Copia solamente archivos con el attributo de archivo definido, supprime\n\
+\tl'attributo de archivo\n\
+[/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\
+\t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\
+\t\tque el archivo fuente\n\n"
+
+}

base/applications/cmdutils/xcopy/rsrc.rc

@@ -30,6 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "En.rc"
 #include "No.rc"
 #include "Pl.rc"
+#include "Es.rc"
 
 /* UTF-8 */
 #include "De.rc"

base/applications/dxdiag/precomp.h

@@ -43,10 +43,10 @@ INT_PTR CALLBACK NetworkPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 /* DirectDraw tests */
-VOID DDTests();
+VOID DDTests(VOID);
 
 /* Direct3D tests */
-VOID D3DTests();
+VOID D3DTests(VOID);
 
 /* DirectSound initialization */
 void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext);

base/applications/games/solitaire/solitaire.h

@@ -16,7 +16,7 @@ extern bool fGameStarted;
 
 extern DWORD dwOptions;
 
-void CreateSol();
+void CreateSol(void);
 void NewGame(void);
 
 #define NUM_ROW_STACKS     7

base/applications/games/spider/spider.h

@@ -25,7 +25,7 @@ extern DWORD dwDifficulty;
 extern TCHAR MsgDeal[];
 extern TCHAR MsgWin[];
 
-void CreateSpider();
+void CreateSpider(void);
 void NewGame(void);
 
 bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards);

base/applications/magnify/magnifier.h

@@ -32,5 +32,5 @@ extern BOOL bInvertColors;
 extern BOOL bStartMinimized;
 extern BOOL bShowMagnifier;
 
-void LoadSettings();
+void LoadSettings(void);
-void SaveSettings();
+void SaveSettings(void);

base/applications/mplay32/mplay32.c

@@ -455,7 +455,7 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
     mciPlay.dwFrom = 0;
     mciPlay.dwTo = MaxFilePos;
 
-    mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
+    mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/, (DWORD_PTR)&mciPlay);
     if (mciError != 0)
     {
         MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);

base/applications/mscutils/eventvwr/eventvwr.c

@@ -203,7 +203,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName,
                 /* Returns a string containing the requested substituted environment variable. */
                 ExpandEnvironmentStringsW((LPCWSTR)szModuleName, ExpandedName, MAX_PATH);
 
-                /* Succesfull */
+                /* Successful */
                 bReturn = TRUE;
             }
         }
@@ -503,11 +503,12 @@ QueryEventMessages(LPWSTR lpMachineName,
     HWND hwndDlg;
     HANDLE hEventLog;
     EVENTLOGRECORD *pevlr;
-    DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags;
+    DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags, dwMaxLength;
     LPWSTR lpSourceName;
     LPWSTR lpComputerName;
-    LPWSTR lpData;
+    LPSTR lpData;
     BOOL bResult = TRUE; /* Read succeeded. */
+    int i;
 
     WCHAR szWindowTitle[MAX_PATH];
     WCHAR szStatusText[MAX_PATH];
@@ -519,6 +520,7 @@ QueryEventMessages(LPWSTR lpMachineName,
     WCHAR szUsername[MAX_PATH];
     WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER];
     WCHAR szCategory[MAX_PATH];
+    WCHAR szData[MAX_PATH];
 
     SYSTEMTIME time;
     LVITEMW lviEventItem;
@@ -606,7 +608,7 @@ QueryEventMessages(LPWSTR lpMachineName,
             lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR));
 
             // This ist the data section of the current event
-            lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset);
+            lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset);
 
             // Compute the event type
             EventTimeToSystemTime(pevlr->TimeWritten, &time);
@@ -665,7 +667,13 @@ QueryEventMessages(LPWSTR lpMachineName,
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID);
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer
-            ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text
+            MultiByteToWideChar(CP_ACP,
+                                0,
+                                lpData,
+                                pevlr->DataLength,
+                                szData,
+                                MAX_PATH);
+            ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, szData); //Event Text
 
             dwRead -= pevlr->Length;
             pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length);
@@ -678,7 +686,15 @@ QueryEventMessages(LPWSTR lpMachineName,
     // All events loaded
     EndDialog(hwndDlg, 0);
 
-    swprintf(szWindowTitle, L"%s - %s Log on \\\\%s", szTitle, lpLogName, lpComputerName);
+
+    i = swprintf(szWindowTitle, L"%s - %s Log on \\\\", szTitle, lpLogName); /* i = number of characters written */
+    /* lpComputerName can be NULL here if no records was read */
+    dwMaxLength = sizeof(szWindowTitle)/sizeof(WCHAR)-i;
+    if(!lpComputerName)
+        GetComputerNameW(szWindowTitle+i, &dwMaxLength);
+    else
+        _snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName);
+
     swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords);
 
     // Update the status bar

base/applications/network/ftp/cmds.c

@@ -47,14 +47,15 @@ static char sccsid[] = "@(#)cmds.c	5.18 (Berkeley) 4/20/89";
 
 extern	char *globerr;
 extern	char home[];
-extern	char *remglob();
+static	const char *remglob(const char *argv[], int doswitch);
 extern	int allbinary;
 extern off_t restart_point;
 extern char reply_string[];
 
 const char *mname;
 jmp_buf jabort;
-const char *dotrans(), *domap();
+const char *dotrans(const char *name);
+const char *domap(const char *name);
 
 extern short portnum;
 extern char *hostname;
@@ -169,8 +170,7 @@ struct	types {
 /*
  * Set transfer type.
  */
-void settype(argc, argv)
+void settype(int argc, const char *argv[])
-	const char *argv[];
 {
 	register struct types *p;
 	int comret;
@@ -225,7 +225,7 @@ const char *stype[] = {
  * Set binary transfer type.
  */
 /*VARARGS*/
-void setbinary()
+void setbinary(int argc, const char *argv[])
 {
 	stype[1] = "binary";
 	settype(2, stype);
@@ -235,7 +235,7 @@ void setbinary()
  * Set ascii transfer type.
  */
 /*VARARGS*/
-void setascii()
+void setascii(int argc, const char *argv[])
 {
 	stype[1] = "ascii";
 	settype(2, stype);
@@ -245,7 +245,7 @@ void setascii()
  * Set tenex transfer type.
  */
 /*VARARGS*/
-void settenex()
+void settenex(int argc, const char *argv[])
 {
 	stype[1] = "tenex";
 	settype(2, stype);
@@ -266,8 +266,7 @@ void setebcdic()
  */
 
 /*ARGSUSED*/
-void fsetmode(argc, argv)
+void fsetmode(int argc, const char *argv[])
-	char *argv[];
 {
 
 	printf("We only support %s mode, sorry.\n", modename);
@@ -280,8 +279,7 @@ void fsetmode(argc, argv)
  * Set file transfer format.
  */
 /*ARGSUSED*/
-void setform(argc, argv)
+void setform(int argc, const char *argv[])
-	char *argv[];
 {
 
 	printf("We only support %s format, sorry.\n", formname);
@@ -293,8 +291,7 @@ void setform(argc, argv)
  * Set file transfer structure.
  */
 /*ARGSUSED*/
-void setstruct(argc, argv)
+void setstruct(int argc, const char *argv[])
-	char *argv[];
 {
 
 	printf("We only support %s structure, sorry.\n", structname);
@@ -305,9 +302,7 @@ void setstruct(argc, argv)
 /*
  * Send a single file.
  */
-void put(argc, argv)
+void put(int argc, const char *argv[])
-	int argc;
-	const char *argv[];
 {
 	const char *cmd;
 	int loc = 0;
@@ -372,8 +367,7 @@ usage:
 /*
  * Send multiple files.
  */
-void mput(argc, argv)
+void mput(int argc, const char *argv[])
-	const char *argv[];
 {
 	register int i;
 	int ointer;
@@ -400,7 +394,8 @@ void mput(argc, argv)
 //	oldintr = signal(SIGINT, mabort);
 	(void) setjmp(jabort);
 	if (proxy) {
-		char *cp, *tp2, tmpbuf[MAXPATHLEN];
+		const char *cp;
+		char *tp2, tmpbuf[MAXPATHLEN];
 
 		while ((cp = remglob(argv,0)) != NULL) {
 			if (*cp == 0) {
@@ -503,14 +498,12 @@ void mput(argc, argv)
 	mflag = 0;
 }
 
-void reget(argc, argv)
+void reget(int argc, const char *argv[])
-	const char *argv[];
 {
 	(void) getit(argc, argv, 1, "r+w");
 }
 
-void get(argc, argv)
+void get(int argc, const char *argv[])
-	const char *argv[];
 {
 	(void) getit(argc, argv, 0, restart_point ? "r+w" : "w" );
 }
@@ -518,9 +511,7 @@ void get(argc, argv)
 /*
  * Receive one file.
  */
-int getit(argc, argv, restartit, mode)
+int getit(int argc, const char *argv[], int restartit, const char *mode)
-	const char *argv[];
-	const char *mode;
 {
 	int loc = 0;
 	const char *oldargv1, *oldargv2;
@@ -674,8 +665,7 @@ mabort()
 /*
  * Get multiple files.
  */
-void mget(argc, argv)
+void mget(int argc, const char *argv[])
-	const char *argv[];
 {
 	const char *cp, *tp;
     char *tp2, tmpbuf[MAXPATHLEN];
@@ -747,18 +737,17 @@ void mget(argc, argv)
 	mflag = 0;
 }
 
-char *
+const char *
-remglob(argv,doswitch)
+remglob(const char *argv[], int doswitch)
-	char *argv[];
-	int doswitch;
 {
 	char temp[16];
 	static char buf[MAXPATHLEN];
 	static FILE *ftemp = NULL;
-	static char **args;
+	static const char **args;
 	int oldverbose, oldhash;
-	char *cp;
+	const char *cp;
     const char *mode;
+    char *terminator;
 
 	if (!mflag) {
 		if (!doglob) {
@@ -805,16 +794,14 @@ remglob(argv,doswitch)
 		(void) fclose(ftemp), ftemp = NULL;
 		return (NULL);
 	}
-	if ((cp = index(buf, '\n')) != NULL)
+	if ((terminator = index(buf, '\n')) != NULL)
-		*cp = '\0';
+		*terminator = '\0';
 	return (buf);
 }
 
 static const char *
-onoff(bool)
+onoff(int bool)
-	int bool;
 {
-
 	return (bool ? "on" : "off");
 }
 
@@ -822,8 +809,7 @@ onoff(bool)
  * Show status.
  */
 /*ARGSUSED*/
-void status(argc, argv)
+void status(int argc, const char *argv[])
-	char *argv[];
 {
 	int i;
 
@@ -877,7 +863,7 @@ void status(argc, argv)
  * Set beep on cmd completed mode.
  */
 /*VARARGS*/
-void setbell()
+void setbell(int argc, const char *argv[])
 {
 
 	bell = !bell;
@@ -890,7 +876,7 @@ void setbell()
  * Turn on packet tracing.
  */
 /*VARARGS*/
-void settrace()
+void settrace(int argc, const char *argv[])
 {
 
 	trace = !trace;
@@ -903,7 +889,7 @@ void settrace()
  * Toggle hash mark printing during transfers.
  */
 /*VARARGS*/
-void sethash()
+void sethash(int argc, const char *argv[])
 {
 
 	hash = !hash;
@@ -919,7 +905,7 @@ void sethash()
  * Turn on printing of server echo's.
  */
 /*VARARGS*/
-void setverbose()
+void setverbose(int argc, const char *argv[])
 {
 
 	verbose = !verbose;
@@ -932,7 +918,7 @@ void setverbose()
  * Toggle PORT cmd use before each data connection.
  */
 /*VARARGS*/
-void setport()
+void setport(int argc, const char *argv[])
 {
 
 	sendport = !sendport;
@@ -946,7 +932,7 @@ void setport()
  * during mget, mput, and mdelete.
  */
 /*VARARGS*/
-void setprompt()
+void setprompt(int argc, const char *argv[])
 {
 
 	interactive = !interactive;
@@ -960,7 +946,7 @@ void setprompt()
  * on local file names.
  */
 /*VARARGS*/
-void setglob()
+void setglob(int argc, const char *argv[])
 {
 
 	doglob = !doglob;
@@ -974,8 +960,7 @@ void setglob()
  * set level of debugging.
  */
 /*VARARGS*/
-void setdebug(argc, argv)
+void setdebug(int argc, const char *argv[])
-	char *argv[];
 {
 	int val;
 
@@ -1003,8 +988,7 @@ void setdebug(argc, argv)
  * Set current working directory
  * on remote machine.
  */
-void cd(argc, argv)
+void cd(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1035,8 +1019,7 @@ void cd(argc, argv)
  * Set current working directory
  * on local machine.
  */
-void lcd(argc, argv)
+void lcd(int argc, const char *argv[])
-	const char *argv[];
 {
 	char buf[MAXPATHLEN];
 
@@ -1065,8 +1048,7 @@ void lcd(argc, argv)
 /*
  * Delete a single file.
  */
-void delete(argc, argv)
+void delete(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1090,10 +1072,9 @@ void delete(argc, argv)
 /*
  * Delete multiple files.
  */
-void mdelete(argc, argv)
+void mdelete(int argc, const char *argv[])
-	const char *argv[];
 {
-	char *cp;
+	const char *cp;
 	int ointer;
 	extern jmp_buf jabort;
 
@@ -1140,8 +1121,7 @@ void mdelete(argc, argv)
 /*
  * Rename a remote file.
  */
-void renamefile(argc, argv)
+void renamefile(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1179,8 +1159,7 @@ usage:
  * Get a directory listing
  * of remote files.
  */
-void ls(argc, argv)
+void ls(int argc, const char *argv[])
-	const char *argv[];
 {
 	const char *cmd;
 
@@ -1212,8 +1191,7 @@ void ls(argc, argv)
  * Get a directory listing
  * of multiple remote files.
  */
-void mls(argc, argv)
+void mls(int argc, const char *argv[])
-	const char *argv[];
 {
 	const char *cmd, *dest;
 	char mode[1];
@@ -1276,8 +1254,7 @@ void mls(argc, argv)
  * Do a shell escape
  */
 /*ARGSUSED*/
-void shell(argc, argv)
+void shell(int argc, const char *argv[])
-	char *argv[];
 {
 #if 0
 	int pid;
@@ -1396,9 +1373,7 @@ void shell(argc, argv)
 /*
  * Send new user information (re-login)
  */
-void user(argc, argv)
+void user(int argc, const char *argv[])
-	int argc;
-	const char **argv;
 {
 	char acct[80], *getpass();
 	int n, aflag = 0;
@@ -1449,7 +1424,7 @@ void user(argc, argv)
  * Print working directory.
  */
 /*VARARGS*/
-void pwd()
+void pwd(int argc, const char *argv[])
 {
 	int oldverbose = verbose;
 
@@ -1468,8 +1443,7 @@ void pwd()
 /*
  * Make a directory.
  */
-void makedir(argc, argv)
+void makedir(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1499,8 +1473,7 @@ void makedir(argc, argv)
 /*
  * Remove a directory.
  */
-void removedir(argc, argv)
+void removedir(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1530,8 +1503,7 @@ void removedir(argc, argv)
 /*
  * Send a line, verbatim, to the remote machine.
  */
-void quote(argc, argv)
+void quote(int argc, const char *argv[])
-	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1566,9 +1538,7 @@ void quote(argc, argv)
  * is sent almost verbatim to the remote machine, the
  * first argument is changed to SITE.
  */
-
+void site(int argc, const char *argv[])
-void site(argc, argv)
-	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1599,8 +1569,7 @@ void site(argc, argv)
 	}
 }
 
-void do_chmod(argc, argv)
+void do_chmod(int argc, const char *argv[])
-	const char *argv[];
 {
 	if (argc == 2) {
 		printf("usage: %s mode file-name\n", argv[0]);
@@ -1626,8 +1595,7 @@ void do_chmod(argc, argv)
 	(void)command("SITE CHMOD %s %s", argv[1], argv[2]);
 }
 
-void do_umask(argc, argv)
+void do_umask(int argc, const char *argv[])
-	char *argv[];
 {
 	int oldverbose = verbose;
 
@@ -1636,8 +1604,7 @@ void do_umask(argc, argv)
 	verbose = oldverbose;
 }
 
-void idle(argc, argv)
+void idle(int argc, const char *argv[])
-	char *argv[];
 {
 	int oldverbose = verbose;
 
@@ -1649,8 +1616,7 @@ void idle(argc, argv)
 /*
  * Ask the other side for help.
  */
-void rmthelp(argc, argv)
+void rmthelp(int argc, const char *argv[])
-	char *argv[];
 {
 	int oldverbose = verbose;
 
@@ -1663,14 +1629,13 @@ void rmthelp(argc, argv)
  * Terminate session and exit.
  */
 /*VARARGS*/
-void quit()
+void quit(int argc, const char *argv[])
 {
-
 	if (connected)
-		disconnect();
+		disconnect(0, NULL);
 	pswitch(1);
 	if (connected) {
-		disconnect();
+		disconnect(0, NULL);
 	}
 	exit(0);
 }
@@ -1678,7 +1643,7 @@ void quit()
 /*
  * Terminate session, but don't exit.
  */
-void disconnect()
+void disconnect(int argc, const char *argv[])
 {
 	extern int cout;
 	extern int data;
@@ -1694,8 +1659,7 @@ void disconnect()
 	}
 }
 
-int confirm(cmd, file)
+int confirm(const char *cmd, const char *file)
-	const char *cmd, *file;
 {
 	char line[BUFSIZ];
 
@@ -1708,8 +1672,7 @@ int confirm(cmd, file)
 }
 
 #if 0
-static void fatal(msg)
+static void fatal(const char *msg)
-	char *msg;
 {
 
 	fprintf(stderr, "ftp: %s\n", msg);
@@ -1723,8 +1686,7 @@ static void fatal(msg)
  * Can't control multiple values being expanded
  * from the expression, we return only the first.
  */
-int globulize(cpp)
+int globulize(const char **cpp)
-	const char **cpp;
 {
 	char **globbed;
 
@@ -1751,9 +1713,7 @@ int globulize(cpp)
 	return (1);
 }
 
-void account(argc,argv)
+void account(int argc, const char *argv[])
-	int argc;
-	char **argv;
 {
 	char acct[50], *getpass(), *ap;
 
@@ -1797,9 +1757,7 @@ proxabort()
 }
 #endif
 
-void doproxy(argc,argv)
+void doproxy(int argc, const char *argv[])
-	int argc;
-	const char *argv[];
 {
 	register struct cmd *c;
 	struct cmd *getcmd();
@@ -1865,7 +1823,7 @@ void doproxy(argc,argv)
 //	(void) signal(SIGINT, oldintr);
 }
 
-void setcase()
+void setcase(int argc, const char *argv[])
 {
 	mcase = !mcase;
 	printf("Case mapping %s.\n", onoff(mcase));
@@ -1873,7 +1831,7 @@ void setcase()
 	code = mcase;
 }
 
-void setcr()
+void setcr(int argc, const char *argv[])
 {
 	crflag = !crflag;
 	printf("Carriage Return stripping %s.\n", onoff(crflag));
@@ -1881,9 +1839,7 @@ void setcr()
 	code = crflag;
 }
 
-void setntrans(argc,argv)
+void setntrans(int argc, const char *argv[])
-	int argc;
-	char *argv[];
 {
 	if (argc == 1) {
 		ntflag = 0;
@@ -1905,8 +1861,7 @@ void setntrans(argc,argv)
 }
 
 const char *
-dotrans(name)
+dotrans(const char *name)
-	const char *name;
 {
 	static char new[MAXPATHLEN];
 	const char *cp1;
@@ -1933,11 +1888,7 @@ dotrans(name)
 	return(new);
 }
 
-
+void setpassive(int argc, const char *argv[])
-void
-setpassive(argc, argv)
-  int argc;
-  char *argv[];
 {
 	passivemode = !passivemode;
 	printf("Passive mode %s.\n", onoff(passivemode));
@@ -1945,9 +1896,7 @@ setpassive(argc, argv)
 	code = passivemode;
 }
 
-void setnmap(argc, argv)
+void setnmap(int argc, const char *argv[])
-	int argc;
-	const char *argv[];
 {
 	char *cp;
 
@@ -1988,8 +1937,7 @@ void setnmap(argc, argv)
 }
 
 const char *
-domap(name)
+domap(const char *name)
-	const char *name;
 {
 	static char new[MAXPATHLEN];
 	const char *cp1 = name;
@@ -2161,7 +2109,7 @@ LOOP:
 	return(new);
 }
 
-void setsunique()
+void setsunique(int argc, const char *argv[])
 {
 	sunique = !sunique;
 	printf("Store unique %s.\n", onoff(sunique));
@@ -2169,7 +2117,7 @@ void setsunique()
 	code = sunique;
 }
 
-void setrunique()
+void setrunique(int argc, const char *argv[])
 {
 	runique = !runique;
 	printf("Receive unique %s.\n", onoff(runique));
@@ -2178,7 +2126,7 @@ void setrunique()
 }
 
 /* change directory to perent directory */
-void cdup()
+void cdup(int argc, const char *argv[])
 {
 	if (command("CDUP") == ERROR && code == 500) {
 		if (verbose) {
@@ -2190,9 +2138,7 @@ void cdup()
 }
 
 /* restart transfer at specific point */
-void restart(argc, argv)
+void restart(int argc, const char *argv[])
-	int argc;
-	char *argv[];
 {
 	if (argc != 2)
 		printf("restart: offset not specified\n");
@@ -2205,14 +2151,12 @@ void restart(argc, argv)
 }
 
 /* show remote system type */
-void syst()
+void syst(int argc, const char *argv[])
 {
 	(void) command("SYST");
 }
 
-void macdef(argc, argv)
+void macdef(int argc, const char *argv[])
-	int argc;
-	const char *argv[];
 {
 	char *tmp;
 	int c;
@@ -2287,8 +2231,7 @@ void macdef(argc, argv)
 /*
  * get size of file on remote machine
  */
-void sizecmd(argc, argv)
+void sizecmd(int argc, const char *argv[])
-	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -2312,8 +2255,7 @@ void sizecmd(argc, argv)
 /*
  * get last modification time of file on remote machine
  */
-void modtime(argc, argv)
+void modtime(int argc, const char *argv[])
-	const char *argv[];
 {
 	int overbose;
 
@@ -2351,8 +2293,7 @@ void modtime(argc, argv)
 /*
  * show status on reomte machine
  */
-void rmtstatus(argc, argv)
+void rmtstatus(int argc, const char *argv[])
-	const char *argv[];
 {
 	(void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }
@@ -2360,8 +2301,7 @@ void rmtstatus(argc, argv)
 /*
  * get file if modtime is more recent than current file
  */
-void newer(argc, argv)
+void newer(int argc, const char *argv[])
-	const char *argv[];
 {
 	if (getit(argc, argv, -1, "w")) {
 		printf("Local file \"%s\" is newer than remote file \"%s\"\n",

base/applications/network/ftp/domacro.c

@@ -28,9 +28,7 @@ static char sccsid[] = "@(#)domacro.c	1.6 (Berkeley) 2/28/89";
 #include <ctype.h>
 //#include <sys/ttychars.h>
 
-void domacro(argc, argv)
+void domacro(int argc, const char *argv[])
-	int argc;
-	const char *argv[];
 {
 	int i, j;
 	const char *cp1;

base/applications/network/ftp/fake.c

@@ -35,7 +35,7 @@ void blkfree(char **av0)
         free(*av++);
 }
 
-char **glob(register char *v)
+char **glob(const char *v)
 {
    return NULL;
 }

base/applications/network/ftp/ftp.c

@@ -110,7 +110,7 @@ typedef void (*Sig_t)(int);
 
 void psabort(int sig);
 
-char *hookup(char *host, int port)
+char *hookup(const char *host, int port)
 {
 	register struct hostent *hp = 0;
 	int len;
@@ -837,7 +837,7 @@ null();//		(void) signal(SIGINT, oldintr);
 			oldverbose = verbose;
 			if (!debug)
 				verbose = 0;
-			setascii();
+			setascii(0, NULL);
 			verbose = oldverbose;
 		}
 	} else if (restart_point) {
@@ -852,13 +852,13 @@ null();//			(void) signal(SIGINT, oldintr);
 					verbose = 0;
 				switch (oldtype) {
 					case TYPE_I:
-						setbinary();
+						setbinary(0, NULL);
 						break;
 					case TYPE_E:
 						setebcdic();
 						break;
 					case TYPE_L:
-						settenex();
+						settenex(0, NULL);
 						break;
 				}
 				verbose = oldverbose;
@@ -873,13 +873,13 @@ null();//			(void) signal(SIGINT, oldintr);
 					verbose = 0;
 				switch (oldtype) {
 					case TYPE_I:
-						setbinary();
+						setbinary(0, NULL);
 						break;
 					case TYPE_E:
 						setebcdic();
 						break;
 					case TYPE_L:
-						settenex();
+						settenex(0, NULL);
 						break;
 				}
 				verbose = oldverbose;
@@ -1044,13 +1044,13 @@ null();//		(void) signal(SIGPIPE, oldintp);
 			verbose = 0;
 		switch (oldtype) {
 			case TYPE_I:
-				setbinary();
+				setbinary(0, NULL);
 				break;
 			case TYPE_E:
 				setebcdic();
 				break;
 			case TYPE_L:
-				settenex();
+				settenex(0, NULL);
 				break;
 		}
 		verbose = oldverbose;
@@ -1069,13 +1069,13 @@ null();//	(void) signal(SIGINT,SIG_IGN);
 			verbose = 0;
 		switch (oldtype) {
 			case TYPE_I:
-				setbinary();
+				setbinary(0, NULL);
 				break;
 			case TYPE_E:
 				setebcdic();
 				break;
 			case TYPE_L:
-				settenex();
+				settenex(0, NULL);
 				break;
 		}
 		verbose = oldverbose;
@@ -1463,16 +1463,16 @@ void proxtrans(cmd, local, remote)
 		oldtype = type;
 		switch (tmptype) {
 			case TYPE_A:
-				setascii();
+				setascii(0, NULL);
 				break;
 			case TYPE_I:
-				setbinary();
+				setbinary(0, NULL);
 				break;
 			case TYPE_E:
 				setebcdic();
 				break;
 			case TYPE_L:
-				settenex();
+				settenex(0, NULL);
 				break;
 		}
 	}
@@ -1481,16 +1481,16 @@ void proxtrans(cmd, local, remote)
 			case 0:
 				break;
 			case TYPE_A:
-				setascii();
+				setascii(0, NULL);
 				break;
 			case TYPE_I:
-				setbinary();
+				setbinary(0, NULL);
 				break;
 			case TYPE_E:
 				setebcdic();
 				break;
 			case TYPE_L:
-				settenex();
+				settenex(0, NULL);
 				break;
 		}
 		pswitch(1);
@@ -1505,16 +1505,16 @@ null();//		(void) signal(SIGINT, oldintr);
 			case 0:
 				break;
 			case TYPE_A:
-				setascii();
+				setascii(0, NULL);
 				break;
 			case TYPE_I:
-				setbinary();
+				setbinary(0, NULL);
 				break;
 			case TYPE_E:
 				setebcdic();
 				break;
 			case TYPE_L:
-				settenex();
+				settenex(0, NULL);
 				break;
 		}
 		pswitch(1);
@@ -1534,16 +1534,16 @@ null();//	(void) signal(SIGINT, oldintr);
 		case 0:
 			break;
 		case TYPE_A:
-			setascii();
+			setascii(0, NULL);
 			break;
 		case TYPE_I:
-			setbinary();
+			setbinary(0, NULL);
 			break;
 		case TYPE_E:
 			setebcdic();
 			break;
 		case TYPE_L:
-			settenex();
+			settenex(0, NULL);
 			break;
 	}
 	pswitch(1);
@@ -1565,16 +1565,16 @@ null();//	(void) signal(SIGINT, SIG_IGN);
 				case 0:
 					break;
 				case TYPE_A:
-					setascii();
+					setascii(0, NULL);
 					break;
 				case TYPE_I:
-					setbinary();
+					setbinary(0, NULL);
 					break;
 				case TYPE_E:
 					setebcdic();
 					break;
 				case TYPE_L:
-					settenex();
+					settenex(0, NULL);
 					break;
 			}
 			if (cpend) {
@@ -1636,16 +1636,16 @@ null();//		(void) signal(SIGINT, oldintr);
 				case 0:
 					break;
 				case TYPE_A:
-					setascii();
+					setascii(0, NULL);
 					break;
 				case TYPE_I:
-					setbinary();
+					setbinary(0, NULL);
 					break;
 				case TYPE_E:
 					setebcdic();
 					break;
 				case TYPE_L:
-					settenex();
+					settenex(0, NULL);
 					break;
 			}
 			if (cpend) {
@@ -1720,16 +1720,16 @@ null();//			(void) signal(SIGINT, oldintr);
 		case 0:
 			break;
 		case TYPE_A:
-			setascii();
+			setascii(0, NULL);
 			break;
 		case TYPE_I:
-			setbinary();
+			setbinary(0, NULL);
 			break;
 		case TYPE_E:
 			setebcdic();
 			break;
 		case TYPE_L:
-			settenex();
+			settenex(0, NULL);
 			break;
 	}
 	pswitch(1);
@@ -1738,7 +1738,7 @@ null();//			(void) signal(SIGINT, oldintr);
 null();//	(void) signal(SIGINT, oldintr);
 }
 
-void reset()
+void reset(int argc, const char *argv[])
 {
 //	struct
 	fd_set mask;

base/applications/network/ftp/ftp_var.h

@@ -141,7 +141,7 @@ struct cmd {
 	char	c_bell;			/* give bell when command completes */
 	char	c_conn;			/* must be connected to use command */
 	char	c_proxy;		/* proxy server may execute */
-	void	(*c_handler)();		/* function to call */
+	void	(*c_handler)(int argc, const char *argv[]);	/* function to call */
 };
 
 struct macel {

base/applications/network/ftp/main.c

@@ -53,10 +53,10 @@ static char sccsid[] = "@(#)main.c	based on 5.13 (Berkeley) 3/14/89";
 typedef int uid_t;
 #endif
 
-uid_t	getuid();
+uid_t	getuid(void);
-void	intr();
+void	intr(void);
-void	lostpeer();
+void	lostpeer(void);
-char	*getlogin();
+char	*getlogin(void);
 
 short	portnum;
 
@@ -262,10 +262,8 @@ int main(int argc, const char *argv[])
 	}
 }
 
-void
+void intr(void)
-intr()
 {
-
 	longjmp(toplevel, 1);
 }
 
@@ -299,8 +297,7 @@ void lostpeer(void)
 }
 
 /*char *
-tail(filename)
+tail(char *filename)
-	char *filename;
 {
 	register char *s;
 
@@ -318,8 +315,7 @@ tail(filename)
 /*
  * Command parser.
  */
-void cmdscanner(top)
+void cmdscanner(int top)
-	int top;
 {
 	register struct cmd *c;
 
@@ -333,7 +329,7 @@ void cmdscanner(top)
 		}
 		if (gets(line) == 0) {
 			if (feof(stdin) || ferror(stdin))
-				quit();
+				quit(0, NULL);
 			break;
 		}
 		if (line[0] == 0)
@@ -367,8 +363,7 @@ void cmdscanner(top)
 }
 
 struct cmd *
-getcmd(name)
+getcmd(const char *name)
-	const char *name;
 {
 	extern struct cmd cmdtab[];
 	const char *p, *q;
@@ -402,7 +397,7 @@ getcmd(name)
 
 int slrflag;
 
-void makeargv()
+void makeargv(void)
 {
 	const char **argp;
 
@@ -421,7 +416,7 @@ void makeargv()
  * handle quoting and strings
  */
 static const char *
-slurpstring()
+slurpstring(void)
 {
 	int got_one = 0;
 	register char *sb = stringbase;
@@ -544,9 +539,7 @@ OUT1:
  * Help command.
  * Call each command handler with argc == 0 and argv[0] == name.
  */
-void help(argc, argv)
+void help(int argc, const char *argv[])
-	int argc;
-	char *argv[];
 {
 	extern struct cmd cmdtab[];
 	struct cmd *c;
@@ -594,7 +587,7 @@ void help(argc, argv)
 		return;
 	}
 	while (--argc > 0) {
-		register char *arg;
+		const char *arg;
 		arg = *++argv;
 		c = getcmd(arg);
 		if (c == (struct cmd *)-1)

base/applications/network/ftp/prototypes.h

@@ -8,8 +8,8 @@ int fputcSocket(int s, char putChar);
 int fputSocket(int s, char *putChar, int len);
 char *fgetsSocket(int s, char *string);
 
-char *hookup();
+char *hookup(const char *host, int port);
-char **glob();
+char **glob(const char *s);
 int herror(char *s);
 
 int getreply(int expecteof);
@@ -20,18 +20,18 @@ void domacro(int argc, const char *argv[]);
 void proxtrans(const char *cmd, const char *local, const char *remote);
 int null(void);
 int initconn(void);
-void disconnect(void);
+void disconnect(int argc, const char *argv[]);
 void ptransfer(const char *direction, long bytes, struct timeval *t0, struct timeval *t1);
-void setascii(void);
+void setascii(int argc, const char *argv[]);
-void setbinary(void);
+void setbinary(int argc, const char *argv[]);
 void setebcdic(void);
-void settenex(void);
+void settenex(int argc, const char *argv[]);
 void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-void setpassive(int argc, char *argv[]);
+void setpassive(int argc, const char *argv[]);
 void setpeer(int argc, const char *argv[]);
 void cmdscanner(int top);
 void pswitch(int flag);
-void quit(void);
+void quit(int argc, const char *argv[]);
 int login(const char *host);
 int command(const char *fmt, ...);
 int globulize(const char **cpp);
@@ -43,22 +43,59 @@ void blkfree(char **av0);
 int getit(int argc, const char *argv[], int restartit, const char *mode);
 int sleep(int time);
 
-char *tail();
+char *tail(void);
-void	setbell(), setdebug();
+void setbell(int argc, const char *argv[]);
-void	setglob(), sethash(), setport();
+void setdebug(int argc, const char *argv[]);
-void	setprompt();
+void setglob(int argc, const char *argv[]);
-void	settrace(), setverbose();
+void sethash(int argc, const char *argv[]);
-void	settype(), setform(), setstruct();
+void setport(int argc, const char *argv[]);
-void	restart(), syst();
+void setprompt(int argc, const char *argv[]);
-void	cd(), lcd(), delete(), mdelete();
+void settrace(int argc, const char *argv[]);
-void	ls(), mls(), get(), mget(), help(), append(), put(), mput(), reget();
+void setverbose(int argc, const char *argv[]);
-void	status();
+void settype(int argc, const char *argv[]);
-void	renamefile();
+void setform(int argc, const char *argv[]);
-void	quote(), rmthelp(), site();
+void setstruct(int argc, const char *argv[]);
-void	pwd(), makedir(), removedir(), setcr();
+void restart(int argc, const char *argv[]);
-void	account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
+void syst(int argc, const char *argv[]);
-void	setsunique(), setrunique(), cdup(), macdef();
+void cd(int argc, const char *argv[]);
-void	sizecmd(), modtime(), newer(), rmtstatus();
+void lcd(int argc, const char *argv[]);
-void	do_chmod(), do_umask(), idle();
+void delete(int argc, const char *argv[]);
-void	shell(), user(), fsetmode();
+void mdelete(int argc, const char *argv[]);
-struct cmd	*getcmd();
+void ls(int argc, const char *argv[]);
+void mls(int argc, const char *argv[]);
+void get(int argc, const char *argv[]);
+void mget(int argc, const char *argv[]);
+void help(int argc, const char *argv[]);
+void put(int argc, const char *argv[]);
+void mput(int argc, const char *argv[]);
+void reget(int argc, const char *argv[]);
+void status(int argc, const char *argv[]);
+void renamefile(int argc, const char *argv[]);
+void quote(int argc, const char *argv[]);
+void rmthelp(int argc, const char *argv[]);
+void site(int argc, const char *argv[]);
+void pwd(int argc, const char *argv[]);
+void makedir(int argc, const char *argv[]);
+void removedir(int argc, const char *argv[]);
+void setcr(int argc, const char *argv[]);
+void account(int argc, const char *argv[]);
+void doproxy(int argc, const char *argv[]);
+void reset(int argc, const char *argv[]);
+void setcase(int argc, const char *argv[]);
+void setntrans(int argc, const char *argv[]);
+void setnmap(int argc, const char *argv[]);
+void setsunique(int argc, const char *argv[]);
+void setrunique(int argc, const char *argv[]);
+void cdup(int argc, const char *argv[]);
+void macdef(int argc, const char *argv[]);
+void sizecmd(int argc, const char *argv[]);
+void modtime(int argc, const char *argv[]);
+void newer(int argc, const char *argv[]);
+void rmtstatus(int argc, const char *argv[]);
+void do_chmod(int argc, const char *argv[]);
+void do_umask(int argc, const char *argv[]);
+void idle(int argc, const char *argv[]);
+void shell(int argc, const char *argv[]);
+void user(int argc, const char *argv[]);
+void fsetmode(int argc, const char *argv[]);
+struct cmd	*getcmd(const char *name);

base/applications/network/net/net.h

@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <windows.h>
 
-void help();
+void help(void);
-int unimplemented();
+int unimplemented(void);
 
 
 INT cmdHelp(INT argc, CHAR **argv);

base/applications/network/ping/lang/uk-UA.rc

@@ -0,0 +1,43 @@
+/*
+ * PROJECT:     Ping for ReactOS
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/network/ping/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for Ping
+ * TRANSLATORS: Sakara Eugene (vzov@yandex.ua)
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_USAGE "\nÂèêîðèñòàííÿ: ping [-t] [-n count] [-l size] [-w timeout] õîñò\n\n\
+Îïö³¿:\n\
+    -t             ϳíã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñòåíà ðó÷íà çóïèíêà.\n\
+                   Äëÿ çóïèíêè íàòèñí³òü Control-C.\n\
+    -n count       ×èñëî çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\
+    -l size        Ðîçì³ð áóôåðà â³äïðàâêè.\n\
+    -w timeout     ×àñ î÷³êóâàííÿ êîæíî¿ â³äïîâ³ä³ â ì³ë³ñåêóíäàõ.\n\n\0"
+
+    IDS_PING_WITH_BYTES             "\nÎáì³í ïàêåòàìè ç %1 [%2] ïî %3!d! áàéòà:\n\n\0"
+    IDS_PING_STATISTICS             "\nÑòàòèñòèêà Ping äëÿ %1:\n\0"
+    IDS_PACKETS_SENT_RECEIVED_LOST  "    Ïàêåò³â: â³äïðàâëåíî = %1!d!, îòðèìàíî = %2!d!, âòðà÷åíî = %3!d! (%4!d!%% âòðàò),\n\0"
+    IDS_APPROXIMATE_ROUND_TRIP      "Ïðèáëèçíèé ÷àñ ïðèéîìó-ïåðåäà÷³:\n\0"
+    IDS_MIN_MAX_AVERAGE             "    ̳í³ìàëüíèé = %1, Ìàêñèìàëüíèé = %2, Ñåðåäí³é = %3\n\0"
+    IDS_NOT_ENOUGH_RESOURCES        "Íåäîñòàòíüî â³ëüíèõ ðåñóðñ³â.\n\0"
+    IDS_UNKNOWN_HOST                "Íåâ³äîìèé õîñò %1.\n\0"
+    IDS_SETSOCKOPT_FAILED           "setsockopt íåâäàëèé (%1!d!).\n\0"
+    IDS_COULD_NOT_CREATE_SOCKET     "Íå âäàëîñÿ ñòâîðèòè ñîêåò (#%1!d!).\n\0"
+    IDS_COULD_NOT_INIT_WINSOCK      "Íå âäàëîñÿ ³í³ö³àë³çóâàòè winsock dll.\n\0"
+    IDS_DEST_MUST_BE_SPECIFIED      "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèííå áóòè âêàçàíå.\n\0"
+    IDS_BAD_PARAMETER               "Ïîãàíèé ïàðàìåòð %1.\n\0"
+    IDS_BAD_OPTION_FORMAT           "Íåâ³ðíèé ôîðìàò îïö³¿ %1.\n\0"
+    IDS_BAD_OPTION                  "Ïîãàíà îïö³ÿ %1.\n\0"
+    IDS_BAD_VALUE_OPTION_L          "Íåïðàâèëüíå çíà÷åííÿ äëÿ îïö³¿ -l, äîïóñòèìèé ä³àïàçîí â³ä 0 äî %1!d!.\n\0"
+    IDS_REPLY_FROM                  "³äïîâ³äü â³ä %1: áàéò³â=%2!d! ÷àñ%3%4 TTL=%5!d!\n\0"
+    IDS_DEST_UNREACHABLE            "Õîñò íåäîñòóïíèé.\n\0"
+    IDS_COULD_NOT_TRANSMIT          "Íå âäàëîñÿ ïåðåäàòè äàí³ (%1!d!).\n\0"
+    IDS_COULD_NOT_RECV              "Íå âäàëîñÿ îòðèìàòè äàí³ (%1!d!).\n\0"
+    IDS_REQUEST_TIMEOUT             "Î÷³êóâàííÿ çàïèòó.\n\0"
+    IDS_MS                          "ìñ\0"
+    IDS_1MS                         "1ìñ\0"
+END

base/applications/network/ping/ping.rc

@@ -13,3 +13,4 @@
 #include "lang/fr-FR.rc"
 #include "lang/pl-PL.rc"
 #include "lang/it-IT.rc"
+#include "lang/uk-UA.rc"

base/applications/notepad/dialog.c

@@ -112,31 +112,27 @@ VOID ShowLastError(void)
 
 /**
  * Sets the caption of the main window according to Globals.szFileTitle:
- *    Notepad - (untitled)      if no file is open
+ *    (untitled) - Notepad      if no file is open
- *    Notepad - [filename]      if a file is given
+ *    [filename] - Notepad      if a file is given
  */
 static void UpdateWindowCaption(void)
 {
-  TCHAR szCaption[MAX_STRING_LEN];
+  TCHAR szCaption[MAX_STRING_LEN] = _T("");
-  TCHAR szUntitled[MAX_STRING_LEN];
+  TCHAR szNotepad[MAX_STRING_LEN];
 
-  LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, SIZEOF(szCaption));
+  LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));
 
-  if (Globals.szFileTitle[0] != '\0') {
+  if (Globals.szFileTitle[0] != '\0')
-      static const TCHAR bracket_l[] = _T(" - [");
+  {
-      static const TCHAR bracket_r[] = _T("]");
+      StringCchCat(szCaption, MAX_STRING_LEN, Globals.szFileTitle);
-      _tcscat(szCaption, bracket_l);
-      _tcscat(szCaption, Globals.szFileTitle);
-      _tcscat(szCaption, bracket_r);
   }
   else
   {
-      static const TCHAR hyphen[] = _T(" - ");
+      LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption));
-      LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled));
-      _tcscat(szCaption, hyphen);
-      _tcscat(szCaption, szUntitled);
   }
   
+  StringCchCat(szCaption, MAX_STRING_LEN, _T(" - "));
+  StringCchCat(szCaption, MAX_STRING_LEN, szNotepad);
   SetWindowText(Globals.hMainWnd, szCaption);
 }
 
@@ -684,7 +680,7 @@ VOID DIALOG_EditTimeDate(VOID)
     _tcscat(szText, _T(" "));
     GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN);
     _tcscat(szText, szDate);
-    SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate);
+    SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szText);
 }
 
 VOID DoCreateStatusBar(VOID)
@@ -766,7 +762,7 @@ VOID DoCreateEditWindow(VOID)
 {
     DWORD  dwStyle;
     int    iSize;
-    LPTSTR pTemp;
+    LPTSTR pTemp = NULL;
 
     iSize = 0;
 

base/applications/notepad/notepad.h

@@ -6,6 +6,7 @@
 #include <tchar.h>
 #include <richedit.h>
 #include <malloc.h>
+#include <strsafe.h>
 
 #include "main.h"
 #include "dialog.h"

base/applications/notepad/settings.c

@@ -134,10 +134,10 @@ void LoadSettings(void)
 		QueryBool(hKey,     _T("fWrap"),            &Globals.bWrapLongLines);
 		QueryBool(hKey,     _T("fStatusBar"),       &Globals.bShowStatusBar);
 
-		QueryByte(hKey,    _T("iWindowPosX"),       (LPBYTE)&Globals.main_rect.left);
+		QueryDword(hKey,    _T("iWindowPosX"),      (DWORD*)&Globals.main_rect.left);
-		QueryByte(hKey,    _T("iWindowPosX"),       (LPBYTE)&Globals.main_rect.top);
+		QueryDword(hKey,    _T("iWindowPosY"),      (DWORD*)&Globals.main_rect.top);
-		QueryByte(hKey,    _T("iWindowPosDX"),      (LPBYTE)&dx);
+		QueryDword(hKey,    _T("iWindowPosDX"),     (DWORD*)&dx);
-		QueryByte(hKey,    _T("iWindowPosDY"),      (LPBYTE)&dy);
+		QueryDword(hKey,    _T("iWindowPosDY"),     (DWORD*)&dy);
 
         Globals.main_rect.right = Globals.main_rect.left + dx;
         Globals.main_rect.bottom = Globals.main_rect.top + dy;

base/applications/paint/dialogs.h

@@ -6,8 +6,8 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
-int mirrorRotateDlg();
+int mirrorRotateDlg(void);
 
-int attributesDlg();
+int attributesDlg(void);
 
 int changeSizeDlg();

base/applications/paint/history.h

@@ -6,16 +6,16 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
-void newReversible();
+void newReversible(void);
 
-void undo();
+void undo(void);
 
-void redo();
+void redo(void);
 
-void resetToU1();
+void resetToU1(void);
 
-void clearHistory();
+void clearHistory(void);
 
-void insertReversible();
+void insertReversible(HBITMAP hbm);
 
 void cropReversible(int width, int height, int xOffset, int yOffset);

base/applications/paint/mouse.h

@@ -6,7 +6,7 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
-void placeSelWin();
+void placeSelWin(void);
 
 void startPaintingL(HDC hdc, short x, short y, int fg, int bg);
 

base/applications/rapps/lang/fr-FR.rc

@@ -0,0 +1,193 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+	POPUP "&Fichier"
+	BEGIN
+		MENUITEM "&Configuration", ID_SETTINGS
+		MENUITEM SEPARATOR
+		MENUITEM "S&ortir",     ID_EXIT
+	END
+	POPUP "&Programmes"
+	BEGIN
+		MENUITEM "&Installer",  ID_INSTALL
+		MENUITEM "&Désinstaller",ID_UNINSTALL
+		MENUITEM "&Modifier",   ID_MODIFY
+		MENUITEM SEPARATOR
+		MENUITEM "&Supprimer du registre", ID_REGREMOVE
+		MENUITEM SEPARATOR
+		MENUITEM "&Rafraîchir",  ID_REFRESH
+	END
+	POPUP "Aide"
+	BEGIN
+		MENUITEM "Aide",      ID_HELP, GRAYED
+		MENUITEM "À propos",     ID_ABOUT
+	END
+END
+
+IDR_LINKMENU MENU
+BEGIN
+	POPUP "popup"
+	BEGIN
+		MENUITEM "&Ouvrir le lien dans un navigateur", ID_OPEN_LINK
+		MENUITEM "&Copier le lien dans le presse-papier", ID_COPY_LINK
+	END
+END
+
+IDR_APPLICATIONMENU MENU
+BEGIN
+	POPUP "popup"
+	BEGIN
+		MENUITEM "&Installer",   ID_INSTALL
+		MENUITEM "&Désinstaller", ID_UNINSTALL
+		MENUITEM "&Modifier",    ID_MODIFY
+		MENUITEM SEPARATOR
+		MENUITEM "&Supprimer du registre", ID_REGREMOVE
+		MENUITEM SEPARATOR
+		MENUITEM "&Rafraîchir",   ID_REFRESH
+	END
+END
+
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuration"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	GROUPBOX "Général", -1, 4, 2, 240, 61
+	AUTOCHECKBOX "&Enregistrer la position de la fenêtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+	AUTOCHECKBOX "&Mettre à jour la liste des programmes accessibles au démarage", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+	AUTOCHECKBOX "&Journal de l'installation de la suppression des programmes", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+	GROUPBOX "Téléchargement", -1, 4, 65, 240, 51
+	LTEXT "Fichier des téléchargements :", -1, 16, 75, 100, 9
+	EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+	PUSHBUTTON "&Sélectionner", IDC_CHOOSE, 187, 85, 50, 14
+	AUTOCHECKBOX "&Supprimer l'installateur du programme après l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+	PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+	PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14
+	PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14
+END
+
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Installation de programme"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+	AUTORADIOBUTTON "&Installer à partir d'un disque (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Télécharger et installer", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+	PUSHBUTTON "Accepter", IDOK, 86, 78, 60, 14
+	PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14
+END
+
+IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
+STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+CAPTION "Télécharger..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
+    LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER
+    PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+END
+
+IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+CAPTION "À propos"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
+	PUSHBUTTON "Fermer", IDOK, 133, 46, 50, 14
+	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_TOOLTIP_INSTALL "Installer"
+	IDS_TOOLTIP_UNINSTALL "Désinstaller"
+	IDS_TOOLTIP_MODIFY "Modifier"
+	IDS_TOOLTIP_SETTINGS "Configuration"
+	IDS_TOOLTIP_REFRESH "Rafraîchir"
+	IDS_TOOLTIP_EXIT "Sortir"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_APP_NAME "Nom"
+	IDS_APP_INST_VERSION "Version"
+	IDS_APP_DESCRIPTION "Description"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_INFO_VERSION "\nVersion : "
+	IDS_INFO_DESCRIPTION "\nDescription : "
+	IDS_INFO_PUBLISHER "\nAuteur : "
+	IDS_INFO_HELPLINK "\nLien d'aide : "
+	IDS_INFO_HELPPHONE "\nTéléphone d'aide : "
+	IDS_INFO_README "\nLisez-moi : "
+	IDS_INFO_REGOWNER "\nUtilisateur enregistré : "
+	IDS_INFO_PRODUCTID "\nID du produit : "
+	IDS_INFO_CONTACT "\nContact : "
+	IDS_INFO_UPDATEINFO "\nInformation de mise à jour : "
+	IDS_INFO_INFOABOUT "\nInformation à propos : "
+	IDS_INFO_COMMENTS "\nCommentaires : "
+	IDS_INFO_INSTLOCATION "\Emplacement de l'installation : "
+	IDS_INFO_INSTALLSRC "\nSource de l'installation : "
+	IDS_INFO_UNINSTALLSTR "\nCommande de désinstallation : "
+	IDS_INFO_MODIFYPATH "\nModifier le chemin d'accès : "
+	IDS_INFO_INSTALLDATE "\nDate d'installation : "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_AINFO_VERSION "\nVersion : "
+	IDS_AINFO_DESCRIPTION "\nDescription : "
+	IDS_AINFO_SIZE "\nTaille : "
+	IDS_AINFO_URLSITE "\nSite internet : "
+	IDS_AINFO_LICENCE "\nLicence : "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_CAT_AUDIO "Audio"
+	IDS_CAT_DEVEL "Développement"
+	IDS_CAT_DRIVERS "Pilotes"
+	IDS_CAT_EDU "Éducation"
+	IDS_CAT_ENGINEER "Ingénierie"
+	IDS_CAT_FINANCE "Finance"
+	IDS_CAT_GAMES "Jeux & détente"
+	IDS_CAT_GRAPHICS "Graphismes"
+	IDS_CAT_INTERNET "Internet & résaux"
+	IDS_CAT_LIBS "Bibliothèques"
+	IDS_CAT_OFFICE "Bureautique"
+	IDS_CAT_OTHER "Autres"
+	IDS_CAT_SCIENCE "Sciences"
+	IDS_CAT_TOOLS "Outils"
+	IDS_CAT_VIDEO "Vidéo"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_APPTITLE "ReactOS Applications Manager"
+	IDS_SEARCH_TEXT "Chercher..."
+	IDS_INSTALL "Installer"
+	IDS_UNINSTALL "Désinstaller"
+	IDS_MODIFY "Modifier"
+	IDS_APPS_COUNT "Nombre d'applications : %d"
+	IDS_WELCOME_TITLE "Bienvenue à ReactOS Applications Manager!\n\n"
+	IDS_WELCOME_TEXT "Choisisez une catégorie à gauche, ensuite choisisez une application à installer ou désinstaller.\nSite internet de ReactOS : "
+	IDS_WELCOME_URL "http://www.reactos.org"
+	IDS_INSTALLED "Installé"
+	IDS_AVAILABLEFORINST "Disponible pour installation"
+	IDS_UPDATES "Mises à jour"
+	IDS_APPLICATIONS "Applications"
+	IDS_CHOOSE_FOLDER_TEXT "Choisisez un dossier dans lequel seront téléchargés les programmes :"
+	IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spécifié n'existe pas. Le créer ?"
+	IDS_USER_NOT_ADMIN "Vous devez être un administrateur pour démarrer ""ReactOS Applications Manager""!"
+	IDS_APP_REG_REMOVE "Etes-vous sûr de vouloir supprimer les données du programme installé du registre ?"
+	IDS_INFORMATION "Information"
+	IDS_UNABLE_TO_REMOVE "Impossible de supprimer les données du programme du registre !"
+END

base/applications/rapps/rapps/7zip.txt

@@ -17,6 +17,9 @@ Description = Tool zum Erstellen und Öffnen von 7zip, zip, tar, rar und andrern
 [Section.040a]
 Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos.
 
+[Section.040c]
+Description = Utilitaire pour créer et ouvrir les fichiers 7zip, zip, tar, rar et autres archives.
+
 [Section.0415]
 Description = Narzędzie do tworzenia i otwierania plików typu 7zip, zip, tar, i innych plików archiwizacyjnych.
 

base/applications/rapps/rapps/abiword.txt

@@ -17,6 +17,9 @@ Description = Textverarbeitung.
 [Section.040a]
 Description = Procesador de textos.
 
+[Section.040c]
+Description = Éditeur de texte.
+
 [Section.0415]
 Description = Edytor tekstu.
 

base/applications/rapps/rapps/abiword28x.txt

@@ -17,6 +17,9 @@ Description = Textverarbeitung.
 [Section.040a]
 Description = Procesador de textos.
 
+[Section.040c]
+Description = Éditeur de texte.
+
 [Section.0415]
 Description = Edytor tekstu.
 

base/applications/rapps/rapps/abyss.txt

@@ -14,6 +14,9 @@ CDPath = none
 [Section.0407]
 Description = Abyss Web Server ermöglicht es Webseiten auf Ihrem Computer zu hosten. Er unterstützt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausführen, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstützt werden können.
 
+[Section.040c]
+Description = Abyss Web Server vous permet d'héberger vos sites internet sur votre ordinateur. Il supporte les connexions sécurisées SSL/TLS (HTTPS) ainsi qu'un grand nombre de technologies web. Il peut également faire tourner des applications web PHP, Perl, Python, ASP, ASP.Net, Ruby et Ruby on Rails, qui peuvent être associées à des bases de données telles que MySQL, SQLite, MS SQL Server, MS Access ou Oracle.
+
 [Section.0415]
 Description = Abyss Web Server pozwala Ci na stworzenie serwera WWW na własnym komputerze. Ten program obsługuje zabezpieczone połączenia typu SSL/TLS (HTTPS) i wiele technologii Sieci.
 Może także uruchamiać zaawansowane aplikacje internetowe takie jak PHP, Perl, Python, ASP, ASP.NET, i Ruby on Rails.

base/applications/rapps/rapps/ac97forvirtualbox.txt

@@ -29,6 +29,12 @@ Licence = Desconocida
 Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces.
 URLSite = Desconocida
 
+[Section.040c]
+Name = Pilote AC97 pour VirtualBox
+Licence = Inconnue
+Description = Décompresser dans le dossier "ReactOS" puis redémarrer ReactOS deux fois.
+URLSite = Inconnue
+
 [Section.0415]
 Name = Sterownik AC97 dla VirtualBox
 Licence = Nieznana

base/applications/rapps/rapps/audiograbber.txt

@@ -17,6 +17,9 @@ Description = Ein sehr guter CD-Ripper/Audio-Datei-Konverter.
 [Section.040a]
 Description = Un buen CD Ripper/ conversor de archivos de audio.
 
+[Section.040c]
+Description = Un très bon extracteur de CD/convertisseur de fichier audio.
+
 [Section.0415]
 Description = Bardzo dobry CD Ripper/konwerter plików audio.
 

base/applications/rapps/rapps/comctl32ocx.txt

@@ -19,6 +19,10 @@ Description = Datei wird von einigen Anwendungen benötigt.
 Licence = Desconocida
 Description = X es necesario para varias aplicaciones.
 
+[Section.040c]
+Licence = Inconnue
+Description = Fichier nécessaire pour certaines applications.
+
 [Section.0415]
 Licence = Nieznana
 Description = Microsoft Visual Basic 6.0 Common Controls jest używany przez część aplikacji.

base/applications/rapps/rapps/diablo2.txt

@@ -17,6 +17,9 @@ Description = Diablo 2 Shareware. zeckensacks glide wrapper wird zum Ausführen
 [Section.040a]
 Description = Diablo 2 Shareware. zeckensack's glide wrapper es necesario para su ejecución.
 
+[Section.040c]
+Description = Diablo 2 Shareware. zeckensack's glide wrapper est requis pour le faire tourner.
+
 [Section.0415]
 Description = Diablo 2 Shareware. Do poprawnego działania wymagany jest zainstalowany zeckensacks glide wrapper.
 

base/applications/rapps/rapps/dosblaster.txt

@@ -17,6 +17,9 @@ Description = DosBlaster ist eine Shell Extension, die es ermöglicht jede DOS A
 [Section.040a]
 Description = DosBlaster en una extensión Shell que permite abrir cualquier ejecutable DOS en DOSBox desde el botón derecho del ratón. Esta versión contiene DOSBox 0.70, pero puede ser actualizado facilmente instalando una nueva versión de DOSBox en la carpeta de DosBlaster.
 
+[Section.040c]
+Description = DosBlaster est une extension Shell qui permet d'ouvrir n'importe quel exécutable DOS dans DOSBox via un click droit. Cette version contient DOSBox 0.70 mais peut être simplement mise à jour en installant une nouvelle version de DOSBox dans les répertoires de DosBlaster.
+
 [Section.0415]
 Description = DosBlaster to rozszerzenie powłoki, które umożliwia otwarcie każdego DOS-owego pliku wykonywalnego w DOSBox za pomocą prawego klawisza myszki. Ta wersja zawiera DosBox 0.70, ale można go łatwo zaktualizować, instalując nowszą wersje DOSBox do folderów DosBlaster.
 

base/applications/rapps/rapps/dosbox.txt

@@ -17,6 +17,9 @@ Description = DOSBox ist ein DOS Emulator.
 [Section.040a]
 Description = DOSBox es un emulador de DOS.
 
+[Section.040c]
+Description = DOSBox est un émulateur DOS.
+
 [Section.0415]
 Description = DOSBox - emulator DOSa.
 

base/applications/rapps/rapps/fap.txt

@@ -14,6 +14,9 @@ CDPath = none
 [Section.0407]
 Description = Kleiner und einfacher Mediaplayer.
 
+[Section.040c]
+Description = Lecteur audio simple et léger.
+
 [Section.0415]
 Description = Prosty i lekki odtwarzacz audio.
 

base/applications/rapps/rapps/firefox2.txt

@@ -8,29 +8,45 @@ Description = The most popular and one of the best free Web Browsers out there.
 Size = 5.8M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe
 CDPath = none
 
 [Section.0405]
 Description = Nejpopulárnější a jeden z nejlepších svobodných webových prohlížečů.
-Size = 5.5M
 URLSite = http://www.mozilla-europe.org/cs/
-URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setup%202.0.0.20.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setup%202.0.0.20.exe
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
+URLSite = http://www.mozilla-europe.org/de/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/de/Firefox%20Setup%202.0.0.20.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
+URLSite = http://www.mozilla-europe.org/es/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20Setup%202.0.0.20.exe
+
+[Section.040c]
+Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
+URLSite = http://www.mozilla-europe.org/fr/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/fr/Firefox%20Setup%202.0.0.20.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
+URLSite = http://www.mozilla-europe.org/no/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20Setup%202.0.0.20.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
+URLSite = http://www.mozilla-europe.org/pl/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setup%202.0.0.20.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
+URLSite = http://www.mozilla-europe.org/ru/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setup%202.0.0.20.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
+URLSite = http://www.mozilla-europe.org/uk/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/uk/Firefox%20Setup%202.0.0.20.exe

base/applications/rapps/rapps/firefox3.txt

@@ -8,47 +8,52 @@ Description = The most popular and one of the best free Web Browsers out there.
 Size = 7.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/en-US/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/en-US/Firefox%20Setup%203.0.19.exe
 CDPath = none
 
 [Section.0405]
 Description = Nejpopulárnější a jeden z nejlepších svobodných webových prohlížečů.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/cs/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/cs/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/cs/Firefox%20Setup%203.0.19.exe
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/de/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/de/Firefox%20Setup%203.0.19.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/es-ES/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/es-ES/Firefox%20Setup%203.0.19.exe
+
+[Section.040c]
+Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
+URLSite = http://www.mozilla-europe.org/fr/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/fr/Firefox%20Setup%203.0.19.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/nb-NO/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/nb-NO/Firefox%20Setup%203.0.19.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 7.8M
+Size = 7.9M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/pl/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/pl/Firefox%20Setup%203.0.19.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 7.4M
+Size = 7.8M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/ru/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/ru/Firefox%20Setup%203.0.19.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 7.3M
+Size = 7.4M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-real/win32/uk/Firefox%20Setup%203.0.19.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/uk/Firefox%20Setup%203.0.19.exe

base/applications/rapps/rapps/firefox36.txt

@@ -2,47 +2,53 @@
 
 [Section]
 Name = Mozilla Firefox 3.6
-Version = 3.6.13
+Version = 3.6.15
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 8.1M
+Size = 8.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/en-US/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/en-US/Firefox%20Setup%203.6.15.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 8.0M
+Size = 8.1M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/de/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/de/Firefox%20Setup%203.6.15.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
-Size = 8.0M
+Size = 8.1M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/es-ES/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/es-ES/Firefox%20Setup%203.6.15.exe
+
+[Section.040c]
+Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
+Size = 8.1M
+URLSite = http://www.mozilla-europe.org/fr/
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/fr/Firefox%20Setup%203.6.15.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
-Size = 8.0M
+Size = 8.1M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/nb-NO/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Setup%203.6.15.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 8.8M
+Size = 8.9M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/pl/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%203.6.15.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 8.4M
+Size = 8.5M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/ru/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%203.6.15.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 8.4M
+Size = 8.5M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/uk/Firefox%20Setup%203.6.13.exe
+URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%203.6.15.exe

base/applications/rapps/rapps/freebasic.txt

@@ -17,6 +17,9 @@ Description = Open Source BASIC Compiler. Die BASIC Syntax ist kompatibel zu QBA
 [Section.040a]
 Description = Compilador BASIC de código abierto. El lenguaje BASIC es compatible con QBASIC.
 
+[Section.040c]
+Description = Compilateur BASIC open source. La syntaxe du BASIC est compatible avec le QBASIC.
+
 [Section.0415]
 Description = Otwarty kompilator BASIC, ze składnią kompatybilną z QBASIC.
 

base/applications/rapps/rapps/glidewrapzbag.txt

@@ -17,6 +17,9 @@ Description = glidewrapper ist erforderlich um Diablo2 in ReactOS auszuführen.
 [Section.040a]
 Description = glidewrapper es necesario para ejecutar Diablo 2 en ReactOS.
 
+[Section.040c]
+Description = glidewrapper est nécessaire pour faire tourner Diablo 2 dans ReactOS.
+
 [Section.0415]
 Description = glidewrapper jest potrzebny do uruchomienia Diablo2 w ReactOS-ie.
 

base/applications/rapps/rapps/go-oo.txt

@@ -17,6 +17,9 @@ Description = Open Source Office Suite, basierend auf Open Office, aber viel bes
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 
+[Section.040c]
+Description = Suite bureautique open source basée sur Open Office, mais bien meilleure.
+
 [Section.0415]
 Description = Otwarty pakiet biurowy, bazujący na Open Office, ale znacznie lepszy.
 

base/applications/rapps/rapps/irfanview.txt

@@ -19,6 +19,10 @@ Description = Anzeigeprogramm für alle Arten von Grafik-/Audio- oder Video-Date
 Licence = Gratuito (para uso personal)
 Description = Visor para toda clase de archivos de imagen,audio y video.
 
+[Section.040c]
+Licence = Gratuit (pour un usage personnel)
+Description = Visionneur pour tous les types de fichiers graphiques/audio/vidéo.
+
 [Section.0415]
 Licence = Freeware (dla użytku domowego)
 Description = Przeglądarka dla bardzo wielu typów obrazów, plików audio oraz wideo.

base/applications/rapps/rapps/irfanviewplugins.txt

@@ -19,6 +19,10 @@ Description = Zusätzlich Plugins zur Unterstützung von weiteren Dateitypen.
 Licence = Gratuito (para uso personal)
 Description = Complementos adicionales para soportar más formatos.
 
+[Section.040c]
+Licence = Gratuit (pour un usage personnel)
+Description = Modules additionnels pour supporter plus de types de fichiers.
+
 [Section.0415]
 Licence = Freeware (dla użytku domowego)
 Description = Wtyczki otwierające dodatkowe typy plików w Irfanview.

base/applications/rapps/rapps/kdewin.txt

@@ -14,6 +14,9 @@ CDPath = none
 [Section.0407]
 Description = KDE für Windows.
 
+[Section.040c]
+Description = KDE pour Windows.
+
 [Section.0415]
 Description = KDE dla Windows.
 

base/applications/rapps/rapps/lbreakout2.txt

@@ -17,6 +17,9 @@ Description = Breakout-Klon verwendet SDL Bibliothek.
 [Section.040a]
 Description = Clon de Breakout usando las librerias SDL.
 
+[Section.040c]
+Description = Clone de casse-brique utilisant la bibliothèque SDL.
+
 [Section.0415]
 Description = Klon Breakouta/Arkanoida napisany przy użyciu biblioteki SDL.
 

base/applications/rapps/rapps/lgeneral.txt

@@ -17,6 +17,9 @@ Description = Panzer-General-Klon verwendet SDL Bibliotheken.
 [Section.040a]
 Description = Clon de Panzer General usando las librerias SDL.
 
+[Section.040c]
+Description = Clone de Pansez General utilisant la bibliothèque SDL.
+
 [Section.0415]
 Description = Klon gry Panzer General napisany przy użyciu biblioteki SDL.
 

base/applications/rapps/rapps/libreoffice.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = LibreOffice
-Version = 3.3.0 RC3
+Version = 3.3.1
 Licence = LGPL
 Description = Former called OpenOffice. Open Source Office Suite.
-Size = 209.0MB
+Size = 213.4MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc3/win/x86/LibO_3.3.0rc3_Win_x86_install_multi.exe
+URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.3.1/win/x86/LibO_3.3.1_Win_x86_install_multi.exe
 CDPath = none
 
 [Section.0407]
@@ -17,6 +17,9 @@ Description = Vorher bekannt als OpenOffice. Open Source Office Suite.
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 
+[Section.040c]
+Description = Précédemment appelé OpenOffice. Suite bureautique open source.
+
 [Section.0415]
 Description = Otwarty pakiet biurowy.
 

base/applications/rapps/rapps/lmarbles.txt

@@ -17,6 +17,9 @@ Description = Atomix-Klon verwendet SDL Bibliotheken.
 [Section.040a]
 Description = Clon de Atomix usando las librerias SDL.
 
+[Section.040c]
+Description = Clone de Atomix utilisant la bibliothèque SDL.
+
 [Section.0415]
 Description = Klon gry Atomix, używający biblioteki SDL.
 

base/applications/rapps/rapps/mfc40.txt

@@ -21,6 +21,11 @@ Name = Visor OLE y Microsoft Foundation Classes Version 4
 Licence = Desconocida
 Description = MFC 4 es necesario para varias aplicaciones.
 
+[Section.040c]
+Name = Visionneur OLE et Microsoft Foundation Classes version 4
+Licence = Inconnue
+Description = MFC 4 est nécessaire pour certaines applications.
+
 [Section.0415]
 Name = Przeglądarka OLE oraz MFC (Microsoft Foundation Classes) wersja 4
 Licence = Nieznana

base/applications/rapps/rapps/mingw.txt

@@ -17,6 +17,9 @@ Description = Eine Portierung der GNU Werkzeugkette mit GCC, GDB, GNU make usw.
 [Section.040a]
 Description = Es una cadena de herramientas GNU con GCC, GDB, GNU make, etc.
 
+[Section.040c]
+Description = Un portage de la chaîne d'outils GNU avec GCC, GDB, GNU make, etc.
+
 [Section.0415]
 Description = Kompilator GCC dla platformy Windows wraz z dodatkowymi narzędziami (GDB, make, itd.).
 

base/applications/rapps/rapps/mirandaim.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.9.13
+Version = 0.9.17
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
 Size = 3.0MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.13-unicode.exe
+URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.17-unicode.exe
 CDPath = none
 
 [Section.0407]
@@ -17,6 +17,9 @@ Description = Open source Multiprotokoll Instant Messaging Anwendung - funktioni
 [Section.040a]
 Description = Aplicación de mensajería instantánea multiprotocolo de código abierto - Puede no funcionar en su totalidad.
 
+[Section.040c]
+Description = Application de messagerie instantannée multi-protocoles open source - pourrait ne pas fonctionner complètement.
+
 [Section.0415]
 Description = Otwarty komunikator internetowy, obsługujący wiele różnych protokołów (m.in. GG, Tlen, Jabber, ICQ, IRC) - może nie działać prawidłowo.
 

base/applications/rapps/rapps/mirc.txt

@@ -1,14 +1,14 @@
 ; UTF-8
 
 [Section]
-Name = mIRC
+Name = mIRC 7
-Version = 7.17
+Version = 7.19
 Licence = Shareware
 Description = The most popular client for the Internet Relay Chat (IRC).
-Size = 2.0M
+Size = 1.9M
 Category = 5
 URLSite = http://www.mirc.com/
-URLDownload = http://download.mirc.com/mirc717.exe
+URLDownload = http://download.mirc.com/mirc719.exe
 CDPath = none
 
 [Section.0407]
@@ -17,6 +17,9 @@ Description = Der populärste Client für Internet Relay Chat (IRC).
 [Section.040a]
 Description = El más popular cliente para Internet Relay Chat (IRC).
 
+[Section.040c]
+Description = Le client le plus populaire pour l'Internet Relay Chat (IRC).
+
 [Section.0415]
 Description = Najpopularniejszy klient IRC (Internet Relay Chat).
 

base/applications/rapps/rapps/mirc6.txt

@@ -0,0 +1,27 @@
+; UTF-8
+
+[Section]
+Name = mIRC 6
+Version = 6.35
+Licence = Shareware
+Description = The most popular client for the Internet Relay Chat (IRC).
+Size = 1.9M
+Category = 5
+URLSite = http://www.mirc.com/
+URLDownload = http://download.mirc.com/mirc635.exe
+CDPath = none
+
+[Section.0407]
+Description = Der populärste Client für Internet Relay Chat (IRC).
+
+[Section.040a]
+Description = El más popular cliente para Internet Relay Chat (IRC).
+
+[Section.040c]
+Description = Le client le plus populaire pour l'Internet Relay Chat (IRC).
+
+[Section.0415]
+Description = Najpopularniejszy klient IRC (Internet Relay Chat).
+
+[Section.0422]
+Description = Найпопулярніший клієнт IRC (Internet Relay Chat).

base/applications/rapps/rapps/mono2.txt

@@ -11,6 +11,9 @@ URLSite = http://www.mono-project.com/Main_Page
 URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.2/windows-installer/1/mono-2.8.2-gtksharp-2.12.10-win32-1.exe
 CDPath = none
 
+[Section.040c]
+Description = Framework .net open source.
+
 [Section.0415]
 Description = Pakiet Mono .net Framework dla Programistów.
 

base/applications/rapps/rapps/mpc.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Media Player Classic Home Cinema
-Version = 1.4.2499
+Version = 1.5.0.2827
 Licence = GPL
 Description = A media player.
 Size = 4.9MB
 Category = 1
 URLSite = http://mpc-hc.sourceforge.net/
-URLDownload = http://freefr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC%20v1.4.2499.0_32%20bits/MPC-HomeCinema.1.4.2499.0.x86.exe
+URLDownload = http://freefr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC%20v1.5.0.2827_32%20bits/MPC-HomeCinema.1.5.0.2827.x86.exe
 CDPath = none
 
 [Section.0407]
@@ -17,6 +17,9 @@ Description = Ein Mediaplayer.
 [Section.040a]
 Description = Reproductor multimedia.
 
+[Section.040c]
+Description = Un lecteur media.
+
 [Section.0419]
 Description = Мультимедийный проигрыватель.
 

base/applications/rapps/rapps/msxml3.txt

@@ -19,6 +19,10 @@ Description = MSXML3 wird von einige MSI Installern benötigt.
 Licence = Desconocida
 Description = MSXML3 para varios instaladores MSI.
 
+[Section.040c]
+Licence = Inconnue
+Description = MSXML3 est nécessaire pour certains installateurs MSI.
+
 [Section.0415]
 Licence = Nieznana
 Description = Niektóre spośród plików instalacyjnych MSI potrzebują parsera MSXML3.

base/applications/rapps/rapps/net11.txt

@@ -11,5 +11,8 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589
 URLDownload = http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe
 CDPath = none
 
+[Section.040c]
+Description = Microsoft .NET Framework version 1.1 - Paquet redistribuable.
+
 [Section.0415]
 Description = Microsoft .NET Framework Wersja 1.1 - Pakiet Dystrybucyjny.

base/applications/rapps/rapps/net20.txt

@@ -11,5 +11,8 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362
 URLDownload = http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe
 CDPath = none
 
+[Section.040c]
+Description = Microsoft .NET Framework version 2.0 - Paquet redistribuable.
+
 [Section.0415]
 Description = Microsoft .NET Framework Wersja 2.0 - Pakiet Dystrybucyjny.

base/applications/rapps/rapps/net20sp2.txt

@@ -11,5 +11,8 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B
 URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
 CDPath = none
 
+[Section.040c]
+Description = Microsoft .NET Framework version 2.0 Service Pack 2.
+
 [Section.0415]
 Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2.

base/applications/rapps/rapps/offbyone.txt

@@ -20,6 +20,9 @@ Description = Der Off-By-One-Browser ist ein sehr kleiner und schneller Webbrows
 [Section.040a]
 Description = Es un pequeño y rápido navegador web con completo soporte HTML 3.2.
 
+[Section.040c]
+Description = Le navigateur Off By One est un navigateur internet très petit et rapide avec un support complet de HTML 3.2.
+
 [Section.0415]
 Description = Bardzo mała i szybka przeglądarka internetowa z pełną obsługą HTML 3.2.
 

base/applications/rapps/rapps/openoffice2.4.txt

@@ -23,6 +23,13 @@ URLSite = http://es.openoffice.org/
 Size = 113.9MB
 URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe
 
+[Section.040c]
+Version = 2.4.2
+Description = LA suite bureautique open source.
+URLSite = http://fr.openoffice.org/
+Size = 113.9MB
+URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2.4.2/OOo_2.4.2_Win32Intel_install_fr.exe
+
 [Section.0415]
 URLSite = http://pl.openoffice.org/
 Description = Otwarty pakiet biurowy.

base/applications/rapps/rapps/openoffice3.0.txt

@@ -1,36 +1,42 @@
 ; UTF-8
 
 [Section]
-Name = OpenOffice 3.0
+Name = OpenOffice 3.3
-Version = 3.2.1
+Version = 3.3.0
 Licence = LGPL
 Description = THE Open Source Office Suite.
-Size = 134.0MB
+Size = 137.0MB
 Category = 6
 URLSite = http://www.openoffice.org/
-URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.2.1/OOo_3.2.1_Win_x86_install_en-US.exe
+URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.3.0/OOo_3.3.0_Win_x86_install_en-US.exe
 CDPath = none
 
 [Section.0407]
 Description = DIE Open Source Office Suite.
 URLSite = http://de.openoffice.org/
-Size = 144.0MB
+Size = 160.0MB
-URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.2.1/OOo_3.2.1_Win_x86_install_de.exe
+URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.3.0/OOo_3.3.0_Win_x86_install-wJRE_de.exe
 
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 URLSite = http://es.openoffice.org/
-Size = 144.0MB
+Size = 132.0MB
-URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/es/3.2.1/OOo_3.2.1_Win_x86_install-wJRE_es.exe
+URLDownload = http://ftp.gwdg.de/pub/openoffice/localized/es/3.3.0/OOo_3.3.0_Win_x86_install_es.exe
+
+[Section.040c]
+Description = LA suite bureautique open source.
+URLSite = http://fr.openoffice.org/
+Size = 132.0MB
+URLDownload = http://ftp.gwdg.de/pub/openoffice/localized/fr/3.3.0/OOo_3.3.0_Win_x86_install_fr.exe
 
 [Section.0415]
 Description = Otwarty pakiet biurowy.
 URLSite = http://pl.openoffice.org/
-Size = 130.0MB
+Size = 134.0MB
-URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_install_pl.exe
+URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.3.0/OOo_3.3.0_Win_x86_install_pl.exe
 
 [Section.0422]
 Description = Відкритий офісний пакет.
 URLSite = http://ua.openoffice.org/
-Size = 128.0MB
+Size = 133.0MB
-URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/ru/3.2.1/OOo_3.2.1_Win_x86_install_ru.exe
+URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/ru/3.3.0/OOo_3.3.0_Win_x86_install_ru.exe

base/applications/rapps/rapps/openttd.txt

@@ -17,6 +17,9 @@ Description = Open Source Klon der "Transport Tycoon Deluxe" Spiel-Engine. Sie b
 [Section.040a]
 Description = Clon del motor de juegos "Transport Tycoon Deluxe" de código abierto. Es necesaria una copia de Transport Tycoon.
 
+[Section.040c]
+Description = Clone open source du moteur de jeu "Transport Tycoon Deluxe". Vous aurez besoin d'une copie de Transport Tycoon.
+
 [Section.0415]
 Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego działania potrzebna jest kopia gry Transport Tycoon.
 

base/applications/rapps/rapps/opera.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Opera
-Version = 11.00
+Version = 11.01
 Licence = Freeware
 Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
 Size = 8.9M
 Category = 5
 URLSite = http://www.opera.com/
-URLDownload = http://get4.opera.com/pub/opera/win/1100/int/Opera_1100_int_Setup.exe
+URLDownload = http://get4.opera.com/pub/opera/win/1101/int/Opera_1101_int_Setup.exe
 CDPath = none
 
 [Section.0405]
@@ -20,6 +20,9 @@ Description = Der populäre Opera Browser mit vielen fortschrittlichen Eigenscha
 [Section.040a]
 Description = Popular navegador web con muchas características avanzadas e incluye un cliente de correo y BitTorrent.
 
+[Section.040c]
+Description = Le populaire navigateur Opera avec beaucoup de fonctionnalités avancées, incluant un client mail et BitTorrent.
+
 [Section.0415]
 Description = Popularna przeglądarka internetowa z wieloma zaawansowanymi funkcjami, zawierająca klientów: poczty oraz BitTorrent.
 

base/applications/rapps/rapps/opera9.txt

@@ -17,6 +17,9 @@ Description = Der populäre Opera Browser mit vielen fortschrittlichen Eigenscha
 [Section.040a]
 Description = Popular navegador web con muchas características avanzadas e incluye un cliente de correo y BitTorrent.
 
+[Section.040c]
+Description = Le populaire navigateur Opera avec beaucoup de fonctionnalités avancées, incluant un client mail et BitTorrent.
+
 [Section.0415]
 Description = Popularna przeglądarka internetowa z wieloma zaawansowanymi funkcjami, zawierająca klientów: poczty oraz BitTorrent.
 

base/applications/rapps/rapps/putty.txt

@@ -17,6 +17,9 @@ Description = Ein freier SSH-, Telnet-, rlogin- und TCP-Client.
 [Section.040a]
 Description = Un ciente SSH, Telnet, rlogin y TCP gratuito.
 
+[Section.040c]
+Description = Un client SSH, Telnet, rlogin et raw TCP gratuit.
+
 [Section.0415]
 Description = Darmowy klient obsługujący protokoły SSH, Telnet, rlogin oraz bezpośrednie TCP.
 

base/applications/rapps/rapps/python.txt

@@ -14,6 +14,8 @@ CDPath = none
 [Section.0407]
 Description = Eine sehr mächtige, dynamische Programmiersprache.
 
+[Section.040c]
+Description = Un langage de programmation dynamique remarquablement puissant.
 
 [Section.0415]
 Description = Potęży i dynamiczny język programowania.

base/applications/rapps/rapps/remood.txt

@@ -1,10 +1,10 @@
-; UTF-8
+; UTF-8
 
 [Section]
 Name = ReMooD
 Version = 0.8a
 Licence = GPL
-Description = ReMooD is a source port of Doom Legacy. It aims to provide the classic Legacy Experience with new features and more stability. This supports Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x and higher; and Linux (x86 and x86_64).
+Description = ReMooD is a source port of Doom Legacy. It aims to provide the classic Legacy Experience with new features and more stability.
 Size = 1.2M
 Category = 4
 URLSite = http://remood.sourceforge.net/
@@ -12,10 +12,13 @@ URLDownload = http://ovh.dl.sourceforge.net/project/remood/ReMooD/0.8a/remoodset
 CDPath = none
 
 [Section.0407]
-Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64).
+Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten.
+
+[Section.040c]
+Description = ReMood est un portage du source de Doom Legacy. Son but est de fournir l'expérience classique de Legacy avec de nouvelles fonctionnalités et plus de stabilité.
 
 [Section.0415]
-Description = ¯ród³owy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami, i lepsz¹ stabilnoœci¹. Obs³uguje Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x i wy¿sze; i Linux (x86 i x86_64).
+Description = Źródłowy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami i lepszą stabilnością.
 
 [Section.0422]
-Description = ReMooD Ñ<EFBFBD> Портом вихідних кодів Doom Legacy. Його метою Ñ” додати нові можливоÑ<C2BE>Ñ‚Ñ– та Ñ<>табільніÑ<E28093>Ñ‚ÑŒ до доÑ<C2BE>віду клаÑ<C2B0>ичного Legacy. Він підтримує Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x та новіші; а також Linux (x86 та x86_64).
+Description = ReMooD э Портом вихідних кодів Doom Legacy. Його метою є додати нові можливості та стабільність до досвіду класичного Legacy.

base/applications/rapps/rapps/rosbe.txt

@@ -20,6 +20,9 @@ Description = Erlaubt es Ihnen den ReactOS Source Code zu kompilieren. Im ReactO
 [Section.040a]
 Description = Te permite compilar el código de ReactOS. Para más instrucciones consulta la wiki de ReactOS.
 
+[Section.040c]
+Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instruction, reportez-vous au wiki ReactOS.
+
 [Section.0415]
 Description = Pozwala zbudować obraz płyty ReactOS ze źródeł. Więcej informacji na Wiki ReactOS.
 

base/applications/rapps/rapps/rosbeamd64.txt

@@ -20,6 +20,9 @@ Description = Erlaubt es Ihnen den ReactOS AMD64 Source Code zu kompilieren. Im
 [Section.040a]
 Description = Te permite compilar el código de ReactOS AMD64. Para más instrucciones consulta la wiki de ReactOS.
 
+[Section.040c]
+Description = Vous permet de compiler le code source de ReactOS pour AMD64. Pour plus d'instruction, reportez-vous au wiki ReactOS.
+
 [Section.0415]
 Description = Pozwala zbudować obraz płyty ReactOS AMD64 ze źródeł. Więcej informacji na Wiki ReactOS.
 

base/applications/rapps/rapps/rosbearm.txt

@@ -17,6 +17,9 @@ Description = Erlaubt es Ihnen den ReactOS ARM Source Code zu kompilieren. Im Re
 [Section.040a]
 Description = Te permite compilar el código de ReactOS ARM. Para más instrucciones consulta la wiki de ReactOS.
 
+[Section.040c]
+Description = Vous permet de compiler le code source de ReactOS pour ARM. Pour plus d'instruction, reportez-vous au wiki ReactOS.
+
 [Section.0415]
 Description = Pozwala zbudować obraz płyty ReactOS ARM ze źródeł. Więcej informacji na Wiki ReactOS.
 

base/applications/rapps/rapps/sambatng.txt

@@ -17,6 +17,9 @@ Description = Dieses Werkzeug erlaubt den Zugriff auf Windows' gemeinsame Verzei
 [Section.040a]
 Description = Esta utilidad le permite acceder a sus carpetas e impresoras compartidas en Windows con ReactOS.
 
+[Section.040c]
+Description = Cet outil vous permet d'accéder à vos répertoire/imprimantes partagés Windows avec ReactOS.
+
 [Section.0415]
 Description = Narzędzie pozwalające na dostęp z poziomu ReactOSa do współdzielonych folderów/drukarek Windows.
 

base/applications/rapps/rapps/sbforvmware.txt

@@ -29,6 +29,12 @@ Licence = Desconocida
 Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces.
 URLSite = Desconocida
 
+[Section.040c]
+Name = Pilote SoundBlaster pour VMWare
+Licence = Inconnue
+Description = Dézippez dans le répertoire "ReactOS" puis redémarrez deux fois.
+URLSite = Inconnue
+
 [Section.0415]
 Name = Sterownik SoundBlaster dla VMWare
 Licence = Nieznana