Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[chorns] 19142: Display reason for failure
by chorns＠svn.reactos.com 11 Nov '05

11 Nov '05

Display reason for failure Modified: trunk/reactos/regtests/shared/regtests.c _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-11-11 18:46:59 UTC (rev 19141) +++ trunk/reactos/regtests/shared/regtests.c 2005-11-11 19:07:27 UTC (rev 19142) @@ -145,7 +145,6 @@ DisplayResult(PERFORM_TEST_ARGS* Args, LPSTR OutputBuffer) { - char Buffer[5000]; char Format[100]; if (Args->Result == TS_OK) @@ -165,7 +164,7 @@ Args->Time)); } else - sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Buffer); + sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Args->Buffer); if (Args->OutputRoutine != NULL) (*Args->OutputRoutine)(OutputBuffer);

1 0

[gedmurphy] 19141: delete old version of sc.exe
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

delete old version of sc.exe Deleted: trunk/reactos/apps/utils/sc/

1 0

[greatlrd] 19140: sorry did break the build
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

sorry did break the build Modified: trunk/reactos/subsys/system/notepad/Ja.rc _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:39:39 UTC (rev 19139) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:46:32 UTC (rev 19140) @@ -21,8 +21,8 @@ */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) + MAIN_MENU MENU BEGIN POPUP "âtâ@âCâï(&F)"

1 0

[gedmurphy] 19139: add sc.exe to the build
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

add sc.exe to the build Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-11-11 18:33:29 UTC (rev 19138) +++ trunk/reactos/subsys/system/directory.xml 2005-11-11 18:39:39 UTC (rev 19139) @@ -56,6 +56,9 @@ <directory name="rundll32"> <xi:include href="rundll32/rundll32.xml" /> </directory> +<directory name="sc"> + <xi:include href="sc/sc.xml" /> +</directory> <directory name="services"> <xi:include href="services/services.xml" /> </directory>

1 0

[greatlrd] 19138: Make notepad lang rc MSVC compatible
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

Make notepad lang rc MSVC compatible Modified: trunk/reactos/subsys/system/notepad/Cs.rc Modified: trunk/reactos/subsys/system/notepad/Da.rc Modified: trunk/reactos/subsys/system/notepad/De.rc Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/Es.rc Modified: trunk/reactos/subsys/system/notepad/Fi.rc Modified: trunk/reactos/subsys/system/notepad/Fr.rc Modified: trunk/reactos/subsys/system/notepad/Hu.rc Modified: trunk/reactos/subsys/system/notepad/It.rc Modified: trunk/reactos/subsys/system/notepad/Ja.rc Modified: trunk/reactos/subsys/system/notepad/Nl.rc Modified: trunk/reactos/subsys/system/notepad/Pl.rc Modified: trunk/reactos/subsys/system/notepad/Pt.rc Modified: trunk/reactos/subsys/system/notepad/Ru.rc Modified: trunk/reactos/subsys/system/notepad/Si.rc Modified: trunk/reactos/subsys/system/notepad/Sk.rc Modified: trunk/reactos/subsys/system/notepad/Sv.rc Modified: trunk/reactos/subsys/system/notepad/Th.rc Modified: trunk/reactos/subsys/system/notepad/Zh.rc _____ Modified: trunk/reactos/subsys/system/notepad/Cs.rc --- trunk/reactos/subsys/system/notepad/Cs.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Cs.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -24,44 +24,47 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Soubor" { - MENUITEM "&Nov²...", CMD_NEW - MENUITEM "&Otev°Ýt\tCtrl+O", CMD_OPEN - MENUITEM "&Ulo¥it\tCtrl+S", CMD_SAVE - MENUITEM "Ulo¥it j&ako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Tisk", CMD_PRINT - MENUITEM "Nas&tavenÝ strßnky...", CMD_PAGE_SETUP - MENUITEM "NastavenÝ tiskß&rny...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Konec", CMD_EXIT - } -POPUP "U&pravit" { - MENUITEM "&Zpýt\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT - MENUITEM "&KopÝrovat\tCtrl+C", CMD_COPY - MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE - MENUITEM "&Smazat\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL - MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP - MENUITEM "&PÝsmo...", CMD_FONT - } -POPUP "&Nßpovýda" { - MENUITEM "&Obsah", CMD_HELP_CONTENTS - MENUITEM "&NajÝt...", CMD_HELP_SEARCH - MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&Nov²...", CMD_NEW + MENUITEM "&Otev°Ýt\tCtrl+O", CMD_OPEN + MENUITEM "&Ulo¥it\tCtrl+S", CMD_SAVE + MENUITEM "Ulo¥it j&ako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Tisk", CMD_PRINT + MENUITEM "Nas&tavenÝ strßnky...", CMD_PAGE_SETUP + MENUITEM "NastavenÝ tiskß&rny...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Konec", CMD_EXIT + END + POPUP "U&pravit" + BEGIN + MENUITEM "&Zpýt\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT + MENUITEM "&KopÝrovat\tCtrl+C", CMD_COPY + MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE + MENUITEM "&Smazat\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH + MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL + MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP + MENUITEM "&PÝsmo...", CMD_FONT + END + POPUP "&Nßpovýda" + BEGIN + MENUITEM "&Obsah", CMD_HELP_CONTENTS + MENUITEM "&NajÝt...", CMD_HELP_SEARCH + MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Da.rc --- trunk/reactos/subsys/system/notepad/Da.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Da.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,43 +22,47 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Fil" { - MENUITEM "&Ny...", CMD_NEW - MENUITEM "?&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE - MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP - MENUITEM "&Udskriv", CMD_PRINT - MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afslut", CMD_EXIT - } -POPUP "&Rediger" { - MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Klip\tCtrl+X", CMD_CUT - MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "Sµt &ind\tCtrl+V", CMD_PASTE - MENUITEM "&Slet\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Marker &alt", CMD_SELECT_ALL - MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Automatisk &linjeskift", CMD_WRAP - } -POPUP "&S°g" { - MENUITEM "&S°g...", CMD_SEARCH - MENUITEM "&Find nµste\tF3", CMD_SEARCH_NEXT - } -POPUP "&Hjµlp" { - MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Om Notesblok", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny...", CMD_NEW + MENUITEM "?&bn\tEnter", CMD_OPEN + MENUITEM "&Gem", CMD_SAVE + MENUITEM "Gem so&m...", CMD_SAVE_AS + MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP + MENUITEM "&Udskriv", CMD_PRINT + MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Afslut", CMD_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klip\tCtrl+X", CMD_CUT + MENUITEM "K&opier\tCtrl+C", CMD_COPY + MENUITEM "Sµt &ind\tCtrl+V", CMD_PASTE + MENUITEM "&Slet\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Marker &alt", CMD_SELECT_ALL + MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Automatisk &linjeskift", CMD_WRAP + END + POPUP "&S°g" + BEGIN + MENUITEM "&S°g...", CMD_SEARCH + MENUITEM "&Find nµste\tF3", CMD_SEARCH_NEXT + END + POPUP "&Hjµlp" + BEGIN + MENUITEM "&Indhold", CMD_HELP_CONTENTS + MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH + MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Om Notesblok", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/De.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,50 +23,55 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Datei" { - MENUITEM "&Neu...", CMD_NEW - MENUITEM "Í&ffnen...", CMD_OPEN - MENUITEM "&Speichern", CMD_SAVE - MENUITEM "Speichern &unter...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP - MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", CMD_EXIT - } -POPUP "&Bearbeiten" { - MENUITEM "&R³ckgõngig\tStrg+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT - MENUITEM "&Kopieren\tStrg+C", CMD_COPY - MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE - MENUITEM "&L÷schen\tEntf", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE - MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Alles &markieren", CMD_SELECT_ALL - MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE - } -POPUP "F&ormat" { - MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftart...", CMD_FONT -} -POPUP "&Anicht" { - MENUITEM "Status&leiste", CMD_STATUSBAR -} -POPUP "&Hilfe" { - MENUITEM "&Inhalt", CMD_HELP_CONTENTS - MENUITEM "&Suchen...", CMD_HELP_SEARCH - MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Neu...", CMD_NEW + MENUITEM "Í&ffnen...", CMD_OPEN + MENUITEM "&Speichern", CMD_SAVE + MENUITEM "Speichern &unter...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP + MENUITEM "&Drucken", CMD_PRINT + MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Beenden", CMD_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&R³ckgõngig\tStrg+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT + MENUITEM "&Kopieren\tStrg+C", CMD_COPY + MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE + MENUITEM "&L÷schen\tEntf", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE + MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Alles &markieren", CMD_SELECT_ALL + MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Zeilenumbruch", CMD_WRAP + MENUITEM "&Schriftart...", CMD_FONT + END + POPUP "&Anicht" + BEGIN + MENUITEM "Status&leiste", CMD_STATUSBAR + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Inhalt", CMD_HELP_CONTENTS + MENUITEM "&Suchen...", CMD_HELP_SEARCH + MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,52 +23,57 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&File" { - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "&Print", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT - } -POPUP "&Edit" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", CMD_SEARCH - MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - } -POPUP "F&ormat" { - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT -} -POPUP "&View" { - MENUITEM "Status&bar", CMD_STATUSBAR -} -POPUP "&Help" { - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&License", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY - MENUITEM "Inf&o", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New...", CMD_NEW + MENUITEM "&Open\tCtrl+O", CMD_OPEN + MENUITEM "&Save\tCtrl+S", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "&Print", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Find...\tCtrl+F", CMD_SEARCH + MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Help" + BEGIN + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "Inf&o", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -25,44 +25,47 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Archivo" { - MENUITEM "&Nuevo...", CMD_NEW - MENUITEM "&Abrir\tCtrl+O", CMD_OPEN - MENUITEM "&Guardar\tCtrl+S", CMD_SAVE - MENUITEM "Guardar &como...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "Configurar &pßgina...", CMD_PAGE_SETUP - MENUITEM "Configuraci¾n &impresora...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Salir", CMD_EXIT - } -POPUP "&Editar" { - MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "&Pegar\tCtrl+V", CMD_PASTE - MENUITEM "&Borrar\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Ajuste de lÝnea", CMD_WRAP - MENUITEM "Tipo de &letra...", CMD_FONT - } -POPUP "A&yuda" { - MENUITEM "?&ndice", CMD_HELP_CONTENTS - MENUITEM "&Buscar...", CMD_HELP_SEARCH - MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Nuevo...", CMD_NEW + MENUITEM "&Abrir\tCtrl+O", CMD_OPEN + MENUITEM "&Guardar\tCtrl+S", CMD_SAVE + MENUITEM "Guardar &como...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imprimir", CMD_PRINT + MENUITEM "Configurar &pßgina...", CMD_PAGE_SETUP + MENUITEM "Configuraci¾n &impresora...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Salir", CMD_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "&Pegar\tCtrl+V", CMD_PASTE + MENUITEM "&Borrar\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Ajuste de lÝnea", CMD_WRAP + MENUITEM "Tipo de &letra...", CMD_FONT + END + POPUP "A&yuda" + BEGIN + MENUITEM "?&ndice", CMD_HELP_CONTENTS + MENUITEM "&Buscar...", CMD_HELP_SEARCH + MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Fi.rc --- trunk/reactos/subsys/system/notepad/Fi.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Fi.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,42 +22,45 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Tiedosto" { - MENUITEM "&Uusi...", CMD_NEW - MENUITEM "&Avaa", CMD_OPEN - MENUITEM "Ta&lleta", CMD_SAVE - MENUITEM "Talleta &nimellõ...", CMD_SAVE_AS - MENUITEM "T&ulosta", CMD_PRINT - MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP - MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Poistu", CMD_EXIT - } -POPUP "&Muokkaa" { - MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT - MENUITEM "&Kopioi\tCtrl+C", CMD_COPY - MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE - MENUITEM "P&oista\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Valitse kaikki", CMD_SELECT_ALL - MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP - } -POPUP "&Apua" { - MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS - MENUITEM "&Etsi...", CMD_HELP_SEARCH - MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Tiedosto" + BEGIN + MENUITEM "&Uusi...", CMD_NEW + MENUITEM "&Avaa", CMD_OPEN + MENUITEM "Ta&lleta", CMD_SAVE + MENUITEM "Talleta &nimellõ...", CMD_SAVE_AS + MENUITEM "T&ulosta", CMD_PRINT + MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP + MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Poistu", CMD_EXIT + END + POPUP "&Muokkaa" + BEGIN + MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT + MENUITEM "&Kopioi\tCtrl+C", CMD_COPY + MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE + MENUITEM "P&oista\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Etsi...", CMD_SEARCH + MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "&Valitse kaikki", CMD_SELECT_ALL + MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP + END + POPUP "&Apua" + BEGIN + MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS + MENUITEM "&Etsi...", CMD_HELP_SEARCH + MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Fr.rc --- trunk/reactos/subsys/system/notepad/Fr.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Fr.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,44 +23,47 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU -{ - POPUP "&Fichier" { - MENUITEM "&Nouveau...", CMD_NEW - MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN - MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE - MENUITEM "Enregistrer &sous...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Im&primer", CMD_PRINT - MENUITEM "&Mise en page...", CMD_PAGE_SETUP - MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Quitter", CMD_EXIT - } -POPUP "&Edition" { - MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Co&uper\tCtrl+X", CMD_CUT - MENUITEM "&Copier\tCtrl+C", CMD_COPY - MENUITEM "C&oller\tCtrl+V", CMD_PASTE - MENUITEM "&Effacer\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Retour Ó la ligne", CMD_WRAP - MENUITEM "&Police...", CMD_FONT - } -POPUP "&Aide" { - MENUITEM "&Sommaire", CMD_HELP_CONTENTS - MENUITEM "&Rechercher...", CMD_HELP_SEARCH - MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau...", CMD_NEW + MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN + MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE + MENUITEM "Enregistrer &sous...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Im&primer", CMD_PRINT + MENUITEM "&Mise en page...", CMD_PAGE_SETUP + MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Quitter", CMD_EXIT + END + POPUP "&Edition" + BEGIN + MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Co&uper\tCtrl+X", CMD_CUT + MENUITEM "&Copier\tCtrl+C", CMD_COPY + MENUITEM "C&oller\tCtrl+V", CMD_PASTE + MENUITEM "&Effacer\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH + MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Retour Ó la ligne", CMD_WRAP + MENUITEM "&Police...", CMD_FONT + END + POPUP "&Aide" + BEGIN + MENUITEM "&Sommaire", CMD_HELP_CONTENTS + MENUITEM "&Rechercher...", CMD_HELP_SEARCH + MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Hu.rc --- trunk/reactos/subsys/system/notepad/Hu.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Hu.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,43 +22,46 @@ */ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -{ - POPUP "&Fßjl" { - MENUITEM "?&j", CMD_NEW - MENUITEM "Meg&nyitßs...", CMD_OPEN - MENUITEM "&MentÚs", CMD_SAVE - MENUITEM "MentÚs mß&skÚnt...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&OldalbeßllÝtßs...", CMD_PAGE_SETUP - MENUITEM "Nyom&tatßs...", CMD_PRINT - MENUITEM "Nyomtat¾ &beßllÝtßs...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&KilÚpÚs", CMD_EXIT - } -POPUP "S&zerkesztÚs" { - MENUITEM "&Visszavonßs\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Kivß&gßs\tCtrl+X", CMD_CUT - MENUITEM "&Mßsolßs\tCtrl+C", CMD_COPY - MENUITEM "&BeillesztÚs\tCtrl+V", CMD_PASTE - MENUITEM "T÷r&lÚs\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&KeresÚs...", CMD_SEARCH - MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Az ÷sszes kijel÷lÚse", CMD_SELECT_ALL - MENUITEM "&Id§/dßtum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Hossz· sorok t÷rdelÚse", CMD_WRAP - } -POPUP "&S·g¾" { - MENUITEM "&TÚmak÷r÷k", CMD_HELP_CONTENTS - MENUITEM "&KeresÚs...", CMD_HELP_SEARCH - MENUITEM "&Hasznßlat", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fßjl" + BEGIN + MENUITEM "?&j", CMD_NEW + MENUITEM "Meg&nyitßs...", CMD_OPEN + MENUITEM "&MentÚs", CMD_SAVE + MENUITEM "MentÚs mß&skÚnt...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&OldalbeßllÝtßs...", CMD_PAGE_SETUP + MENUITEM "Nyom&tatßs...", CMD_PRINT + MENUITEM "Nyomtat¾ &beßllÝtßs...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&KilÚpÚs", CMD_EXIT + END + POPUP "S&zerkesztÚs" + BEGIN + MENUITEM "&Visszavonßs\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Kivß&gßs\tCtrl+X", CMD_CUT + MENUITEM "&Mßsolßs\tCtrl+C", CMD_COPY + MENUITEM "&BeillesztÚs\tCtrl+V", CMD_PASTE + MENUITEM "T÷r&lÚs\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&KeresÚs...", CMD_SEARCH + MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "&Az ÷sszes kijel÷lÚse", CMD_SELECT_ALL + MENUITEM "&Id§/dßtum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Hossz· sorok t÷rdelÚse", CMD_WRAP + END + POPUP "&S·g¾" + BEGIN + MENUITEM "&TÚmak÷r÷k", CMD_HELP_CONTENTS + MENUITEM "&KeresÚs...", CMD_HELP_SEARCH + MENUITEM "&Hasznßlat", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/It.rc --- trunk/reactos/subsys/system/notepad/It.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/It.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -25,44 +25,47 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&File" { - MENUITEM "&Nuovo", CMD_NEW - MENUITEM "&Apri...\tCtrl+O", CMD_OPEN - MENUITEM "&Salva\tCtrl+S", CMD_SAVE - MENUITEM "Salva &con nome...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Stampa", CMD_PRINT - MENUITEM "&Imposta pagina...", CMD_PAGE_SETUP - MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&sci", CMD_EXIT - } -POPUP "&Modifica" { - MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Taglia\tCtrl+X", CMD_CUT - MENUITEM "&Copia\tCtrl+C", CMD_COPY - MENUITEM "&Incolla\tCtrl+V", CMD_PASTE - MENUITEM "&Elimina\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Trova\tCtrl+F", CMD_SEARCH - MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Seleziona &tutto\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Ora/Data\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&A campo automatico", CMD_WRAP - MENUITEM "&Imposta carattere...", CMD_FONT - } -POPUP "&Aiuto" { - MENUITEM "&Contenuti", CMD_HELP_CONTENTS - MENUITEM "&Trova...", CMD_HELP_SEARCH - MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Nuovo", CMD_NEW + MENUITEM "&Apri...\tCtrl+O", CMD_OPEN + MENUITEM "&Salva\tCtrl+S", CMD_SAVE + MENUITEM "Salva &con nome...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Stampa", CMD_PRINT + MENUITEM "&Imposta pagina...", CMD_PAGE_SETUP + MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&sci", CMD_EXIT + END + POPUP "&Modifica" + BEGIN + MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia\tCtrl+X", CMD_CUT + MENUITEM "&Copia\tCtrl+C", CMD_COPY + MENUITEM "&Incolla\tCtrl+V", CMD_PASTE + MENUITEM "&Elimina\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Trova\tCtrl+F", CMD_SEARCH + MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Seleziona &tutto\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Ora/Data\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&A campo automatico", CMD_WRAP + MENUITEM "&Imposta carattere...", CMD_FONT + END + POPUP "&Aiuto" + BEGIN + MENUITEM "&Contenuti", CMD_HELP_CONTENTS + MENUITEM "&Trova...", CMD_HELP_SEARCH + MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -20,55 +20,61 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +#pragma code_page(932) MAIN_MENU MENU -{ - POPUP "âtâ@âCâï(&F)" { - MENUITEM "ÉVïKìýÉ¼(&N)...", CMD_NEW - MENUITEM "èJé¡(&O)\tCtrl+O", CMD_OPEN - MENUITEM "ò?æÂ(&S)\tCtrl+S", CMD_SAVE - MENUITEM "û?æOéòté»é?ò?æÂ(&A)...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "âyü[âWÉ¦ÆÞ(&T)...", CMD_PAGE_SETUP - MENUITEM "ê¾ì³(&P)", CMD_PRINT - MENUITEM "âvâèâôâ^é?É¦ÆÞ(&R)...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "ÅIù?(&X)", CMD_EXIT - } -POPUP "òÊÅW(&E)" { - MENUITEM "î?é?û?éÀ(&U)\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "ÉÏéÞÄµéÞ(&T)\tCtrl+X", CMD_CUT - MENUITEM "âRâsü[(&C)\tCtrl+C", CMD_COPY - MENUITEM "âyü[âXâg(&P)\tCtrl+V", CMD_PASTE - MENUITEM "ìÝÅ£(&D)\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT - MENUITEM "ÆuèÀ\tCtrl+H", CMD_REPLACE - MENUITEM "ìséÍê?ô«...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "æSé?æIæ(&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "ô·òtéãÄ×ìÅé?æ}ô³(&T)\tF5", CMD_TIME_DATE - } -POPUP "ÅæÄ«(&O)" { - MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP - MENUITEM "âtâHâôâg(&F)...", CMD_FONT -} -POPUP "ò\\Äª(&V)" { - MENUITEM "âXâeü[â^âX âoü[(&B)", CMD_STATUSBAR -} -POPUP "âwâïâv(&H)" { - MENUITEM "û?Äf(&C)", CMD_HELP_CONTENTS - MENUITEM "îfì§(&S)...", CMD_HELP_SEARCH - MENUITEM "âwâïâvé?Ägéóò¹(&H)", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE - MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY - MENUITEM "Å¯ò±(&O)" CMD_ABOUT_WINE - } -} +BEGIN + POPUP "âtâ@âCâï(&F)" + BEGIN + MENUITEM "ÉVïKìýÉ¼(&N)...", CMD_NEW + MENUITEM "èJé¡(&O)\tCtrl+O", CMD_OPEN + MENUITEM "ò?æÂ(&S)\tCtrl+S", CMD_SAVE + MENUITEM "û?æOéòté»é?ò?æÂ(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "âyü[âWÉ¦ÆÞ(&T)...", CMD_PAGE_SETUP + MENUITEM "ê¾ì³(&P)", CMD_PRINT + MENUITEM "âvâèâôâ^é?É¦ÆÞ(&R)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "ÅIù?(&X)", CMD_EXIT + END + POPUP "òÊÅW(&E)" + BEGIN + MENUITEM "î?é?û?éÀ(&U)\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "ÉÏéÞÄµéÞ(&T)\tCtrl+X", CMD_CUT + MENUITEM "âRâsü[(&C)\tCtrl+C", CMD_COPY + MENUITEM "âyü[âXâg(&P)\tCtrl+V", CMD_PASTE + MENUITEM "ìÝÅ£(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH + MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "ÆuèÀ\tCtrl+H", CMD_REPLACE + MENUITEM "ìséÍê?ô«...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "æSé?æIæ(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "ô·òtéãÄ×ìÅé?æ}ô³(&T)\tF5", CMD_TIME_DATE + END + POPUP "ÅæÄ«(&O)" + BEGIN + MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP + MENUITEM "âtâHâôâg(&F)...", CMD_FONT + END + POPUP "ò\\Äª(&V)" + BEGIN + MENUITEM "âXâeü[â^âX âoü[(&B)", CMD_STATUSBAR + END + POPUP "âwâïâv(&H)" + BEGIN + MENUITEM "û?Äf(&C)", CMD_HELP_CONTENTS + MENUITEM "îfì§(&S)...", CMD_HELP_SEARCH + MENUITEM "âwâïâvé?Ägéóò¹(&H)", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE + MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY + MENUITEM "Å¯ò±(&O)" CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -21,44 +21,47 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Bestand" { - MENUITEM "&Nieuw...", CMD_NEW - MENUITEM "&Openen\tCtrl+O", CMD_OPEN - MENUITEM "O&pslaan\tCtrl+p", CMD_SAVE - MENUITEM "Ops&laan als...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Afdrukken", CMD_PRINT - MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP - MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afsluiten", CMD_EXIT - } -POPUP "Be&werken" { - MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "K&nippen\tCtrl+X", CMD_CUT - MENUITEM "&KopiÙren\tCtrl+C", CMD_COPY - MENUITEM "&Plakken\tCtrl+V", CMD_PASTE - MENUITEM "&Verwijderen\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "A&utomatische terugloop", CMD_WRAP - MENUITEM "&Lettertype instellen...", CMD_FONT - } -POPUP "&Help" { - MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS - MENUITEM "&Zoeken...", CMD_HELP_SEARCH - MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw...", CMD_NEW + MENUITEM "&Openen\tCtrl+O", CMD_OPEN + MENUITEM "O&pslaan\tCtrl+p", CMD_SAVE [truncated at 1000 lines; 770 more skipped]

1 0

[weiden] 19137: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.h _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:22:07 UTC (rev 19137) @@ -32,7 +32,7 @@ #define _UNICODE -PTCHAR GetNodeTypeName(UINT NodeType) +LPCTSTR GetNodeTypeName(UINT NodeType) { switch (NodeType) { case 1: return _T("Broadcast"); @@ -43,7 +43,7 @@ } } -PTCHAR GetInterfaceTypeName(UINT InterfaceType) +LPCTSTR GetInterfaceTypeName(UINT InterfaceType) { switch (InterfaceType) { case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-11-11 18:22:07 UTC (rev 19137) @@ -523,7 +523,7 @@ * Translate port numbers into their text equivalent if there is one */ PCHAR -GetPortName(UINT Port, PCHAR Proto, CHAR Name[], INT NameLen) +GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen) { struct servent *pSrvent; _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.h --- trunk/reactos/apps/utils/net/netstat/netstat.h 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/netstat/netstat.h 2005-11-11 18:22:07 UTC (rev 19137) @@ -54,7 +54,7 @@ VOID ShowEthernetStatistics(VOID); VOID ShowTcpTable(VOID); VOID ShowUdpTable(VOID); -PCHAR GetPortName(UINT Port, PCHAR Proto, CHAR Name[PORTNAMELEN], INT NameLen); +PCHAR GetPortName(UINT Port, PCSTR Proto, CHAR Name[PORTNAMELEN], INT NameLen); PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen); VOID Usage(VOID);

1 0

[hpoussin] 19136: Fix device installation in second stage setup
by hpoussin＠svn.reactos.com 11 Nov '05

11 Nov '05

Fix device installation in second stage setup Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-11 18:11:17 UTC (rev 19135) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-11 18:19:12 UTC (rev 19136) @@ -871,7 +871,7 @@ DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); - if ((Show != SW_HIDE) && (!FindDriver(&DevInstData))) + if ((!FindDriver(&DevInstData)) && (Show != SW_HIDE)) { /* Create the Welcome page */

1 0

[weiden] 19135: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include "rtl.h" VOID -MachInit(char *CmdLine) +MachInit(const char *CmdLine) { ULONG PciId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ #include "i386.h" VOID -PcMachInit(char *CmdLine) +PcMachInit(const char *CmdLine) { EnableA20(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ #include "mm.h" #endif -VOID PcMachInit(char *CmdLine); +VOID PcMachInit(const char *CmdLine); VOID PcConsPutChar(int Ch); BOOL PcConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include "i386.h" VOID -XboxMachInit(char *CmdLine) +XboxMachInit(const char *CmdLine) { /* Initialize our stuff */ XboxMemInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(char *CmdLine); +VOID XboxMachInit(const char *CmdLine); VOID XboxConsPutChar(int Ch); BOOL XboxConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -279,7 +279,7 @@ BootMain("freeldr-ppc"); } -void MachInit(char *CmdLine) { +void MachInit(const char *CmdLine) { int len; printf( "Determining boot device:\n" ); len = ofw_getprop(chosen_package, "bootpath", _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -43,8 +43,8 @@ CHAR SettingValue[80]; ULONG SectionId; ULONG OperatingSystemCount; - PCHAR *OperatingSystemSectionNames; - PCHAR *OperatingSystemDisplayNames; + PCSTR *OperatingSystemSectionNames; + PCSTR *OperatingSystemDisplayNames; ULONG DefaultOperatingSystem; LONG TimeOut; ULONG SelectedOperatingSystem; @@ -166,10 +166,10 @@ return; } -ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount) +ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount) { CHAR DefaultOSText[80]; - PCHAR DefaultOSName; + PCSTR DefaultOSName; ULONG SectionId; ULONG DefaultOS = 0; ULONG Idx; _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -106,7 +106,7 @@ } } -char * +const char * CmdLineGetDefaultOS(void) { return CmdLineInfo.DefaultOperatingSystem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -32,20 +32,20 @@ #include <machine.h> -CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; -CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; -CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; -CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; -CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; +const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; +const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; +const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; +const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; +const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; +const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; +const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; -CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; +const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; VOID OptionMenuCustomBoot(VOID) { - PCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -39,7 +39,7 @@ bReportError = bError; } -VOID DiskError(PCHAR ErrorString, ULONG ErrorCode) +VOID DiskError(PCSTR ErrorString, ULONG ErrorCode) { CHAR ErrorCodeString[200]; @@ -53,7 +53,7 @@ UiMessageBox(ErrorCodeString); } -PCHAR DiskGetErrorCodeString(ULONG ErrorCode) +PCSTR DiskGetErrorCodeString(ULONG ErrorCode) { switch (ErrorCode) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -30,7 +30,7 @@ ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler -VOID DriveMapMapDrivesInSection(PCHAR SectionName) +VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; CHAR SettingValue[80]; @@ -117,7 +117,7 @@ } } -BOOL DriveMapIsValidDriveString(PCHAR DriveString) +BOOL DriveMapIsValidDriveString(PCSTR DriveString) { ULONG Index; @@ -147,7 +147,7 @@ return TRUE; } -ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName) +ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName) { ULONG BiosDriveNumber = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include <fs.h> #include <cmdline.h> -VOID BootMain(char *CmdLine) +VOID BootMain(LPSTR CmdLine) { CmdLineParse(CmdLine); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -87,7 +87,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* Ext2OpenFile(PCHAR FileName) +FILE* Ext2OpenFile(PCSTR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; @@ -190,7 +190,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) +BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { UINT i; ULONG NumberOfPathParts; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -667,8 +667,8 @@ BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector); -FILE* Ext2OpenFile(PCHAR FileName); -BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +FILE* Ext2OpenFile(PCSTR FileName); +BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); ULONGLONG Ext2GetFileSize(FILE *FileHandle); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -687,7 +687,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) { UINT i; ULONG NumberOfPathParts; @@ -915,7 +915,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* FatOpenFile(PCHAR FileName) +FILE* FatOpenFile(PCSTR FileName) { FAT_FILE_INFO TempFatFileInfo; PFAT_FILE_INFO FileHandle; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -156,10 +156,10 @@ ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory); BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -FILE* FatOpenFile(PCHAR FileName); +FILE* FatOpenFile(PCSTR FileName); ULONG FatCountClustersInChain(ULONG StartCluster); ULONG* FatGetClusterChainArray(ULONG StartCluster); BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -42,7 +42,7 @@ // FUNCTIONS //////////////////////////////////////////////////////////////////////// ///////////////////// -VOID FileSystemError(PCHAR ErrorString) +VOID FileSystemError(PCSTR ErrorString) { DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString)); @@ -123,7 +123,7 @@ } -PFILE FsOpenFile(PCHAR FileName) +PFILE FsOpenFile(PCSTR FileName) { PFILE FileHandle = NULL; @@ -337,7 +337,7 @@ * This function parses a path in the form of dir1\dir2\file1.ext * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) */ -ULONG FsGetNumPathParts(PCHAR Path) +ULONG FsGetNumPathParts(PCSTR Path) { size_t i; ULONG num; @@ -362,7 +362,7 @@ * and puts the first name of the path (e.g. "dir1") in buffer * compatible with the MSDOS directory structure */ -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { size_t i; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -180,7 +180,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer) { UINT i; ULONG NumberOfPathParts; @@ -263,7 +263,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* IsoOpenFile(PCHAR FileName) +FILE* IsoOpenFile(PCSTR FileName) { ISO_FILE_INFO TempFileInfo; PISO_FILE_INFO FileHandle; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h --- trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -106,7 +106,7 @@ BOOL IsoOpenVolume(ULONG DriveNumber); -FILE* IsoOpenFile(PCHAR FileName); +FILE* IsoOpenFile(PCSTR FileName); BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG IsoGetFileSize(FILE *FileHandle); VOID IsoSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -87,7 +87,7 @@ } /* FIXME: Add support for attribute lists! */ -static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, PWCHAR Name) +static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, const WCHAR *Name) { PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; @@ -563,7 +563,7 @@ return FALSE; } -static BOOL NtfsLookupFile(PCHAR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext) +static BOOL NtfsLookupFile(PCSTR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext) { ULONG NumberOfPathParts; CHAR PathPart[261]; @@ -680,7 +680,7 @@ return TRUE; } -FILE* NtfsOpenFile(PCHAR FileName) +FILE* NtfsOpenFile(PCSTR FileName) { PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -219,7 +219,7 @@ } PACKED NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE; BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector); -FILE* NtfsOpenFile(PCHAR FileName); +FILE* NtfsOpenFile(PCSTR FileName); BOOL NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG NtfsGetFileSize(FILE *FileHandle); VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h --- trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -21,7 +21,7 @@ #define __BOOTMGR_H -ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount); +ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount); LONG GetTimeOut(VOID); BOOL MainBootMenuKeyPressFilter(ULONG KeyPress); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -23,14 +23,14 @@ typedef struct tagCMDLINEINFO { - char *DefaultOperatingSystem; + const char *DefaultOperatingSystem; LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; -extern void CmdLineParse(char *CmdLine); +void CmdLineParse(char *CmdLine); -extern char *CmdLineGetDefaultOS(void); -extern LONG CmdLineGetTimeOut(void); +const char *CmdLineGetDefaultOS(void); +LONG CmdLineGetTimeOut(void); #endif /* __CMDLINE_H__ */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h --- trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -119,8 +119,8 @@ // //////////////////////////////////////////////////////////////////////// /////////////// VOID DiskReportError (BOOL bError); -VOID DiskError(PCHAR ErrorString, ULONG ErrorCode); -PCHAR DiskGetErrorCodeString(ULONG ErrorCode); +VOID DiskError(PCSTR ErrorString, ULONG ErrorCode); +PCSTR DiskGetErrorCodeString(ULONG ErrorCode); BOOL DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOL DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h --- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -29,9 +29,9 @@ } PACKED DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; -VOID DriveMapMapDrivesInSection(PCHAR SectionName); -BOOL DriveMapIsValidDriveString(PCHAR DriveString); // Checks the drive string ("hd0") for validity -ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') +VOID DriveMapMapDrivesInSection(PCSTR SectionName); +BOOL DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity +ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h --- trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -32,17 +32,17 @@ #define FILE VOID #define PFILE FILE * -VOID FileSystemError(PCHAR ErrorString); +VOID FileSystemError(PCSTR ErrorString); BOOL FsOpenBootVolume(); BOOL FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice); -PFILE FsOpenFile(PCHAR FileName); +PFILE FsOpenFile(PCSTR FileName); VOID FsCloseFile(PFILE FileHandle); BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG FsGetFileSize(PFILE FileHandle); VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); ULONG FsGetFilePointer(PFILE FileHandle); BOOL FsIsEndOfFile(PFILE FileHandle); -ULONG FsGetNumPathParts(PCHAR Path); -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path); +ULONG FsGetNumPathParts(PCSTR Path); +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); #endif // #defined __FS_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h --- trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -22,14 +22,14 @@ BOOL IniFileInitialize(VOID); -BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId); +BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId); ULONG IniGetNumSectionItems(ULONG SectionId); ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex); ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex); BOOL IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize); -BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize); -BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId); -BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue); +BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize); +BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId); +BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue); #endif // defined __PARSEINI_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h --- trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -127,9 +127,9 @@ VOID BootNewLinuxKernel(VOID); // Implemented in linux.S VOID BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S -VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description); +VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description); -BOOL LinuxParseIniSection(PCHAR OperatingSystemName); +BOOL LinuxParseIniSection(PCSTR OperatingSystemName); BOOL LinuxReadBootSector(PFILE LinuxKernelFile); BOOL LinuxReadSetupSector(PFILE LinuxKernelFile); BOOL LinuxReadKernel(PFILE LinuxKernelFile); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -72,7 +72,7 @@ VOID (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; -VOID MachInit(char *CmdLine); +VOID MachInit(const char *CmdLine); extern MACHVTBL MachVtbl; _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h --- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -20,8 +20,8 @@ #ifndef __BOOT_H #define __BOOT_H -VOID LoadAndBootBootSector(PCHAR OperatingSystemName); -VOID LoadAndBootPartition(PCHAR OperatingSystemName); -VOID LoadAndBootDrive(PCHAR OperatingSystemName); +VOID LoadAndBootBootSector(PCSTR OperatingSystemName); +VOID LoadAndBootPartition(PCSTR OperatingSystemName); +VOID LoadAndBootDrive(PCSTR OperatingSystemName); #endif // defined __BOOT_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h --- trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -20,7 +20,7 @@ #ifndef __OSLIST_H #define __OSLIST_H -BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer); +BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer); ULONG CountOperatingSystems(ULONG SectionId); BOOL AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount); BOOL RemoveQuotes(PCHAR QuotedString); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ // ReactOS Loading Functions // //////////////////////////////////////////////////////////////////////// /////////////// -VOID LoadAndBootReactOS(PCHAR OperatingSystemName); +VOID LoadAndBootReactOS(PCSTR OperatingSystemName); //////////////////////////////////////////////////////////////////////// /////////////// // @@ -61,8 +61,8 @@ VOID FASTCALL FrLdrSetupPageDirectory(VOID); VOID FASTCALL FrLdrGetPaeMode(VOID); BOOL STDCALL FrLdrMapKernel(FILE *KernelImage); -ULONG_PTR STDCALL FrLdrCreateModule(LPSTR ModuleName); -ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPSTR ModuleName, PULONG ModuleSize); +ULONG_PTR STDCALL FrLdrCreateModule(LPCSTR ModuleName); +ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID STDCALL FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -63,7 +63,6 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define UINT64_C(val) val##ULL //////////////////////////////////////////////////////////////////////// /////////////// _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h --- trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -47,7 +47,7 @@ extern BOOL UiUseSpecialEffects; // Tells us if we should use fade effects -extern CHAR UiMonthNames[12][15]; +extern const CHAR UiMonthNames[12][15]; //////////////////////////////////////////////////////////////////////// /////////////// // @@ -56,26 +56,26 @@ //////////////////////////////////////////////////////////////////////// /////////////// BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface BOOL SetupUiInitialize(VOID); // Initialize User-Interface -VOID UiUnInitialize(PCHAR BootText); // Un-initialize User-Interface +VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID UiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOL Fill, BOOL Shadow, UCHAR Attr); // Draws a box around the area specified -VOID UiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr); // Draws text at coordinates specified -VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges -VOID UiDrawStatusText(PCHAR StatusText); // Draws text at the very bottom line on the screen +VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified +VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges +VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID UiUpdateDateTime(VOID); // Updates the date and time -VOID UiInfoBox(PCHAR MessageText); // Displays a info box on the screen -VOID UiMessageBox(PCHAR MessageText); // Displays a message box on the screen with an ok button -VOID UiMessageBoxCritical(PCHAR MessageText); // Displays a message box on the screen with an ok button using no system resources +VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen +VOID UiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button +VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled -VOID UiShowMessageBoxesInSection(PCHAR SectionName); // Displays all the message boxes in a given section +VOID UiShowMessageBoxesInSection(PCSTR SectionName); // Displays all the message boxes in a given section VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurances of "\n" to '\n' -BOOL UiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length); +BOOL UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); -UCHAR UiTextToColor(PCHAR ColorText); // Converts the text color into it's equivalent color value -UCHAR UiTextToFillStyle(PCHAR FillStyleText); // Converts the text fill into it's equivalent fill value +UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value +UCHAR UiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars); // Truncates a string to MaxChars by adding an ellipsis on the end '...' @@ -89,7 +89,7 @@ //////////////////////////////////////////////////////////////////////// /////////////// typedef BOOL (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); -BOOL UiDisplayMenu(PCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOL UiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); _____ Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include <debug.h> #include <mm.h> -BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId) +BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId) { PINI_SECTION Section; @@ -131,7 +131,7 @@ return FALSE; } -BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize) +BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; @@ -163,7 +163,7 @@ return FALSE; } -BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId) +BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId) { PINI_SECTION Section; @@ -203,7 +203,7 @@ return TRUE; } -BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue) +BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -54,7 +54,7 @@ CHAR LinuxBootDescription[80]; CHAR LinuxBootPath[260] = ""; -VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description) +VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description) { PFILE LinuxKernel = NULL; PFILE LinuxInitrdFile = NULL; @@ -229,7 +229,7 @@ LinuxCommandLineSize = 0; } -BOOL LinuxParseIniSection(PCHAR OperatingSystemName) +BOOL LinuxParseIniSection(PCSTR OperatingSystemName) { CHAR SettingName[260]; ULONG SectionId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c --- trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -29,7 +29,7 @@ #include <drivemap.h> #include <machine.h> -VOID LoadAndBootBootSector(PCHAR OperatingSystemName) +VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; CHAR SettingName[80]; @@ -100,7 +100,7 @@ ChainLoadBiosBootSectorCode(); } -VOID LoadAndBootPartition(PCHAR OperatingSystemName) +VOID LoadAndBootPartition(PCSTR OperatingSystemName) { CHAR SettingName[80]; CHAR SettingValue[80]; @@ -171,7 +171,7 @@ ChainLoadBiosBootSectorCode(); } -VOID LoadAndBootDrive(PCHAR OperatingSystemName) +VOID LoadAndBootDrive(PCSTR OperatingSystemName) { CHAR SettingName[80]; CHAR SettingValue[80]; _____ Modified: trunk/reactos/boot/freeldr/freeldr/options.c --- trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include <arch.h> -PCHAR OptionsMenuList[] = +PCSTR OptionsMenuList[] = { "Safe Mode", "Safe Mode with Networking", _____ Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c --- trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include <mm.h> #include <ui.h> -BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) +BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) { ULONG Idx; ULONG CurrentOperatingSystemIndex; @@ -79,8 +79,8 @@ } *OperatingSystemCountPointer = OperatingSystemCount; - *SectionNamesPointer = OperatingSystemSectionNames; - *DisplayNamesPointer = OperatingSystemDisplayNames; + *SectionNamesPointer = (PCSTR*)OperatingSystemSectionNames; + *DisplayNamesPointer = (PCSTR*)OperatingSystemDisplayNames; return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -326,7 +326,7 @@ static VOID -CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCHAR KeyName) +CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCSTR KeyName) { PCHAR BaseKeyName; ULONG NameSize; @@ -357,7 +357,7 @@ static PREGISTRY_HIVE -CmiCreateHive (PCHAR KeyName) +CmiCreateHive (PCSTR KeyName) { PREGISTRY_HIVE Hive; PCELL_HEADER FreeCell; @@ -1258,7 +1258,7 @@ static BOOL CmiExportHive (PREGISTRY_HIVE Hive, - PCHAR KeyName) + PCSTR KeyName) { PKEY_CELL KeyCell; FRLDRHKEY Key; @@ -1624,7 +1624,7 @@ BOOL -RegExportBinaryHive(PCHAR KeyName, +RegExportBinaryHive(PCSTR KeyName, PCHAR ChunkBase, ULONG* ChunkSize) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c --- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -706,7 +706,7 @@ ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, - LPSTR ModuleName, + LPCSTR ModuleName, PULONG ModuleSize) { ULONG LocalModuleSize; @@ -757,7 +757,7 @@ ULONG_PTR STDCALL -FrLdrCreateModule(LPSTR ModuleName) +FrLdrCreateModule(LPCSTR ModuleName) { PLOADER_MODULE ModuleData; LPSTR NameBuffer; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -78,7 +78,7 @@ FrLdrMapKernel(FilePointer); /* Update Processbar and return success */ - UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); return(TRUE); } @@ -145,8 +145,8 @@ } static BOOL -FrLdrLoadNlsFile(PCHAR szFileName, - PCHAR szModuleName) +FrLdrLoadNlsFile(PCSTR szFileName, + PCSTR szModuleName) { PFILE FilePointer; CHAR value[256]; @@ -340,7 +340,7 @@ FrLdrLoadModule(FilePointer, szFileName, NULL); /* Update status and return */ - UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); return(TRUE); } @@ -570,7 +570,7 @@ } VOID -LoadAndBootReactOS(PCHAR OperatingSystemName) +LoadAndBootReactOS(PCSTR OperatingSystemName) { PFILE FilePointer; CHAR name[1024]; @@ -704,7 +704,7 @@ if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; UiDrawStatusText("Loading..."); - UiDrawProgressBarCenter(0, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS..."); /* * Try to open system drive @@ -838,7 +838,7 @@ */ RegInitCurrentControlSet(FALSE); - UiDrawProgressBarCenter(15, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS..."); /* * Export the hardware hive @@ -847,7 +847,7 @@ RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); FrLdrCloseModule (Base, Size); - UiDrawProgressBarCenter(20, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS..."); /* * Load NLS files @@ -857,13 +857,13 @@ UiMessageBox(MsgBuffer); return; } - UiDrawProgressBarCenter(30, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS..."); /* * Load kernel symbols */ LoadKernelSymbols(szKernelName, 30); - UiDrawProgressBarCenter(40, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS..."); /* * Load boot drivers _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -206,7 +206,7 @@ LONG RegCreateKey(FRLDRHKEY ParentKey, - PCHAR KeyName, + PCSTR KeyName, PFRLDRHKEY Key) { PLIST_ENTRY Ptr; @@ -214,7 +214,7 @@ FRLDRHKEY CurrentKey; FRLDRHKEY NewKey; PCHAR p; - PCHAR name; + PCSTR name; int subkeyLength; int stringLength; @@ -331,7 +331,7 @@ LONG RegDeleteKey(FRLDRHKEY Key, - PCHAR Name) + PCSTR Name) { @@ -384,14 +384,14 @@ LONG RegOpenKey(FRLDRHKEY ParentKey, - PCHAR KeyName, + PCSTR KeyName, [truncated at 1000 lines; 439 more skipped]

1 0

[gedmurphy] 19134: don't try and display data if iphlpapi functions fail
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

don't try and display data if iphlpapi functions fail Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 17:28:13 UTC (rev 19133) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:09:46 UTC (rev 19134) @@ -127,9 +127,16 @@ } if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) - _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + { + _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + return EXIT_FAILURE; + } + if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR) + { _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError()); + return EXIT_FAILURE; + } pAdapter = pAdapterInfo; //HKEY hKey;

1 0

[gedmurphy] 19133: functionality for sc query and queryex
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

functionality for sc query and queryex supports sc query <service> sc query type= <...> sc query state <...> output as per MS utility added usage information for query functionality Modified: trunk/reactos/subsys/system/sc/query.c Modified: trunk/reactos/subsys/system/sc/usage.c _____ Modified: trunk/reactos/subsys/system/sc/query.c --- trunk/reactos/subsys/system/sc/query.c 2005-11-11 16:18:46 UTC (rev 19132) +++ trunk/reactos/subsys/system/sc/query.c 2005-11-11 17:28:13 UTC (rev 19133) @@ -8,27 +8,32 @@ * Ged Murphy 20/10/05 Created * */ +/* + * TODO: + * Allow calling of 2 options e.g.: + * type= driver state= inactive + */ #include "sc.h" /* local function decs */ VOID PrintService(BOOL bExtended); -BOOL EnumServices(DWORD ServiceType, DWORD ServiceState); +BOOL EnumServices(LPCTSTR ServiceName, DWORD ServiceType, DWORD ServiceState); +BOOL QueryService(LPCTSTR ServiceName, BOOL bExtended); /* global variables */ static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; +DWORD NumServices = 0; -BOOL Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended) +BOOL +Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended) { - if (! ServiceName) + if (! ServiceName) /* display all running services and drivers */ { - /* display all running services and drivers */ - _tprintf(_T("No service name, displaying all services\n")); // test - /* get default values */ - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); + EnumServices(NULL, SERVICE_WIN32, SERVICE_ACTIVE); /* print default values */ PrintService(bExtended); @@ -37,13 +42,12 @@ { LPCTSTR Type = *ServiceArgs; - _tprintf(_T("got type\narg = %s\n"), Type); // test if (_tcsicmp(Type, _T("driver")) == 0) - EnumServices(SERVICE_DRIVER, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_DRIVER, SERVICE_ACTIVE); else if (_tcsicmp(Type, _T("service")) == 0) - EnumServices(SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_WIN32, SERVICE_ACTIVE); else if (_tcsicmp(Type, _T("all")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); else { _tprintf(_T("\nERROR following \"type=\"!\n")); @@ -56,12 +60,10 @@ { LPCTSTR State = *ServiceArgs; - if (_tcsicmp(State, _T("active")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); - else if (_tcsicmp(State, _T("inactive")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_INACTIVE); + if (_tcsicmp(State, _T("inactive")) == 0) + EnumServices(NULL, SERVICE_WIN32, SERVICE_INACTIVE); else if (_tcsicmp(State, _T("all")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_WIN32, SERVICE_STATE_ALL); else { _tprintf(_T("\nERROR following \"state=\"!\n")); @@ -77,35 +79,138 @@ else if(_tcsicmp(ServiceName, _T("group="))) */ - else + else /* print only the service requested */ { - /* print only the service requested */ - printf("Service name %s\n", ServiceName); // test + QueryService(ServiceName, bExtended); + } + + return TRUE; +} - /* get default values */ - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - /* print default values */ - PrintService(bExtended); +BOOL +QueryService(LPCTSTR ServiceName, BOOL bExtended) +{ + SERVICE_STATUS_PROCESS *pServiceInfo = NULL; + SC_HANDLE hSc; + DWORD BufSiz = 0; + DWORD BytesNeeded = 0; + DWORD Ret; + + hSc = OpenService(hSCManager, ServiceName, SERVICE_QUERY_STATUS); + + if (hSc == NULL) + { + _tprintf(_T("QueryService: openService failed\n")); + ReportLastError(); + return FALSE; } + + Ret = QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + NULL, + BufSiz, + &BytesNeeded); + + if ((Ret != 0) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + { + _tprintf(_T("QueryService: First call to QueryServiceStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + else /* Call function again if required size was returned */ + { + /* reserve memory for service info array */ + pServiceInfo = (SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceInfo == NULL) + { + _tprintf(_T("QueryService: Failed to allocate memory : ")); + ReportLastError(); + return FALSE; + } + + /* fill array with service info */ + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)pServiceInfo, + BytesNeeded, + &BytesNeeded)) + { + _tprintf(_T("QueryService: Second call to QueryServiceStatusEx failed : ")); + ReportLastError(); + HeapFree(GetProcessHeap(), 0, pServiceInfo); + return FALSE; + } + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + + _tprintf(_T("\tTYPE : %x "), + (unsigned int)pServiceInfo->dwServiceType); + switch (pServiceInfo->dwServiceType) + { + case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; + case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; + case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; + case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\tSTATE : %x "), + (unsigned int)pServiceInfo->dwCurrentState); + + switch (pServiceInfo->dwCurrentState) + { + case 1 : _tprintf(_T("STOPPED\n")); break; + case 2 : _tprintf(_T("START_PENDING\n")); break; + case 3 : _tprintf(_T("STOP_PENDING\n")); break; + case 4 : _tprintf(_T("RUNNING\n")); break; + case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; + case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; + case 7 : _tprintf(_T("PAUSED\n")); break; + default : _tprintf(_T("\n")); break; + } + +// _tprintf(_T("\n\taccepted : 0x%x\n\n"), +// pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); +// (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) + + _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceInfo->dwWin32ExitCode, + (unsigned int)pServiceInfo->dwWin32ExitCode); + _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceInfo->dwServiceSpecificExitCode, + (unsigned int)pServiceInfo->dwServiceSpecificExitCode); + _tprintf(_T("\tCHECKPOINT : 0x%x\n"), + (unsigned int)pServiceInfo->dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : 0x%x\n"), + (unsigned int)pServiceInfo->dwWaitHint); + if (bExtended) + { + _tprintf(_T("\tPID : %lu\n"), + pServiceInfo->dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), + pServiceInfo->dwServiceFlags); + } + + HeapFree(GetProcessHeap(), 0, pServiceInfo); + return TRUE; - } -BOOL EnumServices(DWORD ServiceType, DWORD ServiceState) +BOOL +EnumServices(LPCTSTR ServiceName, DWORD ServiceType, DWORD ServiceState) { - //SC_HANDLE hSc; DWORD BufSize = 0; DWORD BytesNeeded = 0; - DWORD NumServices = 0; DWORD ResumeHandle = 0; - -// hSc = OpenService(hSCManager, ServiceName, SERVICE_QUERY_STATUS); + DWORD Ret; /* determine required buffer size */ - if (! EnumServicesStatusEx(hSCManager, + Ret = EnumServicesStatusEx(hSCManager, SC_ENUM_PROCESS_INFO, ServiceType, ServiceState, @@ -114,39 +219,45 @@ &BytesNeeded, &NumServices, &ResumeHandle, - 0)) + 0); + + if ((Ret != 0) && (GetLastError() != ERROR_MORE_DATA)) { - /* Call function again if required size was returned */ - if (GetLastError() == ERROR_MORE_DATA) + _tprintf(_T("EnumServices: First call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + else /* Call function again if required size was returned */ + { + /* reserve memory for service info array */ + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceStatus == NULL) { - /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); + _tprintf(_T("EnumServices: Failed to allocate memory : ")); + ReportLastError(); + return FALSE; + } - /* fill array with service info */ - if (! EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - _tprintf(_T("Second call to EnumServicesStatusEx failed : ")); - ReportLastError(); - return FALSE; - } - } - else /* exit on failure */ + /* fill array with service info */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)pServiceStatus, + BytesNeeded, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) { - _tprintf(_T("First call to EnumServicesStatusEx failed : ")); + _tprintf(_T("EnumServices: Second call to EnumServicesStatusEx failed : ")); ReportLastError(); + HeapFree(GetProcessHeap(), 0, pServiceStatus); return FALSE; } } - + return TRUE; } @@ -154,26 +265,64 @@ VOID PrintService(BOOL bExtended) { - _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus->lpServiceName); - _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus->lpDisplayName); - _tprintf(_T("TYPE : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwServiceType); - _tprintf(_T("STATE : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwCurrentState); - // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - _tprintf(_T("WIN32_EXIT_CODE : %lu \n"), - pServiceStatus->ServiceStatusProcess.dwWin32ExitCode); - _tprintf(_T("SERVICE_EXIT_CODE : %lu \n"), - pServiceStatus->ServiceStatusProcess.dwServiceSpecificExitCode); - _tprintf(_T("CHECKPOINT : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwCheckPoint); - _tprintf(_T("WAIT_HINT : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwWaitHint); - if (bExtended) + int i; + + for (i=0; i < NumServices; i++) { - _tprintf(_T("PID : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwProcessId); - _tprintf(_T("FLAGS : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwServiceFlags); + + _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus[i].lpServiceName); + _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus[i].lpDisplayName); + + _tprintf(_T("\tTYPE : %x "), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceType); + switch (pServiceStatus[i].ServiceStatusProcess.dwServiceType) + { + case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; + case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; + case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; + case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\tSTATE : %x "), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCurrentState); + + switch (pServiceStatus[i].ServiceStatusProcess.dwCurrentState) + { + case 1 : _tprintf(_T("STOPPED\n")); break; + case 2 : _tprintf(_T("START_PENDING\n")); break; + case 3 : _tprintf(_T("STOP_PENDING\n")); break; + case 4 : _tprintf(_T("RUNNING\n")); break; + case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; + case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; + case 7 : _tprintf(_T("PAUSED\n")); break; + default : _tprintf(_T("\n")); break; + } + + // _tprintf(_T("\n\taccepted : 0x%x\n\n"), + // pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); + // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) + + _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode, + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode); + _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode, + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode); + _tprintf(_T("\tCHECKPOINT : 0x%x\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : 0x%x\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWaitHint); + if (bExtended) + { + _tprintf(_T("\tPID : %lu\n"), + pServiceStatus[i].ServiceStatusProcess.dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), + pServiceStatus[i].ServiceStatusProcess.dwServiceFlags); + } + + _tprintf(_T("\n")); } + + _tprintf(_T("number : %lu\n"), NumServices); } _____ Modified: trunk/reactos/subsys/system/sc/usage.c --- trunk/reactos/subsys/system/sc/usage.c 2005-11-11 16:18:46 UTC (rev 19132) +++ trunk/reactos/subsys/system/sc/usage.c 2005-11-11 17:28:13 UTC (rev 19133) @@ -8,11 +8,13 @@ * Ged Murphy 20/10/05 Created * */ - +#include <conio.h> #include "sc.h" INT MainUsage(VOID) { + TCHAR c; + _tprintf(_T("DESCRIPTION:\n") _T("\tSC is a command line program used for communicating with\n") _T("\tthe Service Control Manager and its services.\n") @@ -52,6 +54,43 @@ // "\t Lock : Locks the SCM Database\n") // "\t QueryLock : Queries the LockStatus for the SCM Database\n") + _tprintf(_T("\nWould you like to see help for the QUERY and QUERYEX commands? [ y | n ]: ")); + c = _getch(); // _gettch isn't defined in our tchar.h + _tprintf(_T("%c\n"), c); + if (tolower(c) == 'y') + { + _tprintf(_T("QUERY and QUERYEX OPTIONS :\n") + _T(" If the query command is followed by a service name, the status\n") + _T(" for that service is returned. Further options do not apply in\n") + _T(" this case. If the query command is followed by nothing or one of\n") + _T(" the options listed below, the services are enumerated.\n") + _T(" type= Type of services to enumerate (driver, service, all)\n") + _T(" (default = service)\n") + _T(" state= State of services to enumerate (inactive, all)\n") + _T(" (default = active)\n") +/* + _T(" bufsize= The size (in bytes) of the enumeration buffer\n") + _T(" (default = 4096)\n") + _T(" ri= The resume index number at which to begin the enumeration\n") + _T(" (default = 0)\n") + _T(" group= Service group to enumerate\n") + _T(" (default = all groups)\n") +*/ + _T("SYNTAX EXAMPLES\n") + _T("sc query - Enumerates status for active services & drivers\n") + _T("sc query messenger - Displays status for the messenger service\n") + _T("sc queryex messenger - Displays extended status for the messenger service\n") + _T("sc query type= driver - Enumerates only active drivers\n") + _T("sc query type= service - Enumerates only Win32 services\n") + _T("sc query state= all - Enumerates all services & drivers\n") +// _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") +// _T("sc query ri= 14 - Enumerates with resume index = 14\n") +// _T("sc queryex group= "" - Enumerates active services not in a group\n") + _T("sc query type= service type= interact - Enumerates all interactive services\n")); +// _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); + } + + return 0; }

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005