Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[npwoods] 18151: Christoph_vW: Updated notepad rc files to match Windows notepad's menu layout (bug #839)

by npwoods＠svn.reactos.com

Christoph_vW: Updated notepad rc files to match Windows notepad's menu layout (bug #839) 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/Sv.rc Modified: trunk/reactos/subsys/system/notepad/Th.rc Modified: trunk/reactos/subsys/system/notepad/Wa.rc Modified: trunk/reactos/subsys/system/notepad/Zh.rc Modified: trunk/reactos/subsys/system/notepad/notepad_res.h _____ Modified: trunk/reactos/subsys/system/notepad/Cs.rc --- trunk/reactos/subsys/system/notepad/Cs.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Cs.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ 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 "&HledßnÝ" { - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT - } 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 - POPUP "Inf&o..." { - MENUITEM "&Licence", CMD_LICENSE - MENUITEM "&BEZ Z?RUKY", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Da.rc --- trunk/reactos/subsys/system/notepad/Da.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Da.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -28,8 +28,8 @@ MENUITEM "?&bn\tEnter", CMD_OPEN MENUITEM "&Gem", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM "&Udskriv", CMD_PRINT MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP + MENUITEM "&Udskriv", CMD_PRINT MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afslut", CMD_EXIT @@ -56,11 +56,7 @@ MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Om Notesblok..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&Ingen Garanti", CMD_NO_WARRANTY - MENUITEM "&Om WINE", CMD_ABOUT_WINE - } + MENUITEM "&Om Notesblok", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/De.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -30,8 +30,8 @@ MENUITEM "&Speichern", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Beenden", CMD_EXIT @@ -44,26 +44,27 @@ 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 - MENUITEM SEPARATOR + } +POPUP "F&ormat" { MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftarten...", CMD_FONT - } -POPUP "&Suchen" { - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - } + 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 - POPUP "Inf&o..." { - MENUITEM "&Lizenz", CMD_LICENSE - MENUITEM "&KEINE GARANTIE", CMD_NO_WARRANTY - MENUITEM "&?ber Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -30,8 +30,8 @@ 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 "Page Se&tup...", CMD_PAGE_SETUP MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "E&xit", CMD_EXIT @@ -44,28 +44,29 @@ MENUITEM "&Paste\tCtrl+V", CMD_PASTE MENUITEM "&Delete\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - } -POPUP "&Search" { 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 - POPUP "Inf&o..." { - MENUITEM "&License", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY - MENUITEM "&About Wine", CMD_ABOUT_WINE - } + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "Inf&o", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -46,6 +46,9 @@ 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 @@ -53,19 +56,13 @@ MENUITEM "Tipo de &letra...", CMD_FONT } POPUP "&Buscar" { - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT } 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 - POPUP "&Informaci¾n..." { - MENUITEM "&Licencia", CMD_LICENSE - MENUITEM "SIN &GARANT?A", CMD_NO_WARRANTY - MENUITEM "&Acerca de Wine", CMD_ABOUT_WINE - } + MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Fi.rc --- trunk/reactos/subsys/system/notepad/Fi.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Fi.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,25 +42,20 @@ 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 "&Etsi" { - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - } POPUP "&Apua" { MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS MENUITEM "&Etsi...", CMD_HELP_SEARCH MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Lisenssi", CMD_LICENSE - MENUITEM "&EI TAKUUTA", CMD_NO_WARRANTY - MENUITEM "&Tietoja Wine:ista", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Fr.rc --- trunk/reactos/subsys/system/notepad/Fr.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Fr.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,26 +44,21 @@ 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 "&Rechercher" { - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - } POPUP "&Aide" { MENUITEM "&Sommaire", CMD_HELP_CONTENTS MENUITEM "&Rechercher...", CMD_HELP_SEARCH MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licence", CMD_LICENSE - MENUITEM "&AUCUNE GARANTIE", CMD_NO_WARRANTY - MENUITEM "&A propos de Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Hu.rc --- trunk/reactos/subsys/system/notepad/Hu.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Hu.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -43,25 +43,20 @@ 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 "&KeresÚs" { - MENUITEM "&KeresÚs...", CMD_SEARCH - MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT - } 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 - POPUP "Inf&ormßci¾..." { - MENUITEM "&Licenc", CMD_LICENSE - MENUITEM "&SEMMI GARANCIA", CMD_NO_WARRANTY - MENUITEM "&Wine nÚvjegy", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/It.rc --- trunk/reactos/subsys/system/notepad/It.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/It.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -46,26 +46,21 @@ 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 "&Trova" { - MENUITEM "&Trova\tCtrl+F", CMD_SEARCH - MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT - } POPUP "&Aiuto" { MENUITEM "&Contenuti", CMD_HELP_CONTENTS MENUITEM "&Trova...", CMD_HELP_SEARCH MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licenza", CMD_LICENSE - MENUITEM "&Garanzia", CMD_NO_WARRANTY - MENUITEM "&Informazioni sul Blocco Note", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,26 +44,21 @@ 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 SEPARATOR MENUITEM "æSé?æIæ(&a)\tCtrl+A", CMD_SELECT_ALL MENUITEM "ô·òtéãÄ×ìÅ(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP MENUITEM "âtâHâôâg(&F)...", CMD_FONT } -POPUP "îfì§(&S)" { - MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT - } 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 - POPUP "Å¯ò±(&o)..." { - MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE - MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY - MENUITEM "Wineé?é?éóé?(&A)", CMD_ABOUT_WINE - } + MENUITEM "Å¯ò±(&o)...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -1,4 +1,4 @@ -/* +´??/* * Notepad (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -42,26 +42,21 @@ 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 "&Zoeken" { - MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - } POPUP "&Help" { MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM "&Zoeken...", CMD_HELP_SEARCH MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o..." { - MENUITEM "&Licentie", CMD_LICENSE - MENUITEM "&GEEN GARANTIE", CMD_NO_WARRANTY - MENUITEM "&Over Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&o...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Pl.rc --- trunk/reactos/subsys/system/notepad/Pl.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Pl.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ MENUITEM "Wkl&ej\tCtrl+V", CMD_PASTE MENUITEM "&Usu±\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Znajdf\tCtrl+F", CMD_SEARCH + MENUITEM "Z&najdf nastÛpny\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Zaznacz w&szystko\tCtrl+A", CMD_SELECT_ALL MENUITEM "Godzina/&Data\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Zawijanie wierszy", CMD_WRAP MENUITEM "Czci&onka...", CMD_FONT } -POPUP "&Znajdf" { - MENUITEM "&Znajdf\tCtrl+F", CMD_SEARCH - MENUITEM "Z&najdf nastÛpny\tF3", CMD_SEARCH_NEXT - } POPUP "Pomo&c" { MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS MENUITEM "&Szukaj...", CMD_HELP_SEARCH MENUITEM "&Pomoc", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "In&fo..." { - MENUITEM "&Licencja", CMD_LICENSE - MENUITEM "&BEZ GWARANCJI", CMD_NO_WARRANTY - MENUITEM "&O Wine...", CMD_ABOUT_WINE - } + MENUITEM "In&fo...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Pt.rc --- trunk/reactos/subsys/system/notepad/Pt.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Pt.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,26 +45,21 @@ MENUITEM "C&olar\tCtrl+V", CMD_PASTE MENUITEM "E&xcluir\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Localizar...", CMD_SEARCH + MENUITEM "Localizar &pr¾xima\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Selecionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Quebrar automßtica de linha", CMD_WRAP MENUITEM "&Fonte...", CMD_FONT } -POPUP "&Pesquisa" { - MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr¾xima\tF3", CMD_SEARCH_NEXT - } POPUP "&Ajuda" { MENUITEM "&Conte·do", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Informaþ§es..." { - MENUITEM "&Licenþa", CMD_LICENSE - MENUITEM "&SEM GARANTIA", CMD_NO_WARRANTY - MENUITEM "&Sobre o Wine", CMD_ABOUT_WINE - } + MENUITEM "&Informaþ§es...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Ru.rc --- trunk/reactos/subsys/system/notepad/Ru.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Ru.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -40,25 +40,20 @@ MENUITEM "?±?&ÓÔÞ?³\tCtrl+V", CMD_PASTE MENUITEM "&ËõÓÙÞ?³\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&?ÓÚ?Þ", CMD_SEARCH + MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "?¹õÕÙÞ?³ Ô&±Õ", CMD_SELECT_ALL MENUITEM "?Õý& Þ õÓ?Ó\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&¤ÕÕÝ¯± ´¯ ±Ù¯ÔÓý", CMD_WRAP } -POPUP "¤&¯Þ±Û" { - MENUITEM "&?ÓÚ?Þ", CMD_SEARCH - MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3", CMD_SEARCH_NEXT - } POPUP "&Ð´ÓÔÛÓ" { MENUITEM "&Ð¯õÕµÓÝÞÕ", CMD_HELP_CONTENTS MENUITEM "&¤¯Þ±Û...", CMD_HELP_SEARCH MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´ÓÔÛÞ", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&ÐÔÕõÕÝÞ ..." { - MENUITEM "&?Þ÷ÕÝþÞ ", CMD_LICENSE - MENUITEM "&??Ã ??ð??Ê??", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "&ÐÔÕõÕÝÞ ...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Si.rc --- trunk/reactos/subsys/system/notepad/Si.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Si.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,25 +42,20 @@ MENUITEM "&Prilepi\tCtrl+V", CMD_PASTE MENUITEM "Izbri&Üi\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "&Najdi ...", CMD_SEARCH + MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Izberi &vse", CMD_SELECT_ALL MENUITEM "?as/&Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Pr&elom vrstice", CMD_WRAP } -POPUP "&Iskanje" { - MENUITEM "&Najdi ...", CMD_SEARCH - MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT - } POPUP "&PomoÞ" { MENUITEM "&Teme pomoÞi", CMD_HELP_CONTENTS MENUITEM "&Najdi ...", CMD_HELP_SEARCH MENUITEM "&O pomoÞi", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormacije ..." { - MENUITEM "&LicenÞna pogodba", CMD_LICENSE - MENUITEM "&BREZ GARANCIJE", CMD_NO_WARRANTY - MENUITEM "&O Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormacije ...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Sv.rc --- trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -44,25 +44,20 @@ MENUITEM "K&listra in\tCtrl+V", CMD_PASTE MENUITEM "&Ta bort\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "S÷k...", CMD_SEARCH + MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Markera &allt", CMD_SELECT_ALL MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Automatiskt radbyte", CMD_WRAP } -POPUP "&S÷k" { - MENUITEM "S÷k...", CMD_SEARCH - MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT - } POPUP "&Hjõlp" { MENUITEM "&InnehÕll", CMD_HELP_CONTENTS MENUITEM "&S÷k...", CMD_HELP_SEARCH MENUITEM "Anvisningar f÷r hjõlpen", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormation..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY - MENUITEM "&Om Wine", CMD_ABOUT_WINE - } + MENUITEM "Inf&ormation...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Th.rc --- trunk/reactos/subsys/system/notepad/Th.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Th.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -42,26 +42,21 @@ MENUITEM "ÃÊº\tCtrl+V", CMD_PASTE MENUITEM "??\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "ñÚ??Ê\tCtrl+F", CMD_SEARCH + MENUITEM "ñÚ??ÊÁÞ?õ?\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "Ó?Î?íÀÐÚº???\tCtrl+A", CMD_SELECT_ALL MENUITEM "ÃÐ?ÀiÞ/\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "?Þ????ÀÐ??ÊÃ", CMD_WRAP MENUITEM "???ß???ÐÃ?Ðí??...", CMD_FONT } - POPUP "ñÐ??Ê" { - MENUITEM "ñÚ??Ê\tCtrl+F", CMD_SEARCH - MENUITEM "ñÚ??ÊÁÞ?õ?\tF3", CMD_SEARCH_NEXT - } POPUP "¬ÞÃ?Ó??i?" { MENUITEM "Ó?ÎÚ??Ê", CMD_HELP_CONTENTS MENUITEM "ñÚ??Ê...", CMD_HELP_SEARCH MENUITEM "ÓíiÞ?ÃíÐ?¬ÞÃ?Ó??i?", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "?Ê??ðÓ?i??..." { - MENUITEM "Ò???Ï¡ÊÁ", CMD_LICENSE - MENUITEM "õ?Þ?i WARRANTY", CMD_NO_WARRANTY - MENUITEM "ÓíiÞ?ÃíÐ? Wine... ", CMD_ABOUT_WINE - } + MENUITEM "?Ê??ðÓ?i??...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Wa.rc --- trunk/reactos/subsys/system/notepad/Wa.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Wa.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -45,25 +45,20 @@ MENUITEM "C&laper\tCtrl+V", CMD_PASTE MENUITEM "&Rafacer\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "Cwer¯...", CMD_SEARCH + MENUITEM "&Sh¹vant\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "&Tchwezi totafwait", CMD_SELECT_ALL MENUITEM "&Eure/Date\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "C¶per les ro&yes", CMD_WRAP } -POPUP "C&wer¯" { - MENUITEM "Cwer¯...", CMD_SEARCH - MENUITEM "&Sh¹vant\tF3", CMD_SEARCH_NEXT - } POPUP "&Aide" { MENUITEM "?&dvins", CMD_HELP_CONTENTS MENUITEM "C&wer¯...", CMD_HELP_SEARCH MENUITEM "&Aide so l' Aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&InformÕcion..." { - MENUITEM "&Licinse", CMD_LICENSE - MENUITEM "&NOLE WARANTEYE", CMD_NO_WARRANTY - MENUITEM "? &dfait di Wine", CMD_ABOUT_WINE - } + MENUITEM "&InformÕcion...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/Zh.rc --- trunk/reactos/subsys/system/notepad/Zh.rc 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/Zh.rc 2005-09-29 03:39:38 UTC (rev 18151) @@ -39,25 +39,20 @@ MENUITEM "i??¨ú¿&Pú®\tCtrl+V", CMD_PASTE MENUITEM "?¥?²ú¿&Dú®\tDel", CMD_DELETE MENUITEM SEPARATOR + MENUITEM "?Ð?¸ú¿&Sú®", CMD_SEARCH + MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR MENUITEM "?½Ðíú¿&Aú®", CMD_SELECT_ALL MENUITEM "?Õ?Ù?iã?íó???õú¿&Tú®\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "ÎÈÂ»??ððú¿&Wú®", CMD_WRAP } -POPUP "?Ð?¸ú¿&Sú®" { - MENUITEM "?Ð?¸ú¿&Sú®", CMD_SEARCH - MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3", CMD_SEARCH_NEXT - } POPUP "?´Í·ú¿&Hú®" { MENUITEM "???¦ú¿&Cú®", CMD_HELP_CONTENTS MENUITEM "?Ð?¸ú¿&Sú®...", CMD_HELP_SEARCH MENUITEM "?þ????Ë??´Í·ú¿&Hú®", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Î??¤ð?¤óú¿&Oú®..." { - MENUITEM "Ë??ºðÝ??ð¡ÊÚú¿&Lú®", CMD_LICENSE - MENUITEM "È???Ì?Ïú¿&Nú®", CMD_NO_WARRANTY - MENUITEM "?ÏË? Wineú¿&Aú®", CMD_ABOUT_WINE - } + MENUITEM "Î??¤ð?¤óú¿&Oú®...", CMD_ABOUT_WINE } } _____ Modified: trunk/reactos/subsys/system/notepad/notepad_res.h --- trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-29 03:33:28 UTC (rev 18150) +++ trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-29 03:39:38 UTC (rev 18151) @@ -54,6 +54,8 @@ #define CMD_WRAP 0x119 #define CMD_FONT 0x140 +#define CMD_STATUSBAR 0x150 + #define CMD_HELP_CONTENTS 0x130 #define CMD_HELP_SEARCH 0x131 #define CMD_HELP_ON_HELP 0x132

18 years, 11 months

[npwoods] 18150: Christoph_vW: regedit: make "modify" to default menu entry (bug #840)

by npwoods＠svn.reactos.com

Christoph_vW: regedit: make "modify" to default menu entry (bug #840) Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-29 03:07:26 UTC (rev 18149) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-29 03:33:28 UTC (rev 18150) @@ -118,12 +118,13 @@ /* Initialize the Windows Common Controls DLL */ InitCommonControls(); + HMENU hEditMenu; + hEditMenu = GetSubMenu(hMenuFrame, 1); + AclUiAvailable = InitializeAclUiDll(); if(!AclUiAvailable) { - HMENU hEditMenu; /* hide the Edit/Permissions... menu entry */ - hEditMenu = GetSubMenu(hMenuFrame, 1); if(hEditMenu != NULL) { RemoveMenu(hEditMenu, ID_EDIT_PERMISSIONS, MF_BYCOMMAND); @@ -132,6 +133,9 @@ } } + if(hEditMenu != NULL) + SetMenuDefaultItem(hEditMenu, ID_EDIT_MODIFY, MF_BYCOMMAND); + nClipboardFormat = RegisterClipboardFormat(strClipboardFormat); /* if (nClipboardFormat == 0) { DWORD dwError = GetLastError();

18 years, 11 months

[npwoods] 18149: Regedit: Set up the export all/export branch UI; currently disabled for now

by npwoods＠svn.reactos.com

Regedit: Set up the export all/export branch UI; currently disabled for now Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/resource.h _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 03:07:26 UTC (rev 18149) @@ -349,11 +349,15 @@ * Dialog */ -IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Sans Serif" BEGIN + GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 + CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 03:07:26 UTC (rev 18149) @@ -183,25 +183,6 @@ return TRUE; } -static UINT_PTR CALLBACK ImportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) -{ - OPENFILENAME* pOpenFileName; - OFNOTIFY* pOfNotify; - - switch (uiMsg) { - case WM_INITDIALOG: - pOpenFileName = (OPENFILENAME*)lParam; - break; - case WM_NOTIFY: - pOfNotify = (OFNOTIFY*)lParam; - if (pOfNotify->hdr.code == CDN_INITDONE) {} - break; - default: - break; - } - return 0L; -} - #define MAX_CUSTOM_FILTER_SIZE 50 TCHAR CustomFilterBuffer[MAX_CUSTOM_FILTER_SIZE]; TCHAR FileNameBuffer[_MAX_PATH]; @@ -311,6 +292,37 @@ } +static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hControl; + UINT_PTR iResult = 0; + + switch(uiMsg) { + case WM_INITDIALOG: + hControl = GetDlgItem(hdlg, IDC_EXPORT_ALL); + if (hControl) + { + EnableWindow(hControl, FALSE); + SendMessage(hControl, BM_SETCHECK, BST_CHECKED, 0); + } + + hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH); + if (hControl) + { + EnableWindow(hControl, FALSE); + SendMessage(hControl, BM_SETCHECK, BST_UNCHECKED, 0); + } + + hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH_TEXT); + if (hControl) + { + EnableWindow(hControl, FALSE); + } + break; + } + return iResult; +} + static BOOL ExportRegistryFile(HWND hWnd) { OPENFILENAME ofn; @@ -322,9 +334,9 @@ LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR)); ofn.lpstrTitle = Caption; /* ofn.lCustData = ;*/ - ofn.Flags = OFN_ENABLETEMPLATE + OFN_EXPLORER; - ofn.lpfnHook = ImportRegistryFile_OFNHookProc; - ofn.lpTemplateName = MAKEINTRESOURCE(IDD_DIALOG1); + ofn.Flags = OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_ENABLEHOOK; + ofn.lpfnHook = ExportRegistryFile_OFNHookProc; + ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; /* FIXME - convert strings to ascii! */ _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-09-29 02:50:38 UTC (rev 18148) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-09-29 03:07:26 UTC (rev 18149) @@ -35,7 +35,7 @@ #define IDC_REGEDIT 109 #define IDC_REGEDIT_FRAME 110 #define IDR_REGEDIT_MENU 130 -#define IDD_DIALOG1 131 +#define IDD_EXPORTRANGE 131 #define IDI_OPEN_FILE 132 #define IDD_DIALOG2 132 #define IDI_CLOSED_FILE 133 @@ -174,4 +174,8 @@ #define IDD_EDIT_MULTI_STRING 2006 #define IDD_EDIT_BIN_DATA 2007 +#define IDC_EXPORT_ALL 2008 +#define IDC_EXPORT_BRANCH 2009 +#define IDC_EXPORT_BRANCH_TEXT 2010 + #define IDC_STATIC -1

18 years, 11 months

[weiden] 18148: display all known value types

by weiden＠svn.reactos.com

display all known value types Modified: trunk/reactos/subsys/system/regedit/listview.c _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-09-29 02:26:33 UTC (rev 18147) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-09-29 02:50:38 UTC (rev 18148) @@ -223,7 +223,7 @@ LPTSTR strBinary; if(dwCount > 0) { - strBinary = HeapAlloc(GetProcessHeap(), 0, (dwCount * sizeof(TCHAR) * 3) + 1); + strBinary = HeapAlloc(GetProcessHeap(), 0, (dwCount * sizeof(TCHAR) * 3) + 1); for (i = 0; i < dwCount; i++) { wsprintf( strBinary + i*3, _T("%02X "), pData[i] ); @@ -235,8 +235,8 @@ else { TCHAR szText[128]; - LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR)); - ListView_SetItemText(hwndLV, index, 2, szText); + LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR)); + ListView_SetItemText(hwndLV, index, 2, szText); } } break; @@ -310,6 +310,9 @@ break; case 1: switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { + case REG_NONE: + plvdi->item.pszText = _T("REG_NONE"); + break; case REG_SZ: plvdi->item.pszText = _T("REG_SZ"); break; @@ -319,18 +322,18 @@ case REG_BINARY: plvdi->item.pszText = _T("REG_BINARY"); break; - case REG_DWORD: + case REG_DWORD: /* REG_DWORD_LITTLE_ENDIAN */ plvdi->item.pszText = _T("REG_DWORD"); break; case REG_DWORD_BIG_ENDIAN: plvdi->item.pszText = _T("REG_DWORD_BIG_ENDIAN"); break; + case REG_LINK: + plvdi->item.pszText = _T("REG_LINK"); + break; case REG_MULTI_SZ: plvdi->item.pszText = _T("REG_MULTI_SZ"); break; - case REG_LINK: - plvdi->item.pszText = _T("REG_LINK"); - break; case REG_RESOURCE_LIST: plvdi->item.pszText = _T("REG_RESOURCE_LIST"); break; @@ -340,8 +343,8 @@ case REG_RESOURCE_REQUIREMENTS_LIST: plvdi->item.pszText = _T("REG_RESOURCE_REQUIREMENTS_LIST"); break; - case REG_NONE: - plvdi->item.pszText = _T("REG_NONE"); + case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */ + plvdi->item.pszText = _T("REG_QWORD"); break; default: { TCHAR buf2[200];

18 years, 11 months

[weiden] 18147: added stub for PrivCopyFileExW. This is needed by XP's ulib.dll, which XP's regedit.exe imports

by weiden＠svn.reactos.com

added stub for PrivCopyFileExW. This is needed by XP's ulib.dll, which XP's regedit.exe imports Modified: trunk/reactos/lib/kernel32/file/copy.c Modified: trunk/reactos/lib/kernel32/kernel32.def _____ Modified: trunk/reactos/lib/kernel32/file/copy.c --- trunk/reactos/lib/kernel32/file/copy.c 2005-09-29 02:02:40 UTC (rev 18146) +++ trunk/reactos/lib/kernel32/file/copy.c 2005-09-29 02:26:33 UTC (rev 18147) @@ -385,4 +385,23 @@ bFailIfExists); } + +/* + * @implemented + */ +BOOL +STDCALL +PrivCopyFileExW ( + LPCWSTR lpExistingFileName, + LPCWSTR lpNewFileName, + LPPROGRESS_ROUTINE lpProgressRoutine, + LPVOID lpData, + BOOL *pbCancel, + DWORD dwCopyFlags + ) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-09-29 02:02:40 UTC (rev 18146) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-09-29 02:26:33 UTC (rev 18147) @@ -677,7 +677,7 @@ PeekConsoleInputA@16 PeekConsoleInputW@16 PeekNamedPipe@24 -;PrivCopyFileExW +PrivCopyFileExW@24 ;PrivMoveFileIdentityW PostQueuedCompletionStatus@16 PrepareTape@12

18 years, 11 months

[weiden] 18146: export BuildSecurityDescriptorA/W and IsWellKnownSid

by weiden＠svn.reactos.com

export BuildSecurityDescriptorA/W and IsWellKnownSid Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/advapi32/sec/sid.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-09-29 00:50:40 UTC (rev 18145) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-09-29 02:02:40 UTC (rev 18146) @@ -47,8 +47,8 @@ BuildImpersonateExplicitAccessWithNameW@24 BuildImpersonateTrusteeA@8 BuildImpersonateTrusteeW@8 -;BuildSecurityDescriptorA@36 -;BuildSecurityDescriptorW@36 +BuildSecurityDescriptorA@36 +BuildSecurityDescriptorW@36 BuildTrusteeWithNameA@8 BuildTrusteeWithNameW@8 BuildTrusteeWithObjectsAndNameA@24 @@ -325,7 +325,7 @@ IsValidAcl@4 IsValidSecurityDescriptor@4 IsValidSid@4 -;IsWellKnownSid +IsWellKnownSid@8 LockServiceDatabase@4 LogonUserA@24 ;LogonUserExA _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-09-29 00:50:40 UTC (rev 18145) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-09-29 02:02:40 UTC (rev 18146) @@ -457,4 +457,45 @@ return FALSE; } + +/* + * @unimplemented + */ +DWORD +STDCALL +BuildSecurityDescriptorW(IN PTRUSTEE_W pOwner OPTIONAL, + IN PTRUSTEE_W pGroup OPTIONAL, + IN ULONG cCountOfAccessEntries, + IN PEXPLICIT_ACCESS pListOfAccessEntries OPTIONAL, + IN ULONG cCountOfAuditEntries, + IN PEXPLICIT_ACCESS pListOfAuditEntries OPTIONAL, + IN PSECURITY_DESCRIPTOR pOldSD OPTIONAL, + OUT PULONG pSizeNewSD, + OUT PSECURITY_DESCRIPTOR* pNewSD) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +DWORD +STDCALL +BuildSecurityDescriptorA(IN PTRUSTEE_A pOwner OPTIONAL, + IN PTRUSTEE_A pGroup OPTIONAL, + IN ULONG cCountOfAccessEntries, + IN PEXPLICIT_ACCESS pListOfAccessEntries OPTIONAL, + IN ULONG cCountOfAuditEntries, + IN PEXPLICIT_ACCESS pListOfAuditEntries OPTIONAL, + IN PSECURITY_DESCRIPTOR pOldSD OPTIONAL, + OUT PULONG pSizeNewSD, + OUT PSECURITY_DESCRIPTOR* pNewSD) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/sid.c --- trunk/reactos/lib/advapi32/sec/sid.c 2005-09-29 00:50:40 UTC (rev 18145) +++ trunk/reactos/lib/advapi32/sec/sid.c 2005-09-29 02:02:40 UTC (rev 18146) @@ -1026,4 +1026,17 @@ return FALSE; } + +/* + * @unimplemented + */ +BOOL STDCALL +IsWellKnownSid(IN PSID pSid, + IN WELL_KNOWN_SID_TYPE WellKnownSidType) +{ + FIXME("unimplemented!\n", __FUNCTION__); + return FALSE; +} + + /* EOF */

18 years, 11 months

[npwoods] 18145: Regedit: Optimized tree expansion

by npwoods＠svn.reactos.com

Regedit: Optimized tree expansion Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-28 23:52:24 UTC (rev 18144) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-29 00:50:40 UTC (rev 18145) @@ -123,7 +123,7 @@ tvi.cChildren = dwChildren; tvi.lParam = (LPARAM)hKey; tvins.u.item = tvi; - tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); + tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_FIRST); tvins.hParent = hParent; return TreeView_InsertItem(hwndTV, &tvins); } @@ -139,6 +139,7 @@ LPTSTR pszNodes = NULL; BOOL bSuccess = FALSE; LPTSTR s; + BOOL bAddedAny; KeyPath = GetItemPath(hwndTV, hItem, &hRoot); @@ -219,6 +220,7 @@ } /* Now go through all the children in the registry, and check if any have to be added. */ + bAddedAny = FALSE; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; BOOL found; @@ -249,10 +251,14 @@ } AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); + bAddedAny = TRUE; } } RegCloseKey(hKey); + if (bAddedAny) + SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); + /* Now go through all the children in the tree, and check if any have to be removed. */ childItem = TreeView_GetChild(hwndTV, hItem); while (childItem) { @@ -306,6 +312,7 @@ if (!hItem) return FALSE; if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE)) { hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); + SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE; item.hItem = hItem; @@ -514,6 +521,7 @@ hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0); if (!hNewItem) goto done; + SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); TreeView_EditLabel(hwndTV, hNewItem); bSuccess = TRUE;

18 years, 11 months

[weiden] 18144: added some missing APIs

by weiden＠svn.reactos.com

added some missing APIs Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/winreg.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-09-28 22:57:21 UTC (rev 18143) +++ trunk/reactos/w32api/include/winbase.h 2005-09-28 23:52:24 UTC (rev 18144) @@ -1364,6 +1364,9 @@ BOOL WINAPI GetExitCodeProcess(HANDLE,PDWORD); BOOL WINAPI GetExitCodeThread(HANDLE,PDWORD); DWORD WINAPI GetFileAttributesA(LPCSTR); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI GetFileAttributesByHandle(HANDLE,LPDWORD,DWORD); +#endif DWORD WINAPI GetFileAttributesW(LPCWSTR); BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID); BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID); @@ -1803,6 +1806,9 @@ VOID WINAPI SetFileApisToANSI(void); VOID WINAPI SetFileApisToOEM(void); BOOL WINAPI SetFileAttributesA(LPCSTR,DWORD); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI SetFileAttributesByHandle(HANDLE,DWORD,DWORD); +#endif BOOL WINAPI SetFileAttributesW(LPCWSTR,DWORD); DWORD WINAPI SetFilePointer(HANDLE,LONG,PLONG,DWORD); BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD); _____ Modified: trunk/reactos/w32api/include/winreg.h --- trunk/reactos/w32api/include/winreg.h 2005-09-28 22:57:21 UTC (rev 18143) +++ trunk/reactos/w32api/include/winreg.h 2005-09-28 23:52:24 UTC (rev 18144) @@ -67,10 +67,12 @@ LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIB UTES,PHKEY,PDWORD); LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); -LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); #if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDeleteKeyValueA(HKEY,LPCSTR,LPCSTR); LONG WINAPI RegDeleteKeyValueW(HKEY,LPCWSTR,LPCWSTR); +#endif +LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); #endif

18 years, 11 months

[npwoods] 18143: Notepad fixes:

by npwoods＠svn.reactos.com

Notepad fixes: 1. Fixed accelerator keys for new commands 2. Properly parented Find/Replace dialog 3. Typo in comment Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-28 22:33:55 UTC (rev 18142) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-28 22:57:21 UTC (rev 18143) @@ -263,7 +263,7 @@ { static const WCHAR empty_strW[] = { 0 }; - /* Close any files and promt to save changes */ + /* Close any files and prompt to save changes */ if (DoCloseFile()) { SetWindowText(Globals.hEdit, empty_strW); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-28 22:33:55 UTC (rev 18142) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-28 22:57:21 UTC (rev 18143) @@ -194,7 +194,7 @@ LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, SIZEOF(szResource)); _sntprintf(szText, SIZEOF(szText), szResource, pFindReplace->lpstrFindWhat); LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - MessageBox(Globals.hEdit, szText, szResource, MB_OK); + MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK); } bSuccess = FALSE; } _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-28 22:33:55 UTC (rev 18142) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-28 22:57:21 UTC (rev 18143) @@ -30,6 +30,8 @@ "^A", CMD_SELECT_ALL "^C", CMD_COPY "^F", CMD_SEARCH + "^G", CMD_GOTO + "^H", CMD_REPLACE "^O", CMD_OPEN "^S", CMD_SAVE "^V", CMD_PASTE

18 years, 11 months

[gedmurphy] 18142: - Added daytime and quote of the day services

by gedmurphy＠svn.reactos.com

- Added daytime and quote of the day services - Use universal header and remove needless seperate dirs - Many bugfixes - Added to build, not yet included in install as it's still in the early stages Tested in WinXP using both Windows and Linux clients. Not yet tried in ROS, Modified: trunk/reactos/apps/utils/net/directory.xml Deleted: trunk/reactos/apps/utils/net/tcpsvcs/chargen/ Added: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c Deleted: trunk/reactos/apps/utils/net/tcpsvcs/daytime/ Added: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c Deleted: trunk/reactos/apps/utils/net/tcpsvcs/discard/ Deleted: trunk/reactos/apps/utils/net/tcpsvcs/echo/ Added: trunk/reactos/apps/utils/net/tcpsvcs/echo.c Deleted: trunk/reactos/apps/utils/net/tcpsvcs/qotd/ Added: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c Deleted: trunk/reactos/apps/utils/net/tcpsvcs/skelserver/ Added: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h Added: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.rc Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/apps/utils/net/directory.xml --- trunk/reactos/apps/utils/net/directory.xml 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/directory.xml 2005-09-28 22:33:55 UTC (rev 18142) @@ -1,30 +1,33 @@ <directory name="arp"> - <xi:include href="arp/arp.xml" /> + <xi:include href="arp/arp.xml" /> </directory> <directory name="finger"> - <xi:include href="finger/finger.xml" /> + <xi:include href="finger/finger.xml" /> </directory> <directory name="ftp"> - <xi:include href="ftp/ftp.xml" /> + <xi:include href="ftp/ftp.xml" /> </directory> <directory name="ipconfig"> - <xi:include href="ipconfig/ipconfig.xml" /> + <xi:include href="ipconfig/ipconfig.xml" /> </directory> <directory name="netstat"> - <xi:include href="netstat/netstat.xml" /> + <xi:include href="netstat/netstat.xml" /> </directory> <directory name="ping"> - <xi:include href="ping/ping.xml" /> + <xi:include href="ping/ping.xml" /> </directory> <directory name="route"> - <xi:include href="route/route.xml" /> + <xi:include href="route/route.xml" /> </directory> +<directory name="tcpsvcs"> + <xi:include href="tcpsvcs/tcpsvcs.xml" /> +</directory> <directory name="telnet"> - <xi:include href="telnet/telnet.xml" /> + <xi:include href="telnet/telnet.xml" /> </directory> <directory name="tracert"> - <xi:include href="tracert/tracert.xml" /> + <xi:include href="tracert/tracert.xml" /> </directory> <directory name="whois"> - <xi:include href="whois/whois.xml" /> + <xi:include href="whois/whois.xml" /> </directory> _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,111 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI ChargenHandler(VOID* Sock_) +{ + DWORD Retval = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!GenerateChars(Sock)) { + _tprintf(_T("Char generation failed\n")); + Retval = 3; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + +BOOL GenerateChars(SOCKET Sock) +{ + int i, + charIndex, /* internal loop */ + loopIndex; /* line loop */ + char ring[END-START]; + char *endring; + BOOL bLoop = TRUE; + + /* fill ring with printable characters */ + for (charIndex=0, i=START; i<=END; charIndex++, i++) + ring[charIndex] = i; + /* establish the end character in the ring */ + endring = &ring[charIndex]; + + /* where we will start output from */ + loopIndex = 0; + + while (bLoop) + { + /* if the loop index is equal to number of chars previously + * printed, start the loop from the beginning */ + if (loopIndex == END-START) + loopIndex = 0; + + /* start printing from char controled by loopIndex */ + charIndex = loopIndex; + for (i=0; i<LINESIZ; i++) + { + /* FIXME: Should send lines instead of chars to improve efficiency + * TCP will wait until it fills a packet anway before putting on + * the wire, so it's pointless to keep polling send */ + if (!SendChar(Sock, ring[charIndex])) + { + return FALSE; + } + /* if current char equal last char, reset */ + if (ring[charIndex] == *endring) + charIndex = 0; + else + charIndex++; + } + + if (bLoop) + if ((!SendChar(Sock, L'\r')) || (!SendChar(Sock, L'\n'))) + return FALSE; + + /* increment loop index to start printing from next char in ring */ + loopIndex++; + } + + return TRUE; +} + +BOOL SendChar(SOCKET Sock, TCHAR c) +{ + INT RetVal; + INT SentBytes; + + SentBytes = 0; + RetVal = send(Sock, &c, sizeof(TCHAR), 0); + /*FIXME: need to establish if peer closes connection, + not just report a socket error */ + if (RetVal > 0) + { + SentBytes += RetVal; + return TRUE; + } + else if (RetVal == SOCKET_ERROR) + { + _tprintf(("Socket error\n")); + return FALSE; + } + else + _tprintf(("unknown error\n")); + //WSAGetLastError() + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c --- trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,46 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include <time.h> +#include "tcpsvcs.h" + +DWORD WINAPI DaytimeHandler(VOID* Sock_) +{ + struct tm *newtime; + time_t aclock; + TCHAR *pszTime; + DWORD Retval = 0; + SOCKET Sock = (SOCKET)Sock_; + + time(&aclock); + newtime = localtime(&aclock); + pszTime = _tasctime(newtime); + + SendTime(Sock, pszTime); + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) + _tprintf(_T("Connection is down.\n")); + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + +BOOL SendTime(SOCKET Sock, TCHAR *time) +{ + INT StringSize = strlen(time); + INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,71 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI EchoHandler(VOID* Sock_) +{ + DWORD Retval = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!EchoIncomingPackets(Sock)) { + _tprintf(_T("Echo incoming packets failed\n")); + Retval = 3; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, TRUE)) { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + + +BOOL EchoIncomingPackets(SOCKET Sock) +{ + TCHAR ReadBuffer[BUF]; + INT Temp; + INT ReadBytes; + INT SentBytes; + + do { + ReadBytes = recv(Sock, ReadBuffer, BUF, 0); + if (ReadBytes > 0) { + _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + + SentBytes = 0; + while (SentBytes < ReadBytes) { + Temp = send(Sock, ReadBuffer + SentBytes, + ReadBytes - SentBytes, 0); + if (Temp > 0) { + _tprintf(_T("Sent %d bytes back to client\n"), Temp); + SentBytes += Temp; + } + else if (Temp == SOCKET_ERROR) { + return FALSE; + } + else { + /* Client closed connection before we could reply to + all the data it sent, so quit early. */ + _tprintf(_T("Peer unexpectedly dropped connection!\n")); + return FALSE; + } + } + } + else if (ReadBytes == SOCKET_ERROR) { + return FALSE; + } + } while (ReadBytes != 0); + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/echo.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,56 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include <time.h> +#include "tcpsvcs.h" + +//these need putting in an RC file. +TCHAR Quotes[][MAX_QUOTE_BUF] = { + _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\" - kjk hyperion"), + _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), + _T("\"if the code is broken though, your free to call it ur own\" - Alex Ionescu"), + _T("\"i don't know about any bug; none exist; ReactOS is prefect\" - filip2307"), + _T("\"if you were kernel code, cutler would rewrite you.\" - Alex Ionescu"), + _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\" - WaxDragon") +}; + +DWORD WINAPI QotdHandler(VOID* Sock_) +{ + DWORD Retval = 0; + SOCKET Sock; + INT NumOfQuotes; + + Sock = (SOCKET)Sock_; + NumOfQuotes = sizeof(Quotes) / MAX_QUOTE_BUF; + + SendQuote(Sock, Quotes[1]); + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) + _tprintf(_T("Connection is down.\n")); + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + +BOOL SendQuote(SOCKET Sock, TCHAR* Quote) +{ + INT StringSize; + INT RetVal; + + StringSize = strlen(Quote); + RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c --- trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,125 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + + +DWORD WINAPI StartServer(LPVOID lpParam) +{ + const TCHAR* HostIP = "127.0.0.1"; + DWORD RetVal; + WSADATA wsaData; + PSERVICES pServices; + + pServices = (PSERVICES)lpParam; + + if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) + { + _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); + return -1; + } + + SOCKET ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); + if (ListeningSocket == INVALID_SOCKET) + { + _tprintf(_T("error setting up socket\n")); + return 3; + } + + _tprintf(_T("Waiting for connections...\n")); + while (1) + { + AcceptConnections(ListeningSocket, pServices->Service); + printf("Acceptor restarting...\n"); + } + + /* won't see this yet as we kill the service */ + _tprintf(_T("Detaching Winsock2...\n")); + WSACleanup(); + return 0; +} + + +SOCKET SetUpListener(const char* ServAddr, int Port) +{ + SOCKET Sock; + SOCKADDR_IN Server; + + Sock = socket(AF_INET, SOCK_STREAM, 0); + if (Sock != INVALID_SOCKET) + { + Server.sin_family = AF_INET; + Server.sin_addr.s_addr = htonl(INADDR_ANY); + Server.sin_port = Port; + if (bind(Sock, (SOCKADDR*)&Server, sizeof(SOCKADDR_IN)) != SOCKET_ERROR) + { + listen(Sock, SOMAXCONN); + return Sock; + } + else + printf("bind() failed\n"); + + } + return INVALID_SOCKET; +} + + + + +VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service) +{ + SOCKADDR_IN Client; + SOCKET Sock; + INT nAddrSize = sizeof(Client); + DWORD ThreadID; + + while (1) + { + Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); + if (Sock != INVALID_SOCKET) + { + _tprintf(_T("Accepted connection from %s:%d\n"), + inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + _tprintf(_T("About to create thread\n")); + CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + } + else + { + _tprintf(_T("accept() failed\n")); + return; + } + } +} + +BOOL ShutdownConnection(SOCKET Sock, BOOL bRec) +{ + /* Disallow any further data sends. This will tell the other side + that we want to go away now. If we skip this step, we don't + shut the connection down nicely. */ + if (shutdown(Sock, SD_SEND) == SOCKET_ERROR) + { + _tprintf(_T("Error in shutdown")); + return FALSE; + } + + /* Receive any extra data still sitting on the socket. After all + data is received, this call will block until the remote host + acknowledges the TCP control packet sent by the shutdown above. + Then we'll get a 0 back from recv, signalling that the remote + host has closed its side of the connection. */ + if (bRec) + { + char ReadBuffer[BUF]; + int NewBytes = recv(Sock, ReadBuffer, BUF, 0); + if (NewBytes == SOCKET_ERROR) + return FALSE; + else if (NewBytes != 0) + _tprintf(_T("FYI, received %d unexpected bytes during shutdown\n"), NewBytes); + } + + /* Close the socket. */ + if (closesocket(Sock) == SOCKET_ERROR) + return FALSE; + + return TRUE; +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-28 22:33:55 UTC (rev 18142) @@ -2,37 +2,49 @@ #include <winsock2.h> #include <tchar.h> #include "tcpsvcs.h" -#include "skelserver/skelserver.h" -#include "echo/echo.h" -#include "chargen/chargen.h" +LPTHREAD_START_ROUTINE +ServiceHandler[NUM_SERVICES] = { + EchoHandler, + ChargenHandler, + DaytimeHandler, + NULL, + QotdHandler +}; + +INT ServicePort[NUM_SERVICES] = { + ECHO_PORT, + CHARGEN_PORT, + DAYTIME_PORT, + DISCARD_PORT, + QOTD_PORT +}; + int main(int argc, char *argv[]) { - PMYDATA pData[MAX_THREADS]; - DWORD dwThreadId[MAX_THREADS]; - HANDLE hThread[MAX_THREADS]; + PSERVICES pServices[NUM_SERVICES]; + DWORD dwThreadId[NUM_SERVICES]; + HANDLE hThread[NUM_SERVICES]; INT i; /* Create MAX_THREADS worker threads. */ - for( i=0; i<MAX_THREADS; i++ ) + for( i=0; i<NUM_SERVICES; i++ ) { /* Allocate memory for thread data. */ - pData[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MYDATA)); - - if( pData == NULL ) + pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); + + if( pServices[i] == NULL ) ExitProcess(2); /* Generate unique data for each thread. */ - pData[0]->Port = ECHO_PORT; - pData[0]->Service = EchoHandler; - pData[1]->Port = CHARGEN_PORT; - pData[1]->Service = ChargenHandler; + pServices[i]->Service = ServiceHandler[i]; + pServices[i]->Port = ServicePort[i]; hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size StartServer, // thread function - pData[i], // argument to thread function + pServices[i], // argument to thread function 0, // use default creation flags &dwThreadId[i]); // returns the thread identifier @@ -44,14 +56,13 @@ } /* Wait until all threads have terminated. */ - WaitForMultipleObjects(MAX_THREADS, hThread, TRUE, INFINITE); + WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); /* Close all thread handles upon completion. */ - for(i=0; i<MAX_THREADS; i++) + for(i=0; i<NUM_SERVICES; i++) { CloseHandle(hThread[i]); } return 0; } - _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-28 22:33:55 UTC (rev 18142) @@ -1,3 +1,4 @@ +/* default port numbers */ #define ECHO_PORT 7 #define CHARGEN_PORT 19 #define DAYTIME_PORT 13 @@ -4,10 +5,49 @@ #define DISCARD_PORT 9 #define QOTD_PORT 17 -#define MAX_THREADS 2 +#define NUM_SERVICES 6 #define BUF_SIZE 255 +#define BUF 1024 -typedef struct _MyData { +/* RFC865 states no more than 512 chars per line */ +#define MAX_QUOTE_BUF 512 + +/* printable ASCII's characters for chargen */ +#define START 32 +#define END 126 + +/* number of chars to put on a line */ +#define LINESIZ 72 + +/* data structure to pass to threads */ +typedef struct _Services { INT Port; LPTHREAD_START_ROUTINE Service; -} MYDATA, *PMYDATA; +} SERVICES, *PSERVICES; + +/* skelserver functions */ +DWORD WINAPI StartServer(LPVOID lpParam); +SOCKET SetUpListener(const char* ServAddr, int Port); +VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service); +BOOL EchoIncomingPackets(SOCKET sd); +BOOL ShutdownConnection(SOCKET Sock, BOOL bRec); + +/* chargen functions */ +DWORD WINAPI ChargenHandler(VOID* Sock_); +BOOL GenerateChars(SOCKET Sock); +BOOL SendChar(SOCKET Sock, CHAR c); + +/* daytime functions */ +DWORD WINAPI DaytimeHandler(VOID* Sock_); +BOOL SendTime(SOCKET Sock, TCHAR *time); + +/* echo functions */ +DWORD WINAPI EchoHandler(VOID* Sock_); +BOOL EchoIncomingPackets(SOCKET Sock); + +/* discard functions */ + + +/* qotd functions */ +DWORD WINAPI QotdHandler(VOID* Sock_); +BOOL SendQuote(SOCKET Sock, TCHAR* Quote); _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.rc --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.rc 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.rc 2005-09-28 22:33:55 UTC (rev 18142) @@ -0,0 +1,7 @@ +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IP Services Application\0" +#define REACTOS_STR_INTERNAL_NAME "tcpsvcs\0" +#define REACTOS_STR_ORIGINAL_FILENAME "tcpsvcs.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-28 21:43:54 UTC (rev 18141) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-28 22:33:55 UTC (rev 18142) @@ -1,13 +1,15 @@ -<module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> - <include base="arp">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>shlwapi</library> - <file>tcpsvcs.c</file> - <file>skelserver/skelserver.c</file> - <file>echo/echo.c</file> - <file>chargen/chargen.c</file> -</module> - +<module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> + <file>tcpsvcs.c</file> + <file>skelserver.c</file> + <file>echo.c</file> + <file>chargen.c</file> + <file>daytime.c</file> + <file>qotd.c</file> +</module> + Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml ___________________________________________________________________ Name: svn:eol-style + native

18 years, 11 months

← Newer
1
2
3
4
5
6
7
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005