Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 5 01:27:21 2015 New Revision: 67554 URL: http://svn.reactos.org/svn/reactos?rev=67554&view=rev Log: oooops Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 01:27:21 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -//add_subdirectory(regexpl) +#add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

9 years, 4 months

[dreimer] 67553: [ROSAPPS] Disable regexpl for now because this is a strange MSVC build error...

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 5 01:25:11 2015 New Revision: 67553 URL: http://svn.reactos.org/svn/reactos?rev=67553&view=rev Log: [ROSAPPS] Disable regexpl for now because this is a strange MSVC build error... Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 01:25:11 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -add_subdirectory(regexpl) +//add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

9 years, 4 months

[dreimer] 67552: [ROSAPPS] Add some missing german translations Add some missing manifests Improve some resources Add possibility to build an application with one language

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 5 01:07:42 2015 New Revision: 67552 URL: http://svn.reactos.org/svn/reactos?rev=67552&view=rev Log: [ROSAPPS] Add some missing german translations Add some missing manifests Improve some resources Add possibility to build an application with one language Added: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc (with props) trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc trunk/rosapps/applications/imagesoft/rsrc.rc trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc trunk/rosapps/applications/screensavers/ssstars/resource.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc trunk/rosapps/applications/sysutils/ctm/ctm.rc trunk/rosapps/templates/old_wordpad/rsrc.rc Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -31,6 +31,8 @@ IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" IDI_MAIN ICON "res/main.ico" IDI_DOC ICON "res/doc.ico" + +#include <reactos/manifest_exe.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/rosapps/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/rsr… ============================================================================== --- trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -1,5 +1,7 @@ #include <windows.h> #include "resource.h" + +#include <reactos/manifest_exe.rc> /* include localised resources */ // UTF-8 Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -10,18 +10,44 @@ #define REACTOS_STR_ORIGINAL_FILENAME "scrnsave.scr\0" #include <reactos/version.rc> +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -1,14 +1,38 @@ /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#include <reactos/manifest_exe.rc> + +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -11,13 +11,32 @@ #include <reactos/version.rc> +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/no-NO.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Added: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Kreise" + IDS_TEXT "Keine Einstellungen notwendig." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -7,19 +7,47 @@ IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" IDI_ICON1 ICON DISCARDABLE "icon1.ico" +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_TH_TH + #include "lang/th-TH.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Added: trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -0,0 +1,52 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +// Dialog + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 292, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Optionen",IDC_STATIC,16,100,260,76 + RTEXT "Anzahl an Sternen:",IDC_STATIC,24,116,68,12, + SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_NUM_OF_STARS,"msctls_trackbar32", + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,96,116,140,12 + CTEXT "Static",IDC_TEXT_NUM_OF_STARS,240,116,24,12, + SS_CENTERIMAGE,WS_EX_STATICEDGE + RTEXT "Geschwindigkeit:",IDC_STATIC,24,137,68,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SPEED,"msctls_trackbar32",TBS_BOTH | + TBS_NOTICKS | WS_TABSTOP,96,137,140,12 + CTEXT "Static",IDC_TEXT_SPEED,240,137,24,12,SS_CENTERIMAGE, + WS_EX_STATICEDGE + RTEXT "Rotation:",IDC_STATIC,24,156,68,12,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_ROTATION,100,156,80,60,CBS_DROPDOWNLIST | + WS_TABSTOP + CONTROL "",IDC_IMAGE_COSMOS,"Static",SS_BITMAP | SS_CENTERIMAGE, + 4,4,284,92 + GROUPBOX "Erweitert",IDC_STATIC,16,180,260,72 + CONTROL "Hintergrund-Blending aktivieren",IDC_CHECK_DOBLENDING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 + CONTROL "Genaue Perspektivenkorrektur aktivieren", + IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,24,208,160,10 + CONTROL "Texturfilterung aktivieren",IDC_CHECK_FILTERING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 + CONTROL "Weiche Schattierungen aktivieren",IDC_CHECK_SHADING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 + PUSHBUTTON "OK",IDOK,60,260,52,16 + PUSHBUTTON "Abbrechen",IDCANCEL,120,260,52,16 + PUSHBUTTON "Ãber",IDC_BUTTON_ABOUT,179,260,52,16 +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Starfield" + IDS_ROTATION_NONE "Keine" + IDS_ROTATION_LINEAR "Linear" + IDS_ROTATION_PERIODIC "Periodisch" + IDS_LICENSE "Starfield ist freie Software verÃ¶ffentlicht unter der GNU GPL Lizenz." + IDS_AUTHOR "Erstellt von Carlo Bramini" +END Propchange: trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Advanced",IDC_STATIC,16,180,260,72 CONTROL "Enable background blending",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "Enable accurate perspective correction", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "Enable texture filtering",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "Enable smooth shading",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Cancel",IDCANCEL,120,260,52,16 PUSHBUTTON "About",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Avanzate",IDC_STATIC,16,180,260,72 CONTROL "Attiva blending sullo sfondo",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,102,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "Attiva correzione prospettica accurata", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,135,10 + WS_TABSTOP,24,208,160,10 CONTROL "Attiva filtraggio delle texture",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "Attiva illuminazione accurata",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,110,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Annulla",IDCANCEL,120,260,52,16 PUSHBUTTON "Info",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Zaawansowane",IDC_STATIC,16,180,260,72 CONTROL "WÅÄcz ÅÄczenie tÅa",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "WÅÄcz precyzyjnÄ poprawÄ perspektywy", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "WÅÄcz filtrowanie tekstur",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "WÅÄcz wygÅadzanie cieni",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Anuluj",IDCANCEL,120,260,52,16 PUSHBUTTON "O wygaszaczu",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -34,14 +34,14 @@ 4,4,284,92 GROUPBOX "A&vansateâ¦",IDC_STATIC,16,180,260,72 CONTROL "ActiveazÄ &Wamestec de fundal",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "ActiveazÄ &corecÈie finÄ de perspectivÄ", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "Activea&zÄ filtrarea texturilor",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "ActiveazÄ umbrire omogenÄ",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "Con&firmÄ",IDOK,60,260,52,16 PUSHBUTTON "A&nuleazÄ",IDCANCEL,120,260,52,16 PUSHBUTTON "&Despreâ¦",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸",IDC_STATIC,16,180,260,72 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¾Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¼ÐµÑÐ¸Ð²Ð°Ð½Ð¸Ðµ",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¾ÑÐ½ÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ¸Ñ Ð¿ÐµÑÑÐ¿ÐµÐºÑÐ¸Ð²Ñ", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¸Ð»ÑÑÑÐ°ÑÐ¸Ñ ÑÐµÐºÑÑÑÑ",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ Ð¼ÑÐ³ÐºÐ¸Ðµ ÑÐµÐ½Ð¸",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,120,260,52,16 PUSHBUTTON "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -39,13 +39,27 @@ IDB_COSMOS BITMAP DISCARDABLE "res/cosmicfractal.bmp" IDB_STAR BITMAP DISCARDABLE "res/star.bmp" +#include <reactos/manifest_exe.rc> // Language resources /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/it-IT.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/pl-PL.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -28,7 +28,7 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif -#ifdef LANGUAGE_ES_ES +#ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif #ifdef LANGUAGE_LT_LT Modified: trunk/rosapps/applications/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -11,11 +11,27 @@ /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/no-NO.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/templates/old_wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/rsrc… ============================================================================== --- trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -2,20 +2,50 @@ #include <commctrl.h> #include "resource.h" +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/fi-FI.rc" -#include "lang/fr-FR.rc" -#include "lang/it-IT.rc" -#include "lang/no-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FI_FI + #include "lang/fi-FI.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_TH_TH + #include "lang/th-TH.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

9 years, 4 months

[aandrejevic] 67551: [NTVDM] Send 0xE0 before each extended key scancode.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 5 00:55:56 2015 New Revision: 67551 URL: http://svn.reactos.org/svn/reactos?rev=67551&view=rev Log: [NTVDM] Send 0xE0 before each extended key scancode. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Tue May 5 00:55:56 2015 @@ -38,6 +38,7 @@ /* Push the scan code into the PS/2 queue */ for (i = 0; i < KeyEvent->wRepeatCount; i++) { + if (KeyEvent->dwControlKeyState & ENHANCED_KEY) PS2QueuePush(PS2Port, 0xE0); PS2QueuePush(PS2Port, ScanCode); }

9 years, 4 months

[dreimer] 67550: [ROSAPPS] Fix binpatch and systeminfo MSVC build.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 5 00:18:15 2015 New Revision: 67550 URL: http://svn.reactos.org/svn/reactos?rev=67550&view=rev Log: [ROSAPPS] Fix binpatch and systeminfo MSVC build. Modified: trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt [iso-8859-1] Tue May 5 00:18:15 2015 @@ -1,5 +1,5 @@ -add_executable(systeminfo systeminfo.c systeminfo.rc rsrc.rc) +add_executable(systeminfo systeminfo.c systeminfo.rc) set_module_type(systeminfo win32cui) add_importlibs(systeminfo user32 advapi32 netapi32 shlwapi iphlpapi ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET systeminfo DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -41,7 +41,7 @@ IDS_PRODUCT_ID, "Produkt ID" IDS_INST_DATE, "Installationsdatum" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Systemtyp" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -39,7 +39,7 @@ IDS_PRODUCT_ID, "Product ID" IDS_INST_DATE, "Install Date" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "System type" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -44,7 +44,7 @@ IDS_PRODUCT_ID, "Identificador de Producto" IDS_INST_DATE, "Fecha de InstalaciÃ³n" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Tipo de sistema" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -39,7 +39,7 @@ IDS_PRODUCT_ID, "ID du produit" IDS_INST_DATE, "Date d'installation" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Type du systÃ¨me" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -39,7 +39,7 @@ IDS_PRODUCT_ID, "ID Prodotto" IDS_INST_DATE, "Data Installazione" IDS_UP_TIME, "Tempo di Avvio Sistema" -IDS_UP_TIME_FORMAT "%u Giorno, %u Ore, %u Minuti, %u Secondi" +IDS_UP_TIME_FORMAT, "%u Giorno, %u Ore, %u Minuti, %u Secondi" IDS_SYS_MANUFACTURER, "Produttore PC" IDS_SYS_MODEL, "Modello Sistema" IDS_SYS_TYPE, "Tipo Sistema" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -39,7 +39,7 @@ IDS_PRODUCT_ID, "Produkt ID" IDS_INST_DATE, "Installert dato" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Systemtype" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -46,7 +46,7 @@ IDS_PRODUCT_ID, "ID produktu" IDS_INST_DATE, "Data instalacji" IDS_UP_TIME, "Czas pracy systemu" -IDS_UP_TIME_FORMAT "%u dni, %u godzin, %u minut, %u sekund" +IDS_UP_TIME_FORMAT, "%u dni, %u godzin, %u minut, %u sekund" IDS_SYS_MANUFACTURER, "Producent systemu" IDS_SYS_MODEL, "Model systemu" IDS_SYS_TYPE, "Rodzaj systemu" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -47,7 +47,7 @@ IDS_PRODUCT_ID, "ID produs" IDS_INST_DATE, "Data de instalare" IDS_UP_TIME, "Timp de operare" -IDS_UP_TIME_FORMAT "%u zile, %u ore, %u minute, %u secunde" +IDS_UP_TIME_FORMAT, "%u zile, %u ore, %u minute, %u secunde" IDS_SYS_MANUFACTURER, "Furnizorul sistemului" IDS_SYS_MODEL, "Modelul sistemului" IDS_SYS_TYPE, "Tipul sistemului" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -43,7 +43,7 @@ IDS_PRODUCT_ID, "ID produktu" IDS_INST_DATE, "DÂ tum inÃ§talÂ cie" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Typ systâmu" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -47,7 +47,7 @@ IDS_PRODUCT_ID, "ID Ð¿ÑÐ¾Ð´ÑÐºÑÐ°" IDS_INST_DATE, "ÐÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" IDS_SYS_MANUFACTURER, "System Manufacturer" IDS_SYS_MODEL, "System Model" IDS_SYS_TYPE, "Ð¢Ð¸Ð¿ ÑÐ¸ÑÑÐµÐ¼Ð¸" Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Tue May 5 00:18:15 2015 @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 1000 #define IDS_HOST_NAME 100 Modified: trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] Tue May 5 00:18:15 2015 @@ -1,16 +1,38 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* UTF-8 */ #pragma code_page(65001) -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/it-IT.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt [iso-8859-1] Tue May 5 00:18:15 2015 @@ -2,4 +2,7 @@ add_executable(binpatch patch.c) set_module_type(binpatch win32cui) add_importlibs(binpatch ntdll msvcrt kernel32) +if(MSVC) + target_link_libraries(binpatch oldnames) +endif() add_cd_file(TARGET binpatch DESTINATION reactos/bin FOR all)

9 years, 4 months

[hbelusca] 67549: [NTVDM]: Add a debug feature to detect which apps erroneously call by themselves the BIOS initialization routine (POST). For whatever reason it is what MSD version 2 and above does.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 5 00:11:43 2015 New Revision: 67549 URL: http://svn.reactos.org/svn/reactos?rev=67549&view=rev Log: [NTVDM]: Add a debug feature to detect which apps erroneously call by themselves the BIOS initialization routine (POST). For whatever reason it is what MSD version 2 and above does. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Tue May 5 00:11:43 2015 @@ -619,6 +619,30 @@ /* Set data segment */ setDS(BDA_SEGMENT); + /* + * Check the word at 0040h:0072h (Bda->SoftReset) and do one of the + * following actions: + * - if the word is 0000h, perform a cold reboot (aka. Reset). Everything gets initialized. + * - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped. + * In case we do a warm reboot, we need to check for the CMOS shutdown flag + * and take a suitable action. + */ + + // FIXME: This is a debug temporary check: + // Since NTVDM memory is by default initialized with 0xCC, it is also + // the case for the BDA. So at first boot we get SoftReset == 0xCCCC. + // After we zero out the BDA and put valid values in it. + // If for some reason an app calls the BIOS initialization code, + // SoftReset is normally zero (unless the app puts a non-null value in SoftReset) + // and we can detect that. With the current state of NTVDM, apps calling + // by hand the BIOS init code is a sign of a bug, e.g. see MSD.EXE version 2+. + if (Bda->SoftReset != 0xCCCC) + { + DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing seems to not behave correctly! The VDM is stopping..."); + EmulatorTerminate(); + return; + } + /* Initialize the BDA and the BIOS ROM Information */ InitializeBiosData(); InitializeBiosInfo(); @@ -677,11 +701,6 @@ /* Disable interrupts */ setIF(0); - // FIXME: Check the word at 0040h:0072h (Bda->SoftReset) and do one of the - // following actions: - // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); - // - if the word is 0000h, perform a cold reboot (aka. Reset). - /* Do the POST */ Bios32Post();

9 years, 4 months

[dreimer] 67548: [ROSAPPS] Fix symdump, ncftp and netreg MSVC build.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon May 4 23:08:17 2015 New Revision: 67548 URL: http://svn.reactos.org/svn/reactos?rev=67548&view=rev Log: [ROSAPPS] Fix symdump, ncftp and netreg MSVC build. Modified: trunk/rosapps/applications/devutils/symdump/CMakeLists.txt trunk/rosapps/applications/net/ncftp/libncftp/ftp.c trunk/rosapps/applications/net/ncftp/sio/syshdrs.h trunk/rosapps/applications/net/netreg/CMakeLists.txt Modified: trunk/rosapps/applications/devutils/symdump/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/symdump/CMakeLists.txt [iso-8859-1] Mon May 4 23:08:17 2015 @@ -3,7 +3,7 @@ add_executable(symdump symdump.c) set_module_type(symdump win32cui) target_link_libraries(symdump wine) -add_importlibs(symdump dbghelp shlwapi msvcrt kernel32) +add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll) if(NOT MSVC) add_target_compile_flags(symdump "-Wno-unused-but-set-variable") endif() Modified: trunk/rosapps/applications/net/ncftp/libncftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib… ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] Mon May 4 23:08:17 2015 @@ -10,8 +10,8 @@ char gLibNcFTPVersion[64] = kLibraryVersion; -/* #ifdef NO_SIGNALS -static char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS"; +#ifdef NO_SIGNALS +char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS"; #else static int gGotSig = 0; @@ -21,7 +21,7 @@ static jmp_buf gCancelConnectJmp; #endif -#endif */ +#endif #ifndef lint Modified: trunk/rosapps/applications/net/ncftp/sio/syshdrs.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/sio… ============================================================================== --- trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/sio/syshdrs.h [iso-8859-1] Mon May 4 23:08:17 2015 @@ -14,7 +14,7 @@ # include "wincfg.h" # include <winsock2.h> /* includes <windows.h> */ # include <io.h> -# define _POSIX_ 1 +//# define _POSIX_ 1 # ifdef HAVE_UNISTD_H # include <unistd.h> # endif Modified: trunk/rosapps/applications/net/netreg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/CM… ============================================================================== --- trunk/rosapps/applications/net/netreg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/CMakeLists.txt [iso-8859-1] Mon May 4 23:08:17 2015 @@ -2,5 +2,5 @@ set_cpp(WITH_RUNTIME WITH_STL) add_executable(netreg netreg.cpp netreg.rc) set_module_type(netreg win32cui) -add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32) +add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET netreg DESTINATION reactos/system32 FOR all)

9 years, 4 months

[aandrejevic] 67547: [FAST486] The parameter count is not pushed onto the stack for call gates.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon May 4 22:16:20 2015 New Revision: 67547 URL: http://svn.reactos.org/svn/reactos?rev=67547&view=rev Log: [FAST486] The parameter count is not pushed onto the stack for call gates. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Mon May 4 22:16:20 2015 @@ -1030,9 +1030,6 @@ } } - /* Push the parameter count */ - if (!Fast486StackPushInternal(State, GateSize, Gate->ParamCount)) return FALSE; - /* Push CS selector */ if (!Fast486StackPushInternal(State, GateSize, OldCs)) return FALSE;

9 years, 4 months

[hbelusca] 67546: [USETUP]: Instead of defining a special function "DrawInputField" just to draw an input field for entering the partition size number, just use the already existing CONSOLE_SetInpu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 4 20:50:51 2015 New Revision: 67546 URL: http://svn.reactos.org/svn/reactos?rev=67546&view=rev Log: [USETUP]: Instead of defining a special function "DrawInputField" just to draw an input field for entering the partition size number, just use the already existing CONSOLE_SetInputTextXY function (and adapt the calling code because the string buffer for the SetInputTextXY function wants a unicode string). We now have a consistent input UI for usetup. CORE-9453 #resolve #comment I committed a more elegant solution to this problem. Modified: trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] Mon May 4 20:50:51 2015 @@ -146,13 +146,6 @@ IN LPCWSTR Text); VOID -CONSOLE_SetInputTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT len, - IN LPCWSTR Text); - -VOID CONSOLE_SetInvertedTextXY( IN SHORT x, IN SHORT y, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon May 4 20:50:51 2015 @@ -392,7 +392,7 @@ Result = TRUE; break; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { Result = FALSE; break; @@ -701,7 +701,7 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) { /* a-z */ - GenericListKeyPress (LanguageList, Ir->Event.KeyEvent.uChar.AsciiChar); + GenericListKeyPress(LanguageList, Ir->Event.KeyEvent.uChar.AsciiChar); RefreshPage = TRUE; } @@ -1678,30 +1678,6 @@ } -static VOID -DrawInputField(ULONG FieldLength, - SHORT Left, - SHORT Top, - PCHAR FieldContent) -{ - CHAR buf[100]; - COORD coPos; - DWORD Written; - - coPos.X = Left; - coPos.Y = Top; - memset(buf, '_', sizeof(buf)); - buf[FieldLength - strlen(FieldContent)] = 0; - strcat(buf, FieldContent); - - WriteConsoleOutputCharacterA(StdOutput, - buf, - strlen(buf), - coPos, - &Written); -} - - #define PARTITION_SIZE_INPUT_FIELD_LENGTH 6 /* Restriction for MaxSize: pow(10, PARTITION_SIZE_INPUT_FIELD_LENGTH)-1 */ #define PARTITION_MAXSIZE 999999 @@ -1720,8 +1696,9 @@ COORD coPos; DWORD Written; CHAR Buffer[100]; + WCHAR PartitionSizeBuffer[100]; ULONG Index; - CHAR ch; + WCHAR ch; SHORT iLeft; SHORT iTop; @@ -1742,7 +1719,7 @@ WriteConsoleOutputCharacterA(StdOutput, Buffer, - strlen (Buffer), + strlen(Buffer), coPos, &Written); @@ -1751,16 +1728,16 @@ coPos.Y = iTop; WriteConsoleOutputCharacterA(StdOutput, Buffer, - strlen (Buffer), + strlen(Buffer), coPos, &Written); - sprintf(Buffer, "%lu", MaxSize); - Index = strlen(Buffer); - DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); + swprintf(PartitionSizeBuffer, L"%lu", MaxSize); + Index = wcslen(PartitionSizeBuffer); + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); while (TRUE) { @@ -1772,52 +1749,53 @@ if (Quit != NULL) *Quit = TRUE; - Buffer[0] = 0; + PartitionSizeBuffer[0] = 0; break; } - else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ + else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { break; } - else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESCAPE */ + else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESCAPE */ { if (Cancel != NULL) *Cancel = TRUE; - Buffer[0] = 0; + PartitionSizeBuffer[0] = 0; break; } else if ((Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) && /* BACKSPACE */ (Index > 0)) { Index--; - Buffer[Index] = 0; - - DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); + PartitionSizeBuffer[Index] = 0; + + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); } else if ((Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) && (Index < PARTITION_SIZE_INPUT_FIELD_LENGTH)) { - ch = Ir.Event.KeyEvent.uChar.AsciiChar; - - if ((ch >= '0') && (ch <= '9')) - { - Buffer[Index] = ch; + ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar; + + if ((ch >= L'0') && (ch <= L'9')) + { + PartitionSizeBuffer[Index] = ch; Index++; - Buffer[Index] = 0; - - DrawInputField(PARTITION_SIZE_INPUT_FIELD_LENGTH, - iLeft, - iTop, - Buffer); - } - } - } - - strcpy(InputBuffer, Buffer); + PartitionSizeBuffer[Index] = 0; + + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); + } + } + } + + /* Convert UNICODE --> ANSI the poor man's way */ + sprintf(InputBuffer, "%S", PartitionSizeBuffer); } @@ -3910,7 +3888,7 @@ break; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { if (Line == 12) { @@ -3958,7 +3936,7 @@ break; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE) {

9 years, 4 months

[aandrejevic] 67545: [FAST486] - Implement call gates. - Fix Fast486InterruptInternal and get rid of ugly hacks. - Fix IRET (CS loaded too early). - Add a structure definition for the 16-bit TSS (n...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon May 4 19:14:23 2015 New Revision: 67545 URL: http://svn.reactos.org/svn/reactos?rev=67545&view=rev Log: [FAST486] - Implement call gates. - Fix Fast486InterruptInternal and get rid of ugly hacks. - Fix IRET (CS loaded too early). - Add a structure definition for the 16-bit TSS (not supported yet). Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Mon May 4 19:14:23 2015 @@ -75,15 +75,18 @@ #define FAST486_DR4_RESERVED 0xFFFF1FF0 #define FAST486_DR5_RESERVED 0x0000DC00 -#define FAST486_LDT_SIGNATURE 0x02 -#define FAST486_TASK_GATE_SIGNATURE 0x05 -#define FAST486_IDT_INT_GATE 0x06 -#define FAST486_IDT_TRAP_GATE 0x07 -#define FAST486_TSS_SIGNATURE 0x09 -#define FAST486_BUSY_TSS_SIGNATURE 0x0B -#define FAST486_CALL_GATE_SIGNATURE 0x0C -#define FAST486_IDT_INT_GATE_32 0x0E -#define FAST486_IDT_TRAP_GATE_32 0x0F +#define FAST486_TSS_16_SIGNATURE 0x01 +#define FAST486_LDT_SIGNATURE 0x02 +#define FAST486_BUSY_TSS_16_SIGNATURE 0x03 +#define FAST486_CALL_GATE_16_SIGNATURE 0x04 +#define FAST486_TASK_GATE_SIGNATURE 0x05 +#define FAST486_IDT_INT_GATE 0x06 +#define FAST486_IDT_TRAP_GATE 0x07 +#define FAST486_TSS_SIGNATURE 0x09 +#define FAST486_BUSY_TSS_SIGNATURE 0x0B +#define FAST486_CALL_GATE_SIGNATURE 0x0C +#define FAST486_IDT_INT_GATE_32 0x0E +#define FAST486_IDT_TRAP_GATE_32 0x0F #define FAST486_PREFIX_SEG (1 << 0) #define FAST486_PREFIX_OPSIZE (1 << 1) @@ -353,44 +356,6 @@ /* Verify the structure size */ C_ASSERT(sizeof(FAST486_IDT_ENTRY) == sizeof(ULONGLONG)); - -#include <poppack.h> - -typedef struct _FAST486_TABLE_REG -{ - USHORT Size; - ULONG Address; -} FAST486_TABLE_REG, *PFAST486_TABLE_REG; - -typedef union _FAST486_FLAGS_REG -{ - USHORT LowWord; - ULONG Long; - - struct - { - ULONG Cf : 1; - ULONG AlwaysSet : 1; - ULONG Pf : 1; - ULONG Reserved0 : 1; - ULONG Af : 1; - ULONG Reserved1 : 1; - ULONG Zf : 1; - ULONG Sf : 1; - ULONG Tf : 1; - ULONG If : 1; - ULONG Df : 1; - ULONG Of : 1; - ULONG Iopl : 2; - ULONG Nt : 1; - ULONG Reserved2 : 1; - ULONG Rf : 1; - ULONG Vm : 1; - ULONG Ac : 1; - - // ULONG Reserved : 13; - }; -} FAST486_FLAGS_REG, *PFAST486_FLAGS_REG; typedef struct _FAST486_TSS { @@ -421,6 +386,70 @@ ULONG Ldtr; ULONG IopbOffset; } FAST486_TSS, *PFAST486_TSS; + +typedef struct _FAST486_LEGACY_TSS +{ + USHORT Link; + USHORT Sp0; + USHORT Ss0; + USHORT Sp1; + USHORT Ss1; + USHORT Sp2; + USHORT Ss2; + USHORT Ip; + USHORT Flags; + USHORT Ax; + USHORT Cx; + USHORT Dx; + USHORT Bx; + USHORT Sp; + USHORT Bp; + USHORT Si; + USHORT Di; + USHORT Es; + USHORT Cs; + USHORT Ss; + USHORT Ds; + USHORT Ldtr; +} FAST486_LEGACY_TSS, *PFAST486_LEGACY_TSS; + +#include <poppack.h> + +typedef struct _FAST486_TABLE_REG +{ + USHORT Size; + ULONG Address; +} FAST486_TABLE_REG, *PFAST486_TABLE_REG; + +typedef union _FAST486_FLAGS_REG +{ + USHORT LowWord; + ULONG Long; + + struct + { + ULONG Cf : 1; + ULONG AlwaysSet : 1; + ULONG Pf : 1; + ULONG Reserved0 : 1; + ULONG Af : 1; + ULONG Reserved1 : 1; + ULONG Zf : 1; + ULONG Sf : 1; + ULONG Tf : 1; + ULONG If : 1; + ULONG Df : 1; + ULONG Of : 1; + ULONG Iopl : 2; + ULONG Nt : 1; + ULONG Reserved2 : 1; + ULONG Rf : 1; + ULONG Vm : 1; + ULONG Ac : 1; + + // ULONG Reserved : 13; + }; +} FAST486_FLAGS_REG, *PFAST486_FLAGS_REG; typedef struct _FAST486_FPU_DATA_REG { Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Mon May 4 19:14:23 2015 @@ -292,38 +292,30 @@ BOOLEAN PushErrorCode, ULONG ErrorCode) { - USHORT SegmentSelector = IdtEntry->Selector; - ULONG Offset = MAKELONG(IdtEntry->Offset, IdtEntry->OffsetHigh); - ULONG GateType = IdtEntry->Type; - BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) || - (GateType == FAST486_IDT_TRAP_GATE_32); - - BOOLEAN Success = FALSE; - ULONG OldPrefixFlags = State->PrefixFlags; + BOOLEAN GateSize = (IdtEntry->Type == FAST486_IDT_INT_GATE_32) || + (IdtEntry->Type == FAST486_IDT_TRAP_GATE_32); + USHORT OldCs = State->SegmentRegs[FAST486_REG_CS].Selector; + ULONG OldEip = State->InstPtr.Long; + ULONG OldFlags = State->Flags.Long; + UCHAR OldCpl = State->Cpl; /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { - FAST486_TSS Tss; USHORT OldSs = State->SegmentRegs[FAST486_REG_SS].Selector; ULONG OldEsp = State->GeneralRegs[FAST486_REG_ESP].Long; - if (GateType == FAST486_TASK_GATE_SIGNATURE) + if (IdtEntry->Type == FAST486_TASK_GATE_SIGNATURE) { /* Task call */ return Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector); } - if (GateSize != (State->SegmentRegs[FAST486_REG_CS].Size)) - { - /* The gate size doesn't match the current operand size, so set the OPSIZE flag. */ - State->PrefixFlags |= FAST486_PREFIX_OPSIZE; - } - /* Check if the interrupt handler is more privileged or if we're in V86 mode */ - if ((Fast486GetCurrentPrivLevel(State) > GET_SEGMENT_RPL(SegmentSelector)) - || State->Flags.Vm) - { + if ((OldCpl > GET_SEGMENT_RPL(IdtEntry->Selector)) || State->Flags.Vm) + { + FAST486_TSS Tss; + /* Read the TSS */ if (!Fast486ReadLinearMemory(State, State->TaskReg.Base, @@ -331,29 +323,11 @@ sizeof(Tss))) { /* Exception occurred */ - goto Cleanup; + return FALSE; } /* Switch to the new privilege level */ - State->Cpl = GET_SEGMENT_RPL(SegmentSelector); - - if (State->Flags.Vm) - { - /* Clear the VM flag */ - State->Flags.Vm = FALSE; - - /* Push GS, FS, DS and ES */ - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_GS].Selector)) goto Cleanup; - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_FS].Selector)) goto Cleanup; - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_DS].Selector)) goto Cleanup; - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_ES].Selector)) goto Cleanup; - - /* Now load them with NULL selectors, since they are useless in protected mode */ - if (!Fast486LoadSegment(State, FAST486_REG_GS, 0)) goto Cleanup; - if (!Fast486LoadSegment(State, FAST486_REG_FS, 0)) goto Cleanup; - if (!Fast486LoadSegment(State, FAST486_REG_DS, 0)) goto Cleanup; - if (!Fast486LoadSegment(State, FAST486_REG_ES, 0)) goto Cleanup; - } + State->Cpl = GET_SEGMENT_RPL(IdtEntry->Selector); /* Check the new (higher) privilege level */ switch (State->Cpl) @@ -363,7 +337,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) { /* Exception occurred */ - goto Cleanup; + return FALSE; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; @@ -375,7 +349,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) { /* Exception occurred */ - goto Cleanup; + return FALSE; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; @@ -387,7 +361,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) { /* Exception occurred */ - goto Cleanup; + return FALSE; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; @@ -400,73 +374,90 @@ ASSERT(FALSE); } } + } + + /* Load new CS */ + if (!Fast486LoadSegment(State, FAST486_REG_CS, IdtEntry->Selector)) + { + /* An exception occurred during the jump */ + return FALSE; + } + + if (GateSize) + { + /* 32-bit code segment, use EIP */ + State->InstPtr.Long = MAKELONG(IdtEntry->Offset, IdtEntry->OffsetHigh); + } + else + { + /* 16-bit code segment, use IP */ + State->InstPtr.LowWord = IdtEntry->Offset; + } + + /* Check if the interrupt handler is more privileged or we're in VM86 mode (again) */ + if ((OldCpl > GET_SEGMENT_RPL(IdtEntry->Selector)) || State->Flags.Vm) + { + if (State->Flags.Vm) + { + /* Clear the VM flag */ + State->Flags.Vm = FALSE; + + /* Push GS, FS, DS and ES */ + if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_GS].Selector)) return FALSE; + if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_FS].Selector)) return FALSE; + if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_DS].Selector)) return FALSE; + if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_ES].Selector)) return FALSE; + + /* Now load them with NULL selectors, since they are useless in protected mode */ + if (!Fast486LoadSegment(State, FAST486_REG_GS, 0)) return FALSE; + if (!Fast486LoadSegment(State, FAST486_REG_FS, 0)) return FALSE; + if (!Fast486LoadSegment(State, FAST486_REG_DS, 0)) return FALSE; + if (!Fast486LoadSegment(State, FAST486_REG_ES, 0)) return FALSE; + } /* Push SS selector */ - if (!Fast486StackPush(State, OldSs)) goto Cleanup; - - /* Push stack pointer */ - if (!Fast486StackPush(State, OldEsp)) goto Cleanup; + if (!Fast486StackPushInternal(State, GateSize, OldSs)) return FALSE; + + /* Push the stack pointer */ + if (!Fast486StackPushInternal(State, GateSize, OldEsp)) return FALSE; } } else { - if (State->SegmentRegs[FAST486_REG_CS].Size) - { - /* Set OPSIZE, because INT always pushes 16-bit values in real mode */ - State->PrefixFlags |= FAST486_PREFIX_OPSIZE; - } + /* Load new CS */ + if (!Fast486LoadSegment(State, FAST486_REG_CS, IdtEntry->Selector)) + { + /* An exception occurred during the jump */ + return FALSE; + } + + /* Set the new IP */ + State->InstPtr.LowWord = IdtEntry->Offset; } /* Push EFLAGS */ - if (!Fast486StackPush(State, State->Flags.Long)) goto Cleanup; + if (!Fast486StackPushInternal(State, GateSize, OldFlags)) return FALSE; /* Push CS selector */ - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) goto Cleanup; + if (!Fast486StackPushInternal(State, GateSize, OldCs)) return FALSE; /* Push the instruction pointer */ - if (!Fast486StackPush(State, State->InstPtr.Long)) goto Cleanup; + if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE; if (PushErrorCode) { /* Push the error code */ - if (!Fast486StackPush(State, ErrorCode)) - { - /* An exception occurred */ - goto Cleanup; - } - } - - if ((GateType == FAST486_IDT_INT_GATE) || (GateType == FAST486_IDT_INT_GATE_32)) + if (!Fast486StackPushInternal(State, GateSize, ErrorCode)) return FALSE; + } + + if ((IdtEntry->Type == FAST486_IDT_INT_GATE) + || (IdtEntry->Type == FAST486_IDT_INT_GATE_32)) { /* Disable interrupts after a jump to an interrupt gate handler */ State->Flags.If = FALSE; } - /* Load new CS */ - if (!Fast486LoadSegment(State, FAST486_REG_CS, SegmentSelector)) - { - /* An exception occurred during the jump */ - goto Cleanup; - } - - if (GateSize) - { - /* 32-bit code segment, use EIP */ - State->InstPtr.Long = Offset; - } - else - { - /* 16-bit code segment, use IP */ - State->InstPtr.LowWord = LOWORD(Offset); - } - - Success = TRUE; - -Cleanup: - /* Restore the prefix flags */ - State->PrefixFlags = OldPrefixFlags; - - return Success; + return TRUE; } BOOLEAN @@ -876,4 +867,180 @@ return TRUE; } +BOOLEAN +FASTCALL +Fast486CallGate(PFAST486_STATE State, + PFAST486_CALL_GATE Gate, + BOOLEAN Call) +{ + BOOLEAN Valid; + FAST486_GDT_ENTRY NewCodeSegment; + BOOLEAN GateSize = (Gate->Type == FAST486_CALL_GATE_SIGNATURE); + FAST486_TSS Tss; + USHORT OldCs = State->SegmentRegs[FAST486_REG_CS].Selector; + ULONG OldEip = State->InstPtr.Long; + USHORT OldCpl = State->Cpl; + USHORT OldSs = State->SegmentRegs[FAST486_REG_SS].Selector; + ULONG OldEsp = State->GeneralRegs[FAST486_REG_ESP].Long; + ULONG ParamBuffer[32]; /* Maximum possible size - 32 DWORDs */ + PULONG LongParams = (PULONG)ParamBuffer; + PUSHORT ShortParams = (PUSHORT)ParamBuffer; + + if (!Gate->Selector) + { + /* The code segment is NULL */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!Fast486ReadDescriptorEntry(State, Gate->Selector, &Valid, &NewCodeSegment)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Valid || (NewCodeSegment.Dpl > Fast486GetCurrentPrivLevel(State))) + { + /* Code segment invalid */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Gate->Selector); + return FALSE; + } + + if (Call && Gate->ParamCount) + { + /* Read the parameters */ + if (!Fast486ReadMemory(State, + FAST486_REG_SS, + OldEsp, + FALSE, + ParamBuffer, + Gate->ParamCount * sizeof(ULONG))) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Check if the new code segment is more privileged */ + if (NewCodeSegment.Dpl < OldCpl) + { + if (Call) + { + /* Read the TSS */ + if (!Fast486ReadLinearMemory(State, + State->TaskReg.Base, + &Tss, + sizeof(Tss))) + { + /* Exception occurred */ + return FALSE; + } + + /* Switch to the new privilege level */ + State->Cpl = NewCodeSegment.Dpl; + + /* Check the new (higher) privilege level */ + switch (State->Cpl) + { + case 0: + { + if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; + + break; + } + + case 1: + { + if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; + + break; + } + + case 2: + { + if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; + + break; + } + + default: + { + /* Should never reach here! */ + ASSERT(FALSE); + } + } + } + else if (!NewCodeSegment.DirConf) + { + /* This is not allowed for jumps */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Gate->Selector); + return FALSE; + } + } + + /* Load new CS */ + if (!Fast486LoadSegment(State, FAST486_REG_CS, Gate->Selector)) + { + /* An exception occurred during the jump */ + return FALSE; + } + + /* Set the instruction pointer */ + if (GateSize) State->InstPtr.Long = MAKELONG(Gate->Offset, Gate->OffsetHigh); + else State->InstPtr.Long = Gate->Offset; + + if (Call) + { + INT i; + + /* Check if the new code segment is more privileged (again) */ + if (NewCodeSegment.Dpl < OldCpl) + { + /* Push SS selector */ + if (!Fast486StackPushInternal(State, GateSize, OldSs)) return FALSE; + + /* Push stack pointer */ + if (!Fast486StackPushInternal(State, GateSize, OldEsp)) return FALSE; + } + + /* Push the parameters in reverse order */ + for (i = Gate->ParamCount - 1; i >= 0; i--) + { + if (!Fast486StackPushInternal(State, + GateSize, + GateSize ? LongParams[i] : ShortParams[i])) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Push the parameter count */ + if (!Fast486StackPushInternal(State, GateSize, Gate->ParamCount)) return FALSE; + + /* Push CS selector */ + if (!Fast486StackPushInternal(State, GateSize, OldCs)) return FALSE; + + /* Push the instruction pointer */ + if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE; + } + + return TRUE; +} + /* EOF */ Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Mon May 4 19:14:23 2015 @@ -183,6 +183,15 @@ USHORT Selector ); +BOOLEAN +FASTCALL +Fast486CallGate +( + PFAST486_STATE State, + PFAST486_CALL_GATE Gate, + BOOLEAN Call +); + /* INLINED FUNCTIONS **********************************************************/ #include "common.inl" Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Mon May 4 19:14:23 2015 @@ -297,19 +297,12 @@ FORCEINLINE BOOLEAN FASTCALL -Fast486StackPush(PFAST486_STATE State, - ULONG Value) -{ - BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; +Fast486StackPushInternal(PFAST486_STATE State, BOOLEAN Size, ULONG Value) +{ ULONG StackPointer = State->GeneralRegs[FAST486_REG_ESP].Long; - /* The OPSIZE prefix toggles the size */ - TOGGLE_OPSIZE(Size); - if (Size) { - /* 32-bit size */ - /* Check if ESP is between 1 and 3 */ if (State->GeneralRegs[FAST486_REG_ESP].Long >= 1 && State->GeneralRegs[FAST486_REG_ESP].Long <= 3) @@ -344,9 +337,6 @@ } else { - /* 16-bit size */ - USHORT ShortValue = LOWORD(Value); - /* Check if SP is 1 */ if (State->GeneralRegs[FAST486_REG_ESP].LowWord == 1) { @@ -360,7 +350,7 @@ State->SegmentRegs[FAST486_REG_SS].Size ? StackPointer - sizeof(USHORT) : LOWORD(StackPointer - sizeof(USHORT)), - &ShortValue, + &Value, sizeof(USHORT))) { /* Exception occurred */ @@ -380,6 +370,20 @@ } return TRUE; +} + +FORCEINLINE +BOOLEAN +FASTCALL +Fast486StackPush(PFAST486_STATE State, ULONG Value) +{ + BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; + + /* The OPSIZE prefix toggles the size */ + TOGGLE_OPSIZE(Size); + + /* Call the internal function */ + return Fast486StackPushInternal(State, Size, Value); } FORCEINLINE @@ -778,12 +782,25 @@ return FALSE; } + case FAST486_CALL_GATE_16_SIGNATURE: case FAST486_CALL_GATE_SIGNATURE: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - Fast486Exception(State, FAST486_EXCEPTION_UD); + if ((Descriptor.Dpl < Fast486GetCurrentPrivLevel(State)) + && (Descriptor.Dpl < GET_SEGMENT_RPL(Selector))) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + if (!Descriptor.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + + Fast486CallGate(State, (PFAST486_CALL_GATE)&Descriptor, Call); + + /* The gate has been processed here, so return FALSE */ return FALSE; } Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Mon May 4 19:14:23 2015 @@ -4707,17 +4707,6 @@ return; } - /* Load the new CS */ - if (!Fast486LoadSegment(State, FAST486_REG_CS, CodeSel)) - { - /* Exception occurred */ - return; - } - - /* Set EIP */ - if (Size) State->InstPtr.Long = InstPtr; - else State->InstPtr.LowWord = LOWORD(InstPtr); - if (GET_SEGMENT_RPL(CodeSel) > OldCpl) { /* Pop ESP */ @@ -4734,6 +4723,17 @@ return; } } + + /* Load the new CS */ + if (!Fast486LoadSegment(State, FAST486_REG_CS, CodeSel)) + { + /* Exception occurred */ + return; + } + + /* Set EIP */ + if (Size) State->InstPtr.Long = InstPtr; + else State->InstPtr.LowWord = LOWORD(InstPtr); /* Update the CPL */ State->Cpl = GET_SEGMENT_RPL(CodeSel);

9 years, 4 months

← Newer
1
...
41
42
43
44
45
46
47
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015