merge up to trunk r72363

svn path=/branches/GSoC_2016/USB/; revision=72364

Author: mvardan

CMakeLists.txt

@@ -108,9 +108,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         else()
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         endif()
     endif()
 

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

@@ -1,11 +1,4 @@
-/* 
- * FILE:       base/applications/cacls/lang/ro-RO.rc
- *             ReactOS Project (http://www.reactos.org)
- * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
- * CHANGE LOG: 2011-08-20  initial translation
- *             2011-10-17  diacritics change
- */
-
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -18,7 +11,7 @@ CACLS nume_fișier [/T] [/E] [/C] [/G utilizator:acces [...]]\n\
    /T                   Modifică ACL pentru fișierele specificate în\n\
                         directorul curent și toate subdirectoarele sale.\n\
    /E                   Editează ACL curentă evitând astfel înlocuirea ei.\n\
-   /C                   Continuă și la erori de acces interzis.\n\
+   /C                   Continuă și la erori de acces respins.\n\
    /G utilizator:acces  Acordă drepturile de acces specificate pentru utilizator.\n\
                         acces poate fi de: R  Citire\n\
                                            W  Scriere\n\

base/applications/calc/CMakeLists.txt

@@ -2,7 +2,6 @@
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
 list(APPEND SOURCE
-    about.c
     convert.c
     function.c
     rpn.c
@@ -14,11 +13,9 @@ file(GLOB calc_rc_deps res/*.*)
 add_rc_deps(resource.rc ${calc_rc_deps})
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
-add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
+add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32)
 
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    target_link_libraries(calc mingwex)
-elseif(MSVC)
+if(MSVC)
     add_importlibs(calc ntdll)
 endif()
 

base/applications/calc/about.c

@@ -41,8 +41,6 @@
 #define IDC_STATIC  ((DWORD)-1)
 #endif
 
-#define CALC_VERSION        TEXT("1.11")
-
 #define MAX_CALC_SIZE       256
 
 /*#define USE_KEYBOARD_HOOK*/

base/applications/calc/calc.h

@@ -296,22 +296,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "За ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Добре", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Изчислителят на РеактОС", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Версия:", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Написано от Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистическа кутия"
@@ -419,11 +403,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Грешка"
     IDS_QUICKHELP "Бърза помощ"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Изчислителят на РеактОС"
+    IDS_AUTHOR "Написано от Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN

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

@@ -295,22 +295,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O ReactOS Kalkulačce"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkulačka", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verze ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Autor: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistické výpočty"
@@ -418,11 +402,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS kalkulačka je svobodný software vydaný pod licencí GNU GPL.\r\n\r\nZde najdete znění GNU GPL licence:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nZde také najdete překlad GNU GPL licence:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Chyba"
     IDS_QUICKHELP "Rychlá nápověda"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkulačka"
+    IDS_AUTHOR "Autor: Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN

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

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Über ReactOS Rechner"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Rechner", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Geschrieben von Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistikbox"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Rechner ist freie Software, herausgegeben unter der GNU GPL Lizenz.\r\n\r\nSie können hier eine Kopie der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nSie können hier auch eine Übersetzung der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fehler"
     IDS_QUICKHELP "Schnellhilfe"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Rechner"
+    IDS_AUTHOR "Geschrieben von Carlo Bramini"
+END
+
 /* Konversionstypen */
 STRINGTABLE
 BEGIN

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

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Σχετικά..."
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Αριθμομηχανή", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Έκδοση ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Από τον Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Σφάλμα"
     IDS_QUICKHELP "Quick help"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Αριθμομηχανή"
+    IDS_AUTHOR "Από τον Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN

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

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Calculator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Quick help"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Calculator"
+    IDS_AUTHOR "Written by Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN

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

@@ -296,22 +296,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Acerca de la Calculadora de ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Aceptar", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculadora de ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versión ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Creada por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Cuadro de estadísticas"
@@ -419,18 +403,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "La Calculadora de ReactOS es software libre realizado bajo licencia GNU GPL.\r\n\
-	\r\n\
-	Puedes obtener una copia de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/gpl.html\r\n\
-	\r\n\
-	También puedes obtener una traducción de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/translations.html"
-	
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ayuda rápida"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculadora de ReactOS"
+    IDS_AUTHOR "Creada por Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN

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

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "À propos de la Calculatrice ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "par Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistiques"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Calculatrice ReactOS est un logiciel libre distribué sous licence GNU GPL.\r\n\r\nVous pouvez obtenir une copie de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVous pouvez aussi obtenir une traduction de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Erreur"
     IDS_QUICKHELP "Aide rapide"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculatrice ReactOS"
+    IDS_AUTHOR "par Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN