[CLT2012]

- Fix directory creation in first stage
- Avoid relocation of syssetup

svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56139

base/applications/mscutils/devmgmt/lang/cs-CZ.rc

@@ -0,0 +1,82 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDR_MAINMENU MENU
+BEGIN
+  POPUP "&Soubor"
+  BEGIN
+    MENUITEM "&Konec",                  IDC_EXIT
+  END
+  POPUP "&Akce"
+  BEGIN
+    MENUITEM "Tisk",                    IDC_PRINT, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Vlastnosti",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Nápověda",                IDC_PROGHELP, GRAYED
+  END
+  POPUP "&Zobrazení"
+  BEGIN
+    MENUITEM "Zařízení podle typu",        IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Zařízení podle připojení",   IDC_STATIC, GRAYED
+    MENUITEM "Prostředky podle typu",      IDC_STATIC, GRAYED
+    MENUITEM "Prostředky podle připojení", IDC_STATIC, GRAYED
+  END
+  POPUP "Nápověda"
+  BEGIN
+    MENUITEM "Nápověda",                IDC_PROGHELP
+    MENUITEM "O programu",              IDC_ABOUT
+  END
+END
+
+IDR_POPUP MENU
+BEGIN
+  POPUP "popup"
+  BEGIN
+    MENUITEM "Vlastnosti",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Nápověda",                IDC_PROGHELP
+  END
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "O Správci zařízení"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT "Správce zařízení v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
+  PUSHBUTTON "Zavřít", IDOK, 75, 162, 44, 15
+  ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_TOOLTIP_PROP      "Vlastnosti"
+  IDS_TOOLTIP_REFRESH   "Obnovit"
+  IDS_TOOLTIP_HELP      "Nápověda"
+  IDS_TOOLTIP_EXIT      "Konec"
+END
+
+/* Hints */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS Správce zařízení"
+  IDS_HINT_BLANK        " "
+  IDS_HINT_EXIT         " Ukončit pogram."
+  IDS_HINT_REFRESH      " Obnovit seznam zařízení."
+  IDS_HINT_PROP         " Zobrazit kartu vlastností pro vybranou položku."
+  IDS_HINT_HELP         " Zobrazit nápovědu."
+  IDS_HINT_ABOUT        " O ReactOS Správci zařízení."
+
+  IDS_HINT_SYS_RESTORE  " Obnoví normální velikost okna."
+  IDS_HINT_SYS_MOVE     " Přesune okno."
+  IDS_HINT_SYS_SIZE     " Změní velikost okna."
+  IDS_HINT_SYS_MINIMIZE " Minimalizuje okno."
+  IDS_HINT_SYS_MAXIMIZE " Maximalizuje okno."
+  IDS_HINT_SYS_CLOSE    " Zavře toto okno."
+END

base/applications/mscutils/devmgmt/rsrc.rc

@@ -15,6 +15,7 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 // UTF-8
 #pragma code_page(65001)
 #include "lang/bg-BG.rc"
+#include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"

base/applications/mspaint/rsrc.rc

@@ -11,6 +11,12 @@
 #include <windows.h>
 #include "definitions.h"
 
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Paint\0"
+#define REACTOS_STR_INTERNAL_NAME     "mspaint\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "mspaint.exe\0"
+
+#include <reactos/version.rc>
+
 #include "icons.rc"
 
 // UTF-8

base/applications/mstsc/connectdialog.c

@@ -27,7 +27,6 @@ HINSTANCE hInst;
 static VOID ReLoadGeneralPage(PINFO pInfo);
 static VOID ReLoadDisplayPage(PINFO pInfo);
 
-
 static VOID
 DoOpenFile(PINFO pInfo)
 {
@@ -98,6 +97,61 @@ OnTabWndSelChange(PINFO pInfo)
 }
 
 
+static VOID
+LoadUsernameHint(HWND hDlg, INT iCur)
+{
+    WCHAR szValue[MAXVALUE+1000];
+    WCHAR szName[MAX_KEY_NAME];
+    WCHAR szKeyName[] = L"Software\\Microsoft\\Terminal Server Client\\Servers";
+    PWCHAR lpAddress;
+    HKEY hKey;
+    HKEY hSubKey;
+    LONG lRet = ERROR_SUCCESS;
+    INT iIndex = 0;
+    DWORD dwSize = MAX_KEY_NAME;
+
+    SendDlgItemMessageW(hDlg, IDC_SERVERCOMBO, CB_GETLBTEXT, (WPARAM)iCur, (LPARAM)szValue);
+
+    /* remove possible port number */
+    lpAddress = wcstok(szValue, L":");
+
+    if (lpAddress == NULL)
+        return;
+
+    if (RegOpenKeyExW(HKEY_CURRENT_USER,
+                      szKeyName,
+                      0,
+                      KEY_READ,
+                      &hKey) == ERROR_SUCCESS)
+    {
+        while (lRet == ERROR_SUCCESS)
+        {
+            dwSize = MAX_KEY_NAME;
+
+            lRet = RegEnumKeyExW(hKey, iIndex, szName, &dwSize, NULL, NULL, NULL, NULL);
+
+            if(lRet == ERROR_SUCCESS && wcscmp(szName, lpAddress) == 0)
+            {
+                if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS)
+                    break;
+
+                dwSize = MAXVALUE;
+
+                if(RegQueryValueExW(hKey, L"UsernameHint", 0,  NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS)
+                {
+                    SetDlgItemTextW(hDlg, IDC_NAMEEDIT, szValue);
+                }
+
+                RegCloseKey(hSubKey);
+                break;
+            }
+            iIndex++;
+        }
+        RegCloseKey(hKey);
+    }
+}
+
+
 static VOID
 FillServerAddesssCombo(PINFO pInfo)
 {
@@ -107,6 +161,7 @@ FillServerAddesssCombo(PINFO pInfo)
     LONG ret = ERROR_SUCCESS;
     DWORD size;
     INT i = 0;
+    BOOL found = FALSE;
 
     if (RegOpenKeyExW(HKEY_CURRENT_USER,
                       KeyName,
@@ -152,6 +207,7 @@ FillServerAddesssCombo(PINFO pInfo)
                                                 CB_ADDSTRING,
                                                 0,
                                                 (LPARAM)lpAddress);
+                            found = TRUE;
                         }
 
                         HeapFree(GetProcessHeap(),
@@ -177,6 +233,17 @@ FillServerAddesssCombo(PINFO pInfo)
                             0,
                             (LPARAM)Name);
     }
+
+    if(found)
+    {
+        SendDlgItemMessageW(pInfo->hGeneralPage,
+                            IDC_SERVERCOMBO,
+                            CB_SETCURSEL,
+                            0,
+                            0);
+        LoadUsernameHint(pInfo->hGeneralPage, 0);
+    }
+
 }
 
 
@@ -194,6 +261,16 @@ ReLoadGeneralPage(PINFO pInfo)
                         IDC_SERVERCOMBO,
                         lpText);
     }
+
+    /* set user name */
+    lpText = GetStringFromSettings(pInfo->pRdpSettings,
+                                   L"username");
+    if (lpText)
+    {
+        SetDlgItemTextW(pInfo->hGeneralPage,
+                        IDC_NAMEEDIT,
+                        lpText);
+    }
 }
 
 
@@ -279,15 +356,18 @@ GeneralDlgProc(HWND hDlg,
                                                   CB_GETCURSEL,
                                                   0,
                                                   0);
-                        cur++;
 
                         last = SendDlgItemMessageW(hDlg,
                                                    IDC_SERVERCOMBO,
                                                    CB_GETCOUNT,
                                                    0,
                                                    0);
-                        if (cur == last)
+                        if ((cur + 1) == last)
                             MessageBoxW(hDlg, L"SMB is not yet supported", L"RDP error", MB_ICONERROR);
+                        else
+                        {
+                            LoadUsernameHint(hDlg, cur);
+                        }
                     }
                     break;
 
@@ -455,7 +535,7 @@ AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICEW DisplayDevice)
 
     newEntry->Resolutions = HeapAlloc(GetProcessHeap(),
                                       0,
-                                      ResolutionsCount * sizeof(RESOLUTION_INFO));
+                                      ResolutionsCount * (sizeof(RESOLUTION_INFO) + 1));
     if (!newEntry->Resolutions) goto ByeBye;
 
     newEntry->ResolutionsCount = ResolutionsCount;
@@ -473,6 +553,11 @@ AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICEW DisplayDevice)
             i++;
         }
     }
+
+    /* fullscreen */
+    newEntry->Resolutions[i].dmPelsWidth = GetSystemMetrics(SM_CXSCREEN);
+    newEntry->Resolutions[i].dmPelsHeight = GetSystemMetrics(SM_CYSCREEN);
+
     descriptionSize = (wcslen(DisplayDevice->DeviceString) + 1) * sizeof(WCHAR);
     description = HeapAlloc(GetProcessHeap(), 0, descriptionSize);
     if (!description) goto ByeBye;
@@ -677,22 +762,36 @@ ReLoadDisplayPage(PINFO pInfo)
 {
     DWORD index;
     INT width, height, pos = 0;
-    INT bpp, num, i;
+    INT bpp, num, i, screenmode;
     BOOL bSet = FALSE;
 
+    /* get fullscreen info */
+    screenmode = GetIntegerFromSettings(pInfo->pRdpSettings, L"screen mode id");
+
     /* set trackbar position */
     width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth");
     height = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopheight");
 
     if (width != -1 && height != -1)
     {
-        for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++)
+        if(screenmode == 2)
         {
-            if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width &&
-                pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height)
+            pos = SendDlgItemMessageW(pInfo->hDisplayPage,
+                                      IDC_GEOSLIDER,
+                                      TBM_GETRANGEMAX,
+                                      0,
+                                      0);
+        }
+        else
+        {
+            for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++)
             {
-                pos = index;
-                break;
+                if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width &&
+                    pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height)
+                {
+                    pos = index;
+                    break;
+                }
             }
         }
     }

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Сървър:",IDC_STATIC,37,41,30,8
     LTEXT           "Потребител:",IDC_STATIC,37,58,48,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Запис",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Запис като...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Отваряне...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Servidor:",IDC_STATIC,47,41,25,8
     LTEXT           "Nom d'usuari:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Desa",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Desa com...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Obre...",IDC_OPEN,177,139,50,14

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

@@ -0,0 +1,64 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDD_GENERAL DIALOGEX 0, 0, 242, 175
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX        "Přihlašovací údaje",IDC_STATIC,7,7,228,89
+    GROUPBOX        "Nastavení spojení",IDC_STATIC,7,103,228,65
+    ICON            "", IDC_LOGONICON, 15,19,20,20
+    LTEXT           "Zadejte adresu serveru",IDC_STATIC,47,24,81,8
+    LTEXT           "Server:",IDC_STATIC,47,41,25,8
+    LTEXT           "Uživatelské jméno:",IDC_STATIC,47,58,60,8
+    COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON      "Uložit",IDC_SAVE,67,139,50,14
+    PUSHBUTTON      "Uložit jako...",IDC_SAVEAS,123,139,50,14
+    PUSHBUTTON      "Otevřít...",IDC_OPEN,177,139,50,14
+    ICON            "", IDC_CONNICON, 16,114,20,20
+    LTEXT           "Uložit současné nastavení nebo načíst nastavení ze souboru",IDC_STATIC,50,115,172,20
+END
+
+IDD_DISPLAY DIALOGEX 0, 0, 242, 175
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    GROUPBOX        "Velikost vzdálené plochy",IDC_STATIC,7,7,228,68
+    GROUPBOX        "Barvy",IDC_STATIC,7,83,228,85
+    ICON            "", IDC_REMICON, 15,19,20,20
+    ICON            "", IDC_COLORSICON, 15,98,20,20
+    LTEXT           "Nastavením posuvníku do krajní pravé polohy zvolíte režim celé obrazovky",IDC_STATIC,53,22,175,21
+    CONTROL         "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17
+    COMBOBOX        IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10
+    LTEXT           "Poznámka: Toto nastavení může být změněno nastavením na serveru",IDC_STATIC,56,143,165,18
+    LTEXT           "Méně",IDC_STATIC,35,42,16,8
+    LTEXT           "Více",IDC_STATIC,189,42,17,8
+    LTEXT           "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER
+END
+
+IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Připojení ke vzdálené ploše"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "Připojit",IDOK,147,245,50,14
+    PUSHBUTTON      "Storno",IDCANCEL,203,245,50,14
+    CONTROL         "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190
+END
+
+
+STRINGTABLE 
+BEGIN
+    IDS_TAB_GENERAL         "Obecné"
+    IDS_TAB_DISPLAY         "Zobrazení"
+    IDS_256COLORS           "256 Barev"
+    IDS_HIGHCOLOR15         "32,768 Barev (15 bit)"
+    IDS_HIGHCOLOR16         "65,536 Barev (16 bit)"
+    IDS_HIGHCOLOR24         "16,777,216 Barev (24 bit)"
+    IDS_PIXEL               "%lux%lu Pixelů"
+    IDS_FULLSCREEN          "Celá obrazovka"
+    IDS_BROWSESERVER        "<Najít další...>"
+    IDS_HEADERTEXT1         "Vzdálená plocha"
+    IDS_HEADERTEXT2         "Připojení"
+END

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Server:",IDC_STATIC,47,41,25,8
     LTEXT           "Benutzername:",IDC_STATIC,47,58,50,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Speichern",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Speichern unter",IDC_SAVEAS,120,139,55,14
     PUSHBUTTON      "Öffnen...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Διακομιστής:",IDC_STATIC,47,41,30,8
     LTEXT           "Όνομα χρήστη:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,89,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Αποθήκευση",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Αποθήκευση Ως...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Άνοιγμα...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Server:",IDC_STATIC,47,41,25,8
     LTEXT           "User name:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Save",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Save As...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Open...",IDC_OPEN,177,139,50,14

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

@@ -16,6 +16,7 @@ BEGIN
     LTEXT           "Servidor:",IDC_STATIC,47,41,28,8
     LTEXT           "Nombre de usuario:",IDC_STATIC,47,58,70,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Guardar",IDC_SAVE,60,139,50,14 //67
     PUSHBUTTON      "Guardar Como...",IDC_SAVEAS,115,139,58,14 //123,50
     PUSHBUTTON      "Abrir...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Serveur:",IDC_STATIC,47,41,25,8
     LTEXT           "Nom d'utilisateur:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Enregistrer",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Enregistrer Sous...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Ouvrir...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Computer:",IDC_STATIC,47,41,35,8
     LTEXT           "Nome utente:",IDC_STATIC,47,58,68,8
     COMBOBOX        IDC_SERVERCOMBO,90,39,136,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Salva",IDC_SAVE,43,139,58,14
     PUSHBUTTON      "Salva con nome",IDC_SAVEAS,107,139,58,14
     PUSHBUTTON      "Apri",IDC_OPEN,169,139,58,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "サーバ:",IDC_STATIC,47,41,25,8
     LTEXT           "ユーザー名:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "保存",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "名前を付けて保存...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "開く...",IDC_OPEN,177,139,50,14

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

@@ -15,6 +15,7 @@ BEGIN
     LTEXT           "서버 주소:",IDC_STATIC,47,41,25,8
     LTEXT           "사용자 이름:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "저장",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "다른 이름으로 저장...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "열기...",IDC_OPEN,177,139,50,14

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

@@ -13,6 +13,7 @@ BEGIN
     LTEXT           "Serveris:",IDC_STATIC,47,41,30,8
     LTEXT           "Vartotojo vardas:",IDC_STATIC,47,58,60,8
     COMBOBOX        IDC_SERVERCOMBO,107,39,113,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Saugoti",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Saugoti kaip...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Atidaryti...",IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Server:",IDC_STATIC,47,41,25,8
     LTEXT           "Brukernavn:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Lagre",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Lagre som...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Åpne...",IDC_OPEN,177,139,50,14

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

@@ -21,6 +21,7 @@ BEGIN
     LTEXT           "Serwer:",IDC_STATIC,39,42,29,8
     LTEXT           "Nazwa użytkownika:",IDC_STATIC,39,57,42,18 
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Zapisz",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Zapisz jako...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Otwórz...",IDC_OPEN,177,139,50,14

base/applications/mstsc/lang/ro-RO.rc

@@ -18,6 +18,7 @@ BEGIN
     LTEXT           "Server:",             IDC_STATIC,47,41,25,8
     LTEXT           "Nume utilizator:",    IDC_STATIC,47,58,58,8
     COMBOBOX                               IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Pă&strează",          IDC_SAVE,57,139,50,14
     PUSHBUTTON      "&Păstrare în…",       IDC_SAVEAS,112,139,60,14
     PUSHBUTTON      "&Deschidere…",        IDC_OPEN,177,139,50,14

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

@@ -11,6 +11,7 @@ BEGIN
     LTEXT           "Сервер:",IDC_STATIC,52,41,31,8
     LTEXT           "Имя пользователя:",IDC_STATIC,15,58,67,8
     COMBOBOX        IDC_SERVERCOMBO,86,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Сохранить",IDC_SAVE,49,139,50,14
     PUSHBUTTON      "Сохранить как...",IDC_SAVEAS,103,139,70,14
     PUSHBUTTON      "Открыть...",IDC_OPEN,177,139,50,14

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

@@ -15,6 +15,7 @@ BEGIN
     LTEXT           "Server:",IDC_STATIC,47,41,25,8
     LTEXT           "Používateľské meno:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "&Uložiť",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Uložiť &ako...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "&Otvoriť...",IDC_OPEN,177,139,50,14

base/applications/mstsc/lang/sv-SE.rc

@@ -18,6 +18,7 @@ BEGIN
     LTEXT           "Server:",IDC_STATIC,47,41,25,8
     LTEXT           "Användarnamn:",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Spara",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Spara som...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Öppna...",IDC_OPEN,177,139,50,14

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

@@ -19,6 +19,7 @@ BEGIN
     LTEXT           "Сервер:",IDC_STATIC,47,41,27,8
     LTEXT           "Користувач:",IDC_STATIC,47,58,41,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "Зберегти",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Зберегти як...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "Відкрити...",IDC_OPEN,177,139,50,14

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

@@ -15,6 +15,7 @@ BEGIN
     LTEXT           "服务器：",IDC_STATIC,47,41,25,8
     LTEXT           "用户名：",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "保存",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "另存为...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "打开...",IDC_OPEN,177,139,50,14

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

@@ -18,6 +18,7 @@ BEGIN
     LTEXT           "伺服器：",IDC_STATIC,47,41,25,8
     LTEXT           "用戶名：",IDC_STATIC,47,58,38,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON      "儲存",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "另存為...",IDC_SAVEAS,123,139,50,14
     PUSHBUTTON      "開啟...",IDC_OPEN,177,139,50,14

base/applications/mstsc/precomp.h

@@ -17,7 +17,7 @@
 
 #define MAXKEY 256
 #define MAXVALUE 256
-#define NUM_SETTINGS 4
+#define NUM_SETTINGS 6
 extern LPWSTR lpSettings[];
 
 typedef struct _SETTINGS

base/applications/mstsc/resource.h

@@ -16,6 +16,7 @@
 #define IDC_GEOSLIDER                   1012
 #define IDC_BPPCOMBO                    1013
 #define IDC_SETTINGS_RESOLUTION_TEXT    1014
+#define IDC_NAMEEDIT                    1015
 
 #define IDC_LOGONICON                   1016
 #define IDC_CONNICON                    1017

base/applications/mstsc/rsrc.rc

@@ -16,6 +16,7 @@ IDB_SPECT   BITMAP "res/spectrum.bmp"
 #pragma code_page(65001)
 #include "lang/bg-BG.rc"
 #include "lang/ca-ES.rc"
+#include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"

base/applications/mstsc/settings.c

@@ -8,6 +8,8 @@ LPWSTR lpSettings[NUM_SETTINGS] =
     L"desktopheight",
     L"session bpp",
     L"full address",
+    L"username",
+    L"screen mode id",
 };
 
 VOID
@@ -27,7 +29,7 @@ SaveAllSettings(PINFO pInfo)
                             szValue);
     }
 
-    /* resolution */
+    /* resolution and fullscreen*/
     ret = SendDlgItemMessage(pInfo->hDisplayPage,
                              IDC_GEOSLIDER,
                              TBM_GETPOS,
@@ -35,6 +37,9 @@ SaveAllSettings(PINFO pInfo)
                              0);
     if (ret != -1)
     {
+        SetIntegerToSettings(pInfo->pRdpSettings,
+                             L"screen mode id",
+                             (ret == SendDlgItemMessageW(pInfo->hDisplayPage, IDC_GEOSLIDER, TBM_GETRANGEMAX, 0, 0)) ? 2 : 1);
         SetIntegerToSettings(pInfo->pRdpSettings,
                              L"desktopwidth",
                              pInfo->DisplayDeviceList->Resolutions[ret].dmPelsWidth);
@@ -63,6 +68,17 @@ SaveAllSettings(PINFO pInfo)
                                  ret);
         }
     }
+
+    /* user name */
+    if (GetDlgItemText(pInfo->hGeneralPage,
+                       IDC_NAMEEDIT,
+                       szValue,
+                       MAXVALUE))
+    {
+        SetStringToSettings(pInfo->pRdpSettings,
+                            L"username",
+                            szValue);
+    }
 }
 
 
@@ -230,6 +246,7 @@ ParseSettings(PRDPSETTINGS pRdpSettings,
 {
     LPWSTR lpStr = lpBuffer;
     WCHAR szSeps[] = L":\r\n";
+    WCHAR szNewline[] = L"\r\n";
     LPWSTR lpToken;
     BOOL bFound;
     INT i;
@@ -258,7 +275,7 @@ ParseSettings(PRDPSETTINGS pRdpSettings,
                 else if (lpToken[0] == L's')
                 {
                     pRdpSettings->pSettings[i].Type = lpToken[0];
-                    lpToken = wcstok(NULL, szSeps);
+                    lpToken = wcstok(NULL, szNewline);
                     if (lpToken != NULL)
                         wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken);
                 }
@@ -268,10 +285,7 @@ ParseSettings(PRDPSETTINGS pRdpSettings,
 
         /* move past the type and value */
         if (!bFound)
-        {
-            lpToken = wcstok(NULL, szSeps);
-            lpToken = wcstok(NULL, szSeps);
-        }
+            lpToken = wcstok(NULL, szNewline);
 
         /* move to next key */
         lpToken = wcstok(NULL, szSeps);

base/applications/mstsc/win32.c

@@ -958,6 +958,56 @@ mi_paint_rect(char * data, int width, int height, int x, int y, int cx, int cy)
 
 }
 
+static INT
+GetPortNumber(PCHAR szAddress)
+{
+    PCHAR szPort;
+    INT iPort = TCP_PORT_RDP;
+
+    szPort = strtok(szAddress, ":");
+
+    if (szPort != NULL)
+    {
+        szPort = strtok(NULL, ":");
+
+        if (szPort != NULL)
+        {
+            iPort = atoi(szPort);
+
+            if (iPort <= 0 || iPort > 0xFFFF)
+                iPort = TCP_PORT_RDP;
+        }
+    }
+
+    return iPort;
+}
+
+static VOID
+SetDomainAndUsername(PCHAR pName)
+{
+    PCHAR pDomain;
+    PCHAR pUsername;
+
+    strcpy(g_domain, "");
+    strcpy(g_username, "");
+
+    pDomain = strtok(pName, "\\");
+
+    if(pDomain == NULL)
+        return;
+
+    pUsername = strtok(NULL, "\\");
+
+    if(pUsername == NULL)
+    {
+        strcpy(g_username, pDomain);
+        return;
+    }
+
+    strcpy(g_username, pUsername);
+    strcpy(g_domain, pDomain);
+    return;
+}
 
 static BOOL
 ParseCommandLine(LPWSTR lpCmdLine,
@@ -977,8 +1027,10 @@ ParseCommandLine(LPWSTR lpCmdLine,
     }
     else
     {
-        /* default to 16bpp */
+        /* default to screen size, 16bpp */
         SetIntegerToSettings(pRdpSettings, L"session bpp", 16);
+        SetIntegerToSettings(pRdpSettings, L"desktopwidth", GetSystemMetrics(SM_CXSCREEN));
+        SetIntegerToSettings(pRdpSettings, L"desktopheight", GetSystemMetrics(SM_CYSCREEN));
 
         lpToken = wcstok(lpStr, szSeps);
         while (lpToken)
@@ -1006,6 +1058,10 @@ ParseCommandLine(LPWSTR lpCmdLine,
                 lpToken += 2;
                 SetIntegerToSettings(pRdpSettings, L"desktopheight", _wtoi(lpToken));
             }
+            else if (*lpToken == L'f')
+            {
+                SetIntegerToSettings(pRdpSettings, L"screen mode id", 2);
+            }
 
             lpToken = wcstok(NULL, szSeps);
         }
@@ -1051,18 +1107,29 @@ wWinMain(HINSTANCE hInstance,
 
                     uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address"));
 
+                    /* GetPortNumber also removes possible trailing port number from address */
+                    g_tcp_port_rdp = GetPortNumber(szValue);
                     strcpy(g_servername, szValue);
-                    //g_port = 3389;
-                    strcpy(g_username, "");
+                    uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"username"));
+                    SetDomainAndUsername(szValue);
                     strcpy(g_password, "");
                     g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp");
                     if (g_server_depth > 16) g_server_depth = 16;  /* hack, we don't support 24bpp yet */
-                    g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth");
-                    g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight");
                     g_screen_width = GetSystemMetrics(SM_CXSCREEN);
                     g_screen_height = GetSystemMetrics(SM_CYSCREEN);
-                    g_xoff = GetSystemMetrics(SM_CXEDGE) * 2;
-                    g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2;
+                    g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth");
+                    g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight");
+                    if (GetIntegerFromSettings(pRdpSettings, L"screen mode id") == 2)
+                    {
+                        g_fullscreen = 1;
+                        g_xoff = 0;
+                        g_yoff = 0;
+                    }
+                    else
+                    {
+                        g_xoff = GetSystemMetrics(SM_CXEDGE) * 2;
+                        g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2;
+                    }
 
                     ui_main();
                     ret = 0;

base/applications/rapps/CreateCabFile.sh

@@ -0,0 +1 @@
+../../../output-MinGW-i386/host-tools/tools/cabman/cabman -M raw -S rappmgr.cab rapps/*.txt

base/applications/rapps/rapps/firefox36.txt

@@ -2,59 +2,59 @@
 
 [Section]
 Name = Mozilla Firefox 3.6
-Version = 3.6.24
+Version = 3.6.25
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 8.3M
+Size = 7.5M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/en-US/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/en-US/Firefox%20Setup%203.6.25.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 8.1M
+Size = 7.4M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/de/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/de/Firefox%20Setup%203.6.25.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
-Size = 8.1M
+Size = 7.4M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/es-ES/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/es-ES/Firefox%20Setup%203.6.25.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
-Size = 8.1M
+Size = 7.6M
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/fr/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/fr/Firefox%20Setup%203.6.25.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
-Size = 8.1M
+Size = 7.4M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/nb-NO/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/nb-NO/Firefox%20Setup%203.6.25.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 9.0M
+Size = 8.2M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/pl/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/pl/Firefox%20Setup%203.6.25.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 8.5M
+Size = 7.8M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/ru/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/ru/Firefox%20Setup%203.6.25.exe
 
 [Section.041b] 
 Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadačov.
-Size = 8.5MB
+Size = 7.8MB
 URLSite = http://www.mozilla-europe.org/sk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/sk/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/sk/Firefox%20Setup%203.6.25.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 8.5M
+Size = 7.7M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/uk/Firefox%20Setup%203.6.24.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win32/uk/Firefox%20Setup%203.6.25.exe

base/applications/rapps/rapps/firefox5.txt

@@ -1,60 +1,60 @@
 ; UTF-8
 
 [Section]
-Name = Mozilla Firefox 8
-Version = 8.0.1
+Name = Mozilla Firefox 9
+Version = 9.0.1
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 14.1M
+Size = 14.6M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/en-US/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/en-US/Firefox%20Setup%209.0.1.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 13.9M
+Size = 14.4M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/de/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/de/Firefox%20Setup%209.0.1.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
-Size = 13.9M
+Size = 14.4M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/es-ES/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/es-ES/Firefox%20Setup%209.0.1.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
-Size = 14.2M
+Size = 14.7M
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/fr/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/fr/Firefox%20Setup%209.0.1.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
-Size = 13.9M
+Size = 14.4M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/nb-NO/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/nb-NO/Firefox%20Setup%209.0.1.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 14.8M
+Size = 15.3M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/pl/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/pl/Firefox%20Setup%209.0.1.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 14.3M
+Size = 14.8M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/ru/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/ru/Firefox%20Setup%209.0.1.exe
 
 [Section.041b] 
 Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadačov.
-Size = 14.6MB
+Size = 15.1MB
 URLSite = http://www.mozilla-europe.org/sk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/sk/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/sk/Firefox%20Setup%209.0.1.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 14.3M
+Size = 14.8M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/uk/Firefox%20Setup%208.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win32/uk/Firefox%20Setup%209.0.1.exe

base/applications/wordpad/rsrc.rc

@@ -19,6 +19,12 @@
 
 #include "wordpad.h"
 
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS WordPad\0"
+#define REACTOS_STR_INTERNAL_NAME     "wordpad\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0"
+
+#include <reactos/version.rc>
+
 MAINACCELTABLE ACCELERATORS
 BEGIN
     "1",          ID_BACK_1,          VIRTKEY, CONTROL

base/services/eventlog/eventlog.c

@@ -267,7 +267,9 @@ PLOGFILE LoadLogFile(HKEY hKey, WCHAR * LogName)
     DWORD MaxValueLen, ValueLen, Type, ExpandedLen;
     WCHAR *Buf = NULL, *Expanded = NULL;
     LONG Result;
-    PLOGFILE pLogf;
+    PLOGFILE pLogf = NULL;
+    UNICODE_STRING FileName;
+    NTSTATUS Status;
 
     DPRINT("LoadLogFile: %S\n", LogName);
 
@@ -314,13 +316,21 @@ PLOGFILE LoadLogFile(HKEY hKey, WCHAR * LogName)
 
     ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen);
 
+    if (!RtlDosPathNameToNtPathName_U(Expanded, &FileName,
+                                      NULL, NULL))
+    {
+        DPRINT1("Can't convert path!\n");
+        HeapFree(MyHeap, 0, Expanded);
+        HeapFree(MyHeap, 0, Buf);
+        return NULL;
+    }
+
     DPRINT("%S -> %S\n", Buf, Expanded);
 
-    pLogf = LogfCreate(LogName, Expanded);
-
-    if (pLogf == NULL)
+    Status = LogfCreate(&pLogf, LogName, &FileName);
+    if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to create %S!\n", Expanded);
+        DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status);
     }
 
     HeapFree(MyHeap, 0, Buf);
@@ -495,7 +505,7 @@ VOID PRINT_HEADER(PEVENTLOGHEADER header)
     DPRINT("Flags: ");
     if (header->Flags & ELF_LOGFILE_HEADER_DIRTY)  DPRINT("ELF_LOGFILE_HEADER_DIRTY");
     if (header->Flags & ELF_LOGFILE_HEADER_WRAP)  DPRINT("| ELF_LOGFILE_HEADER_WRAP ");
-    if (header->Flags & ELF_LOGGFILE_LOGFULL_WRITTEN)  DPRINT("| ELF_LOGGFILE_LOGFULL_WRITTEN ");
+    if (header->Flags & ELF_LOGFILE_LOGFULL_WRITTEN)  DPRINT("| ELF_LOGFILE_LOGFULL_WRITTEN ");
     if (header->Flags & ELF_LOGFILE_ARCHIVE_SET)  DPRINT("| ELF_LOGFILE_ARCHIVE_SET ");
     DPRINT("\n");
 }

base/services/eventlog/eventlog.h

@@ -19,7 +19,7 @@
 #include <lpcfuncs.h>
 #include <rtlfuncs.h>
 #include <obfuncs.h>
-#include <iotypes.h>
+#include <iofuncs.h>
 #include <debug.h>
 #include "eventlogrpc_s.h"
 
@@ -42,7 +42,7 @@ typedef struct _IO_ERROR_LPC
  */
 #define ELF_LOGFILE_HEADER_DIRTY 1
 #define ELF_LOGFILE_HEADER_WRAP 2
-#define ELF_LOGGFILE_LOGFULL_WRITTEN 4
+#define ELF_LOGFILE_LOGFULL_WRITTEN 4
 #define ELF_LOGFILE_ARCHIVE_SET 8
 
 /* FIXME: MSDN reads that the following two structs are in winnt.h. Are they? */
@@ -102,12 +102,17 @@ typedef struct _EVENTSOURCE
     WCHAR szName[1];
 } EVENTSOURCE, *PEVENTSOURCE;
 
+
+/* Log Handle Flags */
+#define LOG_HANDLE_BACKUP_FILE 1
+
 typedef struct _LOGHANDLE
 {
     LIST_ENTRY LogHandleListEntry;
     PEVENTSOURCE EventSource;
     PLOGFILE LogFile;
     ULONG CurrentRecord;
+    ULONG Flags;
     WCHAR szName[1];
 } LOGHANDLE, *PLOGHANDLE;
 
@@ -149,8 +154,10 @@ NTSTATUS
 LogfBackupFile(PLOGFILE LogFile,
                PUNICODE_STRING BackupFileName);
 
-PLOGFILE LogfCreate(WCHAR * LogName,
-                    WCHAR * FileName);
+NTSTATUS
+LogfCreate(PLOGFILE *Logfile,
+           WCHAR * LogName,
+           PUNICODE_STRING FileName);
 
 VOID LogfClose(PLOGFILE LogFile);
 

base/services/eventlog/file.c

@@ -288,104 +288,127 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
     return TRUE;
 }
 
-PLOGFILE LogfCreate(WCHAR * LogName, WCHAR * FileName)
-{
-    PLOGFILE LogFile;
-    BOOL bResult, bCreateNew = FALSE;
 
-    LogFile = (LOGFILE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(LOGFILE));
-    if (!LogFile)
+NTSTATUS
+LogfCreate(PLOGFILE *LogFile,
+           WCHAR * LogName,
+           PUNICODE_STRING FileName)
+{
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    IO_STATUS_BLOCK IoStatusBlock;
+    PLOGFILE pLogFile;
+    BOOL bResult, bCreateNew = FALSE;
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    pLogFile = (LOGFILE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(LOGFILE));
+    if (!pLogFile)
     {
         DPRINT1("Can't allocate heap!\n");
-        return NULL;
+        return STATUS_NO_MEMORY;
     }
 
-    LogFile->hFile = CreateFile(FileName,
-                                GENERIC_READ | GENERIC_WRITE,
-                                FILE_SHARE_READ,
-                                NULL,
-                                OPEN_ALWAYS,
-                                FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
-                                NULL);
+    InitializeObjectAttributes(&ObjectAttributes,
+                               FileName,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
 
-    if (LogFile->hFile == INVALID_HANDLE_VALUE)
+    Status = NtCreateFile(&pLogFile->hFile,
+                          GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE,
+                          &ObjectAttributes,
+                          &IoStatusBlock,
+                          NULL,
+                          FILE_ATTRIBUTE_NORMAL,
+                          FILE_SHARE_READ,
+                          FILE_OPEN_IF,
+                          FILE_SYNCHRONOUS_IO_NONALERT,
+                          NULL,
+                          0);
+    if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Can't create file %S.\n", FileName);
-        HeapFree(MyHeap, 0, LogFile);
-        return NULL;
+        DPRINT1("Can't create file %wZ (Status: 0x%08lx)\n", FileName, Status);
+        goto fail;
     }
 
-    bCreateNew = (GetLastError() == ERROR_ALREADY_EXISTS) ? FALSE : TRUE;
+    bCreateNew = (IoStatusBlock.Information == FILE_CREATED) ? TRUE: FALSE;
 
-    LogFile->LogName =
+    pLogFile->LogName =
         (WCHAR *) HeapAlloc(MyHeap,
                             HEAP_ZERO_MEMORY,
                             (lstrlenW(LogName) + 1) * sizeof(WCHAR));
-
-    if (LogFile->LogName)
-        lstrcpyW(LogFile->LogName, LogName);
-    else
-    {
-        DPRINT1("Can't allocate heap\n");
-        HeapFree(MyHeap, 0, LogFile);
-        return NULL;
-    }
-
-    LogFile->FileName =
-        (WCHAR *) HeapAlloc(MyHeap,
-                            HEAP_ZERO_MEMORY,
-                            (lstrlenW(FileName) + 1) * sizeof(WCHAR));
-
-    if (LogFile->FileName)
-        lstrcpyW(LogFile->FileName, FileName);
-    else
+    if (pLogFile->LogName == NULL)
     {
         DPRINT1("Can't allocate heap\n");
+        Status = STATUS_NO_MEMORY;
         goto fail;
     }
 
-    LogFile->OffsetInfo =
+    lstrcpyW(pLogFile->LogName, LogName);
+
+    pLogFile->FileName =
+        (WCHAR *) HeapAlloc(MyHeap,
+                            HEAP_ZERO_MEMORY,
+                            (lstrlenW(FileName->Buffer) + 1) * sizeof(WCHAR));
+    if (pLogFile->FileName == NULL)
+    {
+        DPRINT1("Can't allocate heap\n");
+        Status = STATUS_NO_MEMORY;
+        goto fail;
+    }
+
+    lstrcpyW(pLogFile->FileName, FileName->Buffer);
+
+    pLogFile->OffsetInfo =
         (PEVENT_OFFSET_INFO) HeapAlloc(MyHeap,
                                        HEAP_ZERO_MEMORY,
                                        sizeof(EVENT_OFFSET_INFO) * 64);
-
-    if (!LogFile->OffsetInfo)
+    if (pLogFile->OffsetInfo == NULL)
     {
         DPRINT1("Can't allocate heap\n");
+        Status = STATUS_NO_MEMORY;
         goto fail;
     }
 
-    LogFile->OffsetInfoSize = 64;
+    pLogFile->OffsetInfoSize = 64;
 
     if (bCreateNew)
-        bResult = LogfInitializeNew(LogFile);
+        bResult = LogfInitializeNew(pLogFile);
     else
-        bResult = LogfInitializeExisting(LogFile);
+        bResult = LogfInitializeExisting(pLogFile);
 
     if (!bResult)
-        goto fail;
-
-    RtlInitializeResource(&LogFile->Lock);
-
-    LogfListAddItem(LogFile);
-    return LogFile;
-
-  fail:
-    if (LogFile)
     {
-        if (LogFile->OffsetInfo)
-            HeapFree(MyHeap, 0, LogFile->OffsetInfo);
-
-        if (LogFile->FileName)
-            HeapFree(MyHeap, 0, LogFile->FileName);
-
-        if (LogFile->LogName)
-            HeapFree(MyHeap, 0, LogFile->LogName);
-
-        HeapFree(MyHeap, 0, LogFile);
+        Status = STATUS_UNSUCCESSFUL;
+        goto fail;
     }
 
-    return NULL;
+    RtlInitializeResource(&pLogFile->Lock);
+
+    LogfListAddItem(pLogFile);
+
+  fail:
+    if (!NT_SUCCESS(Status))
+    {
+        if ((pLogFile->hFile != NULL) && (pLogFile->hFile != INVALID_HANDLE_VALUE))
+            CloseHandle(pLogFile->hFile);
+
+        if (pLogFile->OffsetInfo)
+            HeapFree(MyHeap, 0, pLogFile->OffsetInfo);
+
+        if (pLogFile->FileName)
+            HeapFree(MyHeap, 0, pLogFile->FileName);
+
+        if (pLogFile->LogName)
+            HeapFree(MyHeap, 0, pLogFile->LogName);
+
+        HeapFree(MyHeap, 0, pLogFile);
+    }
+    else
+    {
+        *LogFile = pLogFile;
+    }
+
+    return Status;
 }
 
 VOID LogfClose(PLOGFILE LogFile)
@@ -1077,13 +1100,200 @@ NTSTATUS
 LogfBackupFile(PLOGFILE LogFile,
                PUNICODE_STRING BackupFileName)
 {
-//    RtlAcquireResourceShared(&LogFile->Lock, TRUE);
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    IO_STATUS_BLOCK IoStatusBlock;
+    EVENTLOGHEADER Header;
+    EVENTLOGEOF EofRec;
+    HANDLE FileHandle = NULL;
+    ULONG i;
+    LARGE_INTEGER FileOffset;
+    NTSTATUS Status;
+    PUCHAR Buffer = NULL;
 
-    /* FIXME: Write a backup file */
+    DWORD dwOffset, dwRead, dwRecSize;
 
-//    RtlReleaseResource(&LogFile->Lock);
+    DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName);
 
-    return STATUS_NOT_IMPLEMENTED;
+    /* Lock the log file shared */
+    RtlAcquireResourceShared(&LogFile->Lock, TRUE);
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               BackupFileName,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+
+    Status = NtCreateFile(&FileHandle,
+                          GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE,
+                          &ObjectAttributes,
+                          &IoStatusBlock,
+                          NULL,
+                          FILE_ATTRIBUTE_NORMAL,
+                          FILE_SHARE_READ,
+                          FILE_CREATE,
+                          FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT,
+                          NULL,
+                          0);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT("Can't create backup file %wZ (Status: 0x%08lx)\n", BackupFileName, Status);
+        goto Done;
+    }
+
+    /* Initialize the (dirty) log file header */
+    Header.HeaderSize = sizeof(EVENTLOGHEADER);
+    Header.Signature = LOGFILE_SIGNATURE;
+    Header.MajorVersion = MAJORVER;
+    Header.MinorVersion = MINORVER;
+    Header.StartOffset = sizeof(EVENTLOGHEADER);
+    Header.EndOffset = sizeof(EVENTLOGHEADER);
+    Header.CurrentRecordNumber = 1;
+    Header.OldestRecordNumber = 1;
+    Header.MaxSize = 0;
+    Header.Flags = ELF_LOGFILE_HEADER_DIRTY;
+    Header.Retention = LogFile->Header.Retention;
+    Header.EndHeaderSize = sizeof(EVENTLOGHEADER);
+
+    /* Write the (dirty) log file header */
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatusBlock,
+                         &Header,
+                         sizeof(EVENTLOGHEADER),
+                         NULL,
+                         NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to write the log file header (Status: 0x%08lx)\n", Status);
+        goto Done;
+    }
+
+    for (i = LogFile->Header.OldestRecordNumber; i < LogFile->Header.CurrentRecordNumber; i++)
+    {
+        dwOffset = LogfOffsetByNumber(LogFile, i);
+        if (dwOffset == 0)
+            break;
+
+        if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
+        {
+            DPRINT1("SetFilePointer() failed!\n");
+            goto Done;
+        }
+
+        if (!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL))
+        {
+            DPRINT1("ReadFile() failed!\n");
+            goto Done;
+        }
+
+        if (SetFilePointer(LogFile->hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
+        {
+            DPRINT1("SetFilePointer() failed!\n");
+            goto Done;
+        }
+
+        Buffer = HeapAlloc(MyHeap, 0, dwRecSize);
+        if (Buffer == NULL)
+        {
+            DPRINT1("HeapAlloc() failed!\n");
+            goto Done;
+        }
+
+        if (!ReadFile(LogFile->hFile, &Buffer, dwRecSize, &dwRead, NULL))
+        {
+            DPRINT1("ReadFile() failed!\n");
+            goto Done;
+        }
+
+        /* Write the event record */
+        Status = NtWriteFile(FileHandle,
+                             NULL,
+                             NULL,
+                             NULL,
+                             &IoStatusBlock,
+                             Buffer,
+                             dwRecSize,
+                             NULL,
+                             NULL);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("NtWriteFile() failed!\n");
+            goto Done;
+        }
+
+        /* Update the header information */
+        Header.EndOffset += dwRecSize;
+
+        /* Free the buffer */
+        HeapFree(MyHeap, 0, Buffer);
+        Buffer = NULL;
+    }
+
+    /* Initialize the EOF record */
+    EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF);
+    EofRec.Ones = 0x11111111;
+    EofRec.Twos = 0x22222222;
+    EofRec.Threes = 0x33333333;
+    EofRec.Fours = 0x44444444;
+    EofRec.BeginRecord = sizeof(EVENTLOGHEADER);
+    EofRec.EndRecord = Header.EndOffset;
+    EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber;
+    EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber;
+    EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF);
+
+    /* Write the EOF record */
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatusBlock,
+                         &EofRec,
+                         sizeof(EVENTLOGEOF),
+                         NULL,
+                         NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("NtWriteFile() failed!\n");
+        goto Done;
+    }
+
+    /* Update the header information */
+    Header.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber;
+    Header.OldestRecordNumber = LogFile->Header.OldestRecordNumber;
+    Header.MaxSize = Header.EndOffset + sizeof(EVENTLOGEOF);
+    Header.Flags = 0;
+
+    /* Write the (clean) log file header */
+    FileOffset.QuadPart = 0;
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatusBlock,
+                         &Header,
+                         sizeof(EVENTLOGHEADER),
+                         &FileOffset,
+                         NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("NtWriteFile() failed!\n");
+    }
+
+Done:
+    /* Free the buffer */
+    if (Buffer != NULL)
+        HeapFree(MyHeap, 0, Buffer);
+
+    /* Close the backup file */
+    if (FileHandle != NULL)
+        NtClose(FileHandle);
+
+    /* Unlock the log file */
+    RtlReleaseResource(&LogFile->Lock);
+
+    return Status;
 }
 
 

base/services/eventlog/rpc.c

@@ -44,12 +44,17 @@ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter)
     return 0;
 }
 
-PLOGHANDLE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create)
+
+static NTSTATUS
+ElfCreateEventLogHandle(PLOGHANDLE *LogHandle,
+                        LPCWSTR Name,
+                        BOOL Create)
 {
     PLOGHANDLE lpLogHandle;
     PLOGFILE currentLogFile = NULL;
     INT i, LogsActive;
     PEVENTSOURCE pEventSource;
+    NTSTATUS Status = STATUS_SUCCESS;
 
     DPRINT("ElfCreateEventLogHandle(Name: %S)\n", Name);
 
@@ -58,7 +63,7 @@ PLOGHANDLE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create)
     if (!lpLogHandle)
     {
         DPRINT1("Failed to allocate Heap!\n");
-        return NULL;
+        return STATUS_NO_MEMORY;
     }
 
     wcscpy(lpLogHandle->szName, Name);
@@ -68,7 +73,8 @@ PLOGHANDLE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create)
     if (LogsActive == 0)
     {
         DPRINT1("EventLog service reports no log files!\n");
-        goto Cleanup;
+        Status = STATUS_UNSUCCESSFUL;
+        goto Done;
     }
 
     /* If Creating, default to the Application Log in case we fail, as documented on MSDN */
@@ -114,19 +120,73 @@ PLOGHANDLE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create)
     }
 
     if (!lpLogHandle->LogFile)
-        goto Cleanup;
+        Status = STATUS_UNSUCCESSFUL;
 
-    /* Append log handle */
-    InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry);
+Done:
+    if (NT_SUCCESS(Status))
+    {
+        /* Append log handle */
+        InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry);
+        *LogHandle = lpLogHandle;
+    }
+    else
+    {
+        HeapFree(GetProcessHeap(), 0, lpLogHandle);
+    }
 
-    return lpLogHandle;
-
-Cleanup:
-    HeapFree(GetProcessHeap(), 0, lpLogHandle);
-
-    return NULL;
+    return Status;
 }
 
+
+static NTSTATUS
+ElfCreateBackupLogHandle(PLOGHANDLE *LogHandle,
+                         PUNICODE_STRING FileName)
+{
+    PLOGHANDLE lpLogHandle;
+
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    DPRINT("ElfCreateBackupLogHandle(FileName: %wZ)\n", FileName);
+
+    lpLogHandle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGHANDLE));
+    if (lpLogHandle == NULL)
+    {
+        DPRINT1("Failed to allocate Heap!\n");
+        return STATUS_NO_MEMORY;
+    }
+
+    /* Create the log file */
+    Status = LogfCreate(&lpLogHandle->LogFile,
+                        NULL,
+                        FileName);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to create the log file! (Status 0x%08lx)\n", Status);
+        goto Done;
+    }
+
+    /* Set the backup flag */
+    lpLogHandle->Flags |= LOG_HANDLE_BACKUP_FILE;
+
+    /* Get the current record */
+    lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile);
+
+Done:
+    if (NT_SUCCESS(Status))
+    {
+        /* Append log handle */
+        InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry);
+        *LogHandle = lpLogHandle;
+    }
+    else
+    {
+        HeapFree(GetProcessHeap(), 0, lpLogHandle);
+    }
+
+    return Status;
+}
+
+
 PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle)
 {
     PLOGHANDLE lpLogHandle;
@@ -141,18 +201,23 @@ PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle)
     return lpLogHandle;
 }
 
-BOOL ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle)
+
+static NTSTATUS
+ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle)
 {
     PLOGHANDLE lpLogHandle = (PLOGHANDLE)EventLogHandle;
+
     if (!ElfGetLogHandleEntryByHandle(lpLogHandle))
-    {
-        return FALSE;
-    }
+        return STATUS_INVALID_HANDLE;
+
+    /* Close the log file if it is a backup file */
+    if (lpLogHandle->Flags & LOG_HANDLE_BACKUP_FILE)
+        LogfClose(lpLogHandle->LogFile);
 
     RemoveEntryList(&lpLogHandle->LogHandleListEntry);
     HeapFree(GetProcessHeap(),0,lpLogHandle);
 
-    return TRUE;
+    return STATUS_SUCCESS;
 }
 
 /* Function 0 */
@@ -199,12 +264,7 @@ NTSTATUS ElfrBackupELFW(
 NTSTATUS ElfrCloseEL(
     IELF_HANDLE *LogHandle)
 {
-    if (!ElfDeleteEventLogHandle(*LogHandle))
-    {
-        return STATUS_INVALID_HANDLE;
-    }
-
-    return STATUS_SUCCESS;
+    return ElfDeleteEventLogHandle(*LogHandle);
 }
 
 
@@ -212,12 +272,7 @@ NTSTATUS ElfrCloseEL(
 NTSTATUS ElfrDeregisterEventSource(
     IELF_HANDLE *LogHandle)
 {
-    if (!ElfDeleteEventLogHandle(*LogHandle))
-    {
-        return STATUS_INVALID_HANDLE;
-    }
-
-    return STATUS_SUCCESS;
+    return ElfDeleteEventLogHandle(*LogHandle);
 }
 
 
@@ -307,14 +362,9 @@ NTSTATUS ElfrOpenELW(
 
     /*FIXME: Must verify that caller has read access */
 
-    *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, FALSE);
-
-    if (*LogHandle == NULL)
-    {
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    return STATUS_SUCCESS;
+    return ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle,
+                                   ModuleName->Buffer,
+                                   FALSE);
 }
 
 
@@ -342,9 +392,9 @@ NTSTATUS ElfrRegisterEventSourceW(
 
     /*FIXME: Must verify that caller has write access */
 
-    *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, TRUE);
-
-    return STATUS_SUCCESS;
+    return ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle,
+                                   ModuleName->Buffer,
+                                   TRUE);
 }
 
 
@@ -356,8 +406,17 @@ NTSTATUS ElfrOpenBELW(
     DWORD MinorVersion,
     IELF_HANDLE *LogHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    DPRINT("ElfrOpenBELW(%wZ)\n", BackupFileName);
+
+    if ((MajorVersion != 1) || (MinorVersion != 1))
+        return STATUS_INVALID_PARAMETER;
+
+    /*FIXME: UNCServerName must specify the server */
+
+    /*FIXME: Must verify that caller has read access */
+
+    return ElfCreateBackupLogHandle((PLOGHANDLE *)LogHandle,
+                                    (PUNICODE_STRING)BackupFileName);
 }
 
 
@@ -474,6 +533,14 @@ NTSTATUS ElfrReportEventW(
                 DPRINT("Info: %wZ\n", Strings[i]);
                 break;
 
+            case EVENTLOG_AUDIT_SUCCESS:
+                DPRINT("Audit Success: %wZ\n", Strings[i]);
+                break;
+
+            case EVENTLOG_AUDIT_FAILURE:
+                DPRINT("Audit Failure: %wZ\n", Strings[i]);
+                break;
+
             default:
                 DPRINT1("Type %hu: %wZ\n", EventType, Strings[i]);
                 break;
@@ -597,16 +664,13 @@ NTSTATUS ElfrOpenELA(
 
     /* FIXME: Must verify that caller has read access */
 
-    *LogHandle = ElfCreateEventLogHandle(ModuleNameW.Buffer, FALSE);
+    Status = ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle,
+                                     ModuleNameW.Buffer,
+                                     FALSE);
 
     RtlFreeUnicodeString(&ModuleNameW);
 
-    if (*LogHandle == NULL)
-    {
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    return STATUS_SUCCESS;
+    return Status;
 }
 
 
@@ -646,12 +710,13 @@ NTSTATUS ElfrRegisterEventSourceA(
 
     /* FIXME: Must verify that caller has write access */
 
-    *LogHandle = ElfCreateEventLogHandle(ModuleNameW.Buffer,
-                                         TRUE);
+    Status = ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle,
+                                     ModuleNameW.Buffer,
+                                     TRUE);
 
     RtlFreeUnicodeString(&ModuleNameW);
 
-    return STATUS_SUCCESS;
+    return Status;
 }
 
 
@@ -663,8 +728,36 @@ NTSTATUS ElfrOpenBELA(
     DWORD MinorVersion,
     IELF_HANDLE *LogHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    UNICODE_STRING BackupFileNameW;
+    NTSTATUS Status;
+
+    DPRINT("ElfrOpenBELA(%Z)\n", BackupFileName);
+
+    Status = RtlAnsiStringToUnicodeString(&BackupFileNameW,
+                                          (PANSI_STRING)BackupFileName,
+                                          TRUE);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("RtlAnsiStringToUnicodeString failed (Status 0x%08lx)\n", Status);
+        return Status;
+    }
+
+    if ((MajorVersion != 1) || (MinorVersion != 1))
+    {
+        RtlFreeUnicodeString(&BackupFileNameW);
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    /*FIXME: UNCServerName must specify the server */
+
+    /*FIXME: Must verify that caller has read access */
+
+    Status = ElfCreateBackupLogHandle((PLOGHANDLE *)LogHandle,
+                                      &BackupFileNameW);
+
+    RtlFreeUnicodeString(&BackupFileNameW);
+
+    return Status;
 }
 
 

base/services/svchost/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_executable(svchost svchost.c svchost.rc)
 
-set_module_type(svchost win32cui)
+set_module_type(svchost win32cui UNICODE)
 add_importlibs(svchost advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all)

base/services/svchost/svchost.c

@@ -93,7 +93,7 @@ BOOL PrepareService(LPCTSTR ServiceName)
 	}
 
 	/* Convert possible %SystemRoot% to a real path */
-	BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, sizeof(DllPath));
+	BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath));
 	if (0 == BufferSize)
 	{
 		DPRINT1("Invalid ServiceDll path: %s\n", Buffer);
@@ -124,7 +124,7 @@ BOOL PrepareService(LPCTSTR ServiceName)
 	}
 
 	memset(Service, 0, sizeof(SERVICE));
-	Service->Name = HeapAlloc(GetProcessHeap(), 0, _tcslen(ServiceName) + sizeof(TCHAR));
+	Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR));
 	if (NULL == Service->Name)
 	{
 		DPRINT1("Not enough memory for service: %s\n", ServiceName);
@@ -199,7 +199,7 @@ DWORD LoadServiceCategory(LPCTSTR ServiceCategory)
 		if (TRUE == PrepareService(ServiceName))
 			++NrOfServices;
 
-		BufferIndex += (Length + 1) * sizeof(TCHAR);
+		BufferIndex += Length + 1;
 
 		ServiceName = &Buffer[BufferIndex];
 	}
@@ -238,7 +238,7 @@ int _tmain (int argc, LPTSTR argv [])
 		PSERVICE Service = FirstService;
 
 		/* Fill the service table */
-		for (i = 0; i < NrOfServices; ++i)
+		for (i = 0; i < NrOfServices; i++)
 		{
 			DPRINT("Loading service: %s\n", Service->Name);
 			ServiceTable[i].lpServiceName = Service->Name;
@@ -251,7 +251,7 @@ int _tmain (int argc, LPTSTR argv [])
 		ServiceTable[i].lpServiceProc = NULL;
 
 		if (FALSE == StartServiceCtrlDispatcher(ServiceTable))
-			printf("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError());
+			DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError());
 
 		HeapFree(GetProcessHeap(), 0, ServiceTable);
 	}
@@ -260,7 +260,7 @@ int _tmain (int argc, LPTSTR argv [])
 		DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1));
 	}
 
-	DPRINT1("Freeing services...\n");
+	DPRINT("Freeing services...\n");
 	FreeServices();
 
     return 0;

base/services/svchost/svchost.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe">
+<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe" unicode="yes">
 	<include base="svchost">.</include>
 	<library>advapi32</library>
 	<file>svchost.c</file>

base/setup/welcome/CMakeLists.txt

@@ -4,5 +4,5 @@ set_rc_compiler()
 add_executable(welcome welcome.c welcome.rc)
 
 set_module_type(welcome win32gui UNICODE)
-add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
+add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd)

base/setup/welcome/lang/bg-BG.rc

@@ -1,82 +0,0 @@
-/*
- *  Bulgarian(BG) resources
- *
- *  Copyright (C) 2005 Violin Iliev
- *  www.violin-bg.com
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Добре дошли"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Добре дошли в операционна система React.\n\nИзберете си от темите в ляво."
-//    IDS_CHECKTEXT           "Показвай отново този прозорец"
-//    IDS_CLOSETEXT           "Изход"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Инсталиране на ReactOS"
-    IDS_TOPICBUTTON1        "Разгледай това CD"
-    IDS_TOPICBUTTON2        "Изход"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Инсталиране на ReactOSS"
-    IDS_TOPICTITLE1         "Разгледай това CD"
-    IDS_TOPICTITLE2         "Изход"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Създаване на нова инсталация ня ReactOS или обновяване на съществуваща такава."
-    IDS_TOPICDESC1          "Разглеждане на CD-то."
-    IDS_TOPICDESC2          "Натиснете за изход от програмата."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/cs-CZ.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Vítejte"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Vítejte v operačním systému ReactOS.\n\nKlepněte na tlačítko v levém sloupci."
-//    IDS_CHECKTEXT           "Zobrazit dialog znovu"
-//    IDS_CLOSETEXT           "Konec"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Instalovat ReactOS"
-    IDS_TOPICBUTTON1        "Prohlížet toto CD"
-    IDS_TOPICBUTTON2        "Konec"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Instalovat ReactOS"
-    IDS_TOPICTITLE1         "Prohlížet toto CD"
-    IDS_TOPICTITLE2         "Konec"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Nainstaluje ReactOS na Váš počítač nebo zaktualizuje existující systém."
-    IDS_TOPICDESC1          "Prohlížet toto CD."
-    IDS_TOPICDESC2          "Klepněte pro ukončení tohoto programu."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/da-DK.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Velkommen"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Velkommen til ReactOs operativ System.\n\nKlik på et emne til venstre."
-//    IDS_CHECKTEXT           "Vis denne dialog igen ved opstart"
-//    IDS_CLOSETEXT           "Afslut"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Installer ReactOS"
-    IDS_TOPICBUTTON1        "Gennemse Cdrom"
-    IDS_TOPICBUTTON2        "Afslut"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Installer ReactOS"
-    IDS_TOPICTITLE1         "Gennemse Cdrom"
-    IDS_TOPICTITLE2         "Afslut"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Opret en ny ReactOS installation på din computer eller opgradere en eksisterende installation."
-    IDS_TOPICDESC1          "Gennemse Reactos Installations Cdrom"
-    IDS_TOPICDESC2          "Klik på Afslut for at lukke."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/de-DE.rc

@@ -9,56 +9,57 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 /* Default settings */
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_APPTITLE            "ReactOS - Willkommen"
+    IDS_APPTITLE            "ReactOS 0.3.14 - CLT 2012"
     IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite."
-//    IDS_CHECKTEXT           "Dialog beim nächsen Start wieder anzeigen"
-//    IDS_CLOSETEXT           "Beenden"
+    IDS_DEFAULTTOPICDESC    "ReactOS ist ein modernes Open-Source-Betriebssystem, welches auf dem Design von Windows® XP/2003 basiert. Dazu gehört sowohl die volle Kompatibilität mit Windows-Anwendungen und -Treibern als auch eine ähnliche Benutzeroberfläche, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode des gesamten Systems ist frei verfügbar und steht größtenteils unter der GNU General Public License."
 END
 
 /* Topic buttons */
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TOPICBUTTON0        "ReactOS installieren"
-    IDS_TOPICBUTTON1        "CD durchsuchen"
-    IDS_TOPICBUTTON2        "Beenden"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
+    IDS_TOPICBUTTON1        "ReactOS in QEMU ausprobieren"
+    IDS_TOPICBUTTON2        "ReactOS Build Environment installieren"
+    IDS_TOPICBUTTON3        "ReactOS-Quellcodepaket öffnen"
+    IDS_TOPICBUTTON4        "Die ReactOS-Website besuchen"
+    IDS_TOPICBUTTON5        "Die CD durchsuchen"
+    IDS_TOPICBUTTON6        "Beenden"
 END
 
 /* Topic titles */
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TOPICTITLE0         "ReactOS installieren"
-    IDS_TOPICTITLE1         "CD durchsuchen"
-    IDS_TOPICTITLE2         "Beenden"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
+    IDS_TOPICTITLE1         "ReactOS in QEMU ausprobieren"
+    IDS_TOPICTITLE2         "ReactOS Build Environment installieren"
+    IDS_TOPICTITLE3         "ReactOS-Quellcodepaket öffnen"
+    IDS_TOPICTITLE4         "Die ReactOS-Website besuchen"
+    IDS_TOPICTITLE5         "Die CD durchsuchen"
+    IDS_TOPICTITLE6         "Beenden"
 END
 
 /* Topic descriptions */
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_TOPICDESC0          "Installiert ReactOS auf ihrem Computer oder aktualisiert eine bestehende Installation."
-    IDS_TOPICDESC1          "Die ReactOS-CD durchsuchen."
-    IDS_TOPICDESC2          "Klicken Sie, um dieses Programm zu beenden."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
+    IDS_TOPICDESC0          "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie zur Zeit Ihren Computer mit der ReactOS-CD im Laufwerk neu starten müssen, um die Installation zu starten.\n\nAlternativ können Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden Menüpunkt auf der linken Seite wählen."
+    IDS_TOPICDESC1          "Möglicherweise möchten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen können, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen Menüpunkt öffnet das QEMU-Paket in Ihrem ZIP-Archivprogramm."
+    IDS_TOPICDESC2          "Damit ReactOS so einfach wie möglich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthält die passenden Compiler-Versionen und alle nötigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows 2000, XP oder neueren Versionen. Sie wird über diesen Menüpunkt installiert.\nDie CD enthält auch das Build Environment für Unix-ähnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusätzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version in einer ZIP-Datei."
+    IDS_TOPICDESC3          "Die CD enthält auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\nEin Klick auf diesen Menüpunkt öffnet ihn in Ihrem ZIP-Archivprogramm."
+    IDS_TOPICDESC4          "Die ReactOS-Website liefert viele weitere Informationen über das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezüglich der Entwicklung."
+    IDS_TOPICDESC5          "Durchsuchen Sie den Inhalt dieser CD."
+    IDS_TOPICDESC6          "Beendet das AutoRun-Programm."
+END
+
+/* Topic actions */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOPICACTION0        "<msg>Zur Zeit müssen Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthält!"
+    IDS_TOPICACTION1        "..\\ReactOS in QEMU\\ReactOS-0.3.14-CLT2012-QEMU.zip"
+    IDS_TOPICACTION2        "..\\ReactOS Build Environment\\RosBE-2.0.exe"
+    IDS_TOPICACTION3        "..\\ReactOS-Quellcode\\ReactOS-0.3.14-CLT2012-Quellcode.zip"
+    IDS_TOPICACTION4        "http://www.reactos.org/"
+    IDS_TOPICACTION5        "explorer.exe"
+    IDS_TOPICACTION6        "<exit>"
 END
 
 /* EOF */

base/setup/welcome/lang/el-GR.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Καλώς Ήλθατε"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Καλώς ήλθατε στο React Λειτουργικό Σύστημα.\n\nΕπιλέξτε ένα θέμα από το μενού στα αριστερά."
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Εγκατάσταση του ReactOS"
-    IDS_TOPICBUTTON1        "Εξερεύνηση αυτού του CD"
-    IDS_TOPICBUTTON2        "Έξοδος"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Εγκατάσταση του ReactOS"
-    IDS_TOPICTITLE1         "Εξερεύνηση αυτού του CD"
-    IDS_TOPICTITLE2         "Έξοδος"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Δημιουργία νέας εγκατάστασης του ReactOS στον υπολογιστή ή αναβάθμιση μιας ήδη υπάρχουσας εγκατάστασης."
-    IDS_TOPICDESC1          "Εξερεύνηση αυτού του CD."
-    IDS_TOPICDESC2          "Πατήστε για να τερματίσετε την εφαρμογή αυτή."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/en-US.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Welcome"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Welcome to React Operating System.\n\nClick a topic on the left."
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Install ReactOS"
-    IDS_TOPICBUTTON1        "Browse this CD"
-    IDS_TOPICBUTTON2        "Exit"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Install ReactOS"
-    IDS_TOPICTITLE1         "Browse this CD"
-    IDS_TOPICTITLE2         "Exit"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Create a new ReactOS installation on your computer or upgrade an existing installation."
-    IDS_TOPICDESC1          "Browse the CD."
-    IDS_TOPICDESC2          "Click to exit this application."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/es-ES.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Bienvenido"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opción a la izquierda."
-//    IDS_CHECKTEXT           "Mostrar este dialogo otra vez"
-//    IDS_CLOSETEXT           "Salir"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Instalar ReactOS"
-    IDS_TOPICBUTTON1        "Explorar este CD"
-    IDS_TOPICBUTTON2        "Salir"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Instalar ReactOS"
-    IDS_TOPICTITLE1         "Explorar este CD"
-    IDS_TOPICTITLE2         "Salir"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Crear una nueva instalación de ReactOS en su PC o actualizar una instalación existente."
-    IDS_TOPICDESC1          "Explorar este CD."
-    IDS_TOPICDESC2          "Haz Click para salir de esta aplicación."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/et-EE.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Tere tulemast"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Tere tulemast operatsioonisüsteemi ReactOS.\n\nVali teema vasakult."
-//    IDS_CHECKTEXT           "Näita seda dialoogi veel"
-//    IDS_CLOSETEXT           "Välju"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Paigalda ReactOS"
-    IDS_TOPICBUTTON1        "Sirvi CD sisu"
-    IDS_TOPICBUTTON2        "Välju"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Paigalda ReactOS"
-    IDS_TOPICTITLE1         "Sirvi CD sisu"
-    IDS_TOPICTITLE2         "Välju"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Paigalda ReactOS oma arvutisse või uuenda olemasolevat installatsiooni."
-    IDS_TOPICDESC1          "Sirvi CD sisu."
-    IDS_TOPICDESC2          "Vajuta, et väljuda."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/fr-FR.rc

@@ -1,81 +0,0 @@
-/*
- *  FRENCH(FR) resources
- *
- *  Copyright (C) 2005
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Bienvenue"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Bienvenue sur le système d'exploitation ReactOS.\n\nCliquez sur une section à gauche."
-//    IDS_CHECKTEXT           "Afficher cette boîte de dialogue de nouveau."
-//    IDS_CLOSETEXT           "Quitter"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Installer ReactOS"
-    IDS_TOPICBUTTON1        "Naviguer dans ce CD"
-    IDS_TOPICBUTTON2        "Quitter"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Installer ReactOS"
-    IDS_TOPICTITLE1         "Naviguer dans ce CD"
-    IDS_TOPICTITLE2         "Quitter"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Crée une nouvelle installation de ReactOS sur votre ordinateur ou met à jour votre installation actuelle."
-    IDS_TOPICDESC1          "Explore le CD."
-    IDS_TOPICDESC2          "Cliquez pour quitter l'installation."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/hu-HU.rc

@@ -1,64 +0,0 @@
-/*
-* Copyright 2005 Robert Horvath - Hungarian trasnlation - talley at cubeclub.hu
-*/
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Üdvözlünk"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Üdvözlünk a React Operációs Rendszerben.\n\n"
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Kilépés"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "ReactOS telepítése"
-    IDS_TOPICBUTTON1        "A CD böngészése"
-    IDS_TOPICBUTTON2        "Kilépés"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "ReactOS telepítése"
-    IDS_TOPICTITLE1         "A CD böngészése"
-    IDS_TOPICTITLE2         "Kilépés"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "A ReactOS telepítése vagy frissítése."
-    IDS_TOPICDESC1          "A CD böngészése"
-    IDS_TOPICDESC2          "Kilépés"
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/id-ID.rc

@@ -1,64 +0,0 @@
-/*
- * Indonesian resources by Zaenal Mutaqin (ade999 at gmail dot com)
- */
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Selamat Datang"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Selamat datang di React Operating System.\n\nKlik topik di sisi kiri."
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Instalasi ReactOS"
-    IDS_TOPICBUTTON1        "Lihat CD ini"
-    IDS_TOPICBUTTON2        "Keluar"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Instalasi ReactOS"
-    IDS_TOPICTITLE1         "Lihat CD ini"
-    IDS_TOPICTITLE2         "Keluar"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Buat instalasi baru ReactOS pada komputer anda atau tingkatkan instalasi yang sudah ada."
-    IDS_TOPICDESC1          "Lihat CD."
-    IDS_TOPICDESC2          "Klik untuk keluar aplikasi ini."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/it-IT.rc

@@ -1,62 +0,0 @@
-/* It.rc by Roberto 'Speekix' Pellegrino */
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Benvenuto"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Benvenuto nel React Operating System.\n\nClicca su un argomento a sinistra."
-//    IDS_CHECKTEXT           "Mostra ancora questa finestra"
-//    IDS_CLOSETEXT           "Esci"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Installa ReactOS"
-    IDS_TOPICBUTTON1        "Esplora il CD"
-    IDS_TOPICBUTTON2        "Esci"
-//    IDS_TOPICBUTTON3        "Argomento Vuoto 3"
-//    IDS_TOPICBUTTON4        "Argomento Vuoto 4"
-//    IDS_TOPICBUTTON5        "Argomento Vuoto 5"
-//    IDS_TOPICBUTTON6        "Argomento Vuoto 6"
-//    IDS_TOPICBUTTON7        "Argomento Vuoto 7"
-//    IDS_TOPICBUTTON8        "Argomento Vuoto 8"
-//    IDS_TOPICBUTTON9        "Argomento Vuoto 9"
-END
-
-/* Topic Titolos */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Installa ReactOS"
-    IDS_TOPICTITLE1         "Esplora il CD"
-    IDS_TOPICTITLE2         "Esci"
-//    IDS_TOPICTITLE3         "Argomento Vuoto Titolo 3"
-//    IDS_TOPICTITLE4         "Argomento Vuoto Titolo 4"
-//    IDS_TOPICTITLE5         "Argomento Vuoto Titolo 5"
-//    IDS_TOPICTITLE6         "Argomento Vuoto Titolo 6"
-//    IDS_TOPICTITLE7         "Argomento Vuoto Titolo 7"
-//    IDS_TOPICTITLE8         "Argomento Vuoto Titolo 8"
-//    IDS_TOPICTITLE9         "Argomento Vuoto Titolo 9"
-END
-
-/* Descrizione argomentos */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Crea una nuova installazione di ReactOS sul tuo computer o aggiorna l'installazione esistente."
-    IDS_TOPICDESC1          "Esplora il CD."
-    IDS_TOPICDESC2          "Clicca per uscire dall'applicazione."
-//    IDS_TOPICDESC3          "Descrizione argomento 3.\n\nDescrivi l'argomento 3 qui."
-//    IDS_TOPICDESC4          "Descrizione argomento 4.\n\nDescrivi l'argomento 4 qui."
-//    IDS_TOPICDESC5          "Descrizione argomento 5.\n\nDescrivi l'argomento 5 qui."
-//    IDS_TOPICDESC6          "Descrizione argomento 6.\n\nDescrivi l'argomento 6 qui."
-//    IDS_TOPICDESC7          "Descrizione argomento 7.\n\nDescrivi l'argomento 7 qui."
-//    IDS_TOPICDESC8          "Descrizione argomento 8.\n\nDescrivi l'argomento 8 qui."
-//    IDS_TOPICDESC9          "Descrizione argomento 9.\n\nDescrivi l'argomento 9 qui."
-END
-
-/* EOF */

base/setup/welcome/lang/ja-JP.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Welcome"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "React へようこそ。\n\n左側のトピックをクリックしてください。"
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "ReactOS をインストールする"
-    IDS_TOPICBUTTON1        "この CD を開く"
-    IDS_TOPICBUTTON2        "終了"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "ReactOS をインストールする"
-    IDS_TOPICTITLE1         "この CD を開く"
-    IDS_TOPICTITLE2         "終了"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "コンピュータに新しく ReactOS をインストールしたり、既存の ReactOS をアップグレードします。"
-    IDS_TOPICDESC1          "CD の内容を参照します。"
-    IDS_TOPICDESC2          "クリックするとこのアプリケーションを終了します。"
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/lt-LT.rc

@@ -1,62 +0,0 @@
-// Translation by Vytis 'CMan' Girdžijauskas cman@cman.us
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Sveiki"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Sveiki, čia React Operacinė Sistema.\n\nPasirinkite punktą kairėje."
-//    IDS_CHECKTEXT           "Rodyti šį langą vėl"
-//    IDS_CLOSETEXT           "Išeiti"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Įdiegti ReactOS"
-    IDS_TOPICBUTTON1        "Peržiūrėti šį CD"
-    IDS_TOPICBUTTON2        "Išeiti"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Įdiegti ReactOS"
-    IDS_TOPICTITLE1         "Peržiūrėti šį CD"
-    IDS_TOPICTITLE2         "Išeiti"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Įdiekite arba atnaujinkite ReactOS."
-    IDS_TOPICDESC1          "Peržiūrėti šį CD."
-    IDS_TOPICDESC2          "Paspauskite, kad išeitumėte iš programos."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/nl-NL.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Welkom"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Welkom bij het React Operation System.\n\nKlik links op een onderwerp."
-//    IDS_CHECKTEXT           "Ga terug naar dit scherm"
-//    IDS_CLOSETEXT           "Afsluiten"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Installeer ReactOS"
-    IDS_TOPICBUTTON1        "Deze CD Verkennen"
-    IDS_TOPICBUTTON2        "Afsluiten"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Installeer ReactOS"
-    IDS_TOPICTITLE1         "Deze CD Verkennen"
-    IDS_TOPICTITLE2         "Afsluiten"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Maak een nieuwe ReactOS installatie of upgrade een bestaande installatie."
-    IDS_TOPICDESC1          "Deze CD Verkennen."
-    IDS_TOPICDESC2          "Klik om dit programma af te sluiten."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/no-NO.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_APPTITLE            "ReactOS - Velkommen"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Velkommen til React Operativsystem.\n\nTrykk et emne til venstre."
-//    IDS_CHECKTEXT           "Vis denne dialoget igjen"
-//    IDS_CLOSETEXT           "Avslutt"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Innstaller ReactOS"
-    IDS_TOPICBUTTON1        "Utforsk denne CD"
-    IDS_TOPICBUTTON2        "Avslutt"
-//    IDS_TOPICBUTTON3        "Tomt emne  3"
-//    IDS_TOPICBUTTON4        "Tomt emne  4"
-//    IDS_TOPICBUTTON5        "Tomt emne  5"
-//    IDS_TOPICBUTTON6        "Tomt emne  6"
-//    IDS_TOPICBUTTON7        "Tomt emne  7"
-//    IDS_TOPICBUTTON8        "Tomt emne  8"
-//    IDS_TOPICBUTTON9        "Tomt emne  9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Innstaller ReactOS"
-    IDS_TOPICTITLE1         "Utforsk denne CD"
-    IDS_TOPICTITLE2         "Avslutt"
-//    IDS_TOPICTITLE3         "Tomt emne  tittel 3"
-//    IDS_TOPICTITLE4         "Tomt emne  tittel 4"
-//    IDS_TOPICTITLE5         "Tomt emne  tittel 5"
-//    IDS_TOPICTITLE6         "Tomt emne  tittel 6"
-//    IDS_TOPICTITLE7         "Tomt emne  tittel 7"
-//    IDS_TOPICTITLE8         "Tomt emne  tittel 8"
-//    IDS_TOPICTITLE9         "Tomt emne  tittel 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Opprett en ny ReactOS innstallasjon på din datamaskin eller oppgrader eksisterende innstallasjon."
-    IDS_TOPICDESC1          "Utforsk CDen."
-    IDS_TOPICDESC2          "Trykk avslutt for å avslutte denne applikasjonen."
-//    IDS_TOPICDESC3          "Emner beskrivelse 3.\n\nBeskriv emner 3 her."
-//    IDS_TOPICDESC4          "Emner beskrivelse 4.\n\nBeskriv emner 4 her."
-//    IDS_TOPICDESC5          "Emner beskrivelse 5.\n\nBeskriv emner 5 her."
-//    IDS_TOPICDESC6          "Emner beskrivelse 6.\n\nBeskriv emner 6 her."
-//    IDS_TOPICDESC7          "Emner beskrivelse 7.\n\nBeskriv emner 7 her."
-//    IDS_TOPICDESC8          "Emner beskrivelse 8.\n\nBeskriv emner 8 her."
-//    IDS_TOPICDESC9          "Emner beskrivelse 9.\n\nBeskriv emner 9 her."
-END
-
-/* EOF */

base/setup/welcome/lang/pl-PL.rc

@@ -1,66 +0,0 @@
-/*
- *      translated by Polish Translation Team (Apr, 2007)
- *      https://sourceforge.net/projects/reactospl
- *      UTF-8 conversion by Caemyr (May, 2011)
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Zapraszamy"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej."
-//    IDS_CHECKTEXT           "Pokaż ten dialog ponownie"
-//    IDS_CLOSETEXT           "Wyjście"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Zainstaluj ReactOS"
-    IDS_TOPICBUTTON1        "Przeglądaj CD"
-    IDS_TOPICBUTTON2        "Wyjście"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Zainstaluj ReactOS"
-    IDS_TOPICTITLE1         "Przeglądaj CD"
-    IDS_TOPICTITLE2         "Wyjście"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Utwórz nową instalację ReactOS na komputerze lub aktualizuj już istniejącą."
-    IDS_TOPICDESC1          "Przeglądaj CD."
-    IDS_TOPICDESC2          "Kliknij, aby zakończyć aplikację."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/pt-BR.rc

@@ -1,60 +0,0 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Bem vindo"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Bem vindo ao Sistema Operacional React (ReactOS).\n\nClique em um tópico à esquerda."
-//    IDS_CHECKTEXT           "Exibir este diálogo novamente"
-//    IDS_CLOSETEXT           "Sair"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Instalar ReactOS"
-    IDS_TOPICBUTTON1        "Examinar este CD"
-    IDS_TOPICBUTTON2        "Sair"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Instalar ReactOS"
-    IDS_TOPICTITLE1         "Examinar este CD"
-    IDS_TOPICTITLE2         "Sair"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Cria uma nova instalação do ReactOS em seu computador ou atualiza uma instalação já existente."
-    IDS_TOPICDESC1          "Exibe os arquivos contidos no CD."
-    IDS_TOPICDESC2          "Clique para fechar este aplicativo."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/ro-RO.rc

@@ -1,67 +0,0 @@
-/* 
- * FILE:             base/setup/welcome/lang/ro-RO.rc
- *                   ReactOS Project (http://www.reactos.org)
- * TRANSLATOR:       Fulea Ștefan (PM on ReactOS Forum to fulea.stefan)
- * CHANGE LOG:       2011-10-30  initial translation
- */
-
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Bun venit"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Bun venit în Sistemul de Operare React.\n\nAlegeți o opțiune din stânga."
-//    IDS_CHECKTEXT           "Afișează acest dialog și altă dată"
-//    IDS_CLOSETEXT           "Ieșire"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Instalare ReactOS"
-    IDS_TOPICBUTTON1        "Explorare CD"
-    IDS_TOPICBUTTON2        "Ieșire"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Instalare ReactOS"
-    IDS_TOPICTITLE1         "Explorare CD"
-    IDS_TOPICTITLE2         "Ieșire"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Creați o instalare nouă sau actualizați o instalare existentă."
-    IDS_TOPICDESC1          "Explorați conținutul acestui CD."
-    IDS_TOPICDESC2          "Apăsați pentru a ieși din aplicație."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/ru-RU.rc

@@ -1,62 +0,0 @@
-/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Добро пожаловать!"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Добро пожаловать в ReactOS.\n\nВыберите пункт слева."
-//    IDS_CHECKTEXT           "Показывать это окно снова"
-//    IDS_CLOSETEXT           "Выход"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Установить ReactOS"
-    IDS_TOPICBUTTON1        "Обзор диска"
-    IDS_TOPICBUTTON2        "Выход"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Установить ReactOS"
-    IDS_TOPICTITLE1         "Обзор диска"
-    IDS_TOPICTITLE2         "Выход"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Установит ReactOS на Ваш компьютер с нуля или обновит уже установленную версию."
-    IDS_TOPICDESC1          "Обзор диска."
-    IDS_TOPICDESC2          "Выберите для выхода из этого приложения."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/sk-SK.rc

@@ -1,62 +0,0 @@
-// Slovak translation by Kario  2007 <kario@szm.sk>
-
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Vitajte"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Vitajte v operačnom systéme ReactOS.\n\nKliknite na tlačidlo v ľavom stĺpci."
-//    IDS_CHECKTEXT           "Zobraziť toto okno aj nabudúce"
-//    IDS_CLOSETEXT           "Koniec"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Inštalovať ReactOS"
-    IDS_TOPICBUTTON1        "Prezerať toto CD"
-    IDS_TOPICBUTTON2        "Koniec"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Inštalovať ReactOS"
-    IDS_TOPICTITLE1         "Prezerať toto CD"
-    IDS_TOPICTITLE2         "Koniec"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Nainštaluje ReactOS na Váš počítač alebo zaktualizuje už existujúci systém."
-    IDS_TOPICDESC1          "Prezerať toto CD."
-    IDS_TOPICDESC2          "Kliknutím ukončíte tento program."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/sv-SE.rc

@@ -1,80 +0,0 @@
-/*
- *  Swedish (SE) resources
- *
- *  Copyright (C) 2005 David Nordenberg
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Välkommen"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Välkommen till React Operating System.\n\nKlicka på ett avsnitt till vänster."
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Installera ReactOS"
-    IDS_TOPICBUTTON1        "Utforska skivan"
-    IDS_TOPICBUTTON2        "Avsluta"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Installera ReactOS"
-    IDS_TOPICTITLE1         "Utforska skivan"
-    IDS_TOPICTITLE2         "Avsluta"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Skapa en ny ReactOS installation på den här datorn eller uppgradera en befintlig."
-    IDS_TOPICDESC1          "Utforska skivan."
-    IDS_TOPICDESC2          "Avsluta det här programmet."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/th-TH.rc

@@ -1,67 +0,0 @@
-/*
- * PROJECT:     ReactOS welcome/autorun application
- * LICENSE:     See COPYING in the top level directory
- * FILE:        base/setup/welcome/lang/th-TH.rc
- * TRANSLATOR:  Sumath Aowsakulsutthi
- */
-
-LANGUAGE LANG_THAI, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - ยินดีต้อนรับ"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "ยินดีต้อนรับสู่ระบบปฏิบัติการ React \n\nกดเลือกเนื้อหาบนแถบซ้ายมือ"
-//    IDS_CHECKTEXT           "แสดงคำแนะนำอีกครั้ง"
-//    IDS_CLOSETEXT           "ออกจากโปรแกรม"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "ติดตั้ง ReactOS"
-    IDS_TOPICBUTTON1        "ดูรายละเอียดของแผ่นซีดีนี้"
-    IDS_TOPICBUTTON2        "ออกจากโปรแกรม"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "ติดตั้ง ReactOS"
-    IDS_TOPICTITLE1         "ดูรายละเอียดของแผ่นซีดีนี้"
-    IDS_TOPICTITLE2         "ออกจากโปรแกรม"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "คุณต้องการติดตั้ง ReactOS ลงในเครื่องคอมพิวเตอร์ของคุณ\n\nหรือต้องการปรับแต่งเพิ่มเติมจากที่มีอยู่เดิม."
-    IDS_TOPICDESC1          "ดูรายละเอียดของแผ่นซีดีนี้."
-    IDS_TOPICDESC2          "กดเลือกที่นี่เพื่อต้องการออกจากการติดตั้ง."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/uk-UA.rc

@@ -1,80 +0,0 @@
-/*
- *  Welcome (Ukrainian resources)
- *
- *  Copyright 2006 Artem Reznikov
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - Ласкаво просимо"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "Ласкаво просимо до операційної системи ReactOS.\n\nКлацніть по темі ліворуч"
-//    IDS_CHECKTEXT           "Показувати цей діалог знов"
-//    IDS_CLOSETEXT           "Вихід"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "Встановлення ReactOS"
-    IDS_TOPICBUTTON1        "Огляд цього CD"
-    IDS_TOPICBUTTON2        "Вихід"
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "Встановлення ReactOS"
-    IDS_TOPICTITLE1         "Огляд цього CD"
-    IDS_TOPICTITLE2         "Вихід"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "Створення нової інсталяції ReactOS на Вашому комп'ютері чи оновлення існуючої інсталяції."
-    IDS_TOPICDESC1          "Проглянути CD."
-    IDS_TOPICDESC2          "Натисніть для виходу з цієї програми."
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/lang/zh-CN.rc

@@ -1,80 +0,0 @@
-/*
- *  welcome (Simplified Chinese resources)
- *  (简体中文资源)
- *  Copyright 2007 zhangbing <e_zb@21cn.com, ezb@mail.gywb.cn>
- *
- * This program 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE            "ReactOS - 欢迎"
-    IDS_DEFAULTTOPICTITLE   "ReactOS"
-    IDS_DEFAULTTOPICDESC    "欢迎使用 React 操作系统。\n\n 请点击左边的主题。"
-//    IDS_CHECKTEXT           "Show this dialog again"
-//    IDS_CLOSETEXT           "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICBUTTON0        "安装 ReactOS"
-    IDS_TOPICBUTTON1        "浏览 CD"
-    IDS_TOPICBUTTON2        "退出 "
-//    IDS_TOPICBUTTON3        "Empty Topic 3"
-//    IDS_TOPICBUTTON4        "Empty Topic 4"
-//    IDS_TOPICBUTTON5        "Empty Topic 5"
-//    IDS_TOPICBUTTON6        "Empty Topic 6"
-//    IDS_TOPICBUTTON7        "Empty Topic 7"
-//    IDS_TOPICBUTTON8        "Empty Topic 8"
-//    IDS_TOPICBUTTON9        "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICTITLE0         "安装 ReactOS"
-    IDS_TOPICTITLE1         "浏览 CD"
-    IDS_TOPICTITLE2         "退出"
-//    IDS_TOPICTITLE3         "Empty Topic Title 3"
-//    IDS_TOPICTITLE4         "Empty Topic Title 4"
-//    IDS_TOPICTITLE5         "Empty Topic Title 5"
-//    IDS_TOPICTITLE6         "Empty Topic Title 6"
-//    IDS_TOPICTITLE7         "Empty Topic Title 7"
-//    IDS_TOPICTITLE8         "Empty Topic Title 8"
-//    IDS_TOPICTITLE9         "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICDESC0          "重新安装 ReactOS 或 更新你的ReactOS 。"
-    IDS_TOPICDESC1          "浏览 CD 的内容。"
-    IDS_TOPICDESC2          "点击退出应用程序。"
-//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
-END
-
-/* EOF */

base/setup/welcome/rsrc.rc

@@ -22,47 +22,7 @@ IDB_TITLEBITMAP         BITMAP  DISCARDABLE     "res/title.bmp"
 //IDB_TOPICBITMAP9        BITMAP  DISCARDABLE     "res/topic9.bmp"
 
 
-/* Topic actions */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOPICACTION0        "reactos.exe"
-    IDS_TOPICACTION1        "explorer.exe"
-    IDS_TOPICACTION2        "<exit>"  /* this quits the app */
-//    IDS_TOPICACTION3        "..."
-//    IDS_TOPICACTION4        "..."
-//    IDS_TOPICACTION5        "..."
-//    IDS_TOPICACTION6        "..."
-//    IDS_TOPICACTION7        "..."
-//    IDS_TOPICACTION8        "..."
-//    IDS_TOPICACTION9        "..."
-END
-
-
 /* Language-specific resources */
 // UTF-8
 #pragma code_page(65001)
-#include "lang/bg-BG.rc"
-#include "lang/cs-CZ.rc"
-#include "lang/da-DK.rc"
 #include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/et-EE.rc"
-#include "lang/fr-FR.rc"
-#include "lang/hu-HU.rc"
-#include "lang/id-ID.rc"
-#include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
-#include "lang/lt-LT.rc"
-#include "lang/no-NO.rc"
-#include "lang/nl-NL.rc"
-#include "lang/pl-PL.rc"
-#include "lang/pt-BR.rc"
-#include "lang/ro-RO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/sk-SK.rc"
-#include "lang/sv-SE.rc"
-#include "lang/th-TH.rc"
-#include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"

base/setup/welcome/welcome.c

@@ -46,6 +46,7 @@
 #define TITLE_WIDTH  480
 #define TITLE_HEIGHT  93
 
+#define TOPIC_DESC_LENGTH	1024
 
 /* GLOBALS ******************************************************************/
 
@@ -238,16 +239,12 @@ ButtonSubclassWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 static BOOL
 RunApplication(int nTopic)
 {
-  PROCESS_INFORMATION ProcessInfo;
-  STARTUPINFO StartupInfo;
-  TCHAR AppName[256];
-  TCHAR CurrentDir[256];
+  TCHAR AppName[512];
+  TCHAR Parameters[2];
   int nLength;
 
   InvalidateRect(hwndMain, NULL, TRUE);
 
-  GetCurrentDirectory(256, CurrentDir);
-
   nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, 256);
   if (nLength == 0)
     return TRUE;
@@ -255,25 +252,18 @@ RunApplication(int nTopic)
   if (!_tcsicmp(AppName, TEXT("<exit>")))
     return FALSE;
 
+  if (!_tcsnicmp(AppName, TEXT("<msg>"), 5))
+  {
+    MessageBox(hwndMain, AppName + 5, TEXT("ReactOS"), MB_OK | MB_TASKMODAL);
+    return TRUE;
+  }
+
   if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0)
-    {
-      _tcscat(AppName, TEXT(" "));
-      _tcscat(AppName, CurrentDir);
-    }
+    _tcscpy(Parameters, TEXT("\\"));
+  else
+    *Parameters = 0;
 
-  memset(&StartupInfo, 0, sizeof(STARTUPINFO));
-  StartupInfo.cb = sizeof(STARTUPINFO);
-  StartupInfo.lpTitle = TEXT("Test");
-  StartupInfo.dwFlags = STARTF_USESHOWWINDOW;
-  StartupInfo.wShowWindow = SW_SHOWNORMAL;
-
-  CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE,NULL,
-		CurrentDir,
-		&StartupInfo,
-		&ProcessInfo);
-
-  CloseHandle(ProcessInfo.hProcess);
-  CloseHandle(ProcessInfo.hThread);
+  ShellExecute(NULL, TEXT("open"), AppName, Parameters, NULL, SW_SHOWDEFAULT);
 
   return TRUE;
 }
@@ -521,7 +511,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
   HFONT hOldFont;
   RECT rcTitle, rcDescription;
   TCHAR szTopicTitle[80];
-  TCHAR szTopicDesc[256];
+  TCHAR szTopicDesc[TOPIC_DESC_LENGTH];
   int nLength;
   BITMAP bmpInfo;
   TCHAR version[50];
@@ -605,13 +595,13 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
 
   if (nTopic == -1)
     {
-      nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256);
+      nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH);
     }
   else
     {
-      nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, 256);
+      nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, TOPIC_DESC_LENGTH);
       if (nLength == 0)
-	nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256);
+	nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH);
     }
 
   SetBkMode(hdc, TRANSPARENT);

base/setup/welcome/welcome.rbuild

@@ -5,6 +5,7 @@
 	<include base="welcome">.</include>
 	<library>gdi32</library>
 	<library>user32</library>
+	<library>shell32</library>
 	<file>welcome.c</file>
 	<file>welcome.rc</file>
 </module>

base/shell/explorer-new/startmnu.c

@@ -818,20 +818,14 @@ UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup,
                                      (PVOID)&pbb);
     if (SUCCEEDED(hRet))
     {
-       // hRet = IBanneredBar_SetBitmap(pbb,
-       //                               hbmBanner);
-        hRet = pbb->lpVtbl->SetBitmap(pbb,
-                                      hbmBanner);
+        hRet = IBanneredBar_SetBitmap(pbb, hbmBanner);
 
 
         /* Update the icon size */
-        //hRet = IBanneredBar_SetIconSize(pbb,
-        //                                bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
-        hRet = pbb->lpVtbl->SetIconSize(pbb,
+        hRet = IBanneredBar_SetIconSize(pbb,
                                         bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
 
-        //IBanneredBar_Release(pbb);
-        pbb->lpVtbl->Release(pbb);
+        IBanneredBar_Release(pbb);
     }
 
     return hRet;
@@ -889,11 +883,8 @@ CreateStartMenu(IN ITrayWindow *Tray,
     hr = IMenuPopup_QueryInterface(pMp, &IID_IInitializeObject, (PVOID*)&pIo);
     if (SUCCEEDED(hr))
     {
-        //hr = IInitializeObject_Initialize(pIo);
-        hr = pIo->lpVtbl->Initialize(pIo);
-
-        //IInitializeObject_Release(pIo);
-        pIo->lpVtbl->Release(pIo);
+        hr = IInitializeObject_Initialize(pIo);
+        IInitializeObject_Release(pIo);
     }
     else
         hr = S_OK;

base/shell/explorer-new/todo.h

@@ -1,41 +1,11 @@
 #pragma once
 
-#ifdef INTERFACE
-#undef INTERFACE
-#endif
-
 /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */
-static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}};
-#define IID_IShellView2 IID_HACK_IShellView2
-static const GUID IID_HACK_IShellView3 = {0xEC39FA88,0xF8AF,0x41CF,{0x84,0x21,0x38,0xBE,0xD2,0x8F,0x46,0x73}};
-#define IID_IShellView3 IID_HACK_IShellView2
 static const GUID VID_HACK_LargeIcons = {0x0057D0E0, 0x3573, 0x11CF, {0xAE, 0x69, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62}};
 #define VID_LargeIcons VID_HACK_LargeIcons
 
-static const GUID IID_HACK_IDeskBarClient = {0xEB0FE175, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}};
-#define IID_IDeskBarClient IID_HACK_IDeskBarClient
 static const GUID IID_HACK_IDeskBar = {0xEB0FE173, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}};
 #define IID_IDeskBar IID_HACK_IDeskBar
 
-static const GUID IID_HACK_IMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}};
-#define IID_IMenuPopup IID_HACK_IMenuPopup
-static const GUID IID_HACK_IBanneredBar = {0x596A9A94,0x013E,0x11D1,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}};
-#define IID_IBanneredBar IID_HACK_IBanneredBar
-
-static const GUID IID_HACK_IInitializeObject = {0x4622AD16,0xFF23,0x11D0,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}};
-#define IID_IInitializeObject IID_HACK_IInitializeObject
-
 static const GUID SID_HACK_SMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}};
 #define SID_SMenuPopup SID_HACK_SMenuPopup
-
-#ifdef COBJMACROS
-#define IDeskBarClient_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
-#define IDeskBarClient_AddRef(T) (T)->lpVtbl->AddRef(T)
-#define IDeskBarClient_Release(T) (T)->lpVtbl->Release(T)
-#define IDeskBarClient_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a)
-#define IDeskBarClient_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a)
-#define IDeskBarClient_SetDeskBarSite(T,a) (T)->lpVtbl->SetDeskBarSite(T,a)
-#define IDeskBarClient_SetModeDBC(T,a) (T)->lpVtbl->SetModeDBC(T,a)
-#define IDeskBarClient_UIActivateDBC(T,a) (T)->lpVtbl->UIActivateDBC(T,a)
-#define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b)
-#endif

baseaddress.rbuild

@@ -171,7 +171,7 @@
 	<property name="BASEADDRESS_MSCTF"		value="0x746e0000" />
 	<property name="BASEADDRESS_QUARTZ"		value="0x747d0000" />
 	<property name="BASEADDRESS_USERENV"		value="0x74850000" />
-	<property name="BASEADDRESS_SYSSETUP"		value="0x74a10000" />
+	<property name="BASEADDRESS_SYSSETUP"		value="0x74900000" />
 	<property name="BASEADDRESS_WS2_32"		value="0x74aa0000" />
 	<property name="BASEADDRESS_POWRPROF"		value="0x74ad0000" />
 	<property name="BASEADDRESS_MSXML3"		value="0x74ae0000" />

boot/bootdata/hivecls_i386.inf

@@ -316,6 +316,10 @@ HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}"
 
 HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553}"
 
+; Applications
+HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1"
+HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1"
+HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1"
 
 ; For language support:
 

boot/bootdata/hivesys_amd64.inf

@@ -1398,20 +1398,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSe
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
 
-; USB uhci/ehci driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001
-
-; USB storage driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001
-
 ; Windows Installer Service
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer"
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)"

boot/bootdata/hivesys_i386.inf

@@ -1666,7 +1666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ErrorControl",0x00010001,0x0000
 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Group",0x00000000,"UIGroup"
 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ImagePath",0x00020000,"%SystemRoot%\system32\thmsvc.exe"
 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002
 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020
 
 ; Sound Blaster (NT4)
@@ -1730,20 +1730,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSe
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
 
-; USB uhci/ehci driver
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004
-HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001
-
-; USB storage driver
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys"
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003
-;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001
-
 ; Windows Installer Service
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer"
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)"

boot/bootdata/packages/reactos.dff

@@ -21,6 +21,9 @@ Signature = "$ReactOS$"
 6 = inf
 7 = bin
 8 = media
+9 = Resources
+10 = Resources\Themes
+11 = Resources\Themes\Lautus
 
 .InfEnd
 
@@ -694,6 +697,9 @@ media\inf\xboxdisp.inf                              6
 ; Media Files
 media\sounds\ReactOS_LogOn.wav                      8
 
+; Lautus Theme
+media\themes\Lautus.msstyles                        11  optional
+
 ; Ini Files
 boot\bootdata\system.ini                            4
 
@@ -888,4 +894,4 @@ modules\rostests\kmtests\example\example_drv.sys                           7   o
 modules\rostests\kmtests\ntos_io\iodeviceobject_drv.sys                    7   optional
 modules\rostests\kmtests\ntos_io\iohelper_drv.sys                          7   optional
 
-modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
+modules\wallpaper\dark-clt2012.bmp                                         4   optional

boot/bootdata/packages/reactos.dff.in

@@ -22,6 +22,9 @@ Signature = "$ReactOS$"
 6 = inf
 7 = bin
 8 = media
+9 = Resources
+10 = Resources\Themes
+11 = Resources\Themes\Lautus
 
 .InfEnd
 
@@ -53,4 +56,4 @@ modules\optional\vmx_svga.inf                       6  optional
 modules\optional\vmx_svga.sys                       2  optional
 modules\optional\wine_gecko-1.0.0-x86.cab           4  optional
 
-modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
+modules\wallpaper\dark-clt2012.bmp                  4  optional

boot/bootdata/readme.txt

@@ -1,54 +1,25 @@
-========================
-ReactOS Version 0.3.x
-Updated July 28, 2007
-========================
+===========================================================================
+ReactOS Version 0.3.14
+f<EFBFBD>r die Chemnitzer Linux-Tage 2012
+===========================================================================
 
-1. What is ReactOS?
--------------------
+Willkommen zu ReactOS!
 
-ReactOS is an Open Source effort to develop a quality operating system that is
-compatible with applications and drivers written for the Microsoft Windows NT
-family of operating systems (NT4, 2000, XP, 2003, Vista).
+CD-INHALT:
 
-Website: http://www.reactos.org/
+  * ReactOS Live-System/Installation
+  * ReactOS in einer virtuellen QEMU-Maschine
+  * ReactOS Build Environment (RosBE)
+  * Quellcode
 
+Diese CD sollte unter Windows ein AutoRun-Programm starten. Alternativ
+k<EFBFBD>nnen Sie sich den CD-Inhalt <20>ber einen Dateibrowser anschauen.
+Die Ordnernamen sollten selbsterkl<6B>rend sein.
 
-2. Relationship with the WINE project
--------------------------------------
+Der gesamte Quellcode des Betriebssystems l<>sst sich unter Einsatz des
+ReactOS Build Environments sowohl unter Windows als auch unter
+Unix-<2D>hnlichen Betriebssystemen wie Linux kompilieren.
 
-ReactOS has always intended to work with the WINE project to share as much
-programming effort as possible. This mainly concerns User Mode DLLs and
-still happens to a degree today. Other areas of cooperation lie in
-applications and testing suites.
+Weitere Informationen <20>ber ReactOS finden Sie unter www.reactos.org!
 
-
-3. Future compatibility
------------------------
-
-The ReactOS project, although currently focused on Windows XP
-compatibility, is always keeping an eye toward compatibility with
-Windows Vista and future Windows NT releases.
-
-
-4. Supporting other System Applications
----------------------------------------
-
-The Windows NT architecture allows for subsystems, as does the ReactOS
-architecture. A subsystem is an implementation of the APIs of another
-operating system, allowing ReactOS to run applications from other systems. We
-are already looking at subsystems for: Java, OS/2, and DOS and possibly others
-in the future.
-
-
-5. Tutorials
-------------
-
-Developer and User Tutorials: http://www.reactos.org/wiki/index.php/Main_Page
-
-The tutorials contain more information on the project, compiling and testing
-ReactOS - among other topics. Contributors to the project are always welcome.
-
-6. Author
----------
-
-This document was written by Jason Filby (jasonfilby@yahoo.com).
+===========================================================================

boot/bootdata/txtsetup.sif

@@ -32,7 +32,6 @@ kdcom.dll=,,,,,,,,,,,,2
 disk.sys=,,,,,,x,,,,,,4
 floppy.sys=,,,,,,x,,,,,,4
 i8042prt.sys=,,,,,,x,,,,,,4
-usbdrv.sys=,,,,,,,,,,,,4
 kbdclass.sys=,,,,,,x,,,,,,4
 l_intl.nls=,,,,,,,,,,,,2
 ntfs.sys=,,,,,,,,,,,,4

boot/freeldr/freeldr/arch/i386/hardware.c

@@ -250,7 +250,8 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
   TRACE("Estimated buffer size %u\n", NodeSize * NodeCount);
 
     /* Set 'Configuration Data' value */
-  Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount);
+  Size = sizeof(CM_PARTIAL_RESOURCE_LIST)
+        + sizeof(CM_PNP_BIOS_INSTALLATION_CHECK) + (NodeSize * NodeCount);
   PartialResourceList = MmHeapAlloc(Size);
   if (PartialResourceList == NULL)
     {
@@ -268,8 +269,8 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
   PartialResourceList->PartialDescriptors[0].ShareDisposition =
     CmResourceShareUndetermined;
 
-  Ptr = (char *)(((ULONG_PTR)&PartialResourceList->PartialDescriptors[0]) +
-		 sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
+  /* The buffer starts after PartialResourceList->PartialDescriptors[0] */
+  Ptr = (char *)(PartialResourceList + 1);
 
   /* Set instalation check data */
   memcpy (Ptr, InstData, sizeof(CM_PNP_BIOS_INSTALLATION_CHECK));
@@ -292,6 +293,12 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
 		    DeviceNode->Size,
 		    DeviceNode->Size);
 
+      if (PnpBufferSize + DeviceNode->Size > Size)
+      {
+          ERR("Buffer too small!\n");
+          break;
+      }
+
 	  memcpy (Ptr,
 		  DeviceNode,
 		  DeviceNode->Size);

boot/freeldr/freeldr/bootmgr.c

@@ -231,15 +231,20 @@ VOID RunLoader(VOID)
 		IniOpenSection("Operating Systems", &SectionId);
 		IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue));
 
+#ifndef _M_ARM
 		// Install the drive mapper according to this sections drive mappings
 #if defined(_M_IX86) && !defined(_MSC_VER)
 		DriveMapMapDrivesInSection(SectionName);
 #endif
 
 #ifdef FREELDR_REACTOS_SETUP
-        // WinLdr-style boot
-        LoadReactOSSetup();
-#elif defined(_M_IX86)
+		if (_stricmp(BootType, "ReactOSSetup") == 0)
+		{
+			LoadReactOSSetup();
+		}
+		else
+#endif
+#ifdef _M_IX86
 		if (_stricmp(BootType, "Windows") == 0)
 		{
 			LoadAndBootWindows(SectionName, SettingValue, 0);
@@ -268,6 +273,7 @@ VOID RunLoader(VOID)
 		{
 			LoadAndBootDrive(SectionName);
 		}
+#endif
 #else
 		LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03);
 #endif

cmake/CMakeMacros.cmake

@@ -294,7 +294,8 @@ function(set_module_type MODULE TYPE)
         set(__subsystem console)
     elseif(${TYPE} STREQUAL win32gui)
         set(__subsystem windows)
-    elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl)))
+    elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
+            OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
         message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
     endif()
 
@@ -336,6 +337,8 @@ function(set_module_type MODULE TYPE)
     elseif(${TYPE} STREQUAL nativedll)
         set(__entrypoint DllMain)
         set(__entrystack 12)
+    elseif(${TYPE} STREQUAL module)
+        set(__entrypoint 0)
     endif()
 
     if(DEFINED __entrypoint)

cmake/Platform/Windows-cl.cmake

@@ -213,15 +213,15 @@ endif()
 #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
 
 SET(CMAKE_BUILD_TYPE_INIT Debug)
-SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
-SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
+SET(CMAKE_CXX_FLAGS_DEBUG_INIT "")
+SET(CMAKE_C_FLAGS_DEBUG_INIT "")
 SET(CMAKE_CXX_FLAGS_INIT "")
 SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
-SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE_INIT "")
 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1")
 SET(CMAKE_C_FLAGS_INIT "")
 SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
-SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
+SET(CMAKE_C_FLAGS_RELEASE_INIT "")
 SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1")
 SET(CMAKE_C_STANDARD_LIBRARIES_INIT "")
 SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}")

cmake/config-amd64.cmake

@@ -41,3 +41,8 @@ This settings is disabled (0) by default.")
 set(USERMODE TRUE CACHE BOOL
 "Whether to compile any usermode parts. This is while kernel mode is under
  heavy development and usermode part not relevant for bootcd.")
+
+if(MSVC)
+set(_PREFAST_ FALSE CACHE BOOL
+"Whether to enable PREFAST while compiling.")
+endif()

cmake/config.cmake

@@ -25,14 +25,23 @@ set(GDB FALSE CACHE BOOL
 "Whether to compile for debugging with GDB.
 If you don't use GDB, don't	enable this.")
 
-set(DBG TRUE CACHE BOOL
+if(${CMAKE_BUILD_TYPE} MATCHES Release)
+    set(DBG FALSE CACHE BOOL
 "Whether to compile for debugging.")
+else()
+    set(DBG TRUE CACHE BOOL
+"Whether to compile for debugging.")
+endif()
 
 if(MSVC)
     set(KDBG FALSE CACHE BOOL
 "Whether to compile in the integrated kernel debugger.")
-    set(_WINKD_ TRUE CACHE BOOL
-"Whether to compile with the KD protocol.")
+    if(${CMAKE_BUILD_TYPE} MATCHES Release)
+        set(_WINKD_ FALSE CACHE BOOL "Whether to compile with the KD protocol.")
+    else()
+        set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.")
+    endif()
+    
 else()
     set(KDBG TRUE CACHE BOOL
 "Whether to compile in the integrated kernel debugger.")
@@ -55,3 +64,8 @@ set(BUILD_MP TRUE CACHE BOOL
 
 set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL
 "Whether to create a graphml dependency of dlls.")
+
+if(MSVC)
+set(_PREFAST_ FALSE CACHE BOOL
+"Whether to enable PREFAST while compiling.")
+endif()

cmake/idl-support.cmake

@@ -53,7 +53,7 @@ function(get_defines OUTPUT_VAR)
     set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
 endfunction()
 
-function(add_typelib TARGET)
+function(add_typelib)
     get_includes(INCLUDES)
     get_defines(DEFINES)
     foreach(FILE ${ARGN})
@@ -64,7 +64,6 @@ function(add_typelib TARGET)
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS})
         list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb)
     endforeach()
-    add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
 endfunction()
 
 function(add_idl_headers TARGET)

cmake/msvc.cmake

@@ -21,6 +21,16 @@ add_definitions(/Dinline=__inline /D__STDC__=1)
 
 add_compile_flags("/X /GR- /GS- /Zl /W3")
 
+# Debugging
+if(${CMAKE_BUILD_TYPE} MATCHES Debug)
+    if(NOT _PREFAST_)
+        add_compile_flags("/Zi")
+    endif()
+    add_compile_flags("/Ob0 /Od")
+elseif(${CMAKE_BUILD_TYPE} MATCHES Release)
+    add_compile_flags("/Ob2 /D NDEBUG")
+endif()
+
 if(${_MACHINE_ARCH_FLAG} MATCHES X86)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE")
@@ -43,15 +53,32 @@ if(MSVC_IDE)
     # We may temporarily use just the global defines, but this is not a solution as some modules (minihal for example) apply additional definitions to source files, so we get an incorrect build of such targets.
     get_directory_property(definitions DEFINITIONS)
     set(CMAKE_ASM_COMPILE_OBJECT
-        "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
+        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 else()
     # NMake Makefiles
     set(CMAKE_ASM_COMPILE_OBJECT
-        "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
+        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 endif()
 
+if(_PREFAST_)
+    if(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION GREATER 1600)
+        add_compile_flags("/analyze")
+    else()
+        message("PREFAST enabled!")
+        set(CMAKE_C_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}"
+    "prefast LIST")
+        set(CMAKE_CXX_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}"
+    "prefast LIST")
+        set(CMAKE_C_LINK_EXECUTABLE
+    "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
+        set(CMAKE_CXX_LINK_EXECUTABLE
+    "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
+    endif()
+    
+endif()
+
 set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})
 set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})
 set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
@@ -197,7 +224,7 @@ function(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_addre
 
     add_custom_command(
         OUTPUT ${_temp_file}
-        COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
+        COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
         DEPENDS ${_asm_file})
 
     add_custom_command(

dll/cpl/CMakeLists.txt

@@ -4,9 +4,7 @@ add_subdirectory(appwiz)
 add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence
 add_subdirectory(desk)
 add_subdirectory(hdwwiz)
-if(NOT MSVC)
-    add_subdirectory(inetcpl) # FIXME: msvc build.
-endif()
+add_subdirectory(inetcpl)
 add_subdirectory(input)
 add_subdirectory(intl)
 add_subdirectory(joy)
@@ -20,3 +18,4 @@ add_subdirectory(sysdm)
 add_subdirectory(telephon)
 add_subdirectory(timedate)
 add_subdirectory(usrmgr)
+add_subdirectory(wined3dcfg)

dll/cpl/cpl.rbuild

@@ -55,4 +55,7 @@
 <directory name="usrmgr">
 	<xi:include href="usrmgr/usrmgr.rbuild" />
 </directory>
+<directory name="wined3dcfg">
+	<xi:include href="wined3dcfg/wined3dcfg.rbuild" />
+</directory>
 </group>

dll/cpl/intl/CMakeLists.txt

@@ -28,7 +28,8 @@ add_importlibs(intl
     advapi32
     setupapi
     shell32
-    kernel32)
+    kernel32
+    ntdll)
 
 add_pch(intl intl.h)
 add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all)

dll/cpl/intl/generalp.c

@@ -331,7 +331,8 @@ GeneralPageProc(HWND hwndDlg,
                 {
                     SetNewLocale(UnattendLCID);
                     PostQuitMessage(0);
-                }
+                } else
+                    DPRINT1("VerifyUnattendLCID failed\n");
                 return TRUE;
             }
             break;

dll/cpl/intl/intl.c

@@ -67,29 +67,26 @@ OpenSetupInf(VOID)
     lpCmdLine = GetCommandLine();
 
     lpSwitch = _tcsstr(lpCmdLine, _T("/f:\""));
-
-    if(!lpSwitch)
-    {
+    if (!lpSwitch)
         return FALSE;
-    }
 
     len = _tcslen(lpSwitch);
-    if (len < 5)
-    {
-        return FALSE;
-    }
-
-    if(lpSwitch[len-1] != _T('\"'))
+    if (len < 5 || lpSwitch[len-1] != _T('\"'))
     {
+        DPRINT1("Invalid switch: %ls\n", lpSwitch);
         return FALSE;
     }
 
     lpSwitch[len-1] = _T('\0');
 
-    hSetupInf = SetupOpenInfFile(&lpSwitch[4], NULL,
-                                 INF_STYLE_OLDNT, NULL);
+    hSetupInf = SetupOpenInfFile(&lpSwitch[4], NULL, INF_STYLE_OLDNT, NULL);
+    if (hSetupInf == INVALID_HANDLE_VALUE)
+    {
+        DPRINT1("Failed to open INF file: %ls\n", &lpSwitch[4]);
+        return FALSE;
+    }
 
-    return (hSetupInf != INVALID_HANDLE_VALUE);
+    return TRUE;
 }
 
 VOID
@@ -104,6 +101,7 @@ ParseSetupInf(VOID)
                             &InfContext))
     {
         SetupCloseInfFile(hSetupInf);
+        DPRINT1("SetupFindFirstLine failed\n");
         return;
     }
 
@@ -111,6 +109,7 @@ ParseSetupInf(VOID)
                              sizeof(szBuffer) / sizeof(TCHAR), NULL))
     {
         SetupCloseInfFile(hSetupInf);
+        DPRINT1("SetupGetStringField failed\n");
         return;
     }