Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 25089: - include path to generated idl files for dependant projects
by janderwald＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: janderwald Date: Fri Dec 8 14:50:56 2006 New Revision: 25089 URL: http://svn.reactos.org/svn/reactos?rev=25089&view=rev Log: - include path to generated idl files for dependant projects Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Dec 8 14:50:56 2006 @@ -114,6 +114,7 @@ // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); + bool include_idl = false; string vcproj_path = module.GetBasePath(); vector<string> source_files, resource_files, includes, includes_wine, libraries; @@ -155,7 +156,15 @@ string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); - + if ( module.type != RpcServer && module.type != RpcClient ) + { + printf("path %s\n", path.c_str ()); + if ( path.find ("/include/reactos/idl") != string::npos) + { + include_idl = true; + continue; + } + } // add to another list win32api and include/wine directories if ( !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) || !strncmp(incs[i]->directory.c_str(), "include\\crt", 11 ) || @@ -270,6 +279,20 @@ fprintf ( OUT, "%s", include.c_str() ); include_string += " /I " + include; multiple_includes = true; + } + } + if ( include_idl ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + if ( configuration.UseConfigurationInPath ) + { + fprintf ( OUT, "%s\\include\\reactos\\idl%s\\%s\r\n", intdir.c_str (), vcdir.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () ); } } if ( cfg.headers == WineHeaders )

1 0

[cwittich] 25088: fix unused variable warning in release build
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 14:15:48 2006 New Revision: 25088 URL: http://svn.reactos.org/svn/reactos?rev=25088&view=rev Log: fix unused variable warning in release build Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.c Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/B… ============================================================================== --- trunk/reactos/drivers/storage/buslogic/BusLogic958.c (original) +++ trunk/reactos/drivers/storage/buslogic/BusLogic958.c Fri Dec 8 14:15:48 2006 @@ -557,8 +557,7 @@ if (StatusRegister.Bits.DataInRegisterReady) { - UCHAR ErrorCode = BusLogic_ReadDataInRegister(HostAdapter); - DebugPrint((ERROR, "HOST ADAPTER ERROR CODE = %d\n", ErrorCode)); + DebugPrint((ERROR, "HOST ADAPTER ERROR CODE = %d\n", BusLogic_ReadDataInRegister(HostAdapter))); } return FALSE; }

1 0

[janderwald] 25087: - add missing source header
by janderwald＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: janderwald Date: Fri Dec 8 13:53:14 2006 New Revision: 25087 URL: http://svn.reactos.org/svn/reactos?rev=25087&view=rev Log: - add missing source header Modified: trunk/reactos/dll/cpl/sysdm/de.rc Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/de.rc (original) +++ trunk/reactos/dll/cpl/sysdm/de.rc Fri Dec 8 13:53:14 2006 @@ -1,5 +1,11 @@ -// German language file for sysdm.cpl -// Copyright 2006 Colin Finck <mail(a)colinfinck.de> +/* + * PROJECT: ReactOS System Configuration Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/sysdm/de.rc + * PURPOSE: German language file for sysdm.cpl + * PROGRAMMERS: Eric Kohl + * TRANSLATOR: Colin Finck <mail(a)colinfinck.de> + */ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

1 0

[cwittich] 25086: updated buslogic driver to version 1.2.0.4 See issue #1891 for more details.
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 05:01:34 2006 New Revision: 25086 URL: http://svn.reactos.org/svn/reactos?rev=25086&view=rev Log: updated buslogic driver to version 1.2.0.4 See issue #1891 for more details. Modified: trunk/reactos/drivers/storage/buslogic/BT958.mof trunk/reactos/drivers/storage/buslogic/BusLogic958.c trunk/reactos/drivers/storage/buslogic/BusLogic958.h trunk/reactos/drivers/storage/buslogic/BusLogic958.rc trunk/reactos/drivers/storage/buslogic/makefile.inc trunk/reactos/drivers/storage/buslogic/sources trunk/reactos/drivers/storage/buslogic/wmi.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/buslogic/BT958.mof URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/B… Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/B… Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/B… Modified: trunk/reactos/drivers/storage/buslogic/BusLogic958.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/B… Modified: trunk/reactos/drivers/storage/buslogic/makefile.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/m… Modified: trunk/reactos/drivers/storage/buslogic/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/s… Modified: trunk/reactos/drivers/storage/buslogic/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/w…

1 0

[cwittich] 25085: fix a typo in ObFindObject patch by hto See issue #1861 for more details.
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 04:06:10 2006 New Revision: 25085 URL: http://svn.reactos.org/svn/reactos?rev=25085&view=rev Log: fix a typo in ObFindObject patch by hto See issue #1861 for more details. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Fri Dec 8 04:06:10 2006 @@ -246,7 +246,7 @@ IN POBP_LOOKUP_CONTEXT Context, IN PACCESS_STATE AccessState, IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN PVOID ParseContext, + IN OUT PVOID ParseContext, OUT PVOID ExpectedObject) { PVOID RootDirectory;

1 0

[cwittich] 25084: -new german language file -some fixed for the english language file patch by Colin Finck See issue #1900 for more details.
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 04:00:51 2006 New Revision: 25084 URL: http://svn.reactos.org/svn/reactos?rev=25084&view=rev Log: -new german language file -some fixed for the english language file patch by Colin Finck See issue #1900 for more details. Modified: trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/de.rc (original) +++ trunk/reactos/dll/cpl/sysdm/de.rc Fri Dec 8 04:00:51 2006 @@ -1,172 +1,294 @@ +// German language file for sysdm.cpl +// Copyright 2006 Colin Finck <mail(a)colinfinck.de> + LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -RC_LICENSE RTDATA "resources/gpl.txt" - -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Betriebssystem",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "Version "REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - LTEXT "Computer",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY -END - -IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Netzwerk Identifikation" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "ReactOS benutzt folgende Informationen, um Sie im Netzwerk zu identifizieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - LTEXT "Vollständiger Computername:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4 - LTEXT "(Default)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5 - LTEXT "Arbeitsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6 - LTEXT "(leer)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING(1),LABELLINE(6)-6,60,LABELLINE(6)-6 - LTEXT "Klicken Sie auf Netzwerkkennung um sich einer Domäne anzuschließen und einen lokalen Benutzer zu erstellen",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&Netzwerkkennung...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "Klicken Sie auf Eigenschaften, um den Computer umzubennen oder einer Domäne anzuschließen.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2 - PUSHBUTTON "&Eigenschaften...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 -END - -IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "ReactOS-Homepage besuchen", IDC_ROSHOMEPAGE_LINK, 20, 200, 100, 8 + PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Computername" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS benutzt folgende Informationen, um ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Computer-Beschreibung:", IDC_STATIC, 6, 40, 80, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Computername:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "(Standard)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Arbeitsgruppe:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(leer)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Um den Netzwerk-Identifikations-Assistenten zum Anmelden an einer Domäne und dem Erstellen eines lokalen Benutzers aufzurufen, klicken Sie auf ""Netzwerk-ID"".", IDC_STATIC, 6, 108, 172, 32 + PUSHBUTTON "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Um diesen Computer umzubenennen oder sich an einer Domäne anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&Ändern...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Bitte beachten: Nur Administratoren können die Identifikation dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Hardware Assistent",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Der Hardware Assistent hilft Ihnen Hardware zu installieren, zu enfernen, zu reparieren und zu konfigurieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - PUSHBUTTON "&Hardware Assistent..",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - - GROUPBOX "Geräte Manager",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Der Gerätemanager zeigt alle installierte Hardware auf Ihrem Computer an. Benutzen Sie den Gerätemanager, um die Eigenschaften aller Geräte zu ändern.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - - PUSHBUTTON "&Geräte Manager...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - - GROUPBOX "Hardware Profile",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Hardwareprofile können zur Speicherung mehrerer Hardwareprofile verwendet werden.",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "Hard&wareprofile...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -END - -IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +BEGIN + GROUPBOX "Geräte-Manager", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Der Geräte-Manager zeigt alle Hardware-Geräte ihres Computers an. Benutzen Sie den Geräte-Manager, um die Eigenschaften eines Gerätes zu ändern.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "&Geräte-Manager...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "Hardware-Assistent", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "Der Hardware-Assistent hilft ihnen, Hardware zu installieren, zu deinstallieren, zu reparieren und zu konfigurieren.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "&Hardware-Assistent...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "Hardware-Profile", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Mit Hardware-Profilen können Sie mehrere verschiedene Hardware-Konfigurationen einrichten und speichern.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "Hard&ware-Profile...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Administrator-Rechte werden für die meisten dieser Einstellungen benötigt.", IDC_STATIC, 12, 5, 242, 8 + GROUPBOX "Leistung", IDC_STATIC, 6, 18, 244, 50 + LTEXT "Mit Leistungs-Optionen können Sie einstellen, wie Programme Speicher benutzen sollen. Diese Einstellungen beeinflussen die Leistung ihres Computers.", IDC_STATIC, 16, 29, 210, 24 + PUSHBUTTON "Einstellungen", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Benutzerprofile", IDC_STATIC, 6,75,244,48 + LTEXT "Desktop-Einstellungen bezüglich der Anmeldung", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Einstellungen", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Starten und Wiederherstellen", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Start- und Wiederherstellungs-Einstellungen regeln, wie der Computer gestartet werden soll und was passieren soll, wenn ein Fehler auftritt.", IDC_STATIC, 16, 144, 210, 27 + PUSHBUTTON "Einstellungen", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Umgebungsvariablen", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "Fehler melden", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hardware-Profile" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "Sie können Hardware-Profile für verschiedene Hardware-Konfigurationen einrichten. Beim Starten können Sie dann das Profil auswählen, welches benutzt werden soll.", IDC_STATIC, 46, 11, 200, 25 + LTEXT "Verfügbare Hardware-Profile:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "&Eigenschaften", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "&Kopieren", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "&Umbenennen", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "&Löschen", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Hardware-Profil Auswahl", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Wenn ReactOS startet:", IDC_STATIC, 14, 142, 210, 8 + //RADIOBUTTON "&Warten, bis ein Hardware-Profil gewählt wird", IDC_HRDPROFWAIT, 14, 158, 170, 8 + //RADIOBUTTON "&Das erste Profil aus der Liste wählen, wenn ich kein Profil innerhalb von", IDC_HRDPROFSELECT, 14, 173, 190, 8 + CONTROL "&Warten, bis ein Hardware-Profil gewählt wird", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 170, 8 + CONTROL "&Das erste Profil wählen, wenn kein Profil innerhalb von", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 200, 8 + LTEXT "Sekunden gewählt wird", IDC_STATIC, 65, 187, 80, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profil umbenennen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Von:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "Nach:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 196, 24, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Benutzerprofile" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Benutzerprofile enthalten Desktopeinstellungen und andere Daten, um sich einzuloggen. Sie können auf jedem Computer, den Sie verwenden ein anderes Profil erstellen, oder ein Serverprofil, das auf jedem benutzten Computer gleich ist.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4) - LTEXT "Auf diesem Computer gespeicherte Profile:",-1,PROPSHEETPADDING(1),LABELLINE(6),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) - CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(11),WS_EX_CLIENTEDGE - - PUSHBUTTON "Löschen",IDC_USERPROFILE_DELETE,PROPSHEETPADDING(1),LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Typ ändern...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Kopieren zu...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING(1)-60,LABELLINE(20),60,LABELLINE(1)+2 -END - -IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Erweitert" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Systemleistung",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Die Systemleistungseinstellungen steuern wie Anwendungen den Arbeitsspeicher nutzen, was die Computergeschwindigkeit beeinflusst.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Systemleistungseinstellungen...",IDC_PERFOR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(5)+2,PROPSHEETPADDING(18),14 - GROUPBOX "Umgebungsvariablen",-1,PROPSHEETPADDING(1),LABELLINE(8)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Über Umgebungsvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Umgebungsvariablen..",IDC_ENVVAR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(12)+2,PROPSHEETPADDING(18),14 - GROUPBOX "&Start und Wiederherstellung",-1,PROPSHEETPADDING(1),LABELLINE(15)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Diese Optionen legen fest, was beim Starten des Computers passiert und was passieren soll, wenn der Computer wegen eines Fehlers anhält.",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Start und Wiederherstellung...",IDC_STAREC,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(19)+2,PROPSHEETPADDING(18),14 +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Benutzerprofile enthalten Desktop-Einstellungen und andere Informationen bezüglich ihrer Anmeldung. Sie können unterschiedliche Profile, für jeden Computer, den Sie benutzen, einrichten, oder aber auch ein einziges Profil wählen, welches auf jedem Computer gleich ist.", + IDC_STATIC, 40, 7, 204, 40 + LTEXT "Auf diesem Computer gespeicherte Profile:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "Typ ändern", IDC_USERPROFILE_CHANGE, 74, 156, 56, 13 + PUSHBUTTON "Löschen", IDC_USERPROFILE_DELETE, 134, 156, 56, 13 + PUSHBUTTON "Kopieren nach", IDC_USERPROFILE_COPY, 194, 156, 56, 13 + + LTEXT "Um neue Benutzerprofile zu erstellen, öffnen Sie ", IDC_STATIC, 7, 175, 162, 8 + LTEXT "Benutzerkonten", IDC_USERACCOUNT_LINK, 167, 175, 56, 8 + LTEXT "in der Systemsteuerung.", IDC_STATIC, 8, 185, 101, 8 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Starten und Wiederherstellen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System-Start", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Standard Betriebs&system:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + //CHECKBOX "&Anzeigedauer der Betriebssystem-Liste:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "An&zeigedauer der Betriebssystem-Liste:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12 + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "Sek.", IDC_STATIC, 221, 56, 14, 8 + CONTROL "Anze&igedauer der Wiederherstellungs-Optionen:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 165, 8 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12 + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "Sek.", IDC_STATIC, 221, 70, 14, 8 + LTEXT "Um die Start-Optionen manuell zu bearbeiten, klicken Sie auf ""Bearbeiten"".", IDC_STATIC, 14, 84, 170, 18 + PUSHBUTTON "Be&arbeiten", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "System-Fehler", IDC_STATIC, 7, 111, 238, 140 + CONTROL "Ereignis in das Systemprotokoll &eintragen", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 + CONTROL "Administrator-Warnmeldung &senden", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 + CONTROL "Automatisch &neu starten", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 + + GROUPBOX "Debug-Informationen schreiben", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "Dump-&Datei:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + CONTROL "Vorhandene Dateien &überschreiben", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 195, 259, 50, 14 END IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Virtueller Speicher" +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Virtueller Arbeitsspeicher" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "",IDC_PAGEFILELIST,"ListBox",0x50010141,10,16,204,52,0x00000200 - LTEXT "Laufwerk [Bezeichnung]", -1, 12, 5, 96, 9 - LTEXT "Auslagerungsdatei (MB)", -1, 114, 5, 100, 9 - CONTROL "Größe der Auslagerungsdatei für das Laufwerk",IDC_DRIVEGROUP,"Button",0x50000007,10,70,204,104 - LTEXT "", IDC_DRIVE, 20, 84, 100, 9 - LTEXT "", IDC_SPACEAVAIL, 20, 94, 112, 8 - CONTROL "Benutzerdefinierte Größe",IDC_CUSTOM,"Button",0x50010009,20,105,95,9 - CONTROL "",IDC_INITIALSIZE,"Edit",0x50010000,100,114,44,13,0x00000200 - CONTROL "",IDC_MAXSIZE,"Edit",0x50010000,100,129,44,13,0x00000200 - LTEXT "Anfangsgröße (MB):", -1 ,22,118,54,9 - LTEXT "Maximale Größe (MB):", -1 ,22,131,64,9 - CONTROL "System verwaltet die Größe",IDC_SYSMANSIZE,"Button",0x50010009,20,145,110,9 - CONTROL "Keine Auslagerungsdatei",IDC_NOPAGEFILE,"Button",0x50010009,20,158,110,9 - PUSHBUTTON "Festlegen",IDC_SET, 158, 155, 50, 13 - CONTROL "Gesamtgröße der Auslagerungsdatei für alle Laufwerke", IDC_TOTALGROUP, "Button", 0x50000007, 10, 179, 204, 46 - PUSHBUTTON "OK", IDOK, 114, 232, 48, 13 - PUSHBUTTON "Abbrechen", IDCANCEL, 168, 232, 48, 13 - LTEXT "", IDC_MINIMUM, 18, 200, 100, 9 - LTEXT "", IDC_RECOMMENDED, 18, 200, 100, 9 - LTEXT "", IDC_CURRENT, 18, 200, 100, 9 -END + LTEXT "Laufwerk [Bezeichnung]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Auslagerungsdatei (MB)", IDC_STATIC, 115, 5, 96, 9 + CONTROL "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP, + 10, 16, 204, 52, WS_EX_CLIENTEDGE + + GROUPBOX "Größe der Auslagerungsdatei für das gewählte Laufwerk", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "Laufwerk:", IDC_STATIC, 20, 80, 40, 8 + LTEXT "", IDC_DRIVE, 105, 81, 100, 9 + LTEXT "Verfügbarer Speicherplatz:", IDC_STATIC, 20, 92, 130, 9 + LTEXT "", IDC_SPACEAVAIL, 105, 92, 104, 9 + LTEXT "&Anfangsgröße (MB):", -1, 22, 118, 70, 9 + LTEXT "Ma&ximale Größe (MB):", -1, 22, 131, 75, 9 + CONTROL "&Benutzerdefinierte Größe", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 90, 9 + CONTROL "Größe wird vom &System verwaltet", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 120, 9 + CONTROL "&Keine Auslagerungsdatei", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 90, 9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "Einstellen", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Gesamtgröße der Auslagerungsdatei für alle Laufwerke", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Minimal zugelassen:", IDC_STATIC, 18, 188, 70, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Empfohlen:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "Momentan zugeteilt:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 168, 232, 48, 13 +END + IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Umgebungsvariablen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Benutzervariablen",-1,7,12,238,100 - LTEXT "&Variablen:",-1,14,24,224,8 - CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "Ne&u...",IDC_USER_VARIABLE_NEW,80,90,50,14 - PUSHBUTTON "Än&dern...",IDC_USER_VARIABLE_EDIT,134,90,50,14 - PUSHBUTTON "Lö&schen",IDC_USER_VARIABLE_DELETE,188,90,50,14 - - GROUPBOX "Systemvariablen",-1,7,116,238,100 - LTEXT "V&ariablen:",-1,14,128,224,8 - CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "&Neu...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 - PUSHBUTTON "&Ändern...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 - PUSHBUTTON "&Löschen",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 - - DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,195,224,50,14 + GROUPBOX "Benutzerdefinierte Variablen", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&Neu...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "Be&arbeiten...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&Löschen", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "System-Variablen", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "N&eu...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "Bea&rbeiten...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "Lös&chen", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 195, 224, 50, 14 END IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Variable editieren" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Variablen&name:",-1,7,14,50,8 - EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL - LTEXT "Variablen&wert:",-1,7,32,50,8 - EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL - - DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,170,50,50,14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "System" - IDS_CPLSYSTEMDESCRIPTION "Zeigt Informationen über Ihren Computer an und ändert System- und Hardwareeinstellungen." - IDS_DRIVE "Laufwerk: %s" - IDS_SPACE "Verfügbarer Speicherplatz: %s" - IDS_MIN "Minimal möglich: %s" - IDS_REC "Empfohlen: %s" - IDS_CUR "Zur Zeit zugewiesen: %s" -END +CAPTION "Variable bearbeiten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Variablen-&Name:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "Variablen-&Wert:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "Lizenz" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "System" + IDS_CPLSYSTEMDESCRIPTION "Zeigt Informationen über ihren Computer an und ändert verschiedene Computer- und Hardware-Einstellungen" + IDS_MEGABYTE "MB RAM" + IDS_GIGABYTE "GB RAM" + IDS_TERABYTE "TB RAM" + IDS_PETABYTE "PB RAM" +END Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/en.rc (original) +++ trunk/reactos/dll/cpl/sysdm/en.rc Fri Dec 8 04:00:51 2006 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 LTEXT "Visit the ReactOS Homepage", IDC_ROSHOMEPAGE_LINK, 20, 200, 93, 8 - PUSHBUTTON "View licence...", IDC_LICENCE, 170, 199, 78, 13 + PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 199, 78, 13 END @@ -34,11 +34,11 @@ LTEXT "(Default)", IDC_COMPUTERNAME, 98, 68, 144, 11 LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 LTEXT "(empty)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 - LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click Network ID.", IDC_STATIC, 6, 108, 172, 24 + LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 6, 108, 172, 24 PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "To rename this computer or join a domain, click Properties.", IDC_STATIC, 6, 149, 170, 17 + LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17 PUSHBUTTON "&Change...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "Note: Only Administrators can change the identification of this computer", IDC_STATIC, 6, 179, 300, 9 + LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9 END @@ -69,7 +69,7 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "You must be logged on as an administrator to make most of these changes.", IDC_STATIC, 12, 5, 236, 8 + LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 LTEXT "Performance options control how applications use memory, which affects the speed of your computer.", IDC_STATIC, 16, 29, 210, 17 PUSHBUTTON "Settings", IDC_PERFOR, 194, 48, 50, 15 @@ -93,7 +93,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Available hardware profiles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 @@ -104,7 +104,7 @@ PUSHBUTTON "&Delete", IDC_HRDPROFDEL, 173, 106, 50, 14 GROUPBOX "Hardware profiles selection", IDC_STATIC, 7, 130, 240, 75 - LTEXT "When Windows starts:", IDC_STATIC, 14, 142, 210, 8 + LTEXT "When ReactOS starts:", IDC_STATIC, 14, 142, 210, 8 //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 CONTROL "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 133, 8 @@ -207,7 +207,7 @@ LTEXT "Drive:", IDC_STATIC, 20, 80, 20, 8 LTEXT "", IDC_DRIVE, 88, 81, 100, 9 LTEXT "Space available:", IDC_STATIC, 20, 92, 56, 9 - LTEXT "", IDC_SPACEAVAIL, 84, 92, 104, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 LTEXT "&Initial size (MB):", -1, 22, 118, 54, 9 LTEXT "Ma&ximum size (MB):", -1, 22, 131, 64, 9 CONTROL "&Custom size", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 @@ -219,7 +219,7 @@ GROUPBOX "Total paging file size for all drives", IDC_TOTALGROUP, 10, 177, 204, 46 LTEXT "Minimum allowed:", IDC_STATIC, 18, 188, 58, 9 - LTEXT "", IDC_MINIMUM, 86, 186, 100, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 LTEXT "Recommended:", IDC_STATIC, 18, 199, 52, 9 LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 LTEXT "Currently allocated:", IDC_STATIC, 18, 210, 66, 9 Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Fri Dec 8 04:00:51 2006 @@ -22,9 +22,9 @@ RC_LICENSE RTDATA "resources/gpl.txt" #include "en.rc" +#include "de.rc" /* #include "cz.rc" -#include "de.rc" #include "dk.rc" #include "fr.rc" #include "nl.rc"

1 0

[cwittich] 25083: fix gcc 4.1.2 build patch by Coviti See issue #1897 for more details.
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 03:50:58 2006 New Revision: 25083 URL: http://svn.reactos.org/svn/reactos?rev=25083&view=rev Log: fix gcc 4.1.2 build patch by Coviti See issue #1897 for more details. Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Dec 8 03:50:58 2006 @@ -1294,7 +1294,7 @@ if (DebugEvent->Flags & 0x10) { /* Set busy flag */ - InterlockedOr(&DebugEvent->Flags, 0x100); + InterlockedOr((PLONG)&DebugEvent->Flags, 0x100); } else { @@ -1313,7 +1313,7 @@ DebugEvent->BackoutThread = NULL; /* Set flag */ - InterlockedOr(&DebugEvent->Flags, 0x80); + InterlockedOr((PLONG)&DebugEvent->Flags, 0x80); } } else

1 0

[greatlrd] 25082: Adding more setup infromations for createsurface. (does not working yet)
by greatlrd＠svn.reactos.org 07 Dec '06

07 Dec '06

Author: greatlrd Date: Thu Dec 7 23:48:00 2006 New Revision: 25082 URL: http://svn.reactos.org/svn/reactos?rev=25082&view=rev Log: Adding more setup infromations for createsurface. (does not working yet) Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Thu Dec 7 23:48:00 2006 @@ -217,6 +217,10 @@ That->lpLcl->lpGbl = &ddSurfGbl; That->lpLcl->lpGbl->lpDD = &ddgbl; + That->lpLcl->lpSurfMore = (LPDDRAWI_DDRAWSURFACE_MORE)DxHeapMemAlloc(sizeof(LPDDRAWI_DDRAWSURFACE_MORE)); + That->lpLcl->lpSurfMore->lpDD_int = This; + That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; + /* Code from wine cvs 24/7-2006 */ @@ -250,6 +254,7 @@ /* own code now */ + mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;

1 0

[greatlrd] 25081: start config up createsurface right to create surface but we are not setting all value right yet.
by greatlrd＠svn.reactos.org 07 Dec '06

07 Dec '06

Author: greatlrd Date: Thu Dec 7 21:27:16 2006 New Revision: 25081 URL: http://svn.reactos.org/svn/reactos?rev=25081&view=rev Log: start config up createsurface right to create surface but we are not setting all value right yet. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Thu Dec 7 21:27:16 2006 @@ -183,6 +183,8 @@ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; LPDDRAWI_DDRAWSURFACE_INT That; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_CREATESURFACEDATA mDdCreateSurface; if (pUnkOuter!=NULL) { @@ -246,26 +248,55 @@ DX_STUB_str("pDDSD->dwFlags ok"); - /* own code now */ - + /* own code now */ + + mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; + mDdCanCreateSurface.ddRVal = DDERR_GENERIC; + + mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; + mDdCreateSurface.ddRVal = DDERR_GENERIC; + mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + //mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + mDdCreateSurface.lplpSList = &That->lpLcl; + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { + /* we only create one surface it is primary */ //LPDDRAWI_DDRAWSURFACE_LCL surf; DX_STUB_str( "Can not create primary surface well yet"); + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str( "Can not create surface "); + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + DX_STUB_str( "Fail"); + return mDdCanCreateSurface.ddRVal; + } + + DX_STUB_str( "Can not create primary surface well yet"); + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str( "Can not create surface fail"); + return DDERR_NOTINITIALIZED; + } + + DX_STUB_str( "Can not create primary surface well yet"); - if (That == NULL) - { - return E_OUTOFMEMORY; - } - - // This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface(); - // This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface(); Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); - return DD_OK; + return mDdCreateSurface.ddRVal; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY)

1 0

[greatlrd] 25080: start writing on the createsurface code, current does not setup the interface right yet so we do not doing the callbacks yet
by greatlrd＠svn.reactos.org 07 Dec '06

07 Dec '06

Author: greatlrd Date: Thu Dec 7 19:46:33 2006 New Revision: 25080 URL: http://svn.reactos.org/svn/reactos?rev=25080&view=rev Log: start writing on the createsurface code, current does not setup the interface right yet so we do not doing the callbacks yet Added: trunk/reactos/dll/directx/ddraw/thunks/ - copied from r25012, trunk/reactos/dll/directx/ddraw/thunks/ Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Thu Dec 7 19:46:33 2006 @@ -202,7 +202,8 @@ } That->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL)); - + This->lpLcl->lpPrimary = That; + if (That == NULL) { return E_OUTOFMEMORY; @@ -214,15 +215,7 @@ That->lpLcl->lpGbl = &ddSurfGbl; That->lpLcl->lpGbl->lpDD = &ddgbl; - Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); - - if (This->lpLcl->lpGbl->dsList == NULL) - { - This->lpLcl->lpGbl->dsList = That; - } - - /* Code from wine cvs 24/7-2006 */ if (!(pDDSD->dwFlags & DDSD_CAPS)) @@ -253,16 +246,27 @@ DX_STUB_str("pDDSD->dwFlags ok"); - /* own code now */ - - /* FIXME - remove all old code for create a surface - for we need rewrite it - */ + /* own code now */ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - DX_STUB_str( "Can not create primary surface"); + { + /* we only create one surface it is primary */ + //LPDDRAWI_DDRAWSURFACE_LCL surf; + + DX_STUB_str( "Can not create primary surface well yet"); + + + if (That == NULL) + { + return E_OUTOFMEMORY; + } + + // This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface(); + // This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface(); + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); + return DD_OK; + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { @@ -720,7 +724,7 @@ /* This code should be a callback */ This->lpLcl->hWnd = hwnd; This->lpLcl->hFocusWnd = hwnd; - ReCreateDirectDraw(iface); + ReCreateDirectDraw((LPDIRECTDRAW*)iface); // TODO: // - create a scaner that check which driver we should get the HDC from

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