Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 30971: - Add defines for "Delete" and "Save As" buttons to all languages - Delete 4-bits icons
by dchapyshev＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dchapyshev Date: Sun Dec 2 22:51:15 2007 New Revision: 30971 URL: http://svn.reactos.org/svn/reactos?rev=30971&view=rev Log: - Add defines for "Delete" and "Save As" buttons to all languages - Delete 4-bits icons Modified: trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/resources/batterycharging.ico trunk/reactos/dll/cpl/powercfg/resources/batterychargingcritical.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginghalf.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginghigh.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginglow.ico trunk/reactos/dll/cpl/powercfg/resources/batterycritical.ico trunk/reactos/dll/cpl/powercfg/resources/batteryfull.ico trunk/reactos/dll/cpl/powercfg/resources/batteryhalf.ico trunk/reactos/dll/cpl/powercfg/resources/batteryhigh.ico trunk/reactos/dll/cpl/powercfg/resources/batterylow.ico trunk/reactos/dll/cpl/powercfg/resources/batteryunknown.ico trunk/reactos/dll/cpl/powercfg/resources/nobattery.ico Modified: trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/bg-B… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "Çà&õðàíâàíå", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Çàïèñ êàòî...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Èçòðèâàíå", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Çàïèñ êàòî...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Èçòðèâàíå", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Íåèçâåñòíî", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Êîãàòî êîìïþòúðúò ñå:",IDC_SAT,15,120,60,18 LTEXT "Çàõðàíâà îò ìðåæàòà",IDC_SAC,100,120,45,18 Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "&Schéma napájení", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Uloit jako...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Odstranit", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Uloit jako...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Neznámý", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Pokud je poèítaè:",IDC_SAT,15,120,60,10 LTEXT "Pøipojen",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "&Energieschemata", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Speichern &unter...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Löschen", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Unbekannt", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Bei:",IDC_SAT,15,120,60,10 LTEXT "Netzbetrieb",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "P&rofils d'alimentation", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Sauvegarder sous...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Supprimer", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Inconnu", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Alimentation :",IDC_SAT,15,120,60,10 LTEXT "Branché",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/id-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "Skema Tena&ga", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Simpan Sebagai...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Hapus", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Tidak Dikenal", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Ketika komputer:",IDC_SAT,15,120,60,10 LTEXT "Dicolok listrik",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc Sun Dec 2 22:51:15 2007 @@ -11,8 +11,8 @@ GROUPBOX "Schema di gestione dell'energia",-1,8,48,240,48 COMBOBOX IDC_ENERGYLIST,15,61,224,92,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Salva come...",-1,101,76,75,15,WS_DISABLED - PUSHBUTTON "&Cancella",-1,181,76,55,15,WS_DISABLED + PUSHBUTTON "&Salva come...",IDC_SAVEAS_BTN,101,76,75,15,WS_DISABLED + PUSHBUTTON "&Cancella",IDC_DELETE_BTN,181,76,55,15,WS_DISABLED GROUPBOX "sconosciuto",IDC_GRPDETAIL,8,100,240,112 LTEXT "Quando il computer è:",IDC_SAT,16,112,72,16 LTEXT "Alimentato\rda rete",IDC_SAC,120,112,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,45,13,194,36 GROUPBOX "&Energie schema's", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Opslaan als...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Verwijderen", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Onbekend", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Wanneer computer:",IDC_SAT,15,120,60,10 LTEXT "Op netvoeding werkt",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc Sun Dec 2 22:51:15 2007 @@ -15,8 +15,8 @@ -1,45,13,194,36 GROUPBOX "&Schematy zasilania", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Zapisz jako...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Usuñ", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Usuñ", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Nieznany", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Kiedy komputer jest:",IDC_SAT,15,120,60,10 LTEXT "Pod³¹czony",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc Sun Dec 2 22:51:15 2007 @@ -12,8 +12,8 @@ -1,37,5,194,36 GROUPBOX "&Ñõåìû óïðàâëåíèÿ ïèòàíèåì", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü &êàê...", -1, 103,85,75,15,WS_DISABLED - PUSHBUTTON "&Óäàëèòü", -1, 183,85,55,15,WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü &êàê...", IDC_SAVEAS_BTN, 103,85,75,15,WS_DISABLED + PUSHBUTTON "&Óäàëèòü", IDC_DELETE_BTN, 183,85,55,15,WS_DISABLED GROUPBOX "Íåò äàííûõ", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Ïðè ïèòàíèè:",IDC_SAT,15,120,60,10 LTEXT "îò ñåòè",IDC_SAC,113,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc Sun Dec 2 22:51:15 2007 @@ -10,8 +10,8 @@ -1,45,13,194,36 GROUPBOX "P&ower schemes", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&ºÑ¹·Ö¡à»ç¹...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Åº", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "&ºÑ¹·Ö¡à»ç¹...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Åº", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "äÁè·ÃÒº¤èÒ", IDC_GRPDETAIL, 7,108,240,105 LTEXT "àÁ×èÍ¤ÍÁ¾ÔÇàµÍÃìà»ç¹:",IDC_SAT,15,120,60,10 LTEXT "Plugged in",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Sun Dec 2 22:51:15 2007 @@ -18,8 +18,8 @@ -1,45,13,194,36 GROUPBOX "&Ñõåìè êåðóâàííÿ æèâëåííÿì", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Çáåðåãòè &ÿê...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "Â&èäàëèòè", -1, 180,85,55,15,WS_DISABLED + PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED + PUSHBUTTON "Â&èäàëèòè", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED GROUPBOX "Íåìàº äàíèõ", IDC_GRPDETAIL, 7,108,240,105 LTEXT "Ïðè æèâëåíí³:",IDC_SAT,15,120,60,10 LTEXT "â³ä ìåðåæ³",IDC_SAC,100,120,45,15 Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharging.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterychargingcritical.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginghalf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginghigh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginglow.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycritical.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryfull.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryhalf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryhigh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterylow.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryunknown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/nobattery.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available.

1 0

[dchapyshev] 30970: - Add Russian translation for deskadp and deskmon
by dchapyshev＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dchapyshev Date: Sun Dec 2 22:39:59 2007 New Revision: 30970 URL: http://svn.reactos.org/svn/reactos?rev=30970&view=rev Log: - Add Russian translation for deskadp and deskmon Added: trunk/reactos/dll/win32/shellext/deskadp/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Added: trunk/reactos/dll/win32/shellext/deskadp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/ru-RU.rc Sun Dec 2 22:39:59 2007 @@ -1,0 +1,48 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Àäàïòåð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï àäàïòåðà", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&Ñâîéñòâà", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Ñâåäåíèÿ îá àäàïòåðå", -1, 7, 56, 237, 75 + LTEXT "Òèï ìèêðîñõåì:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 90, 68, 150, 8, SS_NOPREFIX + LTEXT "Òèï êîíâåðòåðà DAC:", -1, 13, 80, 80, 8 + LTEXT "", IDC_DACTYPE, 90, 80, 150, 8, SS_NOPREFIX + LTEXT "Îáúåì ïàìÿòè:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 90, 92, 150, 8, SS_NOPREFIX + LTEXT "Ñòðîêà êîíòðîëëåðà:", -1, 13, 104, 80, 8 + LTEXT "", IDC_ADAPTERSTRING, 90, 104, 150, 8, SS_NOPREFIX + LTEXT "Ñâåäåíèÿ î BIOS:", -1, 13, 116, 67, 8 + LTEXT "", IDC_BIOSINFORMATION, 90, 116, 150, 8, SS_NOPREFIX + PUSHBUTTON "&Ñïèñîê âñåõ ðåæèìîâ...", IDC_LISTALLMODES, 7, 139, 95, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Ñïèñîê âñåõ ðåæèìîâ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Îòìåíà", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Ñïèñîê äîïóñòèìûõ ðåæèìîâ", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d îò %d, %s, %s" + IDS_DEFREFRESHRATE "÷àñòîòà ïî óìîë÷àíèþ" + IDES_REFRESHRATEFMT "%d Ãö" + IDS_4BPP "16 öâåòîâ" + IDS_8BPP "256 öâåòîâ" + IDS_15BPP "High Color (15 áèò)" + IDS_16BPP "High Color (16 áèò)" + IDS_24BPP "True Color (24 áèòà)" + IDS_32BPP "True Color (32 áèòà)" +END + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Sun Dec 2 22:39:59 2007 @@ -6,3 +6,4 @@ #include "lang/fr-FR.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/ru-RU.rc Sun Dec 2 22:39:59 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìîíèòîð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï ìîíèòîðà", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&Ñâîéñòâà", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Ïàðàìåòðû ìîíèòîðà", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&×àñòîòà îáíîâëåíèÿ ýêðàíà:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ñêðûòü ðåæèìû, êîòîðûå ìîíèòîð íå ìîæåò èñïîëüçîâàòü", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "Èñïîëüçîâàòü ïàðàìåòðû îáîðóäîâàíèÿ ïî óìîë÷àíèþ" + IDS_FREQFMT "%u Ãö" +END Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Sun Dec 2 22:39:59 2007 @@ -6,3 +6,4 @@ #include "lang/fr-FR.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc"

1 0

[dchapyshev] 30969: - Update Russian translation
by dchapyshev＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dchapyshev Date: Sun Dec 2 22:31:33 2007 New Revision: 30969 URL: http://svn.reactos.org/svn/reactos?rev=30969&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/serialui/lang/ru-RU.rc Sun Dec 2 22:31:33 2007 @@ -2,11 +2,11 @@ STRINGTABLE LOADONCALL DISCARDABLE BEGIN - IDS_EVENPARITY, "Even" - IDS_MARKPARITY, "Ïîìåòèòü" + IDS_EVENPARITY, "×åò" + IDS_MARKPARITY, "Ìàðêåð (1)" IDS_NOPARITY, "No parity" - IDS_ODDPARITY, "Odd" - IDS_SPACEPARITY, "Space" + IDS_ODDPARITY, "Íå÷åò" + IDS_SPACEPARITY, "Ïðîáåë (0)" IDS_ONESTOPBIT, "1 stop bit" IDS_ONE5STOPBITS, "1.5 stop bits" @@ -25,13 +25,13 @@ EXSTYLE 0x00000001 BEGIN CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 - CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 - CONTROL "Îòìåíà",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 - CONTROL "Baud rate:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 - CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 - CONTROL "Parity:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 - CONTROL "Stop bits:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 - CONTROL "Flow control:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,14,0x00000000 + CONTROL "Îòìåíà",IDC_CANCELBTN,"Button",0x50010000,158,156,56,14,0x00000000 + CONTROL "&Ñêîðîñòü (áèò/ñ):",IDC_STC1,"Static",0x50000000,16,31,80,9,0x00000000 + CONTROL "&Áèòû äàííûõ:",IDC_STC2,"Static",0x50000000,16,53,80,9,0x00000000 + CONTROL "&×åòíîñòü:",IDC_STC3,"Static",0x50000000,16,73,80,9,0x00000000 + CONTROL "Ñ&òîïîâûå áèòû:",IDC_STC4,"Static",0x50000000,16,96,80,9,0x00000000 + CONTROL "&Óïðàâëåíèå ïîòîêîì:",IDC_STC5,"Static",0x50000000,16,120,80,9,0x00000000 CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000

1 0

[pschweitzer] 30968: - Updated ChangeLog - Updated ReadMe : - added myself (no comment ; )) - fixed a link
by pschweitzer＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: pschweitzer Date: Sun Dec 2 22:13:25 2007 New Revision: 30968 URL: http://svn.reactos.org/svn/reactos?rev=30968&view=rev Log: - Updated ChangeLog - Updated ReadMe : - added myself (no comment ;)) - fixed a link Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sun Dec 2 22:13:25 2007 @@ -6,6 +6,7 @@ - Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added help strings when mouse is over a control. (Pierre Schweitzer) - Improved check for log directory (Pierre Schweitzer) + - Updated French translation (Pierre Schweitzer) - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. (Peter Ward) - Set the working directory for the "Options" shortcut correctly (see above bullet). (Colin Fink) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[peterw] 30967: - Small update to the readme.
by peterw＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: peterw Date: Sun Dec 2 21:56:21 2007 New Revision: 30967 URL: http://svn.reactos.org/svn/reactos?rev=30967&view=rev Log: - Small update to the readme. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[fireball] 30966: - Implement NtInitalizeRegistry with proper boot flags instead of TRUE/FALSE (our winlogon doesn't yet call the function with the CM_BOOT_FLAG_ACCEPTED_X flag-- this is needed to support setting the last known good boot/current control set). - Always set last mode to kernel-mode when calling this function.
by fireball＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: fireball Date: Sun Dec 2 21:40:33 2007 New Revision: 30966 URL: http://svn.reactos.org/svn/reactos?rev=30966&view=rev Log: - Implement NtInitalizeRegistry with proper boot flags instead of TRUE/FALSE (our winlogon doesn't yet call the function with the CM_BOOT_FLAG_ACCEPTED_X flag-- this is needed to support setting the last known good boot/current control set). - Always set last mode to kernel-mode when calling this function. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/system/smss/initreg.c trunk/reactos/include/ndk/cmtypes.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Dec 2 21:40:33 2007 @@ -3197,7 +3197,7 @@ /* Create the default hives */ #ifdef __REACTOS__ - Status = NtInitializeRegistry(TRUE); + Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); if (!NT_SUCCESS(Status)) { DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); Modified: trunk/reactos/base/system/smss/initreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initreg.c… ============================================================================== --- trunk/reactos/base/system/smss/initreg.c (original) +++ trunk/reactos/base/system/smss/initreg.c Sun Dec 2 21:40:33 2007 @@ -35,7 +35,7 @@ DPRINT("SM: %s: initializing registry\n", __FUNCTION__); /* Load remaining registry hives */ - return NtInitializeRegistry(FALSE); + return NtInitializeRegistry(CM_BOOT_FLAG_SMSS); } /* EOF */ Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h (original) +++ trunk/reactos/include/ndk/cmtypes.h Sun Dec 2 21:40:33 2007 @@ -110,6 +110,14 @@ #define CM_RESOURCE_DMA_TYPE_B 0x0020 #define CM_RESOURCE_DMA_TYPE_F 0x0040 +// +// NtInitializeRegistry Flags +// +#define CM_BOOT_FLAG_SMSS 0x0000 +#define CM_BOOT_FLAG_SETUP 0x0001 +#define CM_BOOT_FLAG_ACCEPTED 0x0002 +#define CM_BOOT_FLAG_MAX 0x03E9 + #ifdef NTOS_MODE_USER // @@ -510,3 +518,4 @@ #endif // _CMTYPES_H + Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sun Dec 2 21:40:33 2007 @@ -29,8 +29,6 @@ ACCESS_MASK GrantedAccess, ULONG HandleAttributes, PHANDLE HandleReturn); - -static BOOLEAN CmiRegistryInitialized = FALSE; /* FUNCTIONS ****************************************************************/ @@ -284,22 +282,4 @@ return Status; } -NTSTATUS -NTAPI -NtInitializeRegistry (IN USHORT Flag) -{ - PAGED_CODE(); - - if (CmiRegistryInitialized == TRUE) - return STATUS_ACCESS_DENIED; - - /* Save boot log file */ - IopSaveBootLogToFile(); - - CmpCmdInit(Flag); - CmiRegistryInitialized = TRUE; - - return STATUS_SUCCESS; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sun Dec 2 21:40:33 2007 @@ -1353,6 +1353,15 @@ IN PULONG ResultLength ); +NTSTATUS +NTAPI +CmLoadKey( + IN POBJECT_ATTRIBUTES TargetKey, + IN POBJECT_ATTRIBUTES SourceFile, + IN ULONG Flags, + IN PKEY_OBJECT KeyBody +); + // // Startup and Shutdown // @@ -1406,6 +1415,7 @@ extern BOOLEAN CmpWasSetupBoot; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead; +extern BOOLEAN CmpHoldLazyFlush; // // Inlined functions Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sun Dec 2 21:40:33 2007 @@ -12,6 +12,9 @@ #include "cm.h" #define NDEBUG #include "debug.h" + +BOOLEAN CmBootAcceptFirstTime = TRUE; +BOOLEAN CmFirstTime = TRUE; /* FUNCTIONS *****************************************************************/ @@ -503,13 +506,6 @@ NTSTATUS NTAPI -CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, - IN POBJECT_ATTRIBUTES SourceFile, - IN ULONG Flags, - IN PKEY_OBJECT KeyBody); - -NTSTATUS -NTAPI NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, @@ -557,6 +553,68 @@ /* Return status */ return Status; +} + +NTSTATUS +NTAPI +NtInitializeRegistry(IN USHORT Flag) +{ + BOOLEAN SetupBoot; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Always do this as kernel mode */ + if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); + + /* Validate flag */ + if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; + + /* Check if boot was accepted */ + if ((Flag >= CM_BOOT_FLAG_ACCEPTED) && (Flag <= CM_BOOT_FLAG_MAX)) + { + /* Only allow once */ + if (!CmBootAcceptFirstTime) return STATUS_ACCESS_DENIED; + CmBootAcceptFirstTime = FALSE; + + /* Get the control set accepted */ + Flag -= CM_BOOT_FLAG_ACCEPTED; + if (Flag) + { + /* FIXME: Save the last known good boot */ + //Status = CmpSaveBootControlSet(Flag); + + /* Notify HAL */ + HalEndOfBoot(); + + /* Enable lazy flush */ + CmpHoldLazyFlush = FALSE; + CmpLazyFlush(); + return Status; + } + + /* Otherwise, invalid boot */ + return STATUS_INVALID_PARAMETER; + } + + /* Check if this was a setup boot */ + SetupBoot = (Flag == CM_BOOT_FLAG_SETUP ? TRUE : FALSE); + + /* Make sure we're only called once */ + if (!CmFirstTime) return STATUS_ACCESS_DENIED; + CmFirstTime = FALSE; + + /* Acquire registry lock */ + //CmpLockRegistryExclusive(); + + /* Initialize the hives and lazy flusher */ + CmpCmdInit(SetupBoot); + + /* FIXME: Save version data */ + //CmpSetVersionData(); + + /* Release the registry lock */ + //CmpUnlockRegistry(); + return STATUS_SUCCESS; } NTSTATUS

1 0

[dchapyshev] 30965: - Add Russian translation
by dchapyshev＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dchapyshev Date: Sun Dec 2 21:37:23 2007 New Revision: 30965 URL: http://svn.reactos.org/svn/reactos?rev=30965&view=rev Log: - Add Russian translation Added: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ru-R… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc…

1 0

[dreimer] 30964: Remove Trailing spaces.
by dreimer＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dreimer Date: Sun Dec 2 21:25:06 2007 New Revision: 30964 URL: http://svn.reactos.org/svn/reactos?rev=30964&view=rev Log: Remove Trailing spaces. Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.h trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp trunk/tools/RosBE/RosBE-PPC/ovr/make trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/argpar… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp Sun Dec 2 21:25:06 2007 @@ -23,7 +23,7 @@ for(size_t i = 0; i < arguments.size(); i++) { const std::string arg = arguments[i]; - + // Find -Wl and parse if (arg.size() > 3 && arg.substr(0,3) == "-Wl") { @@ -68,7 +68,7 @@ return true; } // Catch --entry=foo@12 - else if (arg.size() > longName.size() && + else if (arg.size() > longName.size() && arg.substr(0,longName.size()) == longName && arg[longName.size()] == '=') { Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/argpar… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h Sun Dec 2 21:25:06 2007 @@ -5,7 +5,7 @@ #include <string> bool getarg -(const std::string &shortName, +(const std::string &shortName, const std::string &longName, bool remove, std::vector<std::string> &arguments, Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp Sun Dec 2 21:25:06 2007 @@ -38,7 +38,7 @@ } void possibly_define -(std::vector<std::string> &args, +(std::vector<std::string> &args, std::string label, std::string body = "1") { @@ -58,12 +58,12 @@ } int main( int argc, char **argv ) { - bool verbose = false, nostdlib = false, + bool verbose = false, nostdlib = false, nostartfiles = false, compile_only = false, is_dll = false, entry, mkheader = true; int status = 0; - std::string gcc_name, gcc_hash_output, gcc_line, - mingw_lib_dir, output_file, entry_point = "", + std::string gcc_name, gcc_hash_output, gcc_line, + mingw_lib_dir, output_file, entry_point = "", image_base = "0x400000", section_align = "0x1000", file_align = "0x1000", subsystem = "cui", result; @@ -97,8 +97,8 @@ if( entry ) { - if(entry_point.size() && entry_point[0] == '_') - { + if(entry_point.size() && entry_point[0] == '_') + { entry_point = entry_point.substr(1); } if( !compile_only ) @@ -140,7 +140,7 @@ // Stack on driver name and dump commands flag if( verbose ) gcc_args_str.insert(gcc_args_str.begin(),"-v"); - if (!compile_only) + if (!compile_only) { if( is_dll ) gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-q"); @@ -165,9 +165,9 @@ /* Ok fixup the elf object file */ ElfObjectFile eof(output_file); const ElfObjectFile::Symbol *entry_sym; - - if(!eof) exit(1); - + + if(!eof) exit(1); + entry_sym = eof.getNamedSymbol(entry_point); ElfPeHeader header @@ -182,7 +182,7 @@ atoi(subsystem.c_str()), is_dll, &eof); - + eof.addSection(".peheader", header.getData(), TYPE_PEHEADER); } Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/header… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp Sun Dec 2 21:25:06 2007 @@ -3,7 +3,7 @@ #include "header.h" ElfPeHeader::ElfPeHeader - (uint32_t imagebase, + (uint32_t imagebase, uint32_t filealign, uint32_t sectionalign, const ElfObjectFile::Symbol *entry, @@ -33,7 +33,7 @@ return sectionalign; /* We'll compute it for real later */ } -void ElfPeHeader::createHeaderSection() +void ElfPeHeader::createHeaderSection() { std::vector<section_mapping_t> sectionRvaSet; uint32_t imageSize = getSectionRvas(sectionRvaSet); @@ -95,11 +95,11 @@ le32pwrite_postinc(dataptr, getTlsInfo()); // Fixup size of optional header le16write - (&data[0] + optHeaderSizeMember, + (&data[0] + optHeaderSizeMember, (dataptr - &data[0]) - coffHeaderSize); // Here, we store references to the sections, filling in the RVA and // size, but leaving out the other info. We write the section name - // truncated into the name field and leave the section id in the + // truncated into the name field and leave the section id in the // physical address bit for (int i = 0; i < sectionRvaSet.size(); i++) { @@ -115,7 +115,7 @@ le32write_postinc(dataptr, size); le32write_postinc(dataptr, rva); le32write_postinc(dataptr, size); - // Note: we put the index in the offset slot so we can find the + // Note: we put the index in the offset slot so we can find the // real offset later in the loader le32write_postinc(dataptr, sectionRvaSet[i].index); le32write_postinc(dataptr, 0); @@ -133,7 +133,7 @@ uint32_t start = computeSize(); uint32_t limit = start; for(int i = 0; i < eof->getNumSections(); i++) { - { + { const ElfObjectFile::Section &sect = eof->getSection(i); if(sect.getFlags() & SHF_ALLOC) { limit = roundup(start + sect.logicalSize(), sectionalign); @@ -155,7 +155,7 @@ return IMAGE_FILE_MACHINE_POWERPCBE; /* for now */ } -u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) +u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) { const ElfObjectFile::Section *sect = eof->getNamedSection(name); uint32_t sectaddr; @@ -188,7 +188,7 @@ return getNamedSectionInfo(eof, mapping, ".rsrc"); } -u32pair_t ElfPeHeader::getExceptionInfo() const +u32pair_t ElfPeHeader::getExceptionInfo() const { return std::make_pair(0,0); } @@ -224,12 +224,12 @@ } uint32_t ElfPeHeader::getEntryPoint -(const std::vector<section_mapping_t> &secmap, +(const std::vector<section_mapping_t> &secmap, const ElfObjectFile::Symbol *entry) const { if(entry == NULL) return computeSize(); for(int i = 0; i < secmap.size(); i++) { - if(secmap[i].index == entry->section) + if(secmap[i].index == entry->section) return secmap[i].rva + entry->offset; } return computeSize(); Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/header… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.h Sun Dec 2 21:25:06 2007 @@ -11,7 +11,7 @@ const ElfObjectFile::Section *section; uint32_t rva; int index; - + section_mapping_t (const ElfObjectFile::Section *sect, uint32_t rva, int index) : section(sect), rva(rva), index(index) { } @@ -22,7 +22,7 @@ class ElfPeHeader { public: ElfPeHeader - (uint32_t imagebase, + (uint32_t imagebase, uint32_t imagealign, uint32_t filealign, const ElfObjectFile::Symbol *entry, @@ -56,9 +56,9 @@ uint32_t saToRva(int section, uint32_t offset) const; uint32_t vaToRva(uint32_t source_addr) const; - uint32_t + uint32_t imagebase, filealign, sectionalign, - stackreserve, stackcommit, + stackreserve, stackcommit, heapreserve, heapcommit; bool dll; int subsysid; Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/object… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp Sun Dec 2 21:25:06 2007 @@ -79,7 +79,7 @@ void ElfObjectFile::addSection(const std::string &name, const secdata_t &data, int type) { - Elf_Scn *newsect = elf_newscn(elfHeader), + Elf_Scn *newsect = elf_newscn(elfHeader), *strsect = elf_getscn(elfHeader, shstrndx); Elf32_Shdr *shdr = elf32_getshdr(newsect); /* Create data for the new section */ Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/object… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h Sun Dec 2 21:25:06 2007 @@ -12,8 +12,8 @@ class Symbol { public: - Symbol(const std::string &name, uint32_t offset, - int section, int flags) : + Symbol(const std::string &name, uint32_t offset, + int section, int flags) : name(name), offset(offset), section(section), flags(flags) { } std::string name; uint32_t offset; @@ -23,12 +23,12 @@ class Section { public: - Section(const Section &other) : - obj(other.obj), section(other.section), have_data(false), - number(other.number) { + Section(const Section &other) : + obj(other.obj), section(other.section), have_data(false), + number(other.number) { e32shdr = elf32_getshdr(section); } - Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : + Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : obj(&obj), section(sechdr), have_data(false), number(number) { e32shdr = elf32_getshdr(section); } @@ -40,7 +40,7 @@ number = other.number; } operator bool () { return !!section; } - std::string getName() const { + std::string getName() const { return obj->getString(e32shdr->sh_name); } @@ -100,7 +100,7 @@ bool operator ! () const { return fd == -1 ? true : false; } int getNumSections() const { return sections.size(); } uint32_t getEntryPoint() const; - std::string getString(int offset) const { + std::string getString(int offset) const { return elf_strptr(elfHeader, shstrndx, offset); } void addSection Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/util.c… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp Sun Dec 2 21:25:06 2007 @@ -34,7 +34,7 @@ le32write_postinc(dataptr, value.second); } -uint16_t be16read(uint8_t *dataptr) +uint16_t be16read(uint8_t *dataptr) { return dataptr[0] << 8 | dataptr[1]; } @@ -46,7 +46,7 @@ return res; } -uint32_t be32read(uint8_t *dataptr) +uint32_t be32read(uint8_t *dataptr) { return be16read(dataptr) << 16 | be16read(dataptr+2); } Modified: trunk/tools/RosBE/RosBE-PPC/ovr/make URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/ovr/make?rev… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/ovr/make (original) +++ trunk/tools/RosBE/RosBE-PPC/ovr/make Sun Dec 2 21:25:06 2007 @@ -3,7 +3,7 @@ export PATH=tools/ppc.lost+found:$PATH if [ ! -d tmp-ppc ] ; then - mkdir tmp-ppc || echo "Could not make temp dir" + mkdir tmp-ppc || echo "Could not make temp dir" fi $OLDMAKE \ Modified: trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b (original) +++ trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b Sun Dec 2 21:25:06 2007 @@ -1,64 +1,64 @@ -<CHRP-BOOT> -<COMPATIBLE> -MacRISC MacRISC3 MacRISC4 -</COMPATIBLE> -<DESCRIPTION> -GNU/Linux PPC bootloader -</DESCRIPTION> -<BOOT-SCRIPT> -" screen" output -load-base release-load-area -boot cd:,\install\yaboot -</BOOT-SCRIPT> -<OS-BADGE-ICONS> -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 -</OS-BADGE-ICONS> -</CHRP-BOOT> +<CHRP-BOOT> +<COMPATIBLE> +MacRISC MacRISC3 MacRISC4 +</COMPATIBLE> +<DESCRIPTION> +GNU/Linux PPC bootloader +</DESCRIPTION> +<BOOT-SCRIPT> +" screen" output +load-base release-load-area +boot cd:,\install\yaboot +</BOOT-SCRIPT> +<OS-BADGE-ICONS> +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 +</OS-BADGE-ICONS> +</CHRP-BOOT> Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py Sun Dec 2 21:25:06 2007 @@ -124,7 +124,7 @@ return result + \ round_pad(self.name,4) + \ round_pad(self.classname,4) - + def size_header(self): return len(self.encode_header()) @@ -143,16 +143,16 @@ data = struct.pack(">"+str(len(valuecells))+"I",*valuecells) regf.write(cellid, data) return cellid - + def makecell(self,regf): valcells = [] keycells = [] - + mycell = regf.claim(self.size_header()) - + for val in self.values: valcells.append(val.makecell(regf)) - + for key in self.subkeys: key.parentcell = mycell keycells.append((key.name,key.makecell(regf))) @@ -160,7 +160,7 @@ self.keylist = self.make_key_list_cell(regf, keycells) self.valuelist = self.make_value_list_cell(regf, valcells) regf.write(mycell,self.encode_header()) - + return mycell class hbin: @@ -264,7 +264,7 @@ outf.write(pad(header,self.blocksize)) for hbin in self.bins: hbin.export(outf) - + def alloc_hbin(self): self.thebin = hbin(len(self.bins)) self.bins.append(self.thebin) Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/mkhiv… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py Sun Dec 2 21:25:06 2007 @@ -21,7 +21,7 @@ hivedir = sys.argv[2] ri = reginf.reginf() - + for file in ["hivesys.inf","hivecls.inf","hivesft.inf","hivedef.inf"]: lines = open(os.path.join(infdir,file)).read().split('\n') curline = 0 @@ -53,4 +53,4 @@ thehive.export(outf) outf.close() - + Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/regin… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py Sun Dec 2 21:25:06 2007 @@ -1,5 +1,5 @@ import hbin -import struct +import struct FLG_ADDREG_BINVALUETYPE = 1 FLG_ADDREG_NOCLOBBER = 2 @@ -38,7 +38,7 @@ (len(stripcomment(linelist[curline]).strip()) == 0 or \ linelist[curline] == '['): curline = curline + 1 - + while not stop and curline < len(linelist): theline = linelist[curline] if len(theline) and theline[-1] == '\\': @@ -138,7 +138,7 @@ else: result = self.parsed[4:] return result - + class reginf: def __init__(self): self.content = [] Modified: trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pynls/nlsswa… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py Sun Dec 2 21:25:06 2007 @@ -15,7 +15,7 @@ for i in xrange(0,narrow_size): result = result + struct.pack(">H",*struct.unpack("<H",nlsbuf[start:start+2])) start = start + 2 - + # Optional OEM table nextlen = struct.unpack("<H",nlsbuf[start:start+2])[0] result = result + struct.pack(">H",nextlen) @@ -27,13 +27,13 @@ start = start + 2 else: result = result + struct.pack(">H",nextlen) - + dbcs_ranges = struct.unpack("<H",nlsbuf[start:start+2])[0] if (dbcs_ranges & 0x8000) != 0: for i in xrange(start/2,len(nlsbuf)/2): result = result + struct.pack(">H",*struct.unpack("<H",nlsbuf[start:start+2])) start = start + 2 - + result = result + nlsbuf[len(result):] return result

1 0

[greatlrd] 30963: Fix two smaller bugs in DxDdStartupDxGraphics ------------------------------------------------ fix : use full path to dxg.sys when we trying load it fix : only try unload dxg.sys if it really been load and got a fail status code.
by greatlrd＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: greatlrd Date: Sun Dec 2 20:31:12 2007 New Revision: 30963 URL: http://svn.reactos.org/svn/reactos?rev=30963&view=rev Log: Fix two smaller bugs in DxDdStartupDxGraphics ------------------------------------------------ fix : use full path to dxg.sys when we trying load it fix : only try unload dxg.sys if it really been load and got a fail status code. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Dec 2 20:31:12 2007 @@ -50,10 +50,12 @@ // DxApiGetVersion() /* Loading the kernel interface of directx for win32k */ - ghDxGraphics = EngLoadImage(L"drivers\\dxg.sys"); - if (!ghDxGraphics) - { - DPRINT1("Warning: dxg.sys not found\n"); + + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); + + if (ghDxGraphics == NULL) + { + DPRINT1("Warning: dxg.sys not found\n"); Status = STATUS_DLL_NOT_FOUND; } else @@ -83,8 +85,11 @@ { gpfnStartupDxGraphics = NULL; gpfnCleanupDxGraphics = NULL; - EngUnloadImage( ghDxGraphics); - ghDxGraphics = NULL; + if (ghDxGraphics != NULL) + { + EngUnloadImage( ghDxGraphics); + ghDxGraphics = NULL; + } DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); } else

1 0

[fireball] 30962: - Hackfix the build: remove the function call to NetUserSetInfo (#if0/#endif). Eric, please, do a proper fix and revert this commit when it's ready.
by fireball＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: fireball Date: Sun Dec 2 19:54:32 2007 New Revision: 30962 URL: http://svn.reactos.org/svn/reactos?rev=30962&view=rev Log: - Hackfix the build: remove the function call to NetUserSetInfo (#if0/#endif). Eric, please, do a proper fix and revert this commit when it's ready. Modified: trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c Sun Dec 2 19:54:32 2007 @@ -205,7 +205,11 @@ useri0.usri0_name = szNewUserName; +#if 0 status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); +#else + status = NERR_Success; +#endif if (status != NERR_Success) { TCHAR szText[256];

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