Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 26803: a better winmine icon
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 02:27:34 2007 New Revision: 26803 URL: http://svn.reactos.org/svn/reactos?rev=26803&view=rev Log: a better winmine icon Modified: trunk/reactos/base/applications/games/winemine/rc/winemine.ico Modified: trunk/reactos/base/applications/games/winemine/rc/winemine.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 26802: add a regedit icon, made for ReactOS by Taliesin Penfound (tpenfound at gmail!com)
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 02:20:35 2007 New Revision: 26802 URL: http://svn.reactos.org/svn/reactos?rev=26802&view=rev Log: add a regedit icon, made for ReactOS by Taliesin Penfound (tpenfound at gmail!com) Modified: trunk/reactos/base/applications/regedit/res/regedit.ico Modified: trunk/reactos/base/applications/regedit/res/regedit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 26801: Implement sound acessibility settings.
by ekohl＠svn.reactos.org 15 May '07

15 May '07

Author: ekohl Date: Wed May 16 01:59:14 2007 New Revision: 26801 URL: http://svn.reactos.org/svn/reactos?rev=26801&view=rev Log: Implement sound acessibility settings. Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Zvuk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Funkce Popis zvuku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Funkce Popis zvuku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Pouijte funkci Zobrazení zvuku, pokud chcete aby ReactOS vizuálnì upozoròoval na kadý zvuk vydaný systémem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Pouívat funkci Popis zvuku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20),14 - PUSHBUTTON "&Nastavení",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Pouívat funkci Popis zvuku",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(20),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" IDS_CPLSYSTEMDESCRIPTION "Upraví monosti usnadnìní pro tento poèítaè." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,16 @@ CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 - PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Darstellungsoptionen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) + LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 + LTEXT "Zu verwendende Warnsignale:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+2 + LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -50,7 +52,6 @@ AUTOCHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14 PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END - IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Drücken Sie fünfmal die Umschalttaste um die Einrastfunktion zu aktivieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" IDS_CPLSYSTEMDESCRIPTION "Stellen sie die Bedienbarkeitsfunktionen für ihren Computer ein." + + IDS_SENTRY_NONE "[Keine]" + IDS_SENTRY_TITLE "Aktive Titelleiste blinkt" + IDS_SENTRY_WINDOW "Aktives Fenster blinkt" + IDS_SENTRY_DISPLAY "Desktop blinkt" END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -96,7 +97,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -107,4 +108,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Wed May 16 01:59:14 2007 @@ -30,14 +30,15 @@ CAPTION "Sonidos" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Opcione&s",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -100,7 +101,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -111,4 +112,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" IDS_CPLSYSTEMDESCRIPTION "Cambia las características de accesibilidad disponibles para su computadora." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Wed May 16 01:59:14 2007 @@ -28,14 +28,15 @@ CAPTION "Son" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Sons visuels",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Sons visuels",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Utilisez les sons visuels si vous voulez que Reactos génère un avertissement visuel lorsque votre système émet un son.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Paramètres",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il génèrent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il génèrent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -98,7 +99,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -109,4 +110,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibilité" IDS_CPLSYSTEMDESCRIPTION "Adapte les fonctionnalités d'accessibilité pour votre ordinateur." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Wed May 16 01:59:14 2007 @@ -28,14 +28,15 @@ CAPTION "Hang" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "HangFigyelõ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "HangFigyelõ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ezt a funkciót akkor használja, ha szeretné, hogy a Reactos látható figyelmeztetéseket küldjön olyankor, amikor a rendszer hangjelzést ad.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&HangFigyelõ használata",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Beállítások",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14 + AUTOCHECKBOX "&HangFigyelõ használata",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Ezzel a funkcióval adhatja meg programjainak, hogy a hangokhoz jelenítsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Ezzel a funkcióval adhatja meg programjainak, hogy a hangokhoz jelenítsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -98,7 +99,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -109,4 +110,9 @@ BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" IDS_CPLSYSTEMDESCRIPTION "A kisegítõ lehetõségek testreszabása a számítógépén." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,15 @@ CAPTION "Suara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Gunakan SoundSentry jika anda ingin Reactos untuk membuat peringatan visual ketika sistem anda membuat suara.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Gunakan &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Setelan",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Gunakan &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Gunakan ShowSounds untuk memberitahu program anda untuk menampilkan judul untuk speech dan suara yang dibuatnya.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Gunakan ShowSounds untuk memberitahu program anda untuk menampilkan judul untuk speech dan suara yang dibuatnya.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" IDS_CPLSYSTEMDESCRIPTION "Mengkustomisasi fitur aksesibilitas untuk komputer anda." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Suoni" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Usa questa opzione se vuoi una segnalazione visiva in corrispondenza delle segnalazioni acustiche.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Impostazioni",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "TEh" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "TEhÊm",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "TEhÊm",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "VXeª¹ðÂç·Æ«AoIÉÊmðoµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "TEhÊmðg¤(&S)",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Ýè(&S)",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "TEhÊmðg¤(&S)",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "TEhðà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "vOª¹ðÂç·Æ«AÂç·¹ÉÂ¢Äðàð\\¦µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "TEhðà",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "vOª¹ðÂç·Æ«AÂç·¹ÉÂ¢Äðàð\\¦µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "[U[â" IDS_CPLSYSTEMDESCRIPTION "oA®oAlÌóÔÉí¹ÄA[U[ðâ·é@\\ð²®µÜ·B" + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,15 @@ CAPTION "Geluid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "U kunt Geluidswaarschuwingen gebruiken als u wilt dat Reactos visuele visuele waarschuwingen weergeeft wanneer het systeem een geluid laat horen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Inst&ellingen...",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" IDS_CPLSYSTEMDESCRIPTION "Toehangelijkheidsopties voor deze computer aanpassen." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Wed May 16 01:59:14 2007 @@ -30,14 +30,15 @@ CAPTION "Dwiêk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Wartownik Dwiêku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Wartownik Dwiêku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "U¿yj funkcji Wartownik Dwiêku jeli chcesz, ¿eby ReactOS pokazywa³ wizualne ostrze¿enia w chwili generacji dwiêku.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji &Wartownik Dwiêku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Ustawienia",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "U¿yj funkcji &Wartownik Dwiêku",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -100,7 +101,7 @@ BEGIN GROUPBOX "Klawisze",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Nacinij klawisz SHIFT 5 razy by aktywowaæ funkcjê KlawiszeTrwa³e.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -111,4 +112,9 @@ BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na twoim komputerze." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Çâóê" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ñîïðîâîæäåíèå çâóêîâûõ ñèãíàëîâ âèçóàëüíûì îïîâåùåíèåì.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Íàñòðîéêà",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé Âàøåãî êîìïüþòåðà." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Wed May 16 01:59:14 2007 @@ -25,6 +25,12 @@ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_SENTRY_NONE 1501 +#define IDS_SENTRY_TITLE 1502 +#define IDS_SENTRY_WINDOW 1503 +#define IDS_SENTRY_DISPLAY 1504 + + /* controls */ #define IDC_STICKY_BOX 200 #define IDC_STICKY_BUTTON 201 @@ -32,23 +38,30 @@ #define IDC_FILTER_BUTTON 203 #define IDC_TOGGLE_BOX 204 #define IDC_TOGGLE_BUTTON 205 + #define IDC_SENTRY_BOX 206 -#define IDC_SENTRY_BUTTON 207 -#define IDC_SSHOW_BOX 208 -#define IDC_CONTRAST_BOX 209 -#define IDC_CONTRAST_BUTTON 210 -#define IDC_MOUSE_BOX 211 -#define IDC_MOUSE_BUTTON 212 -#define IDC_RESET_BOX 213 -#define IDC_RESET_COMBO 214 -#define IDC_NOTIFICATION_MESSAGE 215 -#define IDC_NOTIFICATION_SOUND 216 -#define IDC_SERIAL_BOX 217 -#define IDC_SERIAL_BUTTON 218 -#define IDC_ADMIN_LOGON_BOX 219 -#define IDC_ADMIN_USERS_BOX 220 +#define IDC_SENTRY_TEXT 207 +#define IDC_SENTRY_COMBO 208 +#define IDC_SSHOW_BOX 209 -#define IDC_STICKY_ACTVATE 221 +#define IDC_CONTRAST_BOX 211 +#define IDC_CONTRAST_BUTTON 212 +#define IDC_MOUSE_BOX 213 +#define IDC_MOUSE_BUTTON 214 +#define IDC_RESET_BOX 215 +#define IDC_RESET_COMBO 216 +#define IDC_NOTIFICATION_MESSAGE 217 +#define IDC_NOTIFICATION_SOUND 218 +#define IDC_SERIAL_BOX 219 +#define IDC_SERIAL_BUTTON 220 +#define IDC_ADMIN_LOGON_BOX 221 +#define IDC_ADMIN_USERS_BOX 222 + +#define IDC_STICKY_ACTVATE_CHECK 221 +#define IDC_STICKY_LOCK_CHECK 222 +#define IDC_STICKY_UNLOCK_CHECK 223 +#define IDC_STICKY_SIGNAL_CHECK 224 +#define IDC_STICKY_STATUS_CHECK 225 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Wed May 16 01:59:14 2007 @@ -2,16 +2,78 @@ * * PROJECT: ReactOS System Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c - * PURPOSE: Memory, start-up and profiles settings + * FILE: dll/cpl/access/sound.c + * PURPOSE: Sound-related acessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ #include <windows.h> +#include <commctrl.h> +#include <prsht.h> #include <stdlib.h> #include "resource.h" #include "access.h" + + +typedef struct _SOUNDDATA +{ + SOUNDSENTRY ssSoundSentry; + BOOL bShowSounds; +} SOUNDDATA, *PSOUNDDATA; + + +static VOID +OnInitDialog(HWND hwndDlg, PSOUNDDATA pSoundData) +{ + TCHAR szBuffer[256]; + UINT i; + + pSoundData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); + SystemParametersInfo(SPI_GETSOUNDSENTRY, + sizeof(SOUNDSENTRY), + &pSoundData->ssSoundSentry, + 0); + + SystemParametersInfo(SPI_GETSHOWSOUNDS, + 0, + &pSoundData->bShowSounds, + 0); + + /* Add strings to the combo-box */ + for (i = 0; i < 4; i++) + { + LoadString(hApplet, IDS_SENTRY_NONE + i, szBuffer, 256); + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + /* Select a combo-box item */ + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pSoundData->ssSoundSentry.iWindowsEffect, 0); + + /* Initialize SoundSentry settings */ + if (!(pSoundData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_BOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), FALSE); + } + else + { + if (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) + { + CheckDlgButton(hwndDlg, IDC_SENTRY_BOX, BST_CHECKED); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), FALSE); + } + } + + /* Initialize ShowSounds settings */ + if (pSoundData->bShowSounds) + CheckDlgButton(hwndDlg, IDC_SSHOW_BOX, BST_CHECKED); +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -20,29 +82,70 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + PSOUNDDATA pSoundData; + + pSoundData = (PSOUNDDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: + pSoundData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUNDDATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSoundData); + + OnInitDialog(hwndDlg, pSoundData); break; + case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SENTRY_BOX: + pSoundData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; - case IDC_SENTRY_BUTTON: + case IDC_SENTRY_COMBO: + if (HIWORD(wParam) == CBN_SELENDOK) + { + pSoundData->ssSoundSentry.iWindowsEffect = + (DWORD)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; case IDC_SSHOW_BOX: + pSoundData->bShowSounds = !pSoundData->bShowSounds; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; default: break; } break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + SystemParametersInfo(SPI_SETSOUNDSENTRY, + sizeof(SOUNDSENTRY), + &pSoundData->ssSoundSentry, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETSHOWSOUNDS, + pSoundData->bShowSounds, + 0, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + return TRUE; + + default: + break; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pSoundData); + break; } return FALSE;

1 0

[gedmurphy] 26800: a couple of simple aesthetic changes
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 01:37:55 2007 New Revision: 26800 URL: http://svn.reactos.org/svn/reactos?rev=26800&view=rev Log: a couple of simple aesthetic changes Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/Resources/snapshot.png Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Wed May 16 01:37:55 2007 @@ -25,7 +25,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("ReactOS", 0); + System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("ReactOS", 0); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.ImageListView = new System.Windows.Forms.ListView(); this.columnName = new System.Windows.Forms.ColumnHeader(); @@ -45,18 +45,22 @@ this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); - this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); - this.MainMenu = new System.Windows.Forms.MenuStrip(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuFileExit = new System.Windows.Forms.ToolStripMenuItem(); + this.mainmenuOptions = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuHelp = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); - this.MainMenu.SuspendLayout(); + this.mainMenu.SuspendLayout(); this.SuspendLayout(); // // ImageListView @@ -71,7 +75,7 @@ this.columnDebug}); this.ImageListView.FullRowSelect = true; this.ImageListView.Items.AddRange(new System.Windows.Forms.ListViewItem[] { - listViewItem2}); + listViewItem1}); this.ImageListView.Location = new System.Drawing.Point(12, 52); this.ImageListView.Name = "ImageListView"; this.ImageListView.Size = new System.Drawing.Size(516, 237); @@ -130,6 +134,7 @@ this.toolbarLaunch.Name = "toolbarLaunch"; this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; // // toolbarStop // @@ -138,6 +143,7 @@ this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarStop.Name = "toolbarStop"; this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; // // toolbarSep1 // @@ -151,6 +157,7 @@ this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarImageAdd.Name = "toolbarImageAdd"; this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; // // toolbarImageDel // @@ -159,6 +166,7 @@ this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarImageDel.Name = "toolbarImageDel"; this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; // // toolbarSep2 // @@ -172,11 +180,12 @@ this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarHelpContents.Name = "toolbarHelpContents"; this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - // - // toolbarSep3 - // - this.toolbarSep3.Name = "toolbarSep3"; - this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarSep4 + // + this.toolbarSep4.Name = "toolbarSep4"; + this.toolbarSep4.Size = new System.Drawing.Size(6, 25); // // toolbarExit // @@ -185,6 +194,7 @@ this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarExit.Name = "toolbarExit"; this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; // // mainToolbar // @@ -195,23 +205,52 @@ this.toolbarImageAdd, this.toolbarImageDel, this.toolbarSep2, + this.toolbarSnapShot, + this.toolbarScreenShot, + this.toolbarSep3, this.toolbarHelpContents, - this.toolbarSep3, + this.toolbarSep4, this.toolbarExit}); this.mainToolbar.Location = new System.Drawing.Point(0, 24); this.mainToolbar.Name = "mainToolbar"; this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // - // MainMenu - // - this.MainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + // toolbarSnapShot + // + this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarSnapShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarSnapShot.Image"))); + this.toolbarSnapShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarSnapShot.Name = "toolbarSnapShot"; + this.toolbarSnapShot.Size = new System.Drawing.Size(23, 22); + this.toolbarSnapShot.Text = "toolStripButton1"; + this.toolbarSnapShot.ToolTipText = "Create a snap shot of the current status"; + // + // toolbarScreenShot + // + this.toolbarScreenShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarScreenShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarScreenShot.Image"))); + this.toolbarScreenShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarScreenShot.Name = "toolbarScreenShot"; + this.toolbarScreenShot.Size = new System.Drawing.Size(23, 22); + this.toolbarScreenShot.Text = "toolStripButton2"; + this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; + // + // toolbarSep3 + // + this.toolbarSep3.Name = "toolbarSep3"; + this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mainmenuFile, + this.mainmenuOptions, this.mainmenuHelp}); - this.MainMenu.Location = new System.Drawing.Point(0, 0); - this.MainMenu.Name = "MainMenu"; - this.MainMenu.Size = new System.Drawing.Size(540, 24); - this.MainMenu.TabIndex = 11; + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(540, 24); + this.mainMenu.TabIndex = 11; // // mainmenuFile // @@ -224,9 +263,15 @@ // mainmenuFileExit // this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(152, 22); + this.mainmenuFileExit.Size = new System.Drawing.Size(103, 22); this.mainmenuFileExit.Text = "Exit"; this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // mainmenuOptions + // + this.mainmenuOptions.Name = "mainmenuOptions"; + this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Text = "Options"; // // mainmenuHelp // @@ -254,7 +299,7 @@ this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; this.MainMenuHelpAbout.Size = new System.Drawing.Size(152, 22); this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); // // MainForm // @@ -263,21 +308,22 @@ this.ClientSize = new System.Drawing.Size(540, 301); this.Controls.Add(this.ImageListView); this.Controls.Add(this.mainToolbar); - this.Controls.Add(this.MainMenu); + this.Controls.Add(this.mainMenu); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.ImeMode = System.Windows.Forms.ImeMode.On; - this.MainMenuStrip = this.MainMenu; + this.MainMenuStrip = this.mainMenu; this.MaximizeBox = false; this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ReactOS Test Environment"; + this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); this.mainToolbar.PerformLayout(); - this.MainMenu.ResumeLayout(false); - this.MainMenu.PerformLayout(); + this.mainMenu.ResumeLayout(false); + this.mainMenu.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -303,16 +349,20 @@ private System.Windows.Forms.ToolStripButton toolbarImageDel; private System.Windows.Forms.ToolStripSeparator toolbarSep2; private System.Windows.Forms.ToolStripButton toolbarHelpContents; - private System.Windows.Forms.ToolStripSeparator toolbarSep3; + private System.Windows.Forms.ToolStripSeparator toolbarSep4; private System.Windows.Forms.ToolStripButton toolbarExit; private System.Windows.Forms.ToolStrip mainToolbar; - private System.Windows.Forms.MenuStrip MainMenu; + private System.Windows.Forms.MenuStrip mainMenu; private System.Windows.Forms.ToolStripMenuItem mainmenuFile; private System.Windows.Forms.ToolStripMenuItem mainmenuFileExit; private System.Windows.Forms.ToolStripMenuItem mainmenuHelp; private System.Windows.Forms.ToolStripMenuItem mainmenuHelpContent; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem MainMenuHelpAbout; + private System.Windows.Forms.ToolStripButton toolbarSnapShot; + private System.Windows.Forms.ToolStripButton toolbarScreenShot; + private System.Windows.Forms.ToolStripSeparator toolbarSep3; + private System.Windows.Forms.ToolStripMenuItem mainmenuOptions; } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=26… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Wed May 16 01:37:55 2007 @@ -18,16 +18,20 @@ InitializeComponent(); } - private void aboutToolStripMenuItem_Click(object sender, EventArgs e) + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + Close(); + } + + private void MainForm_Load(object sender, EventArgs e) + { + } + + private void MainMenuHelpAbout_Click(object sender, EventArgs e) { AboutForm Dlg = new AboutForm(); Dlg.StartPosition = FormStartPosition.CenterParent; Dlg.Show(); } - - private void exitToolStripMenuItem_Click(object sender, EventArgs e) - { - Close(); - } } } Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Wed May 16 01:37:55 2007 @@ -190,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP5JREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P/+gb5/gfQ/EDs+Pp6DJIPCInz/3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/wFBfr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/geyPTg08O/de3fA - LoiMDv+DJA9Wh2EYSPDO3VtAfPs/SCOIBuEDB/ej4IOHDuA2ABRoR44e/n/4yCG8GKcL0J155uzp/yAc - GOwPik6YF7G7AN1PIA1Xrl4G4/BIvz8kpwOQAddvXANjsg24fOXSfxAmywBgVP4Kjwz9DcIgNihvEExI - A6IAAEeU4GteB9UDAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP9JREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P8+fl5/gfQ/EDs+Pp6DJIPCIrz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/77+Pr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/geyPSDI7+/de3fA + LoiMDv+DJA9Wh2EYSPDO3VtAfPs/SCOIBuEDB/ej4IOHDuA2ABRoR44e/n/4yCG8GKcL0J155uzp/yDs + F+ADik6YF7G7AN1PIA1Xrl4G4/BI7z8kpwOQAddvXANjsg24fOXSfxAmywAfP59f4ZGhv0EYxAblDYIJ + aUAUAACfo+AcMbeNIAAAAABJRU5ErkJggg== </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -209,20 +209,20 @@ <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE99U11I - U2EYXllBF3VjW91JklGUmCnCxBIVR9Ml/RCYN4JKpghezFwQdCRdZi5N259DaZBTmlAX/hJWElNmiDdm - QYFkM+cPuvM3z87ZOXvbe8zIBR14ON/5zvs83/s+7/vtUcQ8lmtFOULquWLp4KFLEYV4DH/vVexbieOY - sf2fv7yo6R/wxHLkb4IgDjguqr39p09JnybeSyzLgCAIwPM8kGQAZt6MSX0nkySMwdhdIm63O86RkuJ/ - Z7gjCn4/cNNeoCgSAoENGRQVgOCkB7bm5mCs8paIscj5I+K4kDkxVFMdFhYWgKqoADI7Gyj/T1mEpkmg - VpaBzMsDylAP3OwsvC4tDSNHFrBeL0rtSTwucvPzQJWWApWbCxvFxTB8WRd++KgphBi+UhQOlJcDXVgI - lF4P7NQk9CQkiParuvOKNmODxet+GWGHh4DMyoLNkhJwqZQRmzbfSnQQhxGO6Np1VBUJVFfLmTCjI+B5 - NSCZHtyzKdrbTd83NtajRm0CveKHEZ1OsOdlP4112qrJefK2QCuy66ty7Eq0LOQqGo0NoWCQlc3CN6aM - p8YK4B7+47it38aSgFxZAFuGreK44H8FmluMIZ4PybFosCyAaaytrUbdpoFjaBi8XcnbtfmtsRnYNblt - o3p9iI9mQNMULC8vbZeARnhdvRLb3Q10VRWQ4+PQm5go2bUay46JtgKN2ZV0QmK+fQXa2ASM+Rl8sFkl - bIACW9GnVEZYgwFItRpYggBqchIG7xqETnNLCDFKEELwxyIEnU4gMzKALisDV3x8BEdAztSpzvB409Mh - WFcHZGYmMPX1gKmKYjgKEcICD0xnh0xmovMwlZwMyPlTJo7l87Nn1r1pacDU1gLTZZfrxCncBgWMxSyf - jGSM3TXKO5fJqVbP9KlUkY92q7i05JPdRvh8Ppi2msU+5ZEIxvxzmf523HzzRlZ74/0uk6l18bGpmUfg - Gvfwqsd25xc2LTFmPv5ltQAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE99U21I + U2EUXllBP+qPbfVPkoyixEwRJpaouDKX9EFg/hmoZErgj5kLgq75FeTS1H05hIbzAzSC1FLCssDJjBBC + LCiQbOamMne/5t29u3ennWtKLujCw33ve8/zvOc857y7FDGP+VpRjpB6pljaf+BiRCEewd+7FXt8cRwz + vvfLV+edgaGpWI78TRDEPvt5tXvg5Anp8+SkxLIMCIIAPM8DSQZg5s241H88ScIYjN0hMjg4GGdPSfG+ + M9wVBa8XuBk3UBQJgYBfBkUFIOiago25ORivuCViLHK2ReznMt+/rKwICwsLQJWXA5mdDZT3lyxC0yRQ + vmUg8/KAMtQCNzsLz3W6MHJkAcv1olR74lGRm58HSqcDKjcX/MXFMHxZG25oehhCDF8pCgfKyoAuLARK + rwd22gX2hATRdlV7VtHaVGd2DfRH2FejQGZlwXpJCfSolBFrQb6FaCcOIuzRdc9hVSRQVSVnwoy9hg8v + hiRj/X2roq3N+MPvX4satQ60zwsjWq1gy8t+Guu0RZPz5O0FjciurcixvmhZyFXU1ROhYJCVzcI3poyn + xgrgHv7juI0/xpKAXFkAW4at4rjgfwUam+tDPB+SY9FgWQDTWF1dibpNA8fQMHK7grcV5LfEZmDT5LaO + 6fUhPpoBTVOwvLy0WQIa4errldjubqArK4GcmIDexETJVqAxb5lovaQx9SUdk5jv34BuagTG1AmTVouE + DVBgK5xKZYQ1GIBUq4ElCKBcLhi+ZxA6TM0hxChBCMGfixB0OIDMyAC6tBR64uMjOAJypg51xpQ7PR2C + NTVAZmYCU1sLmKoohqMQISzwwHS0y2QmOg/TycmAnO0ycSyfnT615k5LA6a6Gpgum1wnTuEmKGDMJvlk + JGPsjlHeukwOtfqTU6WKfDR3iktLHtlthMfjgZnOdtGpPBTBmH8u09+Om27eyGpreNBlNLYsPjY+4hG4 + xj286rHd+Q2z5jCy9K4XCQAAAABJRU5ErkJggg== </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -240,8 +240,40 @@ <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>358, 23</value> </metadata> - <metadata name="MainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>602, 20</value> + <data name="toolbarSnapShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhRJREFUOE+lU0tr + E1EYvVFxpXtXQn6AImKjoIhokP4F22K6UHTvUhcutGhBqyDaiEKgLkrpAxUSLUjSphjbNGmoycwkM5lH + MonGjQuplFo5zrmQ0Bm768CBO/c758z3mpAIPPkhcXo/xLAIiQvbEGGGD4SEJSAyf0Mi0fdGLAc1vffi + oHixfu0g2g/C+JU4ia3pcxI8844xcnY1KA6IlH3niCc4i83nYfy+dwgbt/dJ8Mw7xsgh12dCVwb+TEY8 + 8mGoY5eRSowg+X4G72YnMTd+F6XRqIyRI026mbBmpkZ3EnLjN1BYy2Njog/u/aMSqlZBOvMJi8+uSw65 + 1FAr6MT6mKLyOIqVfA7HT0WwPXde4mf8GDo/vsFpmPjwMYnSw0uSS43MojgkVDaJdX6eGYPlGHBbTs+E + Bt87LbTaDShaGfMTI5JLDbViZVBsstNsVjadhO3U4bgW3LaDgdiwhOuJm64N09GRXUhJLjXU+gyWFlOo + 2zWZhdM0ceVqTOJE5IxnFINp61j9kvYb7Cwh//YpanXVM6lKMo2shiG/TGPD1KDMx/0l7Gyi8STqTWAZ + Vb0C3SMbVtUTERpqpopqvYJOvN/fxOAYC69uYimXwdr6KrRaWZpphgf9K5qzt/4fIzcquEjKo4vITo2i + VFiAUs6hnnmNzsv+3Repu5J7WuWeyV5+pq4Je8KSOB3OmeCZd3J1A88/Nus6r/DgkxoAAAAASUVORK5C + YII= +</value> + </data> + <data name="toolbarScreenShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAkJJREFUOE+1U21P + klEY1n5ArwsZ2eYH4sV4qCk9tJWZBFqb4Cv4ssTQJEViiPIQKDEY70g5a+tT5QR8zcqtb/2NPuVPgD/A + B3Z1zpHcnuWX1jrbtefZfZ/ruu/rPuc0NPyH1ZjOxqPpbAIipOPrpNaler3G0+qeJcHzBJ2UWKlUUC6X + GarVKhPjdHonyUtOI5/hdPw7TRv/Q6vj2eZarXYCkEVjNKfV6UdFAto2/vtxgofb48LB1z1EomH4A4tY + 9C/At+SF1+eBx+vGZuljXeR4P+U20J/Db5/x5XCfIZNLIf86h9J2EcVSAQWKYgErL0NYDgexUXiP4tYG + A+Uygb2DbTimJzE6bsO8ew65fBr3OjsgkTZBKpOh64GBWEhibt4J68gQkuk4sqspscCTKTv6By1YW3+F + DkI+d+EiLjdJIb3SjCZZM4w9JqQyCQxZBxBPxkinSbHApGOCdUGVJYRIyT+PjoiVHbTIFZArlGyQttFh + vAgJfwpQsss9yxK0bVp5i5BV3A2oNFooNRxr/X5XJxuqyMLupxKohZExK3KrGRiMBiJwFS3XFFBzN7H2 + 5i16LWaEIyHob/OYeTYt7mBnvwRqgQoElwU2MFNPN+RKFavc22dGIhXD3Y47aL2uxlPnFLNxcgpbu5uY + dTkZhm2DeGwfg19YIMOKMkzYx8HrdVC3qlie7hMJUPVYPILQSgBLgg/zz+cwPeNA34AFln4zHj7qhtFk + YPFAUCD3JItsvn6MXDsv/L6Jf/1tv/Xhnx/zLz/3rRNK6BfzAAAAAElFTkSuQmCC +</value> + </data> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> Modified: trunk/tools/RosTE/GUI/Resources/snapshot.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/snapshot… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 26799: Finish up float.c, hopfully the div and sub math is right.
by jimtabor＠svn.reactos.org 15 May '07

15 May '07

Author: jimtabor Date: Wed May 16 00:48:58 2007 New Revision: 26799 URL: http://svn.reactos.org/svn/reactos?rev=26799&view=rev Log: Finish up float.c, hopfully the div and sub math is right. Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Wed May 16 00:48:58 2007 @@ -70,7 +70,7 @@ ULONG STDCALL EngSaveFloatingPointState(OUT VOID *Buffer, - IN ULONG BufferSize) + IN ULONG BufferSize) { KFLOATING_SAVE TempBuffer; NTSTATUS Status; @@ -79,9 +79,9 @@ /* Check for floating point support. */ Status = KeSaveFloatingPointState(&TempBuffer); if (Status != STATUS_SUCCESS) - { - return(0); - } + { + return(0); + } KeRestoreFloatingPointState(&TempBuffer); return(sizeof(KFLOATING_SAVE)); } @@ -153,90 +153,165 @@ VOID STDCALL FLOATOBJ_Add ( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_2i3r.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f + f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_AddFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_0ip3.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f + f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_AddLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_12jr.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f + l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_Div( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_3ndz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f / f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_DivFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_0gfb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f / f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_DivLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_6jdz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f / l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } BOOL STDCALL FLOATOBJ_Equal( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_6ysn.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if (f.f == f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_EqualLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_1pgn.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f == l) return TRUE; return FALSE; } @@ -267,82 +342,133 @@ BOOL STDCALL FLOATOBJ_GreaterThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_8n53.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if(f.f > f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_GreaterThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_6gx3.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f > l) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_LessThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_1ynb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if(f.f < f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_LessThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_9nzb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f < l) return TRUE; return FALSE; } VOID STDCALL FLOATOBJ_Mul( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_8ppj.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f1.f * f.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_MulFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_3puv.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = f1.f * fe.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_MulLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_56lj.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f * l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID @@ -357,9 +483,9 @@ VOID STDCALL FLOATOBJ_SetFloat( - OUT PFLOATOBJ pf, - IN FLOATL f - ) + OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_1prb.htm EFLOAT_S * efp = (EFLOAT_S *)pf; @@ -369,9 +495,9 @@ VOID STDCALL FLOATOBJ_SetLong( - OUT PFLOATOBJ pf, - IN LONG l - ) + OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_0gpz.htm EFLOAT_S * efp = (EFLOAT_S *)pf; @@ -387,32 +513,65 @@ VOID STDCALL FLOATOBJ_Sub( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_6lyf.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f - f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_SubFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_2zvr.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f - f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_SubLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_852f.htm - UNIMPLEMENTED; -} + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f - l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif +}

1 0

[dgorbachev] 26798: Fix Italian rc file. Bug report #2253. From Paolo Devoti.
by dgorbachev＠svn.reactos.org 15 May '07

15 May '07

Author: dgorbachev Date: Wed May 16 00:16:08 2007 New Revision: 26798 URL: http://svn.reactos.org/svn/reactos?rev=26798&view=rev Log: Fix Italian rc file. Bug report #2253. From Paolo Devoti. Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Wed May 16 00:16:08 2007 @@ -17,10 +17,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuti alla configurazione guidata di ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Questa procedura guidata installa ReactOS su questo computer. La procedura "\ + LTEXT "Questa procedura guidata installa ReactOS su questo computer.\nLa procedura "\ "deve raccogliere alcune informazioni sull'utente e sul computer "\ "per configurare ReactOS adeguatamente.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Selezionare Continua per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Selezionare Avanti per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 END @@ -38,7 +38,7 @@ "(in tutto o in parte) è necessario rispettare la GPL", IDC_STATIC,15,110,227,19 PUSHBUTTON "&Mostra la GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Selezionare Continua per proseguire con la configurazione.",IDC_STATIC,15,136, + LTEXT "Selezionare Avanti per proseguire con la configurazione.",IDC_STATIC,15,136, 195,17 END @@ -49,10 +49,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Scrivere il proprio nome completo e il nome della propria ditta o organizzazione.", - IDC_STATIC, 54, 7, 242, 21 - LTEXT "No&me:", IDC_STATIC, 54, 37, 44, 8 + IDC_STATIC, 44, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 44, 37, 120, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organizzazione:", IDC_STATIC, 54, 57, 44, 8 + LTEXT "&Organizzazione:", IDC_STATIC, 44, 57, 120, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -62,19 +62,19 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri. "\ + LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri.\n"\ "Se si è in rete, il nome del computer deve essere univoco.", - IDC_STATIC, 54, 7, 250, 24 - LTEXT "Nome del &computer:", IDC_STATIC, 54, 38, 75, 8 + IDC_STATIC, 44, 7, 250, 24 + LTEXT "Nome del &computer:", IDC_STATIC, 44, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Questa procedura creerà su questo computer un account utente chiamato Administrator. "\ "Si potrà usare questo account se si necessita l'accesso completo al computer.", - IDC_STATIC, 54, 57, 250, 25 + IDC_STATIC, 44, 57, 250, 25 LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", - IDC_STATIC, 54, 87, 250, 8 - LTEXT "Password per &Administrator:", IDC_STATIC, 54, 104, 75, 8 + IDC_STATIC, 44, 87, 250, 8 + LTEXT "Password per &Administrator:", IDC_STATIC, 44, 104, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfermare la password:", IDC_STATIC, 54, 123, 75, 8 + LTEXT "C&onfermare la password:", IDC_STATIC, 44, 123, 95, 8 EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -89,14 +89,14 @@ "i numeri, i valori monetari e le date.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + IDC_STATIC, 53, 50, 184, 8 + PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 47, 50, 14 LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si preme un tasto.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + IDC_STATIC, 53, 106, 184, 8 + PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 102, 50, 14 END @@ -193,21 +193,21 @@ STRINGTABLE BEGIN - IDS_GAMES "Giochi" + IDS_GAMES "Giochi" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Campo minato" END STRINGTABLE BEGIN -IDS_REACTOS_SETUP "Installazione di ReactOS" +IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." - IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " - IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " + IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " + IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " IDS_REGSVR_FAILED "DllRegisterServer fallito: " - IDS_DLLINSTALL_FAILED "DllInstall fallito: " - IDS_TIMEOUT "Tempo scaduto durante la registrazione" + IDS_DLLINSTALL_FAILED "DllInstall fallito: " + IDS_TIMEOUT "Tempo scaduto durante la registrazione" IDS_REASON_UNKNOWN "" END

1 0

[gedmurphy] 26797: start of a new GUI for the ROS Test Environment
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Tue May 15 23:09:52 2007 New Revision: 26797 URL: http://svn.reactos.org/svn/reactos?rev=26797&view=rev Log: start of a new GUI for the ROS Test Environment Added: trunk/tools/RosTE/GUI/AboutForm.Designer.cs trunk/tools/RosTE/GUI/AboutForm.cs trunk/tools/RosTE/GUI/AboutForm.resx trunk/tools/RosTE/GUI/AssemblyInfo.cs trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/Properties/ trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs trunk/tools/RosTE/GUI/Properties/Resources.resx trunk/tools/RosTE/GUI/Properties/app.manifest trunk/tools/RosTE/GUI/Resources/ trunk/tools/RosTE/GUI/Resources/Thumbs.db (with props) trunk/tools/RosTE/GUI/Resources/add.png (with props) trunk/tools/RosTE/GUI/Resources/audio.png (with props) trunk/tools/RosTE/GUI/Resources/copy.png (with props) trunk/tools/RosTE/GUI/Resources/del.png (with props) trunk/tools/RosTE/GUI/Resources/direct/ trunk/tools/RosTE/GUI/Resources/direct/Thumbs.db (with props) trunk/tools/RosTE/GUI/Resources/direct/audio-volume-high.png (with props) trunk/tools/RosTE/GUI/Resources/direct/drive-harddisk.png (with props) trunk/tools/RosTE/GUI/Resources/direct/drive-optical.png (with props) trunk/tools/RosTE/GUI/Resources/direct/drive-removable-media.png (with props) trunk/tools/RosTE/GUI/Resources/direct/folder-saved-search.png (with props) trunk/tools/RosTE/GUI/Resources/direct/folder.png (with props) trunk/tools/RosTE/GUI/Resources/direct/network-wired.png (with props) trunk/tools/RosTE/GUI/Resources/direct/network-workgroup.png (with props) trunk/tools/RosTE/GUI/Resources/exit.png (with props) trunk/tools/RosTE/GUI/Resources/help.png (with props) trunk/tools/RosTE/GUI/Resources/images.png (with props) trunk/tools/RosTE/GUI/Resources/launch.png (with props) trunk/tools/RosTE/GUI/Resources/mount.png (with props) trunk/tools/RosTE/GUI/Resources/preferences-system.png (with props) trunk/tools/RosTE/GUI/Resources/ros.ico (with props) trunk/tools/RosTE/GUI/Resources/save.png (with props) trunk/tools/RosTE/GUI/Resources/screenshot.png (with props) trunk/tools/RosTE/GUI/Resources/snapshot.png (with props) trunk/tools/RosTE/GUI/Resources/stop.png (with props) trunk/tools/RosTE/GUI/RosTE GUI.sln trunk/tools/RosTE/GUI/RosTEGUI.csproj trunk/tools/RosTE/GUI/program.cs trunk/tools/RosTE/GUI/ros.ico (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/tools/RosTE/GUI/AboutForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/AboutForm.Designer… Added: trunk/tools/RosTE/GUI/AboutForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/AboutForm.cs?rev=2… Added: trunk/tools/RosTE/GUI/AboutForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/AboutForm.resx?rev… Added: trunk/tools/RosTE/GUI/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/AssemblyInfo.cs?re… Added: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… Added: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=26… Added: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… Added: trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Properties/Resourc… Added: trunk/tools/RosTE/GUI/Properties/Resources.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Properties/Resourc… Added: trunk/tools/RosTE/GUI/Properties/app.manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Properties/app.man… Added: trunk/tools/RosTE/GUI/Resources/Thumbs.db URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/Thumbs.d… Added: trunk/tools/RosTE/GUI/Resources/add.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/add.png?… Added: trunk/tools/RosTE/GUI/Resources/audio.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/audio.pn… Added: trunk/tools/RosTE/GUI/Resources/copy.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/copy.png… Added: trunk/tools/RosTE/GUI/Resources/del.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/del.png?… Added: trunk/tools/RosTE/GUI/Resources/direct/Thumbs.db URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/T… Added: trunk/tools/RosTE/GUI/Resources/direct/audio-volume-high.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/a… Added: trunk/tools/RosTE/GUI/Resources/direct/drive-harddisk.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/d… Added: trunk/tools/RosTE/GUI/Resources/direct/drive-optical.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/d… Added: trunk/tools/RosTE/GUI/Resources/direct/drive-removable-media.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/d… Added: trunk/tools/RosTE/GUI/Resources/direct/folder-saved-search.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/f… Added: trunk/tools/RosTE/GUI/Resources/direct/folder.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/f… Added: trunk/tools/RosTE/GUI/Resources/direct/network-wired.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/n… Added: trunk/tools/RosTE/GUI/Resources/direct/network-workgroup.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/direct/n… Added: trunk/tools/RosTE/GUI/Resources/exit.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/exit.png… Added: trunk/tools/RosTE/GUI/Resources/help.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/help.png… Added: trunk/tools/RosTE/GUI/Resources/images.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/images.p… Added: trunk/tools/RosTE/GUI/Resources/launch.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/launch.p… Added: trunk/tools/RosTE/GUI/Resources/mount.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/mount.pn… Added: trunk/tools/RosTE/GUI/Resources/preferences-system.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/preferen… Added: trunk/tools/RosTE/GUI/Resources/ros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/ros.ico?… Added: trunk/tools/RosTE/GUI/Resources/save.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/save.png… Added: trunk/tools/RosTE/GUI/Resources/screenshot.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/screensh… Added: trunk/tools/RosTE/GUI/Resources/snapshot.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/snapshot… Added: trunk/tools/RosTE/GUI/Resources/stop.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/stop.png… Added: trunk/tools/RosTE/GUI/RosTE GUI.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTE%20GUI.sln?re… Added: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re… Added: trunk/tools/RosTE/GUI/program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/program.cs?rev=267… Added: trunk/tools/RosTE/GUI/ros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ros.ico?rev=26797&…

1 0

[gedmurphy] 26796: a bit of rearranging
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Tue May 15 21:54:35 2007 New Revision: 26796 URL: http://svn.reactos.org/svn/reactos?rev=26796&view=rev Log: a bit of rearranging Added: trunk/tools/RosTE/GUI/ trunk/tools/RosTE/installer/ trunk/tools/RosTE/installer/LICENSE.txt - copied unchanged from r26794, trunk/tools/RosTE/LICENSE.txt trunk/tools/RosTE/installer/README.txt - copied unchanged from r26794, trunk/tools/RosTE/README.txt trunk/tools/RosTE/installer/RosTE.nsi - copied, changed from r26794, trunk/tools/RosTE/RosTE.nsi trunk/tools/RosTE/installer/ros.ico - copied unchanged from r26794, trunk/tools/RosTE/ros.ico trunk/tools/RosTE/installer/unros.ico - copied unchanged from r26794, trunk/tools/RosTE/unros.ico Removed: trunk/tools/RosTE/LICENSE.txt trunk/tools/RosTE/README.txt trunk/tools/RosTE/RosTE.nsi trunk/tools/RosTE/ros.ico trunk/tools/RosTE/unros.ico Removed: trunk/tools/RosTE/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/LICENSE.txt?rev=26795&… ============================================================================== --- trunk/tools/RosTE/LICENSE.txt (original) +++ trunk/tools/RosTE/LICENSE.txt (removed) @@ -1,868 +1,0 @@ - == ReactOS Test Environment v0.1 == - -The components of the ReactOS Test Environment are released under the following licenses: - - ReactOS Test Environment installer and any accompanying data - GPLv2. - ReactOS QEmu Manager - GPLv2 - QEmu - LGPLv2 - KQEmu - GPLv2 - VDK - GPLv2 - -The respective licenses are detailed below - - - -*** The complete text of the GNU GENERAL PUBLIC LICENSE v2 - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - - - - - - - - -*** The complete text of the GNU LESSER GENERAL PUBLIC LICENSE v2.1 - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! Removed: trunk/tools/RosTE/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/README.txt?rev=26795&v… ============================================================================== --- trunk/tools/RosTE/README.txt (original) +++ trunk/tools/RosTE/README.txt (removed) @@ -1,79 +1,0 @@ -== Introduction == - -RosTE is a Windows based test environment for both ReactOS testers and developers. -It aims to provide an official test environment in a similar fashion to RosBE. -It also aims to provide an environment which is quick and easy to setup, allowing -non-techs or newbies interested in the project to get up an running quickly, with -easy access to important features such as live debugging or quick mounting of the -VM image. - -RosTE encompasses the following key components: - -- ReactOS QEmu Manager 1.3 -This is a GUI front end to RosTE giving a high degree of versatility over the -virtual machine, with many other features added to ensure management of your -test environment is simple. - -- QEmu 0.9.0 -This is the latest QEmu virtual machine for Windows. It provides a reliable -and proven test bed for operating system development - -- KQEmu 1.3.0pre-11 -This is the latest offering of QEmu accelerator, a driver allowing the emulator -to run much faster, improving the performance of ReactOS significantly - -- VDK 3.2 -This is a virtual disk driver allowing quick mounting of your virtual machine -image, allowing it to appear as a regular drive on your Windows operating system. - - - -== Installation == - -Instalation is simple, just double click the installer, and follow the simple -instructions. Upon completion, the QEmu manager will appear. - - - -== Setup == - -Before your newly installed test environment is ready for use, you must configure -some vital settings. - -1. Creating a new VM image (recommended) -If you dont plan on using an existing image, you must setup a new image for use -with RosTE. Click on the tools tab, set the size of the image to your preferred -value (512 is recommended), ensure the format is vmdk and click create image -In the dialog, choose a save location (remember where you save this) and click save - -2. Setting paths -- Paths tab - If you choose to leave the install path as default (C:\Program Files\RosTE) - then you neednt worry about setting the QEmu and VDK paths, however if you - changed this, then you will need to re-associate your paths with your chosen - install location. - - Set the QEmu and VDK paths by clicking on the open dialog buttons and locating - the paths of the corresponding folders (<your path>/RosTE/QEmu and <your path>/RosTE/VDK) - -- Harddisk tab - Check the HDA setting and locate the path of your virtual machine image (ReactOS.vmdk) - -- CD-ROM tab - Ensure the CD-ROM setting is checked. - If you plan on booting ReactOS from the iso provided by RosBE, click on Image File - and enter the path of your default ReactOS source directory. This is where RosBE - will save the generated iso. Otherwise, point this image file to the file located on - your harddisk. - This setting can be changed to Host CD-ROM once you have an installed system, - allowing you to use your computers CD-ROM as the virtual machine CD-ROM - -- Tools tab - You must be an administrator to use the VDK feature. - Set this to the path of your virtual machine image (ReactOS.vmdk) - -3. Setup debugging -To setup live debugging, click the Debug tab and ensure Redirect to screen is -checked. This will setup a telnet session and stream the debug output to a window -provided by RosTE. Note, you must choose Debug at the first boot option to receive -debug information Removed: trunk/tools/RosTE/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/RosTE.nsi?rev=26795&vi… ============================================================================== --- trunk/tools/RosTE/RosTE.nsi (original) +++ trunk/tools/RosTE/RosTE.nsi (removed) @@ -1,222 +1,0 @@ -!define PRODUCT_NAME "ReactOS Test Environment" -!define PRODUCT_VERSION "0.1" -!define PRODUCT_PUBLISHER "ReactOS" -!define PRODUCT_WEB_SITE "http://www.reactos.org" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosTE" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define SOURCE_DIR "D:\ReactOS\trunk\tools\RosTE\files" -!define MODULE_NAME "RosTE" - -;; Basic installer options -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "RosTE-${PRODUCT_VERSION}.exe" -InstallDir "$PROGRAMFILES\RosTE" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -;; Add version/product information metadata to the installation file. -VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.1" -VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" -VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Ged Murphy using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" -VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 Ged Murphy (gedmurphy(a)reactos.org)" -VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.0.1.0" - -CRCCheck force -SetCompressor /FINAL /SOLID lzma - -; MUI 1.67 compatible -!include "MUI.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "ros.ico" -!define MUI_UNICON "unros.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "D:\ReactOS\trunk\tools\RosTE\LICENSE.txt" -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\GUI\QemuGUI.exe" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -ShowInstDetails show -ShowUnInstDetails show - -Section "InstallGui" SEC01 - SetOutPath "$INSTDIR\GUI" - SetOverwrite ifnewer - File "${SOURCE_DIR}\GUI\QemuGUI.exe" - File "${SOURCE_DIR}\GUI\config.xml" - CreateDirectory "$SMPROGRAMS\RosTE" - CreateShortCut "$SMPROGRAMS\RosTE\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" - CreateShortCut "$DESKTOP\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" - WriteRegStr HKCU "Software\RosTE" "DefaultConfig" "$INSTDIR\GUI\config.xml" -SectionEnd - -Section "InstallQemu" SEC02 - SetOutPath "$INSTDIR\QEmu" - SetOverwrite ifnewer - File "${SOURCE_DIR}\qemu-0.9.0-windows\bios.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\fmod.dll" - File "${SOURCE_DIR}\qemu-0.9.0-windows\libusb0.dll" - File "${SOURCE_DIR}\qemu-0.9.0-windows\linux_boot.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-ne2k_pci.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-pcnet.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-rtl8139.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-doc.html" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-img.exe" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-system-x86_64.exe" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-tech.html" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-win.bat" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-x86_64.bat" - File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu.exe" - File "${SOURCE_DIR}\qemu-0.9.0-windows\README-en.txt" - File "${SOURCE_DIR}\qemu-0.9.0-windows\README-ja.txt" - File "${SOURCE_DIR}\qemu-0.9.0-windows\SDL.dll" - File "${SOURCE_DIR}\qemu-0.9.0-windows\vgabios-cirrus.bin" - File "${SOURCE_DIR}\qemu-0.9.0-windows\vgabios.bin" - SetOutPath "$INSTDIR\QEmu\keymaps" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ar" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\common" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\da" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\de" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\de-ch" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\en-gb" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\en-us" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\es" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\et" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fi" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fo" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-be" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-ca" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-ch" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\hr" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\hu" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\is" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\it" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ja" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\lt" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\lv" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\mk" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\modifiers" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\nl" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\nl-be" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\no" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pl" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pt" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pt-br" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ru" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\sl" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\sv" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\th" - File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\tr" - SetOutPath "$INSTDIR\QEmu\License" - File "${SOURCE_DIR}\qemu-0.9.0-windows\License\LICENSE" - File "${SOURCE_DIR}\qemu-0.9.0-windows\License\README-SDL.txt" - File "${SOURCE_DIR}\qemu-0.9.0-windows\License\README.TXT" -SectionEnd - -Section "Installvdk" SEC03 - SetOutPath "$INSTDIR\VDK" - SetOverwrite ifnewer - File "${SOURCE_DIR}\vdk\COPYING.TXT" - File "${SOURCE_DIR}\vdk\README.TXT" - File "${SOURCE_DIR}\vdk\READMEJ.TXT" - File "${SOURCE_DIR}\vdk\vdk.exe" - File "${SOURCE_DIR}\vdk\vdk.sys" -SectionEnd - -Section "InstallQemu" SEC04 - SetOutPath "$INSTDIR\Kqemu" - SetOverwrite ifnewer - File "${SOURCE_DIR}\Kqemu\LICENSE" - File "${SOURCE_DIR}\Kqemu\COPYING" - File "${SOURCE_DIR}\Kqemu\kqemu-doc.html" - File "${SOURCE_DIR}\Kqemu\kqemu-tech.html" - SetOutPath "$SYSDIR\drivers" - File "${SOURCE_DIR}\Kqemu\kqemu.sys" - SetOutPath "$SMPROGRAMS" -SectionEnd - -Section -AdditionalIcons - WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\RosTE\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" - CreateShortCut "$SMPROGRAMS\RosTE\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - ;; Start kqemu after install - ;; Service control manager plugin is used. Inf file isn't used. - nsSCM::Install /NOUNLOAD "kqemu" "KQEmu virtualisation module for QEmu" 1 2 "$SYSDIR\drivers\kqemu.sys" "" "" "" "" - Pop $0 - DetailPrint "snSCM::Install : $0" - nsSCM::Start /NOUNLOAD "kqemu" - Pop $0 - DetailPrint "nsSCM::Start : $0" - - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\GUI\QemuGUI.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\GUI\QemuGUI.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" -SectionEnd - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." -FunctionEnd - -Function un.onInit - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - Delete "$INSTDIR\${PRODUCT_NAME}.url" - Delete "$INSTDIR\uninst.exe" - Delete "$DESKTOP\RosTE.lnk" - RMDir /r /REBOOTOK "$SMPROGRAMS\RosTE" - RMDir /r /REBOOTOK "$INSTDIR\GUI" - RMDir /r /REBOOTOK "$INSTDIR\QEmu" - RMDir /r /REBOOTOK "$INSTDIR\VDK" - RMDir /r /REBOOTOK "$INSTDIR\Kqemu" - RMDir /r /REBOOTOK "$INSTDIR" - - ;; Stop kqemu - nsSCM::Stop /NOUNLOAD "kqemu" - Pop $0 - DetailPrint "nsSCM::Stop : $0" - nsSCM::Remove /NOUNLOAD "kqemu" - Pop $0 - DetailPrint "nsSCM::Remove : $0" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - ; delete user defined default config value - DeleteRegKey HKCU "Software\RosTE" - SetAutoClose false -SectionEnd Copied: trunk/tools/RosTE/installer/RosTE.nsi (from r26794, trunk/tools/RosTE/RosTE.nsi) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/installer/RosTE.nsi?p2… ============================================================================== --- trunk/tools/RosTE/RosTE.nsi (original) +++ trunk/tools/RosTE/installer/RosTE.nsi Tue May 15 21:54:35 2007 @@ -219,4 +219,4 @@ ; delete user defined default config value DeleteRegKey HKCU "Software\RosTE" SetAutoClose false -SectionEnd +SectionEnd Removed: trunk/tools/RosTE/ros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/ros.ico?rev=26795&view… ============================================================================== Binary file - no diff available. Removed: trunk/tools/RosTE/unros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/unros.ico?rev=26795&vi… ============================================================================== Binary file - no diff available.

1 0

[mbosma] 26795: Fix types in startup.c.
by mbosma＠svn.reactos.org 15 May '07

15 May '07

Author: mbosma Date: Tue May 15 21:52:00 2007 New Revision: 26795 URL: http://svn.reactos.org/svn/reactos?rev=26795&view=rev Log: Fix types in startup.c. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 15 21:52:00 2007 @@ -171,7 +171,7 @@ // Update Interals BOOL ModeChanged; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW*)iface, 0, TRUE); + StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue May 15 21:52:00 2007 @@ -20,11 +20,11 @@ extern CRITICAL_SECTION ddcs; extern IDirectDraw7Vtbl DirectDraw7_Vtable; -HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); -HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable); -HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable); +HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW iface, LPGUID pGUID, BOOL reenable); +HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable); +HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); -HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW iface); HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 15 21:52:00 2007 @@ -21,12 +21,9 @@ -HRESULT -WINAPI -Create_DirectDraw (LPGUID pGUID, - LPDIRECTDRAW* pIface, - REFIID id, - BOOL ex) +HRESULT WINAPI +Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, + REFIID id, BOOL ex) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; @@ -89,7 +86,7 @@ { DX_STUB_str("Got iface"); - if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK); + if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK); { DX_STUB_str("here"); @@ -123,7 +120,7 @@ HRESULT WINAPI -StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable) +StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DWORD hal_ret = DD_FALSE; @@ -277,7 +274,7 @@ } HRESULT WINAPI -StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable) +StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; @@ -355,7 +352,7 @@ HRESULT WINAPI -StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable) +StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable) { LPDWORD mpFourCC;

1 0

[mbosma] 26794: Fix compiler warning.
by mbosma＠svn.reactos.org 15 May '07

15 May '07

Author: mbosma Date: Tue May 15 21:41:27 2007 New Revision: 26794 URL: http://svn.reactos.org/svn/reactos?rev=26794&view=rev Log: Fix compiler warning. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 15 21:41:27 2007 @@ -157,8 +157,7 @@ DevMode.dmBitsPerPel = dwBPP; DevMode.dmDisplayFrequency = dwRefreshRate; - LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN /* | CDS_SET_PRIMARY ? */); - DbgPrint("%d\n", retval); + LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN); /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */ if(retval == DISP_CHANGE_BADMODE) { @@ -172,7 +171,7 @@ // Update Interals BOOL ModeChanged; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + StartDirectDraw((LPDIRECTDRAW*)iface, 0, TRUE); return DD_OK; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs