Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gedmurphy] 19682: remove my changes to Elronds patch. RtlNtStatusToDosError does the job for us.

by gedmurphy＠svn.reactos.com

remove my changes to Elronds patch. RtlNtStatusToDosError does the job for us. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 12:23:02 UTC (rev 19681) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 12:28:45 UTC (rev 19682) @@ -863,11 +863,8 @@ DPRINT1("addIPAddress for if %d returning 0x%lx\n", IfIndex, status); } - switch( status ) { - case STATUS_SUCCESS: return ERROR_SUCCESS; - case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; - default: return status; - } + return status; + } NTSTATUS deleteIpAddress( ULONG NteContext ) @@ -897,9 +894,5 @@ DPRINT1("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status); } - - if( NT_SUCCESS(status) ) - return ERROR_SUCCESS; - else - return ERROR_GEN_FAILURE; + return status; }

18 years, 11 months

[greatlrd] 19681: Translaton and keyboard driver by Robert Horvath - Talley (talley_replace_this_by_at_cubeclub.hu), Gergely Risko - Cake Peter Nagy - Kritika (nagylakas_replace_this_by_at_gmail.com), Peter Lukacs - Hungi (lukacs.peter_replace_this_by_at_rtk.pte.hu) small bugfix in kbdhu by me and add it to bootcd menu.

by greatlrd＠svn.reactos.com

18 years, 11 months

[greatlrd] 19680: Translaton and keyboard driver by Robert Horvath - Talley (talley_replace_this_by_at_cubeclub.hu), Gergely Risko - Cake Peter Nagy - Kritika (nagylakas_replace_this_by_at_gmail.com), Peter Lukacs - Hungi (lukacs.peter_replace_this_by_at_rtk.pte.hu) small bugfix in kbdhu by me and add it to bootcd menu.

by greatlrd＠svn.reactos.com

Translaton and keyboard driver by Robert Horvath - Talley (talley_replace_this_by_at_cubeclub.hu), Gergely Risko - Cake Peter Nagy - Kritika (nagylakas_replace_this_by_at_gmail.com), Peter Lukacs - Hungi (lukacs.peter_replace_this_by_at_rtk.pte.hu) small bugfix in kbdhu by me and add it to bootcd menu. \reactos\lib\cmdlg32\ Robert Horvath \reactos\lib\comctl32\ Robert Horvath \reactos\lib\shell32\ Robert Horvath \reactos\subsys\ntvdm\ Robert Horvath \reactos\subsys\system\calc\ Peter Nagy \reactos\subsys\system\expand\ Peter Nagy \reactos\subsys\system\explorer\ Robert Horvath \reactos\subsys\system\format\ Peter Nagy \reactos\subsys\system\notepad\ Peter Nagy \reactos\subsys\system\reactos\ Robert Horvath \reactos\subsys\system\regsrv32\ Peter Nagy \reactos\subsys\system\reporterror\ Robert Horvath \reactos\subsys\system\rundll32\ Peter Nagy \reactos\subsys\system\sm\ Robert Horvath \reactos\subsys\system\taskmgr\ Robert Horvath \reactos\subsys\system\userinit\ Peter Nagy \reactos\subsys\system\winefile\ Peter Nagy \reactos\subsys\system\vmwinst\ Robert Horvath \reactos\lib\winmm\ Peter Nagy \reactos\lib\cpl\ Peter Lukacs Added: trunk/reactos/boot/freeldr/fdebug/Hu.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_Hu.rc Added: trunk/reactos/lib/comctl32/comctl_Hu.rc Modified: trunk/reactos/lib/comctl32/rsrc.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc Added: trunk/reactos/lib/cpl/access/Hu.rc Modified: trunk/reactos/lib/cpl/access/access.rc Added: trunk/reactos/lib/cpl/appwiz/Hu.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/control/Hu.rc Modified: trunk/reactos/lib/cpl/control/control.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc Added: trunk/reactos/lib/cpl/desk/hu.rc Added: trunk/reactos/lib/cpl/hdwwiz/Hu.rc Modified: trunk/reactos/lib/cpl/hdwwiz/hdwwiz.rc Added: trunk/reactos/lib/cpl/intl/hu.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc Added: trunk/reactos/lib/cpl/main/Hu.rc Modified: trunk/reactos/lib/cpl/main/main.rc Added: trunk/reactos/lib/cpl/ncpa/hu.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Added: trunk/reactos/lib/cpl/sysdm/hu.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Added: trunk/reactos/lib/cpl/timedate/Hu.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc Added: trunk/reactos/lib/devmgr/Hu.rc Modified: trunk/reactos/lib/devmgr/devmgr.rc Modified: trunk/reactos/lib/keyboard/directory.xml Added: trunk/reactos/lib/keyboard/kbdhu/ Added: trunk/reactos/lib/keyboard/kbdhu/kbdhu.c Added: trunk/reactos/lib/keyboard/kbdhu/kbdhu.def Added: trunk/reactos/lib/keyboard/kbdhu/kbdhu.rc Added: trunk/reactos/lib/keyboard/kbdhu/kbdhu.xml Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Hu.rc Modified: trunk/reactos/lib/msacm/msacm.rc Added: trunk/reactos/lib/msacm/msacm_Hu.rc Modified: trunk/reactos/lib/msi/msi.rc Added: trunk/reactos/lib/msi/msi_Hu.rc Added: trunk/reactos/lib/newdev/Hu.rc Modified: trunk/reactos/lib/newdev/newdev.rc Modified: trunk/reactos/lib/oleaut32/oleaut32_Hu.rc Added: trunk/reactos/lib/oledlg/oledlg_Hu.rc Modified: trunk/reactos/lib/oledlg/rsrc.rc Added: trunk/reactos/lib/setupapi/Hu.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc Added: trunk/reactos/lib/shdocvw/Hu.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.rc Modified: trunk/reactos/lib/shell32/shell32_Hu.rc Added: trunk/reactos/lib/shellext/slayer/Hu.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc Added: trunk/reactos/lib/shwlapi/ Added: trunk/reactos/lib/shwlapi/shlwapi.rc Added: trunk/reactos/lib/shwlapi/shlwapi_Hu.rc Modified: trunk/reactos/lib/syssetup/syssetup.rc Added: trunk/reactos/lib/syssetup/syssetup_Hu.rc Added: trunk/reactos/lib/user32/Hu.rc Modified: trunk/reactos/lib/user32/user32.rc Added: trunk/reactos/lib/userenv/Hu.rc Modified: trunk/reactos/lib/wininet/rsrc.rc Added: trunk/reactos/lib/wininet/wininet_Hu.rc Added: trunk/reactos/lib/winmm/winmm_Hu.rc Modified: trunk/reactos/lib/winmm/winmm_res.rc Added: trunk/reactos/subsys/ntvdm/Hu.rc Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc Added: trunk/reactos/subsys/system/calc/Hu.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc Added: trunk/reactos/subsys/system/cmd/Hu.rc Modified: trunk/reactos/subsys/system/cmd/cmd.rc Added: trunk/reactos/subsys/system/expand/Hu.rc Modified: trunk/reactos/subsys/system/expand/expand.rc Added: trunk/reactos/subsys/system/explorer/explorer-hu.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Added: trunk/reactos/subsys/system/format/Hu.rc Modified: trunk/reactos/subsys/system/format/format.rc Added: trunk/reactos/subsys/system/ibrowser/Hu.rc Added: trunk/reactos/subsys/system/msconfig/Hu.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.rc Added: trunk/reactos/subsys/system/reactos/Hu.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc Added: trunk/reactos/subsys/system/regsrv32/ Added: trunk/reactos/subsys/system/regsrv32/Hu.rc Added: trunk/reactos/subsys/system/regsrv32/regsvr32.rc Added: trunk/reactos/subsys/system/reporterror/hu.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc Added: trunk/reactos/subsys/system/rundll32/Hu.rc Modified: trunk/reactos/subsys/system/rundll32/rundll32.rc Added: trunk/reactos/subsys/system/sm/Hu.rc Modified: trunk/reactos/subsys/system/sm/sm.rc Added: trunk/reactos/subsys/system/soundvol32/ Added: trunk/reactos/subsys/system/soundvol32/Hu.rc Added: trunk/reactos/subsys/system/soundvol32/sndvol32.rc Added: trunk/reactos/subsys/system/taskmgr/Hu.rc Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc Added: trunk/reactos/subsys/system/userinit/Hu.rc Modified: trunk/reactos/subsys/system/userinit/userinit.rc [truncated at 100 lines; 6 more skipped] _____ Added: trunk/reactos/boot/freeldr/fdebug/Hu.rc --- trunk/reactos/boot/freeldr/fdebug/Hu.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/boot/freeldr/fdebug/Hu.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -0,0 +1,198 @@ +/////////////////////////////////////////////////////////////////////// ////// +// Hungarian (HU) resources by Robert Horvath (talley at cubeclub.hu) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Csatlakoztatßs", ID_FILE_CONNECT + MENUITEM "Kapcsolat&bontßs", ID_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Start Capture", ID_FILE_STARTCAPTURE + MENUITEM "S&top Capture", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Helyi &visszhang", ID_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&KilÚpÚs", IDM_EXIT + END + POPUP "&S·g¾" + BEGIN + MENUITEM "&NÚvjegy ...", IDM_ABOUT + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "FreeLoader Debugger" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kapcsolat tulajdonsßgai" +FONT 8, "Tahoma" +BEGIN + LTEXT "Hasznßlt port (pl. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "?tviteli sebessÚg (pl. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "MÚgse",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Napl¾ ?llomßny" +FONT 8, "Tahoma" +BEGIN + LTEXT "?llomßny neve:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&B÷ngÚszÚs",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "MÚgse",IDCANCEL,194,74,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hell¾ka!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -16,5 +16,6 @@ #undef APSTUDIO_READONLY_SYMBOLS #include "En.rc" +#include "Hu.rc" #include "Ja.rc" #include "Pl.rc" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-27 12:18:52 UTC (rev 19680) @@ -107,6 +107,7 @@ lib\keyboard\kbdes\kbdes.dll 1 lib\keyboard\kbdfr\kbdfr.dll 1 lib\keyboard\kbdgr\kbdgr.dll 1 +lib\keyboard\kbdhu\kbdhu.dll 1 lib\keyboard\kbdru\kbdru.dll 1 lib\keyboard\kbdse\kbdse.dll 1 lib\keyboard\kbdsg\kbdsg.dll 1 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/bootdata/txtsetup.sif 2005-11-27 12:18:52 UTC (rev 19680) @@ -86,6 +86,7 @@ 00010409 = "English (USA-Dvorak)" 0000040C = "French (France)" 00000407 = "German (Germany)" +0000040E = "Hungarian" 00000419 = "Russian" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" @@ -99,6 +100,7 @@ 00010409 = kbddv.dll 0000040A = kbdes.dll 0000040C = kbdfr.dll +0000040E = kbdhu.dll 00000419 = kbdru.dll 0000041D = kbdse.dll 00000809 = kbduk.dll _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/lib/aclui/aclui.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -12,6 +12,7 @@ #include "aclui_Ja.rc" #include "aclui_En.rc" #include "aclui_De.rc" +#include "aclui_Hu.rc" #include "aclui_Nl.rc" #include "aclui_Sv.rc" #include "aclui_Es.rc" _____ Added: trunk/reactos/lib/aclui/aclui_Hu.rc --- trunk/reactos/lib/aclui/aclui_Hu.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/lib/aclui/aclui_Hu.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -0,0 +1,33 @@ +/* + * Hungarian resources for aclui + * + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu +*/ +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Biztonsßg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Csoport vagy felhasznßl¾ nevek:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "H&ozzßadßs...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&T÷rlÚs", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "EngedÚlyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Tiltßs", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Tovßbbi beßllÝtßsok megtekintÚsÚhez kattints a Tovßbbi beßllÝtßsok gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "&Tovßbbi beßllÝtßsok", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "%1 engedÚlye" + IDS_UNKNOWN "Ismeretlen" + IDS_SPECIAL_PERMISSIONS "K³l÷nleges engedÚlyek" + IDS_PERMISSIONS_FOR "%1 engedÚlye" + IDS_PERMISSIONS "EngedÚlyek" +} + _____ Added: trunk/reactos/lib/comctl32/comctl_Hu.rc --- trunk/reactos/lib/comctl32/comctl_Hu.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/lib/comctl32/comctl_Hu.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -0,0 +1,90 @@ +/* + * Hungarian resources for comctl32 + * + * Copyright 1999 Eric Kohl + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "BeßllÝtßsok " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "MÚgse", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Alkalmaz", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&S·g¾", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "TelepÝt§" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Vissza", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Tovßbb >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "BefejezÚs", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "MÚgse", IDCANCEL,178,138,50,14 + PUSHBUTTON "S·g¾", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Eszk÷ztßr testreszabßsa" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Bezßr", IDCANCEL,308,6,44,14 + PUSHBUTTON "V&isszaßllÝt", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&S·g¾", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Fel", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Le", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&ElÚrhet§ gombok:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Hozzßad ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &T÷r÷l", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Eszk÷z&tßr gombjai:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Bezßr" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Ma:" + IDM_GOTODAY "Mai nap" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separator" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ismeretlen" +} _____ Modified: trunk/reactos/lib/comctl32/rsrc.rc --- trunk/reactos/lib/comctl32/rsrc.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/lib/comctl32/rsrc.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -1676,6 +1676,7 @@ #include "comctl_En.rc" #include "comctl_Es.rc" #include "comctl_Fr.rc" +#include "comctl_Hu.rc" #include "comctl_It.rc" #include "comctl_Ja.rc" #include "comctl_Ko.rc" _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc --- trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-11-27 12:03:48 UTC (rev 19679) +++ trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-11-27 12:18:52 UTC (rev 19680) @@ -1,6 +1,9 @@ /* - * Copyright 1997 John Zero + * Hungarian resources for comdlg32 * + * Copyright 1995 Alexandre Julliard + * Copyright 2005 Robert Horvath - Hungarian trasnlation - talley at cubeclub.hu + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,51 +23,50 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -OPEN_FILE DIALOG 36, 24, 275, 134 +OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Megnyitßs" FONT 8, "MS Shell Dlg" { - LTEXT "File &neve:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&K÷nyvtßrak:", -1, 110, 6, 92, 9 - CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9 - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "File &tÝpusok:", 1089, 6, 104, 90, 9 - CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36 - LTEXT "&Meghajt¾k:", 1091, 110, 104, 92, 9 - CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68 - CONTROL "Megnyitßs", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 208, 6, 56, 14 - CONTROL "MÚgsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 24, 56, 14 - CONTROL "&SegÝtsÚg", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 46, 56, 14 - CONTROL "&Csak olvashat¾", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 208, 68, 63, 12 + LTEXT "?llomßny&nÚv:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "Mappß&k:", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "?llomßny &tÝpusok:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Meghajt¾k:", 1091, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Megynit", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Csak &olvasßsra", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "MentÚs ·j nÚven ..." +CAPTION "?llomßny MentÚs ..." FONT 8, "MS Shell Dlg" { - LTEXT "File &neve:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LTEXT "?llomßny&nÚv:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&K÷nyvtßrak:", -1, 110, 6, 92, 9 + LTEXT "Mappß&k:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "File &tÝpusok:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "?llomßny &tÝpusok:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Meghajt¾k:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "MentÚs ·j nÚven", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "MÚgsem", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&SegÝtsÚg", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Csak olvashat¾", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "MentÚs", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Csak olvasßsra", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } - PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nyomtatßs" @@ -72,144 +74,484 @@ { LTEXT "Nyomtat¾:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Nyomtatand¾ ter³let", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Mind", 1056, 16, 45, 60, 12 - RADIOBUTTON "&Kivßlasztott", 1057, 16, 60, 60, 12 - RADIOBUTTON "&Lapok", 1058, 16, 75, 60, 12 - DEFPUSHBUTTON "Nyomtatßs", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "MÚgsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&BeßllÝtßs", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "-&t¾l:", 1090, 60, 80, 30, 9 - LTEXT "-&ig:", 1091, 120, 80, 30, 9 - LTEXT "Mi&n§sÚg:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "&File-ba nyomtat", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "S¹r¹", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Nyomtatßsi tartomßny", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "A tel&jes dokumentum", rad1, 16, 45, 60, 12 + RADIOBUTTON "K&ijel÷lt ter³let", rad2, 16, 60, 60, 12 + RADIOBUTTON "&Oldalak", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "&Nyomtatßs", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&BeßllÝtßsok", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + /* NOT TRANSLATED */ LTEXT "&From:", 1090, 60, 80, 30, 9 + /* NOT TRANSLATED */ LTEXT "&To:", 1091, 120, 80, 30, 9 + LTEXT "Nyomtatßsi MÝn§sÚg:", 1092, 6, 100, 76, 9 + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Nyomtatßs &ßllomßnyba", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + /* NOT TRANSLATED */ CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } - PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Nyomtat¾ beßllÝtßsa" +CAPTION "Nyomtatßsi beßllÝtßsok" FONT 8, "MS Shell Dlg" { - GROUPBOX "Nyomtat¾", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "&AlapÚrtelmezett nyomtat¾", 1056, 16, 20, 80, 12 + GROUPBOX "Nyomtat¾", grp1, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "&AlapÚrtelmezett nyomtat¾", rad1, 16, 20, 80, 12 LTEXT "[nincs]", 1088, 35, 35, 120, 9 - RADIOBUTTON "&Adott nyomtat¾", 1057, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "MÚgsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&BeßllÝtßs", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "OldalfekvÚs", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "?&ll¾", 1058, 50, 100, 40, 12 - RADIOBUTTON "&Fekv§", 1059, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "PapÝr", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "&MÚrete", 1089, 130, 95, 30, 9 - LTEXT "Fo&rrßsa", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "Kivßlasztott &nyomtat¾", rad2, 16, 50, 80, 12 + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&TelepÝtÚs", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Tßjolßs", grp2, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "?&ll¾", rad3, 50, 100, 40, 12 + RADIOBUTTON "&Fekv§", rad4, 50, 115, 40, 12 + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "PapÝrtÝpus", grp3, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "PapÝr&mÚret", 1089, 130, 95, 30, 9 + LTEXT "&Forrßs", 1090, 130, 110, 30, 9 + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } - CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Font" +CAPTION "Bet¹tÝpus" FONT 8, "MS Shell Dlg" { - LTEXT "&Font:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Bet¹tÝpus:",stc1 ,6,3,40,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Font &stÝlus:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Bet¹st&Ýlus:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&MÚret:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&MÚret:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "MÚgsem",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "&Alkalmaz", 1026,218,40,40,14,WS_GROUP - PUSHBUTTON "&SegÝtsÚg" , 1038,218,57,40,14,WS_GROUP - GROUPBOX "Effektusok",1072,6,72,84,34,WS_GROUP - CHECKBOX "?&th·zott", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Alßh·zott", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&SzÝn:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "MÚgse",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Alkalmaz", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Hatßsok",grp1,6,72,84,34,WS_GROUP + CHECKBOX "?&th·zßs", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Alßh·zßs", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "S&zÝn:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz?ßi§?Ú",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + CTEXT "Aa?ßi§?¹",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "?&ßsrendszer:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } - CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SzÝn" +CAPTION "SzÝnek szerkesztÚse" FONT 8, "MS Shell Dlg" { - LTEXT "&Alap szÝnek:", 1088, 4, 4, 140, 10 - LTEXT "&Egyedi szÝnek:", 1089, 4, 106, 140, 10 - LTEXT "SzÝn | &T÷m÷r", 1090, 150, 151, 48, 10 + LTEXT "&AlapszÝnek:", 1088, 4, 4, 140, 10 + LTEXT "&EgyÚni szÝnek:", 1089, 4, 106, 140, 10 + LTEXT "SzÝn | E&gyszÝn¹", 1090, 150, 151, 48, 10 LTEXT "&V÷r÷s:", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Z÷ld:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&KÚk:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Hue:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&?rnyalat:" ,723 /*1091*/,202,126,22,10 + EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&TelÝtettsÚg:" ,724 /*1092*/,202,140,22,10 + EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&FÚnyessÚg:" ,725 /*1093*/,202,154,22,10 + EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "Ok", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "MÚgsem", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "SegÝtsÚg", 1038,100,166, 44, 14 - PUSHBUTTON "&Egyedi szÝnekhez adßs", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "E&gyedi szÝn definißlßs >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&t",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ + DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾", pshHelp,100,166, 44, 14 + PUSHBUTTON "&Hozzßadßs az egyÚni szÝnekhez", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&EgyÚni szÝnek szerkesztÚse >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } -FINDDLGORD DIALOG 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "KeresÚs" FONT 8, "MS Shell Dlg" +{ + LTEXT "Ke&resend§:", -1, 4, 8, 42, 8 + EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Teljes sz¾val megegyez§", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kis- Ús &nagybet¹k megk³l÷nb÷ztetÚse", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Irßny", grp1, 107, 26, 68, 28 + + /* MS style: Up = Vissza, Down = El§re */ + CONTROL "Tete&jÚt§l", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "&Alulr¾l", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + + DEFPUSHBUTTON "&K÷vetkez§ keresÚse", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "MÚgse", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP +} + +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Csere" +FONT 8, "MS Shell Dlg" +{ + LTEXT "K&eresend§:", -1, 4, 9, 48, 8 + EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Cser&e erre:", -1, 4, 26, 48, 8 + EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Teljes sz¾val megegyez§", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kis- Ús &nagybet¹k megk³l÷nb÷ztetÚse", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&K÷vetkez§ keresÚse", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Csere", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&z ÷sszes cserÚje", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "MÚgse", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&S·g¾", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP +} + +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Nyomtatßs" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "MÚgse", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "&S·g¾", pshHelp, 50, 161, 48,14, WS_GROUP + + GROUPBOX "Nyomtat¾ kivßlasztßsa", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "Nyomtatßs &ßllomßnyba", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "&BeßllÝtßsok", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nyomtat¾:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "?llapot:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Hely:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "MegjegyzÚs:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Mßsolatok szßma", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "&PÚldßnyszßm:",stc5,168,108,68,8 + ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "SzÚt&vßlogatßs", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "Nyomtatßsi tartomßny", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&A teljes dokumentum", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Oldalak", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&Kijel÷lt ter³let", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER + /* NOT TRANSLATED */ RTEXT "&from:", stc2, 52,124, 20,8 //what? + /* NOT TRANSLATED */ RTEXT "&to:", stc3, 100,124, 16,8 +} + +PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Nyomtatßsi beßllÝtßsok" +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Mit keressen:", -1, 4, 8, 48, 8 - EDITTEXT 1152, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "Teljes &szavak keresÚse", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Kis/&nagybet¹ k³l÷nb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 92, 12 - GROUPBOX "Irßny", 1072, 97, 26, 78, 28 - CONTROL "&Vissza", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12 - CONTROL "&El§re", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - CONTROL "&K÷vetkez§", 1, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 5, 50, 14 - CONTROL "MÚgsem", 2, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 23, 50, 14 - PUSHBUTTON "&SegÝtsÚg", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP + PUSHBUTTON "MÚgse",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "Hßl¾zat...", psh5, 284,156,48,14 */ + + GROUPBOX "Nyomtat¾", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Tulajdonsßgok", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&NÚv:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "?llapot:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "TÝpus:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Hely:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "MegjegyzÚs:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "PapÝr", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "MÚ&ret:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + /* NOT TRANSLATED */ LTEXT "&Source:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "Tßjolßs", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&?ll¾", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "F&ekv§", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END -REPLACEDLGORD DIALOG 36, 24, 230, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "CserÚlÚs" +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "OldalbeßllÝtßs" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Mit keressen:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 57, 7, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Mire &cserÚljem:", -1, 4, 26, 53, 8 - EDITTEXT 1153, 57, 24, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "Teljes &szavak keresÚse", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 5, 46, 104, 12 - CONTROL "Kis/&nagybet¹ k³l÷nb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 62, 99, 12 - CONTROL "&K÷vetkez§", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 174, 4, 53, 14 - CONTROL "C&serÚl", 1024, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 21, 53, 14 - CONTROL "M&indent cserÚl", 1025, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 38, 53, 14 - CONTROL "MÚgsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 55, 53, 14 - CONTROL "&SegÝtsÚg", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 75, 53, 14 + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "PapÝr", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&MÚret:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "A&dagol¾:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Tßjolßs", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "?&ll¾", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Fekv§", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Marg¾k (millimÚter)", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Bal:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Jobb:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "Fe&ls§:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Als¾:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "MÚgse", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&Nyomtat¾...", psh3, 184, 220, 48, 14 END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Megnyitßs" +FONT 8, "MS Shell Dlg" +{ + /* NOT TRANSLATED */ LTEXT "Look &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "ßllomßny&nÚv:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "?llomßny &tÝpus:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "Csak &olvasßsra",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&Megnyit¹s", IDOK,222,110,50,14 + PUSHBUTTON "MÚgse", IDCANCEL,222,128,50,14 + PUSHBUTTON "&S·g¾", pshHelp,222,145,50,14 +} + +STRINGTABLE DISCARDABLE +{ + IDS_ABOUTBOX "&NÚvjegy" + IDS_DOCUMENTFOLDERS "Dokumentumok" + IDS_PERSONAL "Dokumentumok" + IDS_FAVORITES "Kedvencek" + /* NOT TRANSLATED */ IDS_PATH "System Path" + IDS_DESKTOP "Asztal" + IDS_FONTS "Bet¹tÝpus" + IDS_MYCOMPUTER "SajßtgÚp" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SYSTEMFOLDERS "Rendszer mappßk" + IDS_LOCALHARDRIVES "Helyi lemezek" + IDS_FILENOTFOUND "Az ßllomßny nemtalßlhat¾" + IDS_VERIFYFILE "KÚrlek ellen§rÝzd, hogy helyes ßllomßnynevet adtßl-e meg." + IDS_CREATEFILE "Az ßllomßny nem lÚtezik.\nLÚtre hozza?" + IDS_OVERWRITEFILE "Az ßllomßny mßr lÚtezik.\nFel³l Ýrja?" + IDS_INVALID_FILENAME_TITLE "Nem megengedett karakterek az elÚrÚsi ·tban" + IDS_INVALID_FILENAME "Az ßllomßnynÚv nem tartalmazhatja a k÷vetkez§ karaktereket: \n / : < > |" + IDS_PATHNOTEXISTING "A megadott ·tvonal nem lÚtezik" + IDS_FILENOTEXISTING "Az ßllomßny nem lÚtezik" +} + +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Egy szinttel feljebb" + IDS_NEWFOLDER "?j mappa lÚtrehozßsa" + IDS_LISTVIEW "NÚzetek" + IDS_REPORTVIEW "RÚszletek" + IDS_TODESKTOP "Asztal b÷ngÚszÚse" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Nyomtatßs" + + PD32_VALUE_UREADABLE "Olvashatatlan bejegyzÚs" + PD32_INVALID_PAGE_RANGE "Ez az ÚrtÚk kil¾g a lap mÚretÚb§l.\nKÚrlek Ýrj be egy ÚrtÚket %d Ús %d k÷z÷tt." + PD32_FROM_NOT_ABOVE_TO "Az els§ oldal sorszßma nem lehet nagyobb az utols¾ oldal sorszßmßnßl." + PD32_MARGINS_OVERLAP "A marg¾k kÝv³l esnek vagy ßtfedik egymßst.\n?rj be ·j marg¾kat." + PD32_NR_OF_COPIES_EMPTY "A mßsolatok szßma nem lehet ³res." + PD32_TOO_LARGE_COPIES "Ennyi mßsolatot nem kÚpes kezelni a nyomtat¾.\nAdj meg egy ÚrtÚket 1 Ús %d k÷z÷tt." + PD32_PRINT_ERROR "Nyomtatßsi hiba." + PD32_NO_DEFAULT_PRINTER "Nincs alapÚrtelmezett nyomtat¾." + PD32_CANT_FIND_PRINTER "Nem talßlhat¾ a nyomtat¾." + PD32_OUT_OF_MEMORY "Nincs elÚg mem¾ria." + PD32_GENERIC_ERROR "Nyomtatßsi hiba." + PD32_DRIVER_UNKNOWN "Ismeretlen nyomtat¾ meghajt¾." + PD32_NO_DEVICES "Miel÷tt nyomtatßssal kapcsolatos dolgokat csinßlsz (pl. oldalbeßllÝtßs, nyomtatßs), telepÝtened kell egy nyomtat¾t. KÚrlek telepÝts egyet, Ús pr¾bßld ·jra." + + PD32_DEFAULT_PRINTER "AlapÚrtelmezett nyomtat¾; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d dokumentum a nyomtatßsi listßban" + PD32_MARGINS_IN_INCHES "Marg¾k [inch]" + PD32_MARGINS_IN_MILIMETERS "Marg¾k [mm]" + PD32_MILIMETERS "mm" + + PD32_PRINTER_STATUS_READY "KÚsz" + PD32_PRINTER_STATUS_PAUSED "Sz³neteltetve; " + PD32_PRINTER_STATUS_ERROR "Hiba; " + PD32_PRINTER_STATUS_PENDING_DELETION "T÷rlÚs vÚgrehajtßsa; " + PD32_PRINTER_STATUS_PAPER_JAM "PapÝr jam; " /* NOT TRANSLATED */ + PD32_PRINTER_STATUS_PAPER_OUT "Kifogyott a papÝr; " + PD32_PRINTER_STATUS_MANUAL_FEED "Helyezz be papÝrt; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "PapÝr problÚma; " + PD32_PRINTER_STATUS_OFFLINE "Nyomtat¾ nem elÚrhet§; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O M¹velet; " + PD32_PRINTER_STATUS_BUSY "Foglalt; " + PD32_PRINTER_STATUS_PRINTING "Nyomtat; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "PapÝr tßlca tele van; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Nem elÚrhet§; " + PD32_PRINTER_STATUS_WAITING "Vßrakozik; " + PD32_PRINTER_STATUS_PROCESSING "Feldolgozßs alatt; " + PD32_PRINTER_STATUS_INITIALIZING "IndÝtßs; " + PD32_PRINTER_STATUS_WARMING_UP "FelmelegÝtÚs; " + PD32_PRINTER_STATUS_TONER_LOW "Toner kevÚs; " + PD32_PRINTER_STATUS_NO_TONER "Ninsc toner; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " /* NOT TRANSLATED */ + PD32_PRINTER_STATUS_USER_INTERVENTION "Felhasznßl¾ ßltal megszakÝtva; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Nincs elÚg mem¾ria; " + PD32_PRINTER_STATUS_DOOR_OPEN "A nyomtat¾ ajtaja nyitva; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "A nyomtat¾ kiszolgßl¾ nem ismert; " + PD32_PRINTER_STATUS_POWER_SAVE "EnergiatakarÚkos m¾d; " +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "Fekete" + IDS_COLOR_MAROON "Bord¾" + IDS_COLOR_GREEN "Z÷ld" + IDS_COLOR_OLIVE "Oliva" + IDS_COLOR_NAVY "S÷tÚtkÚk" + IDS_COLOR_PURPLE "S÷tÚtlila" + IDS_COLOR_TEAL "S÷tÚtcißn" + IDS_COLOR_GRAY "S÷tÚtz³rke" + IDS_COLOR_SILVER "Vilßgossz³rke" + IDS_COLOR_RED "V÷r÷s" + IDS_COLOR_LIME "Neonz÷ld" + IDS_COLOR_YELLOW "Sßrga" + IDS_COLOR_BLUE "KÚk" + IDS_COLOR_FUCHSIA "Ciklßmen" + IDS_COLOR_AQUA "T³rkizkÚk" + IDS_COLOR_WHITE "FehÚr" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Vßlassz ki egy bet³tÝpus mÚretet %d Ús %d k÷z÷tt." + IDS_SAVE_BUTTON "&MentÚs" + IDS_SAVE_IN "MentÚs &helye:" + IDS_SAVE "MentÚs" + IDS_SAVE_AS "MentÚ&s mßskÚnt" + IDS_OPEN_FILE "Megnyitßs" +} + + +/****************************************************************/ +/* Hungarian neutral resources +/****************************************************************/ + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Bet¹tÝpus" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Bet¹tÝpus:",stc1 ,6,3,40,9 [truncated at 1000 lines; 5723 more skipped]

18 years, 11 months

[chorns] 19679: Speed up compilation of msconfig

by chorns＠svn.reactos.com

Speed up compilation of msconfig Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-27 11:59:02 UTC (rev 19678) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-27 12:03:48 UTC (rev 19679) @@ -12,12 +12,14 @@ <library>version</library> <library>comctl32</library> <library>shell32</library> - <file>toolspage.c</file> - <file>srvpage.c</file> - <file>systempage.c</file> - <file>startuppage.c</file> - <file>freeldrpage.c</file> - <file>generalpage.c</file> - <file>msconfig.c</file> + <compilationunit name="unit.c"> + <file>toolspage.c</file> + <file>srvpage.c</file> + <file>systempage.c</file> + <file>startuppage.c</file> + <file>freeldrpage.c</file> + <file>generalpage.c</file> + <file>msconfig.c</file> + </compilationunit> <file>msconfig.rc</file> </module>

18 years, 11 months

[chorns] 19678: Speed up compilation of cmd

by chorns＠svn.reactos.com

Speed up compilation of cmd Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmd.xml Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/move.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-27 11:59:02 UTC (rev 19678) @@ -176,10 +176,45 @@ #endif /* - * is character a delimeter when used on first word? + * convert * + * insert commas into a number */ +INT +ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) +{ + TCHAR temp[32]; + INT c = 0; + INT n = 0; + if (num.QuadPart == 0) + { + des[0] = _T('0'); + des[1] = _T('\0'); + n = 1; + } + else + { + temp[31] = 0; + while (num.QuadPart > 0) + { + if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) + temp[30 - c++] = cThousandSeparator; + temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); + num.QuadPart /= 10; + } + + for (n = 0; n <= c; n++) + des[n] = temp[31 - c + n]; + } + + return n; +} + +/* + * is character a delimeter when used on first word? + * + */ static BOOL IsDelimiter (TCHAR c) { return (c == _T('/') || c == _T('=') || c == _T('\0') || _istspace (c)); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-11-27 11:59:02 UTC (rev 19678) @@ -93,6 +93,7 @@ /* Prototypes for CMD.C */ +INT ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator); VOID ParseCommandLine (LPTSTR); LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.xml --- trunk/reactos/subsys/system/cmd/cmd.xml 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/cmd.xml 2005-11-27 11:59:02 UTC (rev 19678) @@ -5,59 +5,61 @@ <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <pch>precomp.h</pch> - <file>alias.c</file> - <file>attrib.c</file> - <file>batch.c</file> - <file>beep.c</file> - <file>call.c</file> - <file>chcp.c</file> - <file>choice.c</file> - <file>cls.c</file> - <file>cmd.c</file> - <file>cmdinput.c</file> - <file>cmdtable.c</file> - <file>color.c</file> - <file>console.c</file> - <file>copy.c</file> - <file>date.c</file> - <file>del.c</file> - <file>delay.c</file> - <file>dir.c</file> - <file>dirstack.c</file> - <file>echo.c</file> - <file>error.c</file> - <file>filecomp.c</file> - <file>for.c</file> - <file>free.c</file> - <file>goto.c</file> - <file>history.c</file> - <file>if.c</file> - <file>internal.c</file> - <file>label.c</file> - <file>locale.c</file> - <file>memory.c</file> - <file>misc.c</file> - <file>move.c</file> - <file>msgbox.c</file> - <file>path.c</file> - <file>pause.c</file> - <file>prompt.c</file> - <file>redir.c</file> - <file>ren.c</file> - <file>screen.c</file> - <file>set.c</file> - <file>shift.c</file> - <file>start.c</file> - <file>strtoclr.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>title.c</file> - <file>type.c</file> - <file>ver.c</file> - <file>verify.c</file> - <file>vol.c</file> - <file>where.c</file> - <file>window.c</file> + <compilationunit name="unit.c"> + <file>alias.c</file> + <file>attrib.c</file> + <file>batch.c</file> + <file>beep.c</file> + <file>call.c</file> + <file>chcp.c</file> + <file>choice.c</file> + <file>cls.c</file> + <file>cmd.c</file> + <file>cmdinput.c</file> + <file>cmdtable.c</file> + <file>color.c</file> + <file>console.c</file> + <file>copy.c</file> + <file>date.c</file> + <file>del.c</file> + <file>delay.c</file> + <file>dir.c</file> + <file>dirstack.c</file> + <file>echo.c</file> + <file>error.c</file> + <file>filecomp.c</file> + <file>for.c</file> + <file>free.c</file> + <file>goto.c</file> + <file>history.c</file> + <file>if.c</file> + <file>internal.c</file> + <file>label.c</file> + <file>locale.c</file> + <file>memory.c</file> + <file>misc.c</file> + <file>move.c</file> + <file>msgbox.c</file> + <file>path.c</file> + <file>pause.c</file> + <file>prompt.c</file> + <file>redir.c</file> + <file>ren.c</file> + <file>screen.c</file> + <file>set.c</file> + <file>shift.c</file> + <file>start.c</file> + <file>strtoclr.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>title.c</file> + <file>type.c</file> + <file>ver.c</file> + <file>verify.c</file> + <file>vol.c</file> + <file>where.c</file> + <file>window.c</file> + </compilationunit> </module> <module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false"> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-11-27 11:59:02 UTC (rev 19678) @@ -324,7 +324,7 @@ } -static INT Overwrite (LPTSTR fn) +static INT CopyOverwrite (LPTSTR fn) { /*ask the user if they want to override*/ TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -844,7 +844,7 @@ /* Handle any overriding / prompting that needs to be done */ if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch) - nOverwrite = Overwrite(tmpDestPath); + nOverwrite = CopyOverwrite(tmpDestPath); if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) continue; if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend)) _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-11-27 11:59:02 UTC (rev 19678) @@ -982,38 +982,6 @@ } #endif -static INT -ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) -{ - TCHAR temp[32]; - INT c = 0; - INT n = 0; - - if (num.QuadPart == 0) - { - des[0] = _T('0'); - des[1] = _T('\0'); - n = 1; - } - else - { - temp[31] = 0; - while (num.QuadPart > 0) - { - if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) - temp[30 - c++] = cThousandSeparator; - temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); - num.QuadPart /= 10; - } - - for (n = 0; n <= c; n++) - des[n] = temp[31 - c + n]; - } - - return n; -} - - static VOID DirPrintFileDateTime(TCHAR *lpDate, TCHAR *lpTime, _____ Modified: trunk/reactos/subsys/system/cmd/free.c --- trunk/reactos/subsys/system/cmd/free.c 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/free.c 2005-11-27 11:59:02 UTC (rev 19678) @@ -16,45 +16,6 @@ #ifdef INCLUDE_CMD_FREE - -/* - * convert - * - * insert commas into a number - */ - -static INT -ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len) -{ - TCHAR temp[32]; - INT c = 0; - INT n = 0; - - if (num.QuadPart == 0) - { - des[0] = _T('0'); - des[1] = _T('\0'); - n = 1; - } - else - { - temp[31] = 0; - while (num.QuadPart > 0) - { - if (((c + 1) % (nNumberGroups + 1)) == 0) - temp[30 - c++] = cThousandSeparator; - temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); - num.QuadPart /= 10; - } - - for (n = 0; n <= c; n++) - des[n] = temp[31 - c + n]; - } - - return n; -} - - static VOID PrintDiskInfo (LPTSTR szDisk) { @@ -112,13 +73,13 @@ } uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwTotCl; - ConvertULargeInteger (uliSize, szTotal, 40); + ConvertULargeInteger (uliSize, szTotal, 40, TRUE); uliSize.QuadPart = dwSecPerCl * dwBytPerSec * (dwTotCl - dwFreeCl); - ConvertULargeInteger (uliSize, szUsed, 40); + ConvertULargeInteger (uliSize, szUsed, 40, TRUE); uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl; - ConvertULargeInteger (uliSize, szFree, 40); + ConvertULargeInteger (uliSize, szFree, 40, TRUE); LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE); _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-11-27 11:30:44 UTC (rev 19677) +++ trunk/reactos/subsys/system/cmd/move.c 2005-11-27 11:59:02 UTC (rev 19678) @@ -53,7 +53,7 @@ MOVE_PATHS_ON_DIF_VOL = 0x080 /* source and destination paths are on different volume */ }; -static INT Overwrite (LPTSTR fn) +static INT MoveOverwrite (LPTSTR fn) { /*ask the user if they want to override*/ TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -412,7 +412,7 @@ continue; if(!(dwFlags & MOVE_OVER_YES) && (dwMoveStatusFlags & MOVE_DEST_EXISTS)) - nOverwrite = Overwrite (szFullDestPath); + nOverwrite = MoveOverwrite (szFullDestPath); if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) continue; if (nOverwrite == PROMPT_ALL)

18 years, 11 months

[gedmurphy] 19677: forgot to remove debugging

by gedmurphy＠svn.reactos.com

forgot to remove debugging Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 11:29:07 UTC (rev 19676) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 11:30:44 UTC (rev 19677) @@ -40,7 +40,7 @@ #include "ifenum.h" #include <assert.h> -#define DEBUG +#define NDEBUG #include "debug.h" /* Globals */

18 years, 11 months

[gedmurphy] 19676: Add more debug info and better error control, from Elrond.

by gedmurphy＠svn.reactos.com

Add more debug info and better error control, from Elrond. A few minor changes by me. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 06:48:34 UTC (rev 19675) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 11:29:07 UTC (rev 19676) @@ -40,7 +40,7 @@ #include "ifenum.h" #include <assert.h> -#define NDEBUG +#define DEBUG #include "debug.h" /* Globals */ @@ -95,7 +95,9 @@ /* String does not need to be freed: it points to the constant * string we provided */ - TRACE("returning %08x\n", (int)status); + if (!NT_SUCCESS(status)) { + DPRINT1("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status); + } return status; } @@ -356,9 +358,13 @@ BOOL interfaceInfoComplete; int curInterf = 0, i; - if( NT_SUCCESS(status) ) - infoSetInt = HeapAlloc( GetProcessHeap(), 0, - sizeof(IFInfo) * numEntities ); + if (!NT_SUCCESS(status)) { + DPRINT1("getInterfaceInfoSet: tdiGetEntityIDSet() failed: 0x%lx\n", status); + return status; + } + + infoSetInt = HeapAlloc( GetProcessHeap(), 0, + sizeof(IFInfo) * numEntities ); if( infoSetInt ) { for( i = 0; i < numEntities; i++ ) { @@ -643,6 +649,11 @@ name ? getInterfaceInfoByName( tcpFile, name, ifInfo ) : getInterfaceInfoByIndex( tcpFile, index, ifInfo ); + + if (!NT_SUCCESS(status)) { + DPRINT1("getIPAddrEntryForIf returning %lx\n", status); + } + return status; } @@ -848,10 +859,14 @@ *NteInstance = Data.NewAddress; } + if (!NT_SUCCESS(status)) { + DPRINT1("addIPAddress for if %d returning 0x%lx\n", IfIndex, status); + } + switch( status ) { - case STATUS_SUCCESS: return ERROR_SUCCESS; - case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; - default: return status; + case STATUS_SUCCESS: return ERROR_SUCCESS; + case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; + default: return status; } } @@ -878,6 +893,13 @@ closeTcpFile( tcpFile ); - if( NT_SUCCESS(status) ) return ERROR_SUCCESS; - else return ERROR_GEN_FAILURE; + if (!NT_SUCCESS(status)) { + DPRINT1("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status); + } + + + if( NT_SUCCESS(status) ) + return ERROR_SUCCESS; + else + return ERROR_GEN_FAILURE; } _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-27 06:48:34 UTC (rev 19675) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-27 11:29:07 UTC (rev 19676) @@ -37,7 +37,7 @@ # include <resolv.h> #endif - +#define DEBUG #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -84,7 +84,7 @@ */ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance) { - return addIPAddress( Address, Netmask, IfIndex, NteContext, NteInstance ); + return RtlNtStatusToDosError(addIPAddress(Address, Netmask, IfIndex, NteContext, NteInstance)); } @@ -402,7 +402,7 @@ DWORD WINAPI DeleteIPAddress(ULONG NTEContext) { TRACE("NTEContext %ld\n", NTEContext); - return deleteIpAddress( NTEContext ); + return RtlNtStatusToDosError(deleteIpAddress(NTEContext)); } @@ -613,7 +613,7 @@ winsEnabled = TRUE; RegCloseKey(hKey); } - + TRACE("num of index is %lu\n", table->numIndexes); for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; DWORD addrLen = sizeof(ptr->Address), type;

18 years, 11 months

[sedwards] 19675: XML.cpp -> xml.cpp, XML.h -> xml.h. Sorry Windows users, if you make sure your stuff is in the correct case the first time then you wont have problems when doing a svn update.

by sedwards＠svn.reactos.com

XML.cpp -> xml.cpp, XML.h -> xml.h. Sorry Windows users, if you make sure your stuff is in the correct case the first time then you wont have problems when doing a svn update. Deleted: trunk/reactos/tools/buildno/XML.cpp Deleted: trunk/reactos/tools/buildno/XML.h Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.mak Added: trunk/reactos/tools/buildno/xml.cpp Added: trunk/reactos/tools/buildno/xml.h Deleted: trunk/reactos/tools/rbuild/XML.cpp Deleted: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Added: trunk/reactos/tools/rbuild/xml.cpp Added: trunk/reactos/tools/rbuild/xml.h _____ Deleted: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -1,733 +0,0 @@ -// XML.cpp - -#include "pch.h" - -#ifdef _MSC_VER -#define MAX_PATH _MAX_PATH -#endif - -#ifdef WIN32 -# include <direct.h> -# include <io.h> -#else -# include <sys/stat.h> -# define MAX_PATH PATH_MAX -#endif -#include <assert.h> - -#include "XML.h" -#include "exception.h" -#include "ssprintf.h" - -using std::string; -using std::vector; - -#ifdef WIN32 -#define getcwd _getcwd -#endif//WIN32 - -static const char* WS = " \t\r\n"; -static const char* WSEQ = " =\t\r\n"; - -string working_directory; - -class XMLInclude -{ -public: - XMLElement *e; - Path path; - - XMLInclude ( XMLElement* e_, const Path& path_ ) - : e(e_), path(path_) - { - } -}; - -class XMLIncludes : public vector<XMLInclude*> -{ -public: - ~XMLIncludes() - { - for ( size_t i = 0; i < this->size(); i++ ) - delete (*this)[i]; - } -}; - -void -InitWorkingDirectory() -{ - // store the current directory for path calculations - working_directory.resize ( _MAX_PATH ); - working_directory[0] = 0; - getcwd ( &working_directory[0], working_directory.size() ); - working_directory.resize ( strlen ( working_directory.c_str() ) ); -} - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ) -{ -#ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); -#else -# ifdef __FreeBSD__ - struct stat file_stat; - if ( fstat(fileno(f), &file_stat) != 0 ) -# else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) -# endif // __FreeBSD__ - return 0; - return file_stat.st_size; - -#endif // WIN32 -} - -Path::Path() -{ - if ( !working_directory.size() ) - InitWorkingDirectory(); - string s ( working_directory ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -Path::Path ( const Path& cwd, const string& file ) -{ - string s ( cwd.Fixup ( file, false ) ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -string -Path::Fixup ( const string& file, bool include_filename ) const -{ - if ( strchr ( "/\\", file[0] ) -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - || file[1] == ':' -#endif//WIN32 - ) - { - return file; - } - vector<string> pathtmp ( path ); - string tmp ( file ); - const char* prev = strtok ( &tmp[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - while ( p ) - { - if ( !strcmp ( prev, "." ) ) - ; // do nothing - else if ( !strcmp ( prev, ".." ) ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( pathtmp.size() > 1 ) -#else - if ( pathtmp.size() ) -#endif - pathtmp.resize ( pathtmp.size() - 1 ); - } - else - pathtmp.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_filename ) - pathtmp.push_back ( prev ); - - // reuse tmp variable to return recombined path - tmp.resize(0); - for ( size_t i = 0; i < pathtmp.size(); i++ ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( i ) tmp += "/"; -#else - tmp += "/"; -#endif - tmp += pathtmp[i]; - } - return tmp; -} - -/*static*/ string -Path::RelativeFromWorkingDirectory ( const string& path ) -{ - vector<string> vwork, vpath, vout; - Path::Split ( vwork, working_directory, true ); - Path::Split ( vpath, path, true ); -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - // not possible to do relative across different drive letters - if ( vwork[0] != vpath[0] ) - return path; -#endif - size_t i = 0; - while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] ) - ++i; - if ( i < vwork.size() ) - { - // path goes above our working directory, we will need some ..'s - for ( size_t j = 0; j < i; j++ ) - vout.push_back ( ".." ); - } - while ( i < vpath.size() ) - vout.push_back ( vpath[i++] ); - - // now merge vout into a string again - string out = "."; - for ( i = 0; i < vout.size(); i++ ) - { - out += "/" + vout[i]; - } - return out; -} - -/*static*/ void -Path::Split ( vector<string>& out, - const string& path, - bool include_last ) -{ - string s ( path ); - const char* prev = strtok ( &s[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - out.resize ( 0 ); - while ( p ) - { - out.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_last ) - out.push_back ( prev ); -} - -XMLFile::XMLFile() -{ -} - -void -XMLFile::close() -{ - _buf.resize(0); - _p = _end = NULL; -} - -bool -XMLFile::open(const string& filename_) -{ - close(); - FILE* f = fopen ( filename_.c_str(), "rb" ); - if ( !f ) - return false; - unsigned long len = (unsigned long)filelen(f); - _buf.resize ( len ); - fread ( &_buf[0], 1, len, f ); - fclose ( f ); - _p = _buf.c_str(); - _end = _p + len; - _filename = filename_; - next_token(); - return true; -} - -// next_token() moves the pointer to next token, which may be -// an xml element or a text element, basically it's a glorified -// skipspace, normally the user of this class won't need to call -// this function -void -XMLFile::next_token() -{ - _p += strspn ( _p, WS ); -} - -bool -XMLFile::next_is_text() -{ - return *_p != '<'; -} - -bool -XMLFile::more_tokens() -{ - return _p != _end; -} - -// get_token() is used to return a token, and move the pointer -// past the token -bool -XMLFile::get_token(string& token) -{ - const char* tokend; - if ( !strncmp ( _p, "" ); - if ( !tokend ) - tokend = _end; - else - tokend += 3; - } - else if ( !strncmp ( _p, "<?", 2 ) ) - { - tokend = strstr ( _p, "?>" ); - if ( !tokend ) - tokend = _end; - else - tokend += 2; - } - else if ( *_p == '<' ) - { - tokend = strchr ( _p, '>' ); - if ( !tokend ) - tokend = _end; - else - ++tokend; - } - else - { - tokend = strchr ( _p, '<' ); - if ( !tokend ) - tokend = _end; - while ( tokend > _p && isspace(tokend[-1]) ) - --tokend; - } - if ( tokend == _p ) - return false; - token = string ( _p, tokend-_p ); - _p = tokend; - next_token(); - return true; -} - -string -XMLFile::Location() const -{ - int line = 1; - const char* p = strchr ( _buf.c_str(), '\n' ); - while ( p && p < _p ) - { - ++line; - p = strchr ( p+1, '\n' ); - } - return ssprintf ( "%s(%i)",_filename.c_str(), line ); -} - -XMLAttribute::XMLAttribute() -{ -} - -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) - : name(name_), value(value_) -{ -} - -XMLAttribute::XMLAttribute ( const XMLAttribute& src ) - : name(src.name), value(src.value) -{ - -} - -XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src ) -{ - name = src.name; - value = src.value; - return *this; -} - -XMLElement::XMLElement ( const string& location_ ) - : location(location_), - parentElement(NULL) -{ -} - -XMLElement::~XMLElement() -{ - size_t i; - for ( i = 0; i < attributes.size(); i++ ) - delete attributes[i]; - for ( i = 0; i < subElements.size(); i++ ) - delete subElements[i]; -} - -void -XMLElement::AddSubElement ( XMLElement* e ) -{ - subElements.push_back ( e ); - e->parentElement = this; -} - -// Parse() -// This function takes a single xml tag ( i.e. beginning with '<' and -// ending with '>', and parses out it's tag name and constituent -// attributes. -// Return Value: returns true if you need to look for a </tag> for -// the one it just parsed... -bool -XMLElement::Parse(const string& token, - bool& end_tag) -{ - const char* p = token.c_str(); - assert ( *p == '<' ); - ++p; - p += strspn ( p, WS ); - - // check if this is a comment - if ( !strncmp ( p, "!--", 3 ) ) - { - name = "!--"; - end_tag = false; - return false; // never look for end tag to a comment - } - - end_tag = ( *p == '/' ); - if ( end_tag ) - { - ++p; - p += strspn ( p, WS ); - } - const char* end = strpbrk ( p, WS ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - name = string ( p, end-p ); - p = end; - p += strspn ( p, WS ); - while ( *p != '>' && *p != '/' ) - { - end = strpbrk ( p, WSEQ ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - string attribute ( p, end-p ), value; - p = end; - p += strspn ( p, WS ); - if ( *p == '=' ) - { - ++p; - p += strspn ( p, WS ); - char quote = 0; - if ( strchr ( "\"'", *p ) ) - { - quote = *p++; - end = strchr ( p, quote ); - } - else - { - end = strpbrk ( p, WS ); - } - if ( !end ) - { - end = strchr ( p, '>' ); - assert(end); - if ( end[-1] == '/' ) - end--; - } - value = string ( p, end-p ); - p = end; - if ( quote && *p == quote ) - p++; - p += strspn ( p, WS ); - } - else if ( name[0] != '!' ) - { - throw XMLSyntaxErrorException ( location, - "attributes must have values" ); - } - attributes.push_back ( new XMLAttribute ( attribute, value ) ); - } - return !( *p == '/' ) && !end_tag; -} - -XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -const XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) const -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -// XMLParse() -// This function reads a "token" from the file loaded in XMLFile -// if it finds a tag that is non-singular, it parses sub-elements and/or -// inner text into the XMLElement that it is building to return. -// Return Value: an XMLElement allocated via the new operator that contains -// it's parsed data. Keep calling this function until it returns NULL -// (no more data) -XMLElement* -XMLParse(XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) -{ - string token; - if ( !f.get_token(token) ) - return NULL; - bool end_tag, is_include = false; - - while ( token[0] != '<' - || !strncmp ( token.c_str(), "<!--", 4 ) - || !strncmp ( token.c_str(), "<?", 2 ) ) - { - if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( f.Location(), - "expecting xml tag, not '%s'", - token.c_str() ); - if ( !f.get_token(token) ) - return NULL; - } - - XMLElement* e = new XMLElement ( f.Location() ); - bool bNeedEnd = e->Parse ( token, end_tag ); - - if ( e->name == "xi:include" && includes ) - { - includes->push_back ( new XMLInclude ( e, path ) ); - is_include = true; - } - - if ( !bNeedEnd ) - { - if ( pend_tag ) - *pend_tag = end_tag; - else if ( end_tag ) - { - delete e; - throw XMLSyntaxErrorException ( f.Location(), - "end tag '%s' not expected", - token.c_str() ); - return NULL; - } - return e; - } - bool bThisMixingErrorReported = false; - while ( f.more_tokens() ) - { - if ( f.next_is_text() ) - { - if ( !f.get_token ( token ) || !token.size() ) - { - throw InvalidBuildFileException ( - f.Location(), - "internal tool error - get_token() failed when more_tokens() returned true" ); - break; - } - if ( e->subElements.size() && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location(), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - if ( strchr ( token.c_str(), '>' ) ) - { - throw XMLSyntaxErrorException ( f.Location(), - "invalid symbol '>'" ); - } - if ( e->value.size() ) - { - throw XMLSyntaxErrorException ( f.Location(), - "multiple instances of inner text" ); - e->value += " " + token; - } - else - e->value = token; - } - else - { - XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); - if ( !e2 ) - { - throw InvalidBuildFileException ( - e->location, - "end of file found looking for end tag" ); - break; - } - if ( end_tag ) - { - if ( e->name != e2->name ) - { - delete e2; - throw XMLSyntaxErrorException ( f.Location(), - "end tag name mismatch" ); - break; - } - delete e2; - break; - } - if ( e->value.size() && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location(), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - e->AddSubElement ( e2 ); - } - } - return e; -} - -void -XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) -{ - for ( ;; ) - { - XMLElement* e = XMLParse ( f, &includes, path ); - if ( !e ) - return; - head.AddSubElement ( e ); - } -} - -XMLElement* -XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) -{ - XMLAttribute* att; - att = e->GetAttribute("href",true); - assert(att); - - string file ( path.Fixup(att->value,true) ); - string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); - e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); - XMLFile fInc; - if ( !fInc.open ( file ) ) - { - // look for xi:fallback element - for ( size_t i = 0; i < e->subElements.size(); i++ ) - { - XMLElement* e2 = e->subElements[i]; - if ( e2->name == "xi:fallback" ) - { - // now look for xi:include below... - for ( i = 0; i < e2->subElements.size(); i++ ) - { - XMLElement* e3 = e2->subElements[i]; - if ( e3->name == "xi:include" ) - { - return XMLLoadInclude ( e3, path, includes ); - } - } - throw InvalidBuildFileException ( - e2->location, - "<xi:fallback> must have a <xi:include> sub-element" ); - return NULL; - } - } - return NULL; - } - else - { - XMLElement* new_e = new XMLElement ( e->location ); - new_e->name = "xi:included"; - Path path2 ( path, att->value ); - XMLReadFile ( fInc, *new_e, includes, path2 ); - return new_e; - } -} - -XMLElement* -XMLLoadFile ( const string& filename, const Path& path ) -{ - XMLIncludes includes; - XMLFile f; - - if ( !f.open ( filename ) ) - throw FileNotFoundException ( filename ); - - XMLElement* head = new XMLElement("(virtual)"); - - XMLReadFile ( f, *head, includes, path ); - - for ( size_t i = 0; i < includes.size(); i++ ) - { - XMLElement* e = includes[i]->e; - XMLElement* e2 = XMLLoadInclude ( includes[i]->e, includes[i]->path, includes ); - if ( !e2 ) - { - throw FileNotFoundException ( - ssprintf("%s (referenced from %s)", - e->GetAttribute("top_href",true)->value.c_str(), - f.Location().c_str() ) ); - } - XMLElement* parent = e->parentElement; - XMLElement** parent_container = NULL; - if ( !parent ) - { - delete e; - throw Exception ( "internal tool error: xi:include doesn't have a parent" ); - return NULL; - } - for ( size_t j = 0; j < parent->subElements.size(); j++ ) - { - if ( parent->subElements[j] == e ) - { - parent_container = &parent->subElements[j]; - break; - } - } - if ( !parent_container ) - { - delete e; - throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); - return NULL; - } - // replace inclusion tree with the imported tree - e2->parentElement = e->parentElement; - e2->name = e->name; - e2->attributes = e->attributes; - *parent_container = e2; - e->attributes.resize(0); - delete e; - } - return head; -} _____ Deleted: trunk/reactos/tools/buildno/XML.h --- trunk/reactos/tools/buildno/XML.h 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/XML.h 2005-11-27 06:48:34 UTC (rev 19675) @@ -1,96 +0,0 @@ -// XML.h - -#ifndef XML_H -#define XML_H - -#include "pch.h" - -void -InitWorkingDirectory(); - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ); - -class Path -{ - std::vector<std::string> path; -public: - Path(); // initializes path to getcwd(); - Path ( const Path& cwd, const std::string& filename ); - std::string Fixup ( const std::string& filename, bool include_filename ) const; - - static std::string RelativeFromWorkingDirectory ( const std::string& path ); - - static void Split ( std::vector<std::string>& out, - const std::string& path, - bool include_last ); -}; - -class XMLFile -{ - friend class XMLElement; -public: - XMLFile(); - void close(); - bool open(const std::string& filename); - void next_token(); - bool next_is_text(); - bool more_tokens(); - bool get_token(std::string& token); - const std::string& filename() { return _filename; } - std::string Location() const; - -private: - std::string _buf, _filename; - - const char *_p, *_end; -}; - - -class XMLAttribute -{ -public: - std::string name; - std::string value; - - XMLAttribute(); - XMLAttribute ( const std::string& name_, const std::string& value_ ); - XMLAttribute ( const XMLAttribute& ); - XMLAttribute& operator = ( const XMLAttribute& ); -}; - - -class XMLElement -{ -public: - std::string location; - std::string name; - std::vector<XMLAttribute*> attributes; - XMLElement* parentElement; - std::vector<XMLElement*> subElements; - std::string value; - - XMLElement ( const std::string& location_ ); - ~XMLElement(); - bool Parse(const std::string& token, - bool& end_tag); - void AddSubElement ( XMLElement* e ); - XMLAttribute* GetAttribute ( const std::string& attribute, - bool required); - const XMLAttribute* GetAttribute ( const std::string& attribute, - bool required) const; -}; - -XMLElement* -XMLLoadFile ( const std::string& filename, const Path& path ); - -/*XMLElement* -XMLParse(XMLFile& f, - const Path& path, - bool* pend_tag = NULL);*/ - -#endif//XML_H _____ Modified: trunk/reactos/tools/buildno/buildno.cpp --- trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -28,7 +28,7 @@ #include <time.h> #include <string.h> #include "version.h" -#include "XML.h" +#include "xml.h" #include "exception.h" #define FALSE 0 _____ Modified: trunk/reactos/tools/buildno/buildno.mak --- trunk/reactos/tools/buildno/buildno.mak 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/buildno.mak 2005-11-27 06:48:34 UTC (rev 19675) @@ -22,7 +22,7 @@ buildno.cpp \ exception.cpp \ ssprintf.cpp \ - XML.cpp \ + xml.cpp \ ) BUILDNO_OBJECTS = \ @@ -48,7 +48,7 @@ $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ -$(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp | $(BUILDNO_INT) +$(BUILDNO_INT_)xml.o: $(BUILDNO_BASE_)xml.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ _____ Copied: trunk/reactos/tools/buildno/xml.cpp (from rev 19674, trunk/reactos/tools/buildno/XML.cpp) --- trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/xml.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -0,0 +1,733 @@ +// xml.cpp + +#include "pch.h" + +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + +#ifdef WIN32 +# include <direct.h> +# include <io.h> +#else +# include <sys/stat.h> +# define MAX_PATH PATH_MAX +#endif +#include <assert.h> + +#include "xml.h" +#include "exception.h" +#include "ssprintf.h" + +using std::string; +using std::vector; + +#ifdef WIN32 +#define getcwd _getcwd +#endif//WIN32 + +static const char* WS = " \t\r\n"; +static const char* WSEQ = " =\t\r\n"; + +string working_directory; + +class XMLInclude +{ +public: + XMLElement *e; + Path path; + + XMLInclude ( XMLElement* e_, const Path& path_ ) + : e(e_), path(path_) + { + } +}; + +class XMLIncludes : public vector<XMLInclude*> +{ +public: + ~XMLIncludes() + { + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; + } +}; + +void +InitWorkingDirectory() +{ + // store the current directory for path calculations + working_directory.resize ( _MAX_PATH ); + working_directory[0] = 0; + getcwd ( &working_directory[0], working_directory.size() ); + working_directory.resize ( strlen ( working_directory.c_str() ) ); +} + +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ) +{ +#ifdef WIN32 + return _filelengthi64 ( _fileno(f) ); +#else +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 +} + +Path::Path() +{ + if ( !working_directory.size() ) + InitWorkingDirectory(); + string s ( working_directory ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +Path::Path ( const Path& cwd, const string& file ) +{ + string s ( cwd.Fixup ( file, false ) ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +string +Path::Fixup ( const string& file, bool include_filename ) const +{ + if ( strchr ( "/\\", file[0] ) +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + || file[1] == ':' [truncated at 1000 lines; 2744 more skipped]

18 years, 11 months

[royce] 19674: remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno uses them too

by royce＠svn.reactos.com

remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno uses them too Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/bootstrap.cpp Modified: trunk/reactos/tools/rbuild/compilerflag.cpp Modified: trunk/reactos/tools/rbuild/exception.cpp Modified: trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/linkerflag.cpp Modified: trunk/reactos/tools/rbuild/linkerscript.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.dsp Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -15,11 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "pch.h" -#ifndef MAX_PATH -#define MAX_PATH _MAX_PATH -#endif +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER #ifdef WIN32 # include <direct.h> @@ -31,9 +30,12 @@ #include <assert.h> #include "XML.h" -#include "exception.h" #include "ssprintf.h" +#ifndef MAX_PATH +#define MAX_PATH _MAX_PATH +#endif + using std::string; using std::vector; @@ -46,6 +48,29 @@ string working_directory; +XMLException::XMLException ( + const std::string& location, + const char* format, ... ) +{ + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); +} + +void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) +{ + _e = location + ": " + ssvprintf(format,args); +} + +void XMLException::SetException ( const std::string& location, const char* format, ... ) +{ + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); +} + XMLIncludes::~XMLIncludes() { for ( size_t i = 0; i < this->size(); i++ ) @@ -56,7 +81,7 @@ InitWorkingDirectory() { // store the current directory for path calculations - working_directory.resize ( _MAX_PATH ); + working_directory.resize ( MAX_PATH ); working_directory[0] = 0; getcwd ( &working_directory[0], working_directory.size() ); working_directory.resize ( strlen ( working_directory.c_str() ) ); @@ -70,18 +95,17 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else # ifdef __FreeBSD__ - struct stat file_stat; - if ( fstat(fileno(f), &file_stat) != 0 ) + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) # else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) # endif // __FreeBSD__ - return 0; - return file_stat.st_size; - + return 0; + return file_stat.st_size; #endif // WIN32 } @@ -227,9 +251,10 @@ } void -Path::Split ( vector<string>& out, - const string& path, - bool include_last ) +Path::Split ( + vector<string>& out, + const string& path, + bool include_last ) { string s ( path ); const char* prev = strtok ( &s[0], "/\\" ); @@ -263,7 +288,7 @@ } bool -XMLFile::open(const string& filename_) +XMLFile::open ( const string& filename_ ) { close(); FILE* f = fopen ( filename_.c_str(), "rb" ); @@ -297,7 +322,7 @@ } bool -XMLFile::more_tokens() +XMLFile::more_tokens () { return _p != _end; } @@ -305,7 +330,7 @@ // get_token() is used to return a token, and move the pointer // past the token bool -XMLFile::get_token(string& token) +XMLFile::get_token ( string& token ) { const char* tokend; if ( !strncmp ( _p, "<!--", 4 ) ) @@ -372,8 +397,9 @@ { } -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) +XMLAttribute::XMLAttribute( + const string& name_, + const string& value_ ) : name(name_), value(value_) { } @@ -391,8 +417,9 @@ return *this; } -XMLElement::XMLElement ( XMLFile* xmlFile, - const string& location ) +XMLElement::XMLElement ( + XMLFile* xmlFile, + const string& location ) : xmlFile ( xmlFile ), location ( location ), parentElement ( NULL ) @@ -422,8 +449,9 @@ // Return Value: returns true if you need to look for a </tag> for // the one it just parsed... bool -XMLElement::Parse(const string& token, - bool& end_tag) +XMLElement::Parse ( + const string& token, + bool& end_tag ) { const char* p = token.c_str(); assert ( *p == '<' ); @@ -493,8 +521,9 @@ } else if ( name[0] != '!' ) { - throw XMLSyntaxErrorException ( location, - "attributes must have values" ); + throw XMLSyntaxErrorException ( + location, + "attributes must have values" ); } attributes.push_back ( new XMLAttribute ( attribute, value ) ); } @@ -502,8 +531,9 @@ } XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) +XMLElement::GetAttribute ( + const string& attribute, + bool required ) { // this would be faster with a tree-based container, but our attribute // lists are likely to stay so short as to not be an issue. @@ -514,16 +544,18 @@ } if ( required ) { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); + throw XMLRequiredAttributeNotFoundException ( + location, + attribute, + name ); } return NULL; } const XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) const +XMLElement::GetAttribute ( + const string& attribute, + bool required ) const { // this would be faster with a tree-based container, but our attribute // lists are likely to stay so short as to not be an issue. @@ -534,13 +566,57 @@ } if ( required ) { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); + throw XMLRequiredAttributeNotFoundException ( + location, + attribute, + name ); } return NULL; } +int +XMLElement::FindElement ( const std::string& type, int prev ) const +{ + int done = subElements.size(); + while ( ++prev < done ) + { + XMLElement* e = subElements[prev]; + if ( e->name == type ) + return prev; + } + return -1; +} + +int +XMLElement::GetElements ( + const std::string& type, + std::vector<XMLElement*>& v ) +{ + int find = FindElement ( type ); + v.resize ( 0 ); + while ( find != -1 ) + { + v.push_back ( subElements[find] ); + find = FindElement ( type, find ); + } + return v.size(); +} + +int +XMLElement::GetElements ( + const std::string& type, + std::vector<const XMLElement*>& v ) const +{ + int find = FindElement ( type ); + v.resize ( 0 ); + while ( find != -1 ) + { + v.push_back ( subElements[find] ); + find = FindElement ( type, find ); + } + return v.size(); +} + // XMLParse() // This function reads a "token" from the file loaded in XMLFile // if it finds a tag that is non-singular, it parses sub-elements and/or @@ -549,30 +625,38 @@ // it's parsed data. Keep calling this function until it returns NULL // (no more data) XMLElement* -XMLParse ( XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) +XMLParse ( + XMLFile& f, + XMLIncludes* includes, + const Path& path, + bool* pend_tag = NULL ) { string token, location; if ( !f.get_token(token,location) ) return NULL; bool end_tag, is_include = false; - while ( token[0] != '<' - || !strncmp ( token.c_str (), "<!--", 4 ) - || !strncmp ( token.c_str (), "<?", 2 ) ) + while + ( + token[0] != '<' + || !strncmp ( token.c_str (), "<!--", 4 ) + || !strncmp ( token.c_str (), "<?", 2 ) + ) { if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( location, - "expecting xml tag, not '%s'", - token.c_str () ); - if ( !f.get_token(token,location) ) + { + throw XMLSyntaxErrorException ( + location, + "expecting xml tag, not '%s'", + token.c_str () ); + } + if ( !f.get_token ( token, location ) ) return NULL; } - XMLElement* e = new XMLElement ( &f, - location ); + XMLElement* e = new XMLElement ( + &f, + location ); bool bNeedEnd = e->Parse ( token, end_tag ); if ( e->name == "xi:include" && includes ) @@ -581,8 +665,10 @@ att = e->GetAttribute ( "href", true ); assert ( att ); string includeFile ( path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) ); + string topIncludeFile ( + Path::RelativeFromWorkingDirectory ( includeFile ) ); + includes->push_back ( + new XMLInclude ( e, path, topIncludeFile ) ); is_include = true; } @@ -593,9 +679,10 @@ else if ( end_tag ) { delete e; - throw XMLSyntaxErrorException ( location, - "end tag '%s' not expected", - token.c_str() ); + throw XMLSyntaxErrorException ( + location, + "end tag '%s' not expected", + token.c_str() ); return NULL; } return e; @@ -607,26 +694,29 @@ { if ( !f.get_token ( token, location ) || token.size () == 0 ) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( location, "internal tool error - get_token() failed when more_tokens() returned true" ); break; } if ( e->subElements.size() && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( location, - "mixing of inner text with sub elements" ); + throw XMLSyntaxErrorException ( + location, + "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } if ( strchr ( token.c_str (), '>' ) ) { - throw XMLSyntaxErrorException ( location, - "invalid symbol '>'" ); + throw XMLSyntaxErrorException ( + location, + "invalid symbol '>'" ); } if ( e->value.size() > 0 ) { - throw XMLSyntaxErrorException ( location, - "multiple instances of inner text" ); + throw XMLSyntaxErrorException ( + location, + "multiple instances of inner text" ); e->value += " " + token; } else @@ -634,13 +724,14 @@ } else { - XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); + XMLElement* e2 = XMLParse ( + f, is_include ? NULL : includes, path, &end_tag ); if ( !e2 ) { string e_location = e->location; string e_name = e->name; delete e; - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( e_location, "end of file found looking for end tag: </%s>", e_name.c_str() ); @@ -669,8 +760,9 @@ { string e_location = e->location; delete e; - throw XMLSyntaxErrorException ( e_location, - "mixing of inner text with sub elements" ); + throw XMLSyntaxErrorException ( + e_location, + "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } e->AddSubElement ( e2 ); @@ -680,7 +772,11 @@ } void -XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) +XMLReadFile ( + XMLFile& f, + XMLElement& head, + XMLIncludes& includes, + const Path& path ) { for ( ;; ) { @@ -692,8 +788,9 @@ } XMLElement* -XMLLoadInclude ( XMLInclude& include, - XMLIncludes& includes ) +XMLLoadInclude ( + XMLInclude& include, + XMLIncludes& includes ) { XMLAttribute* att; att = include.e->GetAttribute("href", true); @@ -720,13 +817,17 @@ { att = e3->GetAttribute ( "href", true ); assert ( att ); - string includeFile ( include.path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile ); - return XMLLoadInclude ( *fallbackInclude, includes ); + string includeFile ( + include.path.Fixup ( att->value, true ) ); + string topIncludeFile ( + Path::RelativeFromWorkingDirectory ( includeFile ) ); + XMLInclude* fallbackInclude = + new XMLInclude ( e3, include.path, topIncludeFile ); + return XMLLoadInclude ( + *fallbackInclude, includes ); } } - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( e2->location, "<xi:fallback> must have a <xi:include> sub-element" ); return NULL; @@ -737,8 +838,9 @@ else { include.fileExists = true; - XMLElement* new_e = new XMLElement ( fInc, - include.e->location ); + XMLElement* new_e = new XMLElement ( + fInc, + include.e->location ); new_e->name = "xi:included"; Path path2 ( include.path, att->value ); XMLReadFile ( *fInc, *new_e, includes, path2 ); @@ -754,10 +856,12 @@ XMLFile* f = new XMLFile(); if ( !f->open ( filename ) ) - throw FileNotFoundException ( filename ); + { + throw XMLFileNotFoundException ( "(virtual)", filename ); + return NULL; + } - XMLElement* head = new XMLElement ( f, - "(virtual)" ); + XMLElement* head = new XMLElement ( f, "(virtual)" ); XMLReadFile ( *f, *head, includes, path ); @@ -767,17 +871,17 @@ XMLElement* e2 = XMLLoadInclude ( *includes[i], includes ); if ( !e2 ) { - throw FileNotFoundException ( - ssprintf ( "%s (referenced from %s)", - e->GetAttribute ( "top_href", true )->value.c_str (), - f->Location ().c_str () ) ); + throw XMLFileNotFoundException ( + f->Location(), + e->GetAttribute ( "top_href", true )->value ); } XMLElement* parent = e->parentElement; XMLElement** parent_container = NULL; if ( !parent ) { + string location = e->location; delete e; - throw Exception ( "internal tool error: xi:include doesn't have a parent" ); + throw XMLException ( location, "internal tool error: xi:include doesn't have a parent" ); return NULL; } for ( size_t j = 0; j < parent->subElements.size (); j++ ) @@ -790,8 +894,9 @@ } if ( !parent_container ) { + string location = e->location; delete e; - throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); + throw XMLException ( location, "internal tool error: couldn't find xi:include in parent's sub-elements" ); return NULL; } // replace inclusion tree with the imported tree _____ Modified: trunk/reactos/tools/rbuild/XML.h --- trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:34:50 UTC (rev 19674) @@ -18,7 +18,9 @@ #ifndef XML_H #define XML_H -#include "pch.h" +#include <string> +#include <vector> +#include <stdarg.h> class XMLElement; @@ -34,6 +36,75 @@ #endif filelen ( FILE* f ); +class XMLException +{ +public: + XMLException ( const std::string& location, const char* format, ... ); + const std::string& operator *() { return _e; } + +protected: + XMLException() {} + void SetExceptionV ( const std::string& location, const char* format, va_list args ); + void SetException ( const std::string& location, const char* format, ... ); + +private: + std::string _e; +}; + +class XMLSyntaxErrorException : public XMLException +{ +public: + XMLSyntaxErrorException ( + const std::string& location, + const char* format, ... ) + { + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); + } +}; + +class XMLRequiredAttributeNotFoundException : public XMLException +{ +public: + XMLRequiredAttributeNotFoundException ( + const std::string& location, + const std::string& attributeName, + const std::string& elementName ) + { + SetException ( location, "Required attribute '%s' not found in element '%s'", + attributeName.c_str(), + elementName.c_str() ); + } +}; + +class XMLInvalidBuildFileException : public XMLException +{ +public: + XMLInvalidBuildFileException ( + const std::string& location, + const char* format, + ... ) + { + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); + } +}; + +class XMLFileNotFoundException : public XMLException +{ +public: + XMLFileNotFoundException ( + const std::string& location, + const std::string& filename ) + { + SetException ( location, "Can't open file '%s'", filename.c_str() ); + } +}; + class Path { std::vector<std::string> path; @@ -46,9 +117,10 @@ static std::string RelativeFromWorkingDirectory ( const std::string& path ); static std::string RelativeFromDirectory ( const std::string& path, const std::string& base_directory); - static void Split ( std::vector<std::string>& out, - const std::string& path, - bool include_last ); + static void Split ( + std::vector<std::string>& out, + const std::string& path, + bool include_last ); }; class XMLInclude @@ -59,8 +131,13 @@ std::string topIncludeFilename; bool fileExists; - XMLInclude ( XMLElement* e_, const Path& path_, const std::string topIncludeFilename_ ) - : e ( e_ ), path ( path_ ), topIncludeFilename ( topIncludeFilename_ ) + XMLInclude ( + XMLElement* e_, + const Path& path_, + const std::string topIncludeFilename_ ) + : e ( e_ ), + path ( path_ ), + topIncludeFilename ( topIncludeFilename_ ) { } }; @@ -117,21 +194,43 @@ std::vector<XMLElement*> subElements; std::string value; - XMLElement ( XMLFile* xmlFile, - const std::string& location ); + XMLElement ( + XMLFile* xmlFile, + const std::string& location ); + ~XMLElement(); - bool Parse(const std::string& token, - bool& end_tag); + + bool Parse ( + const std::string& token, + bool& end_tag); + void AddSubElement ( XMLElement* e ); - XMLAttribute* GetAttribute ( const std::string& attribute, - bool required); - const XMLAttribute* GetAttribute ( const std::string& attribute, - bool required) const; + + XMLAttribute* GetAttribute ( + const std::string& attribute, + bool required); + + const XMLAttribute* GetAttribute ( + const std::string& attribute, + bool required ) const; + + int FindElement ( + const std::string& type, + int prev = -1 ) const; + + int GetElements ( + const std::string& type, + std::vector<XMLElement*>& v ); + + int GetElements ( + const std::string& type, + std::vector<const XMLElement*>& v ) const; }; XMLElement* -XMLLoadFile ( const std::string& filename, - const Path& path, - XMLIncludes& includes ); +XMLLoadFile ( + const std::string& filename, + const Path& path, + XMLIncludes& includes ); #endif // XML_H _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -1944,8 +1944,9 @@ if ( invoke.invokeModule->type != BuildTool ) { - throw InvalidBuildFileException ( module.node.location, - "Only modules of type buildtool can be invoked." ); + throw XMLInvalidBuildFileException ( + module.node.location, + "Only modules of type buildtool can be invoked." ); } string invokeTarget = module.GetInvocationTarget ( i ); _____ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp --- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -72,7 +72,7 @@ { if ( !IsSupportedModuleType ( module->type ) ) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( node.location, "<bootstrap> is not applicable for this module type." ); } _____ Modified: trunk/reactos/tools/rbuild/compilerflag.cpp --- trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -51,7 +51,7 @@ { if (node.value.size () == 0) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( node.location, "<compilerflag> is empty." ); } _____ Modified: trunk/reactos/tools/rbuild/exception.cpp --- trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -26,58 +26,60 @@ Exception::Exception ( const string& message ) { - Message = message; + _e = message; } -Exception::Exception ( const char* format, - ...) +Exception::Exception ( const char* format, ...) { va_list args; - va_start ( args, - format); - Message = ssvprintf ( format, - args); + va_start ( args, format); + _e = ssvprintf ( format, args); va_end ( args ); } -void Exception::SetMessage ( const char* message, - va_list args) +void Exception::SetMessage ( const char* format, ...) { - Message = ssvprintf ( message, - args); + va_list args; + va_start ( args, format); + _e = ssvprintf ( format, args); + va_end ( args ); } +void Exception::SetMessageV ( const char* message, va_list args ) +{ + _e = ssvprintf ( message, args); +} + OutOfMemoryException::OutOfMemoryException () : Exception ( "Out of memory" ) { } -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber ) +InvalidOperationException::InvalidOperationException ( + const char* filename, + const int linenumber ) + : Exception ( "%s:%d", filename, linenumber ) { - Message = ssprintf ( "%s:%d", - filename, - linenumber ); } -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber, - const char* message, - ... ) +InvalidOperationException::InvalidOperationException ( + const char* filename, + const int linenumber, + const char* message, + ... ) { string errorMessage; va_list args; - va_start ( args, - message ); - errorMessage = ssvprintf ( message, - args ); + va_start ( args, message ); + errorMessage = ssvprintf ( message, args ); va_end ( args ); - Message = ssprintf ( "%s:%d %s", - filename, - linenumber, - errorMessage.c_str () ); + SetMessage ( + "%s:%d %s", + filename, + linenumber, + errorMessage.c_str () ); } @@ -97,49 +99,15 @@ } -InvalidBuildFileException::InvalidBuildFileException ( const string& location, - const char* message, - ...) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - -InvalidBuildFileException::InvalidBuildFileException () -{ -} - -void -InvalidBuildFileException::SetLocationMessage ( const std::string& location, - const char* message, - va_list args ) -{ - Message = location + ": " + ssvprintf ( message, args ); -} - -XMLSyntaxErrorException::XMLSyntaxErrorException ( const string& location, - const char* message, - ... ) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - - RequiredAttributeNotFoundException::RequiredAttributeNotFoundException ( const string& location, const string& attributeName, const string& elementName ) - : InvalidBuildFileException ( location, - "Required attribute '%s' not found on '%s'.", - attributeName.c_str (), - elementName.c_str ()) + : XMLInvalidBuildFileException ( + location, + "Required attribute '%s' not found on '%s'.", + attributeName.c_str (), + elementName.c_str ()) { } @@ -147,10 +115,11 @@ const string& location, const string& name, const string& value ) - : InvalidBuildFileException ( location, - "Attribute '%s' has an invalid value '%s'.", - name.c_str (), - value.c_str () ) + : XMLInvalidBuildFileException ( + location, + "Attribute '%s' has an invalid value '%s'.", + name.c_str (), + value.c_str () ) { } @@ -171,9 +140,10 @@ UnknownModuleTypeException::UnknownModuleTypeException ( const string& location, int moduletype ) - : InvalidBuildFileException ( location, - "module type requested: %i", - moduletype ) + : XMLInvalidBuildFileException ( + location, + "module type requested: %i", + moduletype ) { } _____ Modified: trunk/reactos/tools/rbuild/exception.h --- trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:34:50 UTC (rev 19674) @@ -19,6 +19,7 @@ #define __EXCEPTION_H #include "pch.h" +#include "XML.h" class Exception { @@ -26,11 +27,15 @@ Exception ( const std::string& message ); Exception ( const char* format, ...); - std::string Message; + const std::string& operator *() { return _e; } + protected: Exception (); - void SetMessage ( const char* message, - va_list args ); + void SetMessage ( const char* message, ... ); + void SetMessageV ( const char* message, va_list args ); + +private: + std::string _e; }; @@ -68,39 +73,17 @@ std::string Filename; }; -class InvalidBuildFileException : public Exception -{ -public: - InvalidBuildFileException ( const std::string& location, - const char* message, - ...); - void SetLocationMessage ( const std::string& location, - const char* message, - va_list args ); -protected: - InvalidBuildFileException (); -}; - -class XMLSyntaxErrorException : public InvalidBuildFileException +class RequiredAttributeNotFoundException : public XMLInvalidBuildFileException { public: - XMLSyntaxErrorException ( const std::string& location, - const char* message, - ... ); -}; - - -class RequiredAttributeNotFoundException : public InvalidBuildFileException -{ -public: RequiredAttributeNotFoundException ( const std::string& location, const std::string& attributeName, const std::string& elementName ); [truncated at 1000 lines; 679 more skipped]

18 years, 11 months

[sedwards] 19673: more crt, crtdll and msvcrt cleanup

by sedwards＠svn.reactos.com

more crt, crtdll and msvcrt cleanup Modified: trunk/reactos/lib/crt/conio/cgets.c Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cputs.c Modified: trunk/reactos/lib/crt/conio/getch.c Modified: trunk/reactos/lib/crt/conio/getche.c Modified: trunk/reactos/lib/crt/conio/kbhit.c Modified: trunk/reactos/lib/crt/conio/putch.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/float/isnan.c Modified: trunk/reactos/lib/crt/include/float.h Modified: trunk/reactos/lib/crt/include/internal/atexit.h Modified: trunk/reactos/lib/crt/include/internal/console.h Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/include/internal/math.h Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/math/hypot.c Modified: trunk/reactos/lib/crt/math/modf.c Modified: trunk/reactos/lib/crt/mbstring/mbscat.c Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_system.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/fgetchar.c Modified: trunk/reactos/lib/crt/stdio/gets.c Modified: trunk/reactos/lib/crt/stdio/perror.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Modified: trunk/reactos/lib/crt/stdlib/atexit.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/makepath.c Modified: trunk/reactos/lib/crt/stdlib/splitp.c Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c Modified: trunk/reactos/lib/crt/wine/heap.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/crtdll/precomp.h Modified: trunk/reactos/lib/msvcrt/dllmain.c Modified: trunk/reactos/lib/msvcrt/precomp.h Modified: trunk/reactos/lib/rtl/math.c _____ Modified: trunk/reactos/lib/crt/conio/cgets.c --- trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -6,8 +6,7 @@ * PROGRAMMER: Eric Kohl (Imported from DJGPP) */ -#include <conio.h> -#include <stdlib.h> +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -8,8 +8,6 @@ #include "precomp.h" -#include <conio.h> - /* * @unimplemented */ _____ Modified: trunk/reactos/lib/crt/conio/cputs.c --- trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <conio.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@ */ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/conio/getche.c --- trunk/reactos/lib/crt/conio/getche.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getche.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,10 +10,8 @@ * 28/12/98: Created */ -#include <conio.h> -#include <internal/console.h> +#include "precomp.h" - int _getche(void) { if (char_avail) _____ Modified: trunk/reactos/lib/crt/conio/kbhit.c --- trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@ */ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - /* * FIXME PeekConsoleInput returns more than keyboard hits * _____ Modified: trunk/reactos/lib/crt/conio/putch.c --- trunk/reactos/lib/crt/conio/putch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/putch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <conio.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -12,11 +12,6 @@ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - - - int char_avail = 0; int ungot_char = 0; _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,6 @@ #include "precomp.h" #include <direct.h> #include <stdlib.h> -#include <errno.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@ #include <direct.h> #include <internal/debug.h> #include <tchar.h> -#include <errno.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/isnan.c --- trunk/reactos/lib/crt/float/isnan.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/float/isnan.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -16,9 +16,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <math.h> -#include <float.h> -#include <internal/ieee.h> +#include "precomp.h" /* _____ Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/float.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -91,9 +91,13 @@ #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ -#ifndef __GNUC__ -#define DBL_MAX_10_EXP 308 +#ifndef DBL_MAX_10_EXP +#define DBL_MAX_10_EXP 308 +#endif +#ifndef S_IFIFO #define S_IFIFO -1 +#endif +#ifndef UINT64_MAX #define UINT64_MAX 0xffffffffffffffff #endif _____ Modified: trunk/reactos/lib/crt/include/internal/atexit.h --- trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,6 +2,9 @@ #ifndef __CRT_INTERNAL_ATEXIT_H #define __CRT_INTERNAL_ATEXIT_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif struct __atexit { struct __atexit* __next; _____ Modified: trunk/reactos/lib/crt/include/internal/console.h --- trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@ #ifndef __CRT_INTERNAL_CONSOLE_H #define __CRT_INTERNAL_CONSOLE_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + extern int char_avail; extern int ungot_char; _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -136,13 +136,11 @@ #define MB_CUR_MAX __mb_cur_max -int _isnanl(double x); -int _isinfl(double x); +int _isnanl(long double x); +int _isinfl(long double x); int _isnan(double x); int _isinf(double x); - - /* Flags for the iobuf structure (for reference) */ #if 0 #define _IOREAD 1 /* currently reading */ @@ -150,24 +148,22 @@ #define _IORW 0x0080 /* opened as "r+w" */ #endif +#ifndef W_OK +#define W_OK 2 /* Check for write permission */ +#endif + /* internal FILE->_flag flags */ #define _IOMYBUF 0x0008 /* stdio malloc()'d buffer */ #define _IOEOF 0x0010 /* EOF reached on read */ #define _IOERR 0x0020 /* I/O error from system */ #define _IOSTRG 0x0040 /* Strange or no file descriptor */ - #define _IOBINARY 0x040000 #define _IOTEXT 0x000000 - #define _IOCOMMIT 0x100000 - #define _IODIRTY 0x010000 #define _IOAHEAD 0x020000 - - - /* * The three possible buffering mode (nMode) values for setvbuf. * NOTE: _IOFBF works, but _IOLBF seems to work like unbuffered... @@ -176,12 +172,10 @@ #define _IOFBF 0x0000 /* full buffered */ #define _IOLBF 0x0040 /* line buffered */ #define _IONBF 0x0004 /* not buffered */ - #define _IO_LBF 0x80000 /* this value is used insteat of _IOLBF within the structure FILE as value for _flags, because _IOLBF has the same value as _IOSTRG */ - wint_t _filwbuf(FILE *f); #if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 @@ -189,6 +183,5 @@ int __cdecl _flsbuf (int, FILE*); #endif - #endif /* __dj_include_libc_file_h__ */ _____ Modified: trunk/reactos/lib/crt/include/internal/math.h --- trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,9 @@ - #ifndef __CRT_INTERNAL_MATH_H #define __CRT_INTERNAL_MATH_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif int _isinf (double); /* not exported */ int _isnanl (long double); /* not exported */ _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@ #ifndef __CRT_INTERNAL_TLS_H #define __CRT_INTERNAL_TLS_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + #include <stdarg.h> #include <windef.h> _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/access.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,4 @@ #include "precomp.h" -#include <errno.h> #include <tchar.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/open.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -42,7 +42,6 @@ #include <stdarg.h> #endif -#include <fcntl.h> #include <sys/stat.h> #include <string.h> #include <share.h> _____ Modified: trunk/reactos/lib/crt/math/hypot.c --- trunk/reactos/lib/crt/math/hypot.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/hypot.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -17,10 +17,6 @@ */ #include "precomp.h" -#include <float.h> -#include <math.h> -#include <errno.h> - /* Approximate square roots of DBL_MAX and DBL_MIN. Numbers between these two shouldn't neither overflow nor underflow when squared. */ _____ Modified: trunk/reactos/lib/crt/math/modf.c --- trunk/reactos/lib/crt/math/modf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/modf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,12 +10,8 @@ * ==================================================== */ -#include <float.h> -#include <math.h> -#include <internal/ieee.h> -#include <internal/math.h> +#include "precomp.h" - //static const double one = 1.0; double modf(double __x, double *__i) _____ Modified: trunk/reactos/lib/crt/mbstring/mbscat.c --- trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <string.h> /* _____ Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c --- trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <mbstring.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c --- trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,6 +9,7 @@ * 12/04/99: Created */ +#include "precomp.h" #include <mbstring.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,13 +2,18 @@ #define _CRT_PRECOMP_H /* Some global constants to hack around the msvc build */ +/* These will go away or be moved soon enough */ +#define _CRT_NON_CONFORMING_SWPRINTFS #define _CRT_SECURE_NO_DEPRECATE #define _INC_WTIME_INL #define _INC_UTIME_INL #define _INC_TIME_INL /* Headers to be compiled */ +#include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <conio.h> #include <errno.h> #include <fcntl.h> #include <float.h> @@ -16,6 +21,9 @@ #include <math.h> #include <limits.h> +#include <sys/stat.h> +#include <share.h> + /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> @@ -27,7 +35,10 @@ #endif /* CRT Internal data */ +#include <internal/atexit.h> +#include <internal/console.h> #include <internal/file.h> #include <internal/ieee.h> +#include <internal/tls.h> #endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/crt/process/_system.c --- trunk/reactos/lib/crt/process/_system.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/process/_system.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -13,7 +13,6 @@ #include <stdlib.h> #include <string.h> #include <process.h> -#include <errno.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/signal/signal.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@ #include <signal.h> #include <stdlib.h> -#include <errno.h> #include <string.h> void _default_handler(int signal); _____ Modified: trunk/reactos/lib/crt/stdio/fgetchar.c --- trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -22,7 +22,6 @@ */ #include "precomp.h" -#include <conio.h> int _fgetchar(void) { _____ Modified: trunk/reactos/lib/crt/stdio/gets.c --- trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -83,9 +83,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdio.h> -#include <errno.h> -#include <string.h> +#include "precomp.h" link_warning (gets, "the `gets' function is dangerous and should not be used.") _____ Modified: trunk/reactos/lib/crt/stdio/perror.c --- trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,9 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <errno.h> - - #ifdef perror #undef perror void perror(const char *s); _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,12 +2,6 @@ #include "precomp.h" -int _isnanl(double x); -int _isinfl(double x); -int _isnan(double x); -int _isinf(double x); - - int __vfwprintf(FILE *fp, const wchar_t *fmt0, va_list argp); _____ Modified: trunk/reactos/lib/crt/stdlib/atexit.c --- trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <internal/atexit.h> +#include "precomp.h" void _atexit_cleanup(void) { _____ Modified: trunk/reactos/lib/crt/stdlib/errno.c --- trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,8 +2,6 @@ * */ #include "precomp.h" -#include <internal/tls.h> - #include "doserrmap.h" /* _____ Modified: trunk/reactos/lib/crt/stdlib/makepath.c --- trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,6 @@ /* $Id$ */ +#include "precomp.h" #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/stdlib/splitp.c --- trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,8 +1,5 @@ -#include <stdlib.h> -#include <string.h> -#include <tchar.h> +#include "precomp.h" - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c --- trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,4 +2,6 @@ #define _UNICODE #define UNICODE +#include <tchar.h> + #include "splitp.c" _____ Modified: trunk/reactos/lib/crt/wine/heap.c --- trunk/reactos/lib/crt/wine/heap.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/heap.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -23,7 +23,6 @@ #include "precomp.h" -#include <errno.h> #include <malloc.h> #include <stdlib.h> #include <internal/mtdll.h> _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -26,7 +26,6 @@ #include "precomp.h" #include <wchar.h> -#include <conio.h> #include <ctype.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@ */ #include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h> #include <sys/stat.h> _____ Modified: trunk/reactos/lib/crtdll/precomp.h --- trunk/reactos/lib/crtdll/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@ +#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> #include <windows.h> +#include <internal/tls.h> +#include <stdlib.h> + +#endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@ */ #include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h> #define NDEBUG _____ Modified: trunk/reactos/lib/msvcrt/precomp.h --- trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@ +#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> +#include <internal/tls.h> +#include <stdlib.h> #include <windows.h> + +#endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/rtl/math.c --- trunk/reactos/lib/rtl/math.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/rtl/math.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -31,13 +31,13 @@ double atan (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fpatan" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -45,16 +45,16 @@ */ double ceil (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp; __asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw)); - return __value; + return __val; } /* @@ -62,12 +62,12 @@ */ double cos (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fcos" - : "=t" (__value): "0" (__x)); + : "=t" (__val): "0" (__x)); - return __value; + return __val; } /* @@ -75,12 +75,12 @@ */ double fabs (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fabs" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -88,16 +88,16 @@ */ double floor (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp; __asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw)); - return __value; + return __val; } /* @@ -105,26 +105,26 @@ */ double log (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fldln2\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } double __log2 (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -132,7 +132,7 @@ */ double pow (double __x, double __y) { - register double __value, __exponent; + register double __val, __exponent; long __p = (long) __y; if (__x == 0.0 && __y > 0.0) @@ -165,13 +165,13 @@ "fxch\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; + : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __val += 1.0; __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); + : "=t" (__val) : "0" (__val), "u" (__exponent)); - return __value; + return __val; } /* @@ -179,12 +179,12 @@ */ double sin (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsin" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -192,12 +192,12 @@ */ double sqrt (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsqrt" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -205,11 +205,11 @@ */ double tan (double __x) { - register double __value; - register double __value2 __attribute__ ((unused)); + register double __val; + register double __val2 __attribute__ ((unused)); __asm __volatile__ ("fptan" - : "=t" (__value2), "=u" (__value) : "0" (__x)); + : "=t" (__val2), "=u" (__val) : "0" (__x)); - return __value; + return __val; }

18 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005