Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 26641: Update Polish translation. Patch by Lech Groblewicz <xrogers'at'gmail'dot'com> and Olaf Siejka. Bug #2233.
by dgorbachev＠svn.reactos.org 04 May '07

04 May '07

Author: dgorbachev Date: Sat May 5 03:27:28 2007 New Revision: 26641 URL: http://svn.reactos.org/svn/reactos?rev=26641&view=rev Log: Update Polish translation. Patch by Lech Groblewicz <xrogers'at'gmail'dot'com> and Olaf Siejka. Bug #2233. Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sat May 5 03:27:28 2007 @@ -1,4 +1,5 @@ //Polish translation Emil Kaczmarek 2005 +//update by Olaf Siejka (May, 2007) LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL @@ -94,15 +95,15 @@ IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sticky Keys Settings" +CAPTION "Ustawienia Klawiszy Trwa³ych" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + GROUPBOX "Klawisze",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Nacinij klawisz SHIFT 5 razy by aktywowaæ funkcjê KlawiszeTrwa³e.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc Sat May 5 03:27:28 2007 @@ -1,185 +1,185 @@ -/* -* translated by xrogers -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - -IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Opcje regionalne" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Standardy i formaty", IDC_GROUPBOX, 5, 3, 242, 165 - LTEXT "Ta opcja wp³ywa na spsób, w jaki niektóre programy formatuj¹ liczby, waluty, daty i godziny.", -1, 14, 15, 230, 16 - LTEXT "&Wybierz element, aby dopasowaæ jego preferencje lub kliknij przycisk Dostosuj, aby wybraæ w³asne formaty:", -1, 14, 36, 230, 16 - COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - PUSHBUTTON "Do&stosuj...", IDC_SETUP_BUTTON, 187, 54, 52, 13 - LTEXT "Przyk³ady", -1, 14, 73, 70, 10 - LTEXT "Liczba:", -1, 16, 86, 48, 10 - LTEXT "Waluta:", -1, 16, 101, 48, 10 - LTEXT "Godzina:", -1, 16, 116, 48, 10 - LTEXT "Data krótka:", -1, 16, 131, 48, 10 - LTEXT "Data d³uga:", -1, 16, 146, 48, 10 - EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Lokalizacja", -1, 5, 172, 242, 56 - LTEXT "Aby pomóc us³ugom w dostarczaniu informacji lokalnych, takich jak wiadomoci i pogoda, wybierz swoj¹ obecn¹ lokalizacjê:", -1, 14, 184, 225, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT -END - -IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Zaawansowane" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Jêzyk dla programów nie obs³uguj¹cych kodu Unicode", IDC_GROUPBOX, 5, 5, 242, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "To ustawienie systemu umo¿liwia programom nie obs³uguj¹cym kodu Unicode wywietlanie menu i okien dialogowych w ich macierzystym jêzyku. Nie dotyczy ono programów obs³uguj¹cych kod Unicode, ale jest stosowane do wszystkich u¿ytkowników tego komputera.", -1, 14, 18, 223, 33 - LTEXT "&Wybierz jêzyk odpowiadaj¹cy wersji jêzykowej programów nie obs³uguj¹cych kodu Unicode, których chcesz u¿ywaæ:", -1, 14, 55, 223, 18 - GROUPBOX "&Tabele konwersji stron kodowych", -1, 5, 101, 242, 88 -END - -IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Languages" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Text input languages and services", IDC_GROUPBOX, 5, 3, 242, 52 - LTEXT "To view or change language or text input methods press ""Detail...""", -1, 12, 13, 230, 18 - PUSHBUTTON "De&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14 - GROUPBOX "Additional language support", IDC_GROUPBOX, 5, 60, 242, 82 - /* TODO: add other components*/ -END - -IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Numbers" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 48 - LTEXT "Positive:", -1, 11, 20, 28, 10 - EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 128, 20, 31, 10 - EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Positive:", -1, 11, 38, 28, 10 - EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 128, 38, 31, 10 - EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Whole and fractional part separator:", -1, 18, 61, 126, 9 - COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Number of fractional symbols:", -1, 18, 77, 126, 9 - COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Field separator:", -1, 18, 93, 126, 9 - COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Number of digits in field:", -1, 18, 109, 126, 9 - COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Negative number sign:", -1, 18, 125, 126, 9 - COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Negative numbers format:", -1, 18, 141, 126, 9 - COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Leading zeroes:", -1, 18, 157, 126, 9 - COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Elements list separator:", -1, 18, 173, 126, 9 - COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "System of units:", -1, 18, 189, 126, 9 - COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Region corresponding digits:", -1, 18, 205, 126, 9 - COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Digit replacement:", -1, 18, 221, 126, 9 - COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Currency" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 40 - LTEXT "Positive:", -1, 10, 25, 30, 10 - EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 128, 25, 31, 10 - EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Monetary unit:", -1, 20, 61, 126, 9 - COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Positive sum of money format:", -1, 20, 78, 126, 9 - COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Negative sum of money format:", -1, 20, 95, 126, 9 - COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Whole and fractional part separator:", -1, 20, 121, 126, 9 - COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Number of fractional symbols:", -1, 20, 137, 126, 9 - COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Field separator:", -1, 20, 166, 126, 9 - COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Number of digits in field:", -1, 20, 183, 126, 9 - COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Time" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 33 - LTEXT "Sample:", -1, 13, 21, 52, 10 - EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Time format:", -1, 10, 52, 147, 10 - COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Time components separator:", -1, 10, 69, 147, 10 - COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Time about midday notation (AM):", -1, 10, 86, 147, 10 - COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Time afternoon notation (PM):", -1, 10, 104, 147, 10 - COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 - LTEXT "The designation of the time format\nh = hour m = minute s = second t = AM or PM\n\nh = 12-hour day format\nH = 24-hour day format\n\nhh, mm, ss = with zeroes in beginning\nh, m, s = without zeroes", -1, 13, 141, 226, 65 -END - -IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Date" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Calendar", IDC_GROUPBOX, 5, 7, 242, 74 - LTEXT "If year typed as two digits, then show it as year between:", -1, 13, 18, 225, 8 - EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "and", -1, 55, 32, 17, 8 - EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP - CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendar type:", -1, 13, 48, 56, 10 - COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Muslim Calendar:", -1, 13, 59, 60, 16 - COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 238, 81 - LTEXT "Sample:", -1, 13, 95, 63, 10 - EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 - EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Short format:", -1, 13, 131, 60, 10 - COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Date components separator:", -1, 13, 148, 113, 10 - COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 238, 64 - LTEXT "Sample:", -1, 13, 179, 61, 10 - EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 - EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Long format:", -1, 13, 215, 60, 10 - COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Opcje regionalne i jêzykowe" - IDS_CPLDESCRIPTION "Dostosowuje ustawienia wywietlania jêzyków, liczb, godzin i dat." -END +/* +* translated by xrogers +* xxrogers(a)users.sourceforge.net +* https://sourceforge.net/projects/reactospl +*/ +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Opcje regionalne" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Standardy i formaty", IDC_GROUPBOX, 5, 3, 242, 165 + LTEXT "Ta opcja wp³ywa na spsób, w jaki niektóre programy formatuj¹ liczby, waluty, daty i godziny.", -1, 14, 15, 230, 16 + LTEXT "&Wybierz element, aby dopasowaæ jego preferencje lub kliknij przycisk Dostosuj, aby wybraæ w³asne formaty:", -1, 14, 36, 230, 16 + COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + PUSHBUTTON "Do&stosuj...", IDC_SETUP_BUTTON, 187, 54, 52, 13 + LTEXT "Przyk³ady", -1, 14, 73, 70, 10 + LTEXT "Liczba:", -1, 16, 86, 48, 10 + LTEXT "Waluta:", -1, 16, 101, 48, 10 + LTEXT "Godzina:", -1, 16, 116, 48, 10 + LTEXT "Data krótka:", -1, 16, 131, 48, 10 + LTEXT "Data d³uga:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Lokalizacja", -1, 5, 172, 242, 56 + LTEXT "Aby pomóc us³ugom w dostarczaniu informacji lokalnych, takich jak wiadomoci i pogoda, wybierz swoj¹ obecn¹ lokalizacjê:", -1, 14, 184, 225, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zaawansowane" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Jêzyk dla programów nie obs³uguj¹cych kodu Unicode", IDC_GROUPBOX, 5, 5, 242, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "To ustawienie systemu umo¿liwia programom nie obs³uguj¹cym kodu Unicode wywietlanie menu i okien dialogowych w ich macierzystym jêzyku. Nie dotyczy ono programów obs³uguj¹cych kod Unicode, ale jest stosowane do wszystkich u¿ytkowników tego komputera.", -1, 14, 18, 223, 33 + LTEXT "&Wybierz jêzyk odpowiadaj¹cy wersji jêzykowej programów nie obs³uguj¹cych kodu Unicode, których chcesz u¿ywaæ:", -1, 14, 55, 223, 18 + GROUPBOX "&Tabele konwersji stron kodowych", -1, 5, 101, 242, 88 +END + +IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Jêzyki" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Us³ugi tekstowe i jêzykowe", IDC_GROUPBOX, 5, 3, 242, 52 + LTEXT "Aby wywietliæ lub zmieniæ jêzyk i metody wprowadzania tekstu kliknij przycisk ""Szczegó³y""", -1, 12, 13, 230, 18 + PUSHBUTTON "&Szczegó³y", IDC_DETAIL_BUTTON, 186, 34, 54, 14 + GROUPBOX "Obs³uga dodatkowych jêzyków", IDC_GROUPBOX, 5, 60, 242, 82 + /* TODO: add other components*/ +END + +IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Liczby" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Przyk³ady", IDC_GROUPBOX, 5, 7, 242, 48 + LTEXT "Dodatnie:", -1, 11, 20, 28, 10 + EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ujemne:", -1, 128, 20, 31, 10 + EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Dodatnie:", -1, 11, 38, 28, 10 + EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ujemne:", -1, 128, 38, 31, 10 + EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Symbol dziesiêtny:", -1, 18, 61, 126, 9 + COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Liczba cyfr po symbolu dziesiêtnym:", -1, 18, 77, 126, 9 + COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Symbol grupowania cyfr:", -1, 18, 93, 126, 9 + COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Grupowanie cyfr:", -1, 18, 109, 126, 9 + COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Symbol znaku minus:", -1, 18, 125, 126, 9 + COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Format liczb ujemnych:", -1, 18, 141, 126, 9 + COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Wiod¹ce zera:", -1, 18, 157, 126, 9 + COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Separator elementów listy:", -1, 18, 173, 126, 9 + COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "System miar:", -1, 18, 189, 126, 9 + COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Cyfry odpowiadaj¹ce regionowi:", -1, 18, 205, 126, 9 + COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Cyfry zastêpcze:", -1, 18, 221, 126, 9 + COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Waluta" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Przyk³ady", IDC_GROUPBOX, 5, 7, 242, 40 + LTEXT "Dodatnie:", -1, 10, 25, 30, 10 + EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ujemne:", -1, 128, 25, 31, 10 + EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Jednostka monetarna:", -1, 20, 61, 126, 9 + COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Format liczb dodatnich:", -1, 20, 78, 126, 9 + COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Format liczb ujemnych:", -1, 20, 95, 126, 9 + COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Symbol dziesiêtny:", -1, 20, 121, 126, 9 + COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Liczba cyfr dziesiêtnych:", -1, 20, 137, 126, 9 + COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Symbol grupowania cyfr:", -1, 20, 166, 126, 9 + COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Grupowanie cyfr:", -1, 20, 183, 126, 9 + COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Czas" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Przyk³ady", IDC_GROUPBOX, 5, 7, 242, 33 + LTEXT "Przyk³ad:", -1, 13, 21, 52, 10 + EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Format godziny:", -1, 10, 52, 147, 10 + COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Separator godziny:", -1, 10, 69, 147, 10 + COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Godzina w notacji przedpo³udniowej(AM):", -1, 10, 86, 147, 10 + COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Godzina w notacji popo³udniowej(PM):", -1, 10, 104, 147, 10 + COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 + LTEXT "Notacja formatu godziny\ng = godzina m = minuta s = sekunda t = am lub pm\n\ng = 12 godzin\nG = 24 godziny\n\ngg, mm, ss = zero wiod¹ce\ng, m, s = bez zera wiod¹cego", -1, 13, 141, 226, 65 +END + +IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Data" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Kalendarz", IDC_GROUPBOX, 5, 7, 242, 74 + LTEXT "Jeli rok zostanie wprowadzony w postaci dwóch cyfr interpretuj go jako rok z zakresu:", -1, 13, 18, 225, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "i", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Rodzaj kalendarza:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + LTEXT "Kalendarz muzu³mañski:", -1, 13, 59, 60, 16 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + GROUPBOX "Krótki format daty", IDC_GROUPBOX, 7, 83, 238, 81 + LTEXT "Przyk³ad:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Przyk³ad daty d³ugiej:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Krótki format:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Separator daty:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "D³ugi format daty", IDC_GROUPBOX, 7, 167, 238, 64 + LTEXT "Przyk³ad:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Przyk³ad daty d³ugiej:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "D³ugi format:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Opcje regionalne i jêzykowe" + IDS_CPLDESCRIPTION "Dostosowuje ustawienia wywietlania jêzyków, liczb, godzin i dat." +END

1 0

[dgorbachev] 26640: Patch for reformatting the cabman code, Colin Finck, see bug report #2234.
by dgorbachev＠svn.reactos.org 04 May '07

04 May '07

Author: dgorbachev Date: Sat May 5 02:21:55 2007 New Revision: 26640 URL: http://svn.reactos.org/svn/reactos?rev=26640&view=rev Log: Patch for reformatting the cabman code, Colin Finck, see bug report #2234. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.cxx trunk/reactos/tools/cabman/raw.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=2… Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=266… Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=2… Modified: trunk/reactos/tools/cabman/raw.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.cxx?rev=2… Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=266…

1 0

[ekohl] 26639: Removed my name because these files no longer contain any code written by me.
by ekohl＠svn.reactos.org 04 May '07

04 May '07

Author: ekohl Date: Sat May 5 02:15:13 2007 New Revision: 26639 URL: http://svn.reactos.org/svn/reactos?rev=26639&view=rev Log: Removed my name because these files no longer contain any code written by me. Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/pow_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/pow.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/alldiv_asm.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/alldvrm.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/allmul.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/allrem.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/allshl.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/allshr.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/atan.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/aulldiv_asm.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/aulldvrm.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/aullrem.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/uallshr.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/ceil.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/cos.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/fabs.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/floor.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/ftol.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/log.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/pow_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/pow_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/pow.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sin.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sqrt.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/tan.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s (original) +++ trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/atan.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s (original) +++ trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/ceil.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s (original) +++ trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/cos.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s (original) +++ trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/floor.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved. Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s (original) +++ trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s Sat May 5 02:15:13 2007 @@ -4,7 +4,6 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sin.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) * * Copyright (C) 2002 Michael Ringgaard. * All rights reserved.

1 0

[ekohl] 26638: Removed my name because I did not write this file!
by ekohl＠svn.reactos.org 04 May '07

04 May '07

Author: ekohl Date: Sat May 5 01:59:25 2007 New Revision: 26638 URL: http://svn.reactos.org/svn/reactos?rev=26638&view=rev Log: Removed my name because I did not write this file! Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… ============================================================================== --- trunk/reactos/drivers/storage/port/diskdump/diskdump.c (original) +++ trunk/reactos/drivers/storage/port/diskdump/diskdump.c Sat May 5 01:59:25 2007 @@ -22,7 +22,7 @@ * PROJECT: ReactOS Kernel * FILE: services/storage/diskdump/diskdump.c * PURPOSE: Dumping crash data to the pagefile - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: */ /* INCLUDES *****************************************************************/

1 0

[spetreolle] 26637: slash is alive ! -#include "..\gditest.h" +#include "../gditest.h"
by spetreolle＠svn.reactos.org 04 May '07

04 May '07

Author: spetreolle Date: Sat May 5 01:23:42 2007 New Revision: 26637 URL: http://svn.reactos.org/svn/reactos?rev=26637&view=rev Log: slash is alive ! -#include "..\gditest.h" +#include "../gditest.h" Modified: trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c trunk/rostests/win32/gdi32/tests/CreatePen.c trunk/rostests/win32/gdi32/tests/ExtCreatePen.c trunk/rostests/win32/gdi32/tests/GetObject.c trunk/rostests/win32/gdi32/tests/GetStockObject.c trunk/rostests/win32/gdi32/tests/SelectObject.c trunk/rostests/win32/gdi32/tests/SetDCPenColor.c trunk/rostests/win32/gdi32/tests/SetSysColors.c Modified: trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "CreateCompatibleDC.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_CreateCompatibleDC(INT* passed, INT* failed) { Modified: trunk/rostests/win32/gdi32/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateP… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreatePen.c (original) +++ trunk/rostests/win32/gdi32/tests/CreatePen.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "CreatePen.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_CreatePen(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/ExtCrea… ============================================================================== --- trunk/rostests/win32/gdi32/tests/ExtCreatePen.c (original) +++ trunk/rostests/win32/gdi32/tests/ExtCreatePen.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "ExtCreatePen.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_ExtCreatePen(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetObje… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetObject.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "GetObject.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_General(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetStoc… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetStockObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetStockObject.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "GetStockObject.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_GetStockObject(INT* passed, INT* failed) { Modified: trunk/rostests/win32/gdi32/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SelectO… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SelectObject.c (original) +++ trunk/rostests/win32/gdi32/tests/SelectObject.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "SelectObject.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_SelectObject(INT* passed, INT* failed) { Modified: trunk/rostests/win32/gdi32/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetDCPe… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetDCPenColor.c (original) +++ trunk/rostests/win32/gdi32/tests/SetDCPenColor.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "SetDCPenColor.c" -#include "..\gditest.h" +#include "../gditest.h" BOOL Test_SetDCPenColor(INT* passed, INT* failed) { Modified: trunk/rostests/win32/gdi32/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetSysC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetSysColors.c (original) +++ trunk/rostests/win32/gdi32/tests/SetSysColors.c Sat May 5 01:23:42 2007 @@ -1,6 +1,6 @@ #line 2 "SetSysColors.c" -#include "..\gditest.h" +#include "../gditest.h" #define NUM_SYSCOLORS 31

1 0

[fireball] 26636: - Add fundamental VCB structure, and function to initialize it. - Add common headers to all xCB structures. - All development is being done according to Rajeev Nagar's book and some parts are inspired by its accompanying FSD sample.
by fireball＠svn.reactos.org 04 May '07

04 May '07

Author: fireball Date: Fri May 4 22:34:48 2007 New Revision: 26636 URL: http://svn.reactos.org/svn/reactos?rev=26636&view=rev Log: - Add fundamental VCB structure, and function to initialize it. - Add common headers to all xCB structures. - All development is being done according to Rajeev Nagar's book and some parts are inspired by its accompanying FSD sample. Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.c Fri May 4 22:34:48 2007 @@ -14,6 +14,8 @@ #include <debug.h> ULONG NpfsDebugLevel = NPFS_DL_API_TRACE; + +static VOID NpfsInitializeVcb(PNPFS_VCB Vcb); /* FUNCTIONS *****************************************************************/ @@ -67,6 +69,9 @@ /* initialize the device extension */ DeviceExtension = DeviceObject->DeviceExtension; + + NpfsInitializeVcb(&DeviceExtension->Vcb); + InitializeListHead(&DeviceExtension->PipeListHead); InitializeListHead(&DeviceExtension->ThreadListHead); KeInitializeMutex(&DeviceExtension->PipeListLock, 0); @@ -78,6 +83,22 @@ DeviceExtension->MaxQuota = 64 * PAGE_SIZE; return STATUS_SUCCESS; +} + +static VOID +NpfsInitializeVcb(PNPFS_VCB Vcb) +{ + /* Initialize Volume Control Block, it's one per whole named pipe + file system. */ + + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsInitializeVcb(), Vcb = %p\n", Vcb); + + /* Zero-init whole VCB */ + RtlZeroMemory(Vcb, sizeof(NPFS_VCB)); + + /* Initialize the common header */ + Vcb->NodeTypeCode = NPFS_NODETYPE_VCB; + Vcb->NodeByteSize = sizeof(NPFS_VCB); } VOID NTAPI Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h Fri May 4 22:34:48 2007 @@ -11,20 +11,23 @@ #define NPFS_DL_NONE 0x00000000 #define NPFS_DL_API_TRACE 0x00000001 -typedef struct _NPFS_DEVICE_EXTENSION +/* Node type codes for NPFS */ +#define NPFS_NODETYPE_VCB 0x401 +#define NPFS_NODETYPE_DCB 0x402 +#define NPFS_NODETYPE_FCB 0x404 +#define NPFS_NODETYPE_CCB 0x406 + +typedef struct _NPFS_VCB { - LIST_ENTRY PipeListHead; - LIST_ENTRY ThreadListHead; - KMUTEX PipeListLock; - ULONG EmptyWaiterCount; - ULONG MinQuota; - ULONG DefaultQuota; - ULONG MaxQuota; -} NPFS_DEVICE_EXTENSION, *PNPFS_DEVICE_EXTENSION; + /* Common node header */ + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + +} NPFS_VCB, *PNPFS_VCB; typedef struct _NPFS_FCB { - FSRTL_COMMON_FCB_HEADER RFCB; + FSRTL_COMMON_FCB_HEADER RFCB; /* Includes common node header */ UNICODE_STRING PipeName; LIST_ENTRY PipeListEntry; KMUTEX CcbListLock; @@ -46,6 +49,10 @@ typedef struct _NPFS_CCB { + /* Common node header */ + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + LIST_ENTRY CcbListEntry; struct _NPFS_CCB* OtherSide; struct ETHREAD *Thread; @@ -67,6 +74,20 @@ FAST_MUTEX DataListLock; /* Data queue lock */ } NPFS_CCB, *PNPFS_CCB; + +typedef struct _NPFS_DEVICE_EXTENSION +{ + LIST_ENTRY PipeListHead; + LIST_ENTRY ThreadListHead; + KMUTEX PipeListLock; + ULONG EmptyWaiterCount; + ULONG MinQuota; + ULONG DefaultQuota; + ULONG MaxQuota; + + NPFS_VCB Vcb; +} NPFS_DEVICE_EXTENSION, *PNPFS_DEVICE_EXTENSION; + typedef struct _NPFS_CONTEXT { @@ -90,7 +111,6 @@ LIST_ENTRY Entry; PNPFS_CCB Ccb; } NPFS_WAITER_ENTRY, *PNPFS_WAITER_ENTRY; - extern NPAGED_LOOKASIDE_LIST NpfsPipeDataLookasideList;

1 0

[fireball] 26635: - Fixes and changes to NPFS debug printing system, so it actually works now.
by fireball＠svn.reactos.org 04 May '07

04 May '07

Author: fireball Date: Fri May 4 17:40:14 2007 New Revision: 26635 URL: http://svn.reactos.org/svn/reactos?rev=26635&view=rev Log: - Fixes and changes to NPFS debug printing system, so it actually works now. Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/finfo.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/npfs.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/rw.c trunk/reactos/drivers/filesystems/npfs_new/volume.c Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c Fri May 4 17:40:14 2007 @@ -18,7 +18,7 @@ NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -27,7 +27,7 @@ NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE Named Pipe\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CREATE Named Pipe\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -36,7 +36,7 @@ NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "Cleanup\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "Cleanup\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -45,7 +45,7 @@ NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CLOSE\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "IRP_MJ_CLOSE\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/finfo.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/finfo.c Fri May 4 17:40:14 2007 @@ -20,7 +20,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -35,7 +35,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsSetInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsSetInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c Fri May 4 17:40:14 2007 @@ -20,7 +20,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsDirectoryControl()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsDirectoryControl()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -35,7 +35,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFileSystemControl()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFileSystemControl()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.c Fri May 4 17:40:14 2007 @@ -13,7 +13,7 @@ //#define NDEBUG #include <debug.h> -ULONG NpfsDebugLevel = NPFS_DEBUG_HIGHEST; +ULONG NpfsDebugLevel = NPFS_DL_API_TRACE; /* FUNCTIONS *****************************************************************/ @@ -86,7 +86,7 @@ va_list args; char str[300]; - if ((NpfsDebugLevel & Level) == 0) + if (!(NpfsDebugLevel & Level)) return; va_start(args, fmt); Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h Fri May 4 17:40:14 2007 @@ -8,7 +8,8 @@ #include <stdio.h> /* Debug Levels */ -#define NPFS_DEBUG_HIGHEST 0x0 +#define NPFS_DL_NONE 0x00000000 +#define NPFS_DL_API_TRACE 0x00000001 typedef struct _NPFS_DEVICE_EXTENSION { Modified: trunk/reactos/drivers/filesystems/npfs_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/rw.c Fri May 4 17:40:14 2007 @@ -48,7 +48,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsRead()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsRead()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -63,7 +63,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsWrite()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsWrite()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -78,7 +78,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFlushBuffers()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsFlushBuffers()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/volume.c Fri May 4 17:40:14 2007 @@ -20,7 +20,7 @@ { FsRtlEnterFileSystem(); - NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryVolumeInformation()\n"); + NpfsDbgPrint(NPFS_DL_API_TRACE, "NpfsQueryVolumeInformation()\n"); /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[fireball] 26634: - Add function stubs - Add simple dbgprinting mechanism for easier debugging.
by fireball＠svn.reactos.org 04 May '07

04 May '07

Author: fireball Date: Fri May 4 15:50:41 2007 New Revision: 26634 URL: http://svn.reactos.org/svn/reactos?rev=26634&view=rev Log: - Add function stubs - Add simple dbgprinting mechanism for easier debugging. Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/finfo.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/npfs.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/rw.c trunk/reactos/drivers/filesystems/npfs_new/volume.c Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c Fri May 4 15:50:41 2007 @@ -15,4 +15,40 @@ /* FUNCTIONS *****************************************************************/ +NTSTATUS NTAPI +NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CREATE Named Pipe\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "Cleanup\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "IRP_MJ_CLOSE\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/finfo.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/finfo.c Fri May 4 15:50:41 2007 @@ -15,4 +15,34 @@ /* FUNCTIONS *****************************************************************/ +NTSTATUS NTAPI +NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + FsRtlEnterFileSystem(); + + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryInformation()\n"); + + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + FsRtlExitFileSystem(); + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + FsRtlEnterFileSystem(); + + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsSetInformation()\n"); + + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + FsRtlExitFileSystem(); + + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c Fri May 4 15:50:41 2007 @@ -15,5 +15,34 @@ /* FUNCTIONS *****************************************************************/ +NTSTATUS NTAPI +NpfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + FsRtlEnterFileSystem(); + + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsDirectoryControl()\n"); + + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + FsRtlExitFileSystem(); + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + FsRtlEnterFileSystem(); + + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFileSystemControl()\n"); + + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + FsRtlExitFileSystem(); + + return STATUS_SUCCESS; +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.c Fri May 4 15:50:41 2007 @@ -13,9 +13,11 @@ //#define NDEBUG #include <debug.h> +ULONG NpfsDebugLevel = NPFS_DEBUG_HIGHEST; + /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { @@ -24,33 +26,25 @@ UNICODE_STRING DeviceName; NTSTATUS Status; - DPRINT("Named Pipe FSD 0.0.2\n"); + DPRINT("Named Pipe File System Driver v0.1\n"); ASSERT (sizeof(NPFS_CONTEXT) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); ASSERT (sizeof(NPFS_WAITER_ENTRY) <= FIELD_OFFSET(IRP, Tail.Overlay.DriverContext)); DriverObject->MajorFunction[IRP_MJ_CREATE] = NpfsCreate; - DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = - NpfsCreateNamedPipe; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = NpfsCreateNamedPipe; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NpfsClose; DriverObject->MajorFunction[IRP_MJ_READ] = NpfsRead; DriverObject->MajorFunction[IRP_MJ_WRITE] = NpfsWrite; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = - NpfsQueryInformation; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = - NpfsSetInformation; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - NpfsQueryVolumeInformation; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NpfsQueryInformation; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = NpfsSetInformation; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NpfsQueryVolumeInformation; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = NpfsCleanup; DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpfsFlushBuffers; - // DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = - // NpfsDirectoryControl; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = - NpfsFileSystemControl; - // DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = - // NpfsQuerySecurity; - // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = - // NpfsSetSecurity; + DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NpfsDirectoryControl; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NpfsFileSystemControl; + //DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpfsQuerySecurity; + //DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpfsSetSecurity; DriverObject->DriverUnload = NULL; @@ -86,4 +80,20 @@ return STATUS_SUCCESS; } +VOID NTAPI +NpfsDbgPrint(ULONG Level, char *fmt, ...) +{ + va_list args; + char str[300]; + + if ((NpfsDebugLevel & Level) == 0) + return; + + va_start(args, fmt); + vsnprintf(str, sizeof(str), fmt, args); + va_end(args); + DbgPrint ("%4.4d: NPFS %s", PsGetCurrentProcessId(), str); +} + + /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h Fri May 4 15:50:41 2007 @@ -3,6 +3,12 @@ #include <ntifs.h> #include <ndk/iotypes.h> + +#include <stdarg.h> +#include <stdio.h> + +/* Debug Levels */ +#define NPFS_DEBUG_HIGHEST 0x0 typedef struct _NPFS_DEVICE_EXTENSION { @@ -98,25 +104,29 @@ #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) -NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +VOID NTAPI +NpfsDbgPrint(ULONG Level, char *fmt, ...); + #endif /* __DRIVERS_FS_NP_NPFS_H */ Modified: trunk/reactos/drivers/filesystems/npfs_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/rw.c Fri May 4 15:50:41 2007 @@ -43,737 +43,49 @@ } #endif -static VOID STDCALL -NpfsReadWriteCancelRoutine(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NTSTATUS NTAPI +NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PNPFS_CONTEXT Context; - PNPFS_DEVICE_EXTENSION DeviceExt; - PIO_STACK_LOCATION IoStack; - PNPFS_CCB Ccb; - BOOLEAN Complete = FALSE; + FsRtlEnterFileSystem(); - DPRINT("NpfsReadWriteCancelRoutine(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsRead()\n"); - IoReleaseCancelSpinLock(Irp->CancelIrql); + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); - Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); - Ccb = IoStack->FileObject->FsContext2; + FsRtlExitFileSystem(); - KeLockMutex(&DeviceExt->PipeListLock); - ExAcquireFastMutex(&Ccb->DataListLock); - switch(IoStack->MajorFunction) - { - case IRP_MJ_READ: - if (Ccb->ReadRequestListHead.Flink != &Context->ListEntry) - { - /* we are not the first in the list, remove an complete us */ - RemoveEntryList(&Context->ListEntry); - Complete = TRUE; - } - else - { - KeSetEvent(&Ccb->ReadEvent, IO_NO_INCREMENT, FALSE); - } - break; - default: - KEBUGCHECK(0); - } - ExReleaseFastMutex(&Ccb->DataListLock); - KeUnlockMutex(&DeviceExt->PipeListLock); - if (Complete) - { - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } + return STATUS_SUCCESS; } -static VOID STDCALL -NpfsWaiterThread(PVOID InitContext) +NTSTATUS NTAPI +NpfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PNPFS_THREAD_CONTEXT ThreadContext = (PNPFS_THREAD_CONTEXT) InitContext; - ULONG CurrentCount; - ULONG Count = 0; - PIRP Irp = NULL; - PIRP NextIrp; - NTSTATUS Status; - BOOLEAN Terminate = FALSE; - BOOLEAN Cancel = FALSE; - PIO_STACK_LOCATION IoStack = NULL; - PNPFS_CONTEXT Context; - PNPFS_CONTEXT NextContext; - PNPFS_CCB Ccb; + FsRtlEnterFileSystem(); - KeLockMutex(&ThreadContext->DeviceExt->PipeListLock); + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsWrite()\n"); - while (1) - { - CurrentCount = ThreadContext->Count; - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); - if (Irp) - { - if (Cancel) - { - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - switch (IoStack->MajorFunction) - { - case IRP_MJ_READ: - NpfsRead(IoStack->DeviceObject, Irp); - break; - default: - KEBUGCHECK(0); - } - } - } - if (Terminate) - { - break; - } - Status = KeWaitForMultipleObjects(CurrentCount, - ThreadContext->WaitObjectArray, - WaitAny, - Executive, - KernelMode, - FALSE, - NULL, - ThreadContext->WaitBlockArray); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - KeLockMutex(&ThreadContext->DeviceExt->PipeListLock); - Count = Status - STATUS_SUCCESS; - ASSERT (Count < CurrentCount); - if (Count > 0) - { - Irp = ThreadContext->WaitIrpArray[Count]; - ThreadContext->Count--; - ThreadContext->DeviceExt->EmptyWaiterCount++; - ThreadContext->WaitObjectArray[Count] = ThreadContext->WaitObjectArray[ThreadContext->Count]; - ThreadContext->WaitIrpArray[Count] = ThreadContext->WaitIrpArray[ThreadContext->Count]; + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); - Cancel = (NULL == IoSetCancelRoutine(Irp, NULL)); - Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - IoStack = IoGetCurrentIrpStackLocation(Irp); + FsRtlExitFileSystem(); - if (Cancel) - { - Ccb = IoStack->FileObject->FsContext2; - ExAcquireFastMutex(&Ccb->DataListLock); - RemoveEntryList(&Context->ListEntry); - switch (IoStack->MajorFunction) - { - case IRP_MJ_READ: - if (!IsListEmpty(&Ccb->ReadRequestListHead)) - { - /* put the next request on the wait list */ - NextContext = CONTAINING_RECORD(Ccb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry); - ThreadContext->WaitObjectArray[ThreadContext->Count] = NextContext->WaitEvent; - NextIrp = CONTAINING_RECORD(NextContext, IRP, Tail.Overlay.DriverContext); - ThreadContext->WaitIrpArray[ThreadContext->Count] = NextIrp; - ThreadContext->Count++; - ThreadContext->DeviceExt->EmptyWaiterCount--; - } - break; - default: - KEBUGCHECK(0); - } - ExReleaseFastMutex(&Ccb->DataListLock); - } - } - else - { - /* someone has add a new wait request */ - Irp = NULL; - } - if (ThreadContext->Count == 1 && ThreadContext->DeviceExt->EmptyWaiterCount >= MAXIMUM_WAIT_OBJECTS) - { - /* it exist an other thread with empty wait slots, we can remove our thread from the list */ - RemoveEntryList(&ThreadContext->ListEntry); - ThreadContext->DeviceExt->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1; - Terminate = TRUE; - } - } - ExFreePool(ThreadContext); + return STATUS_SUCCESS; } -static NTSTATUS -NpfsAddWaitingReadWriteRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NTSTATUS NTAPI +NpfsFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PLIST_ENTRY ListEntry; - PNPFS_THREAD_CONTEXT ThreadContext = NULL; - NTSTATUS Status; - HANDLE hThread; - KIRQL oldIrql; + FsRtlEnterFileSystem(); - PNPFS_CONTEXT Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - PNPFS_DEVICE_EXTENSION DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsFlushBuffers()\n"); - DPRINT("NpfsAddWaitingReadWriteRequest(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); - - KeLockMutex(&DeviceExt->PipeListLock); - - ListEntry = DeviceExt->ThreadListHead.Flink; - while (ListEntry != &DeviceExt->ThreadListHead) - { - ThreadContext = CONTAINING_RECORD(ListEntry, NPFS_THREAD_CONTEXT, ListEntry); - if (ThreadContext->Count < MAXIMUM_WAIT_OBJECTS) - { - break; - } - ListEntry = ListEntry->Flink; - } - if (ListEntry == &DeviceExt->ThreadListHead) - { - ThreadContext = ExAllocatePool(NonPagedPool, sizeof(NPFS_THREAD_CONTEXT)); - if (ThreadContext == NULL) - { - KeUnlockMutex(&DeviceExt->PipeListLock); - return STATUS_NO_MEMORY; - } - ThreadContext->DeviceExt = DeviceExt; - KeInitializeEvent(&ThreadContext->Event, SynchronizationEvent, FALSE); - ThreadContext->Count = 1; - ThreadContext->WaitObjectArray[0] = &ThreadContext->Event; - - - DPRINT("Creating a new system thread for waiting read/write requests\n"); - - Status = PsCreateSystemThread(&hThread, - THREAD_ALL_ACCESS, - NULL, - NULL, - NULL, - NpfsWaiterThread, - (PVOID)ThreadContext); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ThreadContext); - KeUnlockMutex(&DeviceExt->PipeListLock); - return Status; - } - InsertHeadList(&DeviceExt->ThreadListHead, &ThreadContext->ListEntry); - DeviceExt->EmptyWaiterCount += MAXIMUM_WAIT_OBJECTS - 1; - } - IoMarkIrpPending(Irp); - - IoAcquireCancelSpinLock(&oldIrql); - if (Irp->Cancel) - { - IoReleaseCancelSpinLock(oldIrql); - Status = STATUS_CANCELLED; - } - else - { - (void)IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); - IoReleaseCancelSpinLock(oldIrql); - ThreadContext->WaitObjectArray[ThreadContext->Count] = Context->WaitEvent; - ThreadContext->WaitIrpArray[ThreadContext->Count] = Irp; - ThreadContext->Count++; - DeviceExt->EmptyWaiterCount--; - KeSetEvent(&ThreadContext->Event, IO_NO_INCREMENT, FALSE); - Status = STATUS_SUCCESS; - } - KeUnlockMutex(&DeviceExt->PipeListLock); - return Status; -} - -NTSTATUS STDCALL -NpfsRead(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PFILE_OBJECT FileObject; - NTSTATUS Status; - NTSTATUS OriginalStatus = STATUS_SUCCESS; - PNPFS_CCB Ccb; - PNPFS_CONTEXT Context; - KEVENT Event; - ULONG Length; - ULONG Information = 0; - ULONG CopyLength; - ULONG TempLength; - BOOLEAN IsOriginalRequest = TRUE; - PVOID Buffer; - - DPRINT("NpfsRead(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); - - if (Irp->MdlAddress == NULL) - { - DPRINT("Irp->MdlAddress == NULL\n"); - Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - goto done; - } - - FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject; - Ccb = FileObject->FsContext2; - Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - - if (Ccb->OtherSide == NULL) - { - DPRINT("Pipe is NOT connected!\n"); - if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) - Status = STATUS_PIPE_LISTENING; - else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) - Status = STATUS_PIPE_DISCONNECTED; - else - Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - goto done; - } - - if (Ccb->Data == NULL) - { - DPRINT1("Pipe is NOT readable!\n"); - Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - goto done; - } - - ExAcquireFastMutex(&Ccb->DataListLock); - - if (IoIsOperationSynchronous(Irp)) - { - InsertTailList(&Ccb->ReadRequestListHead, &Context->ListEntry); - if (Ccb->ReadRequestListHead.Flink != &Context->ListEntry) - { - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - Context->WaitEvent = &Event; - ExReleaseFastMutex(&Ccb->DataListLock); - Status = KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - ExAcquireFastMutex(&Ccb->DataListLock); - } - Irp->IoStatus.Information = 0; - } - else - { - KIRQL oldIrql; - if (IsListEmpty(&Ccb->ReadRequestListHead) || - Ccb->ReadRequestListHead.Flink != &Context->ListEntry) - { - /* this is a new request */ - Irp->IoStatus.Information = 0; - Context->WaitEvent = &Ccb->ReadEvent; - InsertTailList(&Ccb->ReadRequestListHead, &Context->ListEntry); - if (Ccb->ReadRequestListHead.Flink != &Context->ListEntry) - { - /* there was already a request on the list */ - IoAcquireCancelSpinLock(&oldIrql); - if (Irp->Cancel) - { - IoReleaseCancelSpinLock(oldIrql); - RemoveEntryList(&Context->ListEntry); - ExReleaseFastMutex(&Ccb->DataListLock); - Status = STATUS_CANCELLED; - goto done; - } - (void)IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); - IoReleaseCancelSpinLock(oldIrql); - ExReleaseFastMutex(&Ccb->DataListLock); - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; - goto done; - } - } - } - - while (1) - { - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - Information = Irp->IoStatus.Information; - Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; - ASSERT (Information <= Length); - Buffer = (PVOID)((ULONG_PTR)Buffer + Information); - Length -= Information; - Status = STATUS_SUCCESS; - - while (1) - { - if (Ccb->ReadDataAvailable == 0) - { - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - ASSERT(Ccb->OtherSide != NULL); - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - if (Information > 0 && - (Ccb->Fcb->ReadMode != FILE_PIPE_BYTE_STREAM_MODE || - Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) - { - break; - } - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) - { - DPRINT("PipeState: %x\n", Ccb->PipeState); - Status = STATUS_PIPE_BROKEN; - break; - } - ExReleaseFastMutex(&Ccb->DataListLock); - if (IoIsOperationSynchronous(Irp)) - { - /* Wait for ReadEvent to become signaled */ - - DPRINT("Waiting for readable data (%wZ)\n", &Ccb->Fcb->PipeName); - Status = KeWaitForSingleObject(&Ccb->ReadEvent, - UserRequest, - KernelMode, - FALSE, - NULL); - DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); - ExAcquireFastMutex(&Ccb->DataListLock); - } - else - { - Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - - Context->WaitEvent = &Ccb->ReadEvent; - Status = NpfsAddWaitingReadWriteRequest(DeviceObject, Irp); - - if (NT_SUCCESS(Status)) - { - Status = STATUS_PENDING; - } - ExAcquireFastMutex(&Ccb->DataListLock); - break; - } - } - ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); - /* Byte stream mode */ - while (Length > 0 && Ccb->ReadDataAvailable > 0) - { - CopyLength = min(Ccb->ReadDataAvailable, Length); - if ((ULONG_PTR)Ccb->ReadPtr + CopyLength <= (ULONG_PTR)Ccb->Data + Ccb->MaxDataLength) - { - memcpy(Buffer, Ccb->ReadPtr, CopyLength); - Ccb->ReadPtr = (PVOID)((ULONG_PTR)Ccb->ReadPtr + CopyLength); - if (Ccb->ReadPtr == (PVOID)((ULONG_PTR)Ccb->Data + Ccb->MaxDataLength)) - { - Ccb->ReadPtr = Ccb->Data; - } - } - else - { - TempLength = (ULONG)((ULONG_PTR)Ccb->Data + Ccb->MaxDataLength - (ULONG_PTR)Ccb->ReadPtr); - memcpy(Buffer, Ccb->ReadPtr, TempLength); - memcpy((PVOID)((ULONG_PTR)Buffer + TempLength), Ccb->Data, CopyLength - TempLength); - Ccb->ReadPtr = (PVOID)((ULONG_PTR)Ccb->Data + CopyLength - TempLength); - } - - Buffer = (PVOID)((ULONG_PTR)Buffer + CopyLength); - Length -= CopyLength; - Information += CopyLength; - - Ccb->ReadDataAvailable -= CopyLength; - Ccb->WriteQuotaAvailable += CopyLength; - } - - if (Length == 0) - { - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - KeResetEvent(&Ccb->ReadEvent); - break; - } - } - else - { - DPRINT("Message mode\n"); - - /* Message mode */ - if (Ccb->ReadDataAvailable) - { - /* Truncate the message if the receive buffer is too small */ - CopyLength = min(Ccb->ReadDataAvailable, Length); - memcpy(Buffer, Ccb->Data, CopyLength); - -#ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); - HexDump((PUCHAR)Buffer, CopyLength); -#endif - - Information = CopyLength; - - if (Ccb->ReadDataAvailable > Length) - { - memmove(Ccb->Data, (PVOID)((ULONG_PTR)Ccb->Data + Length), - Ccb->ReadDataAvailable - Length); - Ccb->ReadDataAvailable -= Length; - Status = STATUS_MORE_ENTRIES; - } - else - { - KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - Ccb->ReadDataAvailable = 0; - Ccb->WriteQuotaAvailable = Ccb->MaxDataLength; - } - } - - if (Information > 0) - { - break; - } - } - } - Irp->IoStatus.Information = Information; - Irp->IoStatus.Status = Status; - - ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); - - if (IoIsOperationSynchronous(Irp)) - { - RemoveEntryList(&Context->ListEntry); - if (!IsListEmpty(&Ccb->ReadRequestListHead)) - { - Context = CONTAINING_RECORD(Ccb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry); - KeSetEvent(Context->WaitEvent, IO_NO_INCREMENT, FALSE); - } - ExReleaseFastMutex(&Ccb->DataListLock); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - DPRINT("NpfsRead done (Status %lx)\n", Status); - return Status; - } - else - { - if (IsOriginalRequest) - { - IsOriginalRequest = FALSE; - OriginalStatus = Status; - } - if (Status == STATUS_PENDING) - { - ExReleaseFastMutex(&Ccb->DataListLock); - DPRINT("NpfsRead done (Status %lx)\n", OriginalStatus); - return OriginalStatus; - } - RemoveEntryList(&Context->ListEntry); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - if (IsListEmpty(&Ccb->ReadRequestListHead)) - { - ExReleaseFastMutex(&Ccb->DataListLock); - DPRINT("NpfsRead done (Status %lx)\n", OriginalStatus); - return OriginalStatus; - } - Context = CONTAINING_RECORD(Ccb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry); - Irp = CONTAINING_RECORD(Context, IRP, Tail.Overlay.DriverContext); - } - } - -done: - Irp->IoStatus.Status = Status; - - if (Status != STATUS_PENDING) - { - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - DPRINT("NpfsRead done (Status %lx)\n", Status); - - return Status; -} - -NTSTATUS STDCALL -NpfsWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PFILE_OBJECT FileObject; - PNPFS_FCB Fcb = NULL; - PNPFS_CCB Ccb = NULL; - PNPFS_CCB ReaderCcb; - PUCHAR Buffer; - NTSTATUS Status = STATUS_SUCCESS; - ULONG Length; - ULONG Offset; - ULONG Information; - ULONG CopyLength; - ULONG TempLength; - - DPRINT("NpfsWrite()\n"); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - FileObject = IoStack->FileObject; - DPRINT("FileObject %p\n", FileObject); - DPRINT("Pipe name %wZ\n", &FileObject->FileName); - - Ccb = FileObject->FsContext2; - ReaderCcb = Ccb->OtherSide; - Fcb = Ccb->Fcb; - - Length = IoStack->Parameters.Write.Length; - Offset = IoStack->Parameters.Write.ByteOffset.u.LowPart; - Information = 0; - - if (Irp->MdlAddress == NULL) - { - DPRINT("Irp->MdlAddress == NULL\n"); - Status = STATUS_UNSUCCESSFUL; - Length = 0; - goto done; - } - - if (ReaderCcb == NULL) - { - DPRINT("Pipe is NOT connected!\n"); - if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) - Status = STATUS_PIPE_LISTENING; - else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) - Status = STATUS_PIPE_DISCONNECTED; - else - Status = STATUS_UNSUCCESSFUL; - Length = 0; - goto done; - } - - if (ReaderCcb->Data == NULL) - { - DPRINT("Pipe is NOT writable!\n"); - Status = STATUS_UNSUCCESSFUL; - Length = 0; - goto done; - } - - Status = STATUS_SUCCESS; - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); - - ExAcquireFastMutex(&ReaderCcb->DataListLock); -#ifndef NDEBUG - DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); - HexDump(Buffer, Length); -#endif - - while(1) - { - if (ReaderCcb->WriteQuotaAvailable == 0) - { - KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) - { - Status = STATUS_PIPE_BROKEN; - ExReleaseFastMutex(&ReaderCcb->DataListLock); - goto done; - } - ExReleaseFastMutex(&ReaderCcb->DataListLock); - - DPRINT("Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); - Status = KeWaitForSingleObject(&Ccb->WriteEvent, - UserRequest, - KernelMode, - FALSE, - NULL); - DPRINT("Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); - - /* - * It's possible that the event was signaled because the - * other side of pipe was closed. - */ - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) - { - DPRINT("PipeState: %x\n", Ccb->PipeState); - Status = STATUS_PIPE_BROKEN; - // ExReleaseFastMutex(&ReaderCcb->DataListLock); - goto done; - } - - ExAcquireFastMutex(&ReaderCcb->DataListLock); - } - - if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) - { - DPRINT("Byte stream mode\n"); - while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0) - { - CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable); - if ((ULONG_PTR)ReaderCcb->WritePtr + CopyLength <= (ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength) - { - memcpy(ReaderCcb->WritePtr, Buffer, CopyLength); - ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->WritePtr + CopyLength); - if ((ULONG_PTR)ReaderCcb->WritePtr == (ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength) - { - ReaderCcb->WritePtr = ReaderCcb->Data; - } - } - else - { - TempLength = (ULONG)((ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength - (ULONG_PTR)ReaderCcb->WritePtr); - memcpy(ReaderCcb->WritePtr, Buffer, TempLength); - memcpy(ReaderCcb->Data, Buffer + TempLength, CopyLength - TempLength); - ReaderCcb->WritePtr = (PVOID)((ULONG_PTR)ReaderCcb->Data + CopyLength - TempLength); - } - - Buffer += CopyLength; - Length -= CopyLength; - Information += CopyLength; - - ReaderCcb->ReadDataAvailable += CopyLength; - ReaderCcb->WriteQuotaAvailable -= CopyLength; - } - - if (Length == 0) - { - KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); - KeResetEvent(&Ccb->WriteEvent); - break; - } - } - else - { - DPRINT("Message mode\n"); - if (Length > 0) - { - CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable); - memcpy(ReaderCcb->Data, Buffer, CopyLength); - - Information = CopyLength; - ReaderCcb->ReadDataAvailable = CopyLength; - ReaderCcb->WriteQuotaAvailable = 0; - } - - if (Information > 0) - { - KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); - KeResetEvent(&Ccb->WriteEvent); - break; - } - } - } - - ExReleaseFastMutex(&ReaderCcb->DataListLock); - -done: - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; - + /* TODO: Implement */ IoCompleteRequest(Irp, IO_NO_INCREMENT); - DPRINT("NpfsWrite done (Status %lx)\n", Status); + FsRtlExitFileSystem(); - return Status; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs_new/volume.c Fri May 4 15:50:41 2007 @@ -15,5 +15,19 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS NTAPI +NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + FsRtlEnterFileSystem(); + + NpfsDbgPrint(NPFS_DEBUG_HIGHEST, "NpfsQueryVolumeInformation()\n"); + + /* TODO: Implement */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + FsRtlExitFileSystem(); + + return STATUS_SUCCESS; +} /* EOF */

1 0

[hpoussin] 26633: Set a valid (but unknown) last write time to registry keys, instead of a random one
by hpoussin＠svn.reactos.org 04 May '07

04 May '07

Author: hpoussin Date: Fri May 4 15:00:14 2007 New Revision: 26633 URL: http://svn.reactos.org/svn/reactos?rev=26633&view=rev Log: Set a valid (but unknown) last write time to registry keys, instead of a random one Modified: trunk/reactos/tools/mkhive/rtl.c Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=266… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c (original) +++ trunk/reactos/tools/mkhive/rtl.c Fri May 4 15:00:14 2007 @@ -144,6 +144,7 @@ OUT PLARGE_INTEGER CurrentTime) { DPRINT1("KeQuerySystemTime() unimplemented\n"); + CurrentTime->QuadPart = 0; } PVOID NTAPI

1 0

[hpoussin] 26632: Don't ignore results of IRP_MN_FILTER_RESOURCE_REQUIREMENTS
by hpoussin＠svn.reactos.org 04 May '07

04 May '07

Author: hpoussin Date: Fri May 4 14:49:53 2007 New Revision: 26632 URL: http://svn.reactos.org/svn/reactos?rev=26632&view=rev Log: Don't ignore results of IRP_MN_FILTER_RESOURCE_REQUIREMENTS Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri May 4 14:49:53 2007 @@ -155,11 +155,12 @@ &IoStatusBlock, IRP_MN_FILTER_RESOURCE_REQUIREMENTS, &Stack); - /* FIXME: Take care of return code */ if (!NT_SUCCESS(Status)) { DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); - } + return Status; + } + DeviceNode->ResourceRequirements = Stack.Parameters.FilterResourceRequirements.IoResourceRequirementList; Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); if (NT_SUCCESS(Status)) @@ -989,9 +990,12 @@ &Event, IoStatusBlock); - /* PNP IRPs are always initialized with a status code of + /* Most of PNP IRPs are initialized with a status code of STATUS_NOT_IMPLEMENTED */ - Irp->IoStatus.Status = MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS ? STATUS_SUCCESS : STATUS_NOT_IMPLEMENTED; // hpoussin's hack of doom + if (MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) + Irp->IoStatus.Status = STATUS_SUCCESS; + else + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs