Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[fireball] 30938: - Fix incorrect russian translation (thanks tower).
by fireball＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: fireball Date: Sat Dec 1 21:29:42 2007 New Revision: 30938 URL: http://svn.reactos.org/svn/reactos?rev=30938&view=rev Log: - Fix incorrect russian translation (thanks tower). Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/rsrc.rc Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Sat Dec 1 21:29:42 2007 @@ -4,50 +4,60 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "????????? ?????",IDC_STATIC,7,7,228,89 - GROUPBOX "????????? ???????????",IDC_STATIC,7,103,228,65 + GROUPBOX "Íàñòðîéêè âõîäà",IDC_STATIC,7,7,228,89 + GROUPBOX "Íàñòðîéêè ïîäêëþ÷åíèÿ",IDC_STATIC,7,103,228,65 ICON "", IDC_LOGONICON, 15,19,20,20 - LTEXT "??????? ????? ???????",IDC_STATIC,47,24,81,8 - LTEXT "??????:",IDC_STATIC,47,41,25,8 - LTEXT "??? ????????????:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "?????????",IDC_SAVE,67,139,50,14 - PUSHBUTTON "????????? ???...",IDC_SAVEAS,123,139,50,14 - PUSHBUTTON "???????...",IDC_OPEN,177,139,50,14 + LTEXT "Ââåäèòå àäðåñ ñåðâåðà",IDC_STATIC,47,24,81,8 + LTEXT "Ñåðâåð:",IDC_STATIC,47,41,25,8 + LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Îòêðûòü...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "????????? ??????? ????????? ??????????? ??? ??????? ??????????? ????????????",IDC_STATIC,50,115,172,20 + LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "?????? ?????????? ???????? ?????",IDC_STATIC,7,7,228,68 - GROUPBOX "?????",IDC_STATIC,7,83,228,85 + GROUPBOX "Ðàçìåð óäàëåííîãî ðàáî÷åãî ñòîëà",IDC_STATIC,7,7,228,68 + GROUPBOX "Öâåòà",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "?????????? ?????? ?????? ?? ????????? ??????????. ?????????? ???????? ? ??????? ?????? ????????? ??? ???????? ? ????????????? ?????.",IDC_STATIC,53,22,175,21 - CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 - COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 - LTEXT "??????????: ????????? ?????????? ?????????? ?????????? ??? ?????????.",IDC_STATIC,56,143,165,18 - LTEXT "??????",IDC_STATIC,35,52,15,8 - LTEXT "??????",IDC_STATIC,189,51,17,8 + LTEXT "Óñòàíîâèòü ðàçìåð ýêðàíà íà óäàëåííîì êîìïüþòåðå. Ïåðåòàùèòå ïîëçóíîê â êðàéíåå ïðàâîå ïîëîæåíèå äëÿ ïåðåõîäà â ïîëíîýêðàííûé ðåæèì.",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Ïðèìå÷àíèå: Íàñòðîéêè óäàëåííîãî êîìïüþòåðà îïðåäåëÿþò ýòè ïàðàìåòðû.",IDC_STATIC,56,143,165,18 + LTEXT "Ìåíüøå",IDC_STATIC,35,52,15,8 + LTEXT "Áîëüøå",IDC_STATIC,189,51,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??????????? ? ?????????? ???????? ?????" +CAPTION "Ïîäêëþ÷åíèå ê óäàëåííîìó ðàáî÷åìó ñòîëó" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "??????????",IDOK,147,256,50,14 - PUSHBUTTON "??????",IDCANCEL,203,256,50,14 + DEFPUSHBUTTON "Ñîåäèíåíèå",IDOK,147,256,50,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,203,256,50,14 CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 END STRINGTABLE BEGIN - IDS_TAB_GENERAL "?????" - IDS_TAB_DISPLAY "?????" + IDS_TAB_GENERAL "Îáùèå" + IDS_TAB_DISPLAY "Ýêðàí" + IDS_256COLORS "256 Öâåòîâ" + IDS_HIGHCOLOR15 "Ðàçðåøåíèå (15 áèò)" + IDS_HIGHCOLOR16 "Ðàçðåøåíèå (16 áèò)" + IDS_HIGHCOLOR24 "Ðàçðåøåíèå (24 áèò)" + IDS_PIXEL "%lux%lu ïèêñåëåé" + IDS_FULLSCREEN "Ïîëíûé ýêðàí" + IDS_BROWSESERVER "<Óêàçàòü ïóòü...>" + IDS_HEADERTEXT1 "Óäàëåííûé ðàáî÷èé ñòîë" + IDS_HEADERTEXT2 "Ñîåäèíåíèå" END Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Sat Dec 1 21:29:42 2007 @@ -19,5 +19,5 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -//#include "lang/ru-RU.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[winesync] 30937: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: winesync Date: Sat Dec 1 21:29:29 2007 New Revision: 30937 URL: http://svn.reactos.org/svn/reactos?rev=30937&view=rev Log: Autosyncing with Wine HEAD Added: trunk/rostests/winetests/comctl32/bmp128x15.bmp (with props) trunk/rostests/winetests/comctl32/bmp80x15.bmp (with props) trunk/rostests/winetests/comctl32/comctl32_ros.diff (with props) trunk/rostests/winetests/comctl32/datetime.c (with props) trunk/rostests/winetests/comctl32/misc.c (with props) trunk/rostests/winetests/comctl32/msg.c (with props) trunk/rostests/winetests/comctl32/msg.h (with props) trunk/rostests/winetests/comctl32/rebar.c (with props) trunk/rostests/winetests/comctl32/resources.h (with props) trunk/rostests/winetests/comctl32/rsrc.rc (with props) trunk/rostests/winetests/comctl32/status.c (with props) trunk/rostests/winetests/comctl32/trackbar.c (with props) Removed: trunk/rostests/winetests/comctl32/propsheet.rc Modified: trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/comctl32.rbuild trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comctl32/progress.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/subclass.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/testlist.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/comctl32/bmp128x15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/bmp128… Added: trunk/rostests/winetests/comctl32/bmp80x15.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/bmp80x… Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… Modified: trunk/rostests/winetests/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… Added: trunk/rostests/winetests/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… Added: trunk/rostests/winetests/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dateti… Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… Added: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… Added: trunk/rostests/winetests/comctl32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.c?… Added: trunk/rostests/winetests/comctl32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.h?… Modified: trunk/rostests/winetests/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/progre… Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… Removed: trunk/rostests/winetests/comctl32/propsheet.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… Added: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… Added: trunk/rostests/winetests/comctl32/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/resour… Added: trunk/rostests/winetests/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rsrc.r… Added: trunk/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status… Modified: trunk/rostests/winetests/comctl32/subclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/subcla… Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… Modified: trunk/rostests/winetests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/testli… Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… Added: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… Modified: trunk/rostests/winetests/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/updown…

1 0

[winesync] 30936: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: winesync Date: Sat Dec 1 21:28:50 2007 New Revision: 30936 URL: http://svn.reactos.org/svn/reactos?rev=30936&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp (with props) trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp (with props) trunk/reactos/dll/win32/comctl32/idb_std_large.bmp (with props) trunk/reactos/dll/win32/comctl32/idb_std_small.bmp (with props) trunk/reactos/dll/win32/comctl32/idb_view_large.bmp (with props) trunk/reactos/dll/win32/comctl32/idb_view_small.bmp (with props) trunk/reactos/dll/win32/comctl32/idc_copy.cur (with props) trunk/reactos/dll/win32/comctl32/idc_divider.cur (with props) trunk/reactos/dll/win32/comctl32/idc_divideropen.cur (with props) trunk/reactos/dll/win32/comctl32/idc_movebutton.cur (with props) trunk/reactos/dll/win32/comctl32/idi_dragarrow.ico (with props) trunk/reactos/dll/win32/comctl32/idi_tt_error_sm.ico (with props) trunk/reactos/dll/win32/comctl32/idi_tt_info_sm.ico (with props) trunk/reactos/dll/win32/comctl32/idi_tt_warn_sm.ico (with props) trunk/reactos/dll/win32/comctl32/idt_check.bmp (with props) Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/theme_dialog.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.… Added: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Added: trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Added: trunk/reactos/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Added: trunk/reactos/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Added: trunk/reactos/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Added: trunk/reactos/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Added: trunk/reactos/dll/win32/comctl32/idc_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_cop… Added: trunk/reactos/dll/win32/comctl32/idc_divider.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… Added: trunk/reactos/dll/win32/comctl32/idc_divideropen.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… Added: trunk/reactos/dll/win32/comctl32/idc_movebutton.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_mov… Added: trunk/reactos/dll/win32/comctl32/idi_dragarrow.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_dra… Added: trunk/reactos/dll/win32/comctl32/idi_tt_error_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… Added: trunk/reactos/dll/win32/comctl32/idi_tt_info_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… Added: trunk/reactos/dll/win32/comctl32/idi_tt_warn_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… Added: trunk/reactos/dll/win32/comctl32/idt_check.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idt_che… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c… Modified: trunk/reactos/dll/win32/comctl32/theme_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_d… Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e… Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_l… Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.…

1 0

[peterw] 30935: - Updated the readme and removed the txt version of it. - Updated the license file to include the GPL/LGPL v3.
by peterw＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: peterw Date: Sat Dec 1 21:25:07 2007 New Revision: 30935 URL: http://svn.reactos.org/svn/reactos?rev=30935&view=rev Log: - Updated the readme and removed the txt version of it. - Updated the license file to include the GPL/LGPL v3. Removed: trunk/tools/RosBE/RosBE-Windows/Root/README.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Dec 1 21:25:07 2007 @@ -55,6 +55,11 @@ set TARGET_CPP=g++ ) ) + +:: +:: Check if the user has chosen to use a different object or output path +:: and set it accordingly. +:: if defined _ROSBE_OBJPATH ( if not exist "%_ROSBE_OBJPATH%\." ( echo ERROR: The path specified doesn't seem to exist. @@ -72,6 +77,7 @@ set ROS_TEMPORARY=%_ROSBE_OUTPATH% ) ) + :: :: Get the current date and time for use in in our build log's file name. :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt Sat Dec 1 21:25:07 2007 @@ -1,15 +1,22 @@ -ReactOS Build Environment v1.0 +ReactOS Build Environment v1.1 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. -(The complete text for each license is included in this document) +(The complete text for each license is included in this document excluding Subversion) - The ReactOS Build Environment installer and any accompanying data are licensed under the GPLv2. -- MinGW is licensed under the GPLv2 with parts licensed under the LGPLv2.1. +- MinGW is licensed under the GPLv2, LGPLv2.1. + +- GCC is licensed under the GPLv2. + +- Binutils is licensed under the GPLv2, LGPLv2, GPLv3, LGPLv3. + +- GDB is licensed under the GPLv3. - NASM is licensed under the LGPLv2.1. -- svn is licensed under the Apache/BSD-style open source license. +- Subversion is licensed under various licenses. + (installed to INSTALLDIR\Tools\licences\*) *** The complete text of the GNU GENERAL PUBLIC LICENSE v2 @@ -354,19 +361,695 @@ library. If this is what you want to do, use the GNU Library General Public License instead of this License. -*** The complete text of the GNU LESSER GENERAL PUBLIC LICENSE v2.1 - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*** The complete text of the GNU GENERAL PUBLIC LICENSE v3 + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 3 of the License, or + (at your option) any later version. + + This 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. + +*** The complete text of the GNU LIBRARY GENERAL PUBLIC LICENSE v2 + + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] Preamble @@ -375,109 +1058,97 @@ Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the library. - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -626,7 +1297,7 @@ Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - 6. As an exception to the Sections above, you may also combine or + 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -653,31 +1324,23 @@ Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at + b) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - d) If distribution of the work is made by offering access to copy + c) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - e) Verify that the user has already received a copy of these + d) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -726,7 +1389,7 @@ original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with +You are not responsible for enforcing compliance by third parties to this License. 11. If, as a consequence of a court judgment or allegation of patent @@ -769,7 +1432,7 @@ written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. +versions of the Library General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -815,7 +1478,7 @@ END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Libraries + Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -832,18 +1495,19 @@ Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA Also add information on how to contact you by electronic and paper mail. @@ -859,18 +1523,19 @@ That's all there is to it! -*** The complete text of the GNU LIBRARY GENERAL PUBLIC LICENSE v2 - - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*** The complete text of the GNU LESSER GENERAL PUBLIC LICENSE v2.1 + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] Preamble @@ -879,97 +1544,109 @@ Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -1118,7 +1795,7 @@ Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - 6. As an exception to the Sections above, you may also compile or + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -1145,23 +1822,31 @@ Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Accompany the work with a written offer, valid for at + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - c) If distribution of the work is made by offering access to copy + d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - d) Verify that the user has already received a copy of these + e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -1210,7 +1895,7 @@ original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent @@ -1253,7 +1938,7 @@ written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. +versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -1299,7 +1984,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -1316,19 +2001,18 @@ Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA + 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 Also add information on how to contact you by electronic and paper mail. @@ -1343,3 +2027,171 @@ Ty Coon, President of Vice That's all there is to it! + +*** The complete text of the GNU LESSER GENERAL PUBLIC LICENSE v3 + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Removed: trunk/tools/RosBE/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/README.txt (removed) @@ -1,47 +1,0 @@ -ReactOS Build Environment 1.0 - - -The ReactOS Build Environment v1.0 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. - -While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. - -To build ReactOS with the ReactOS Build Environment you run "GCC 4.1.3 ReactOS Build Environment" from the start -menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information -about their use) or you can build as you normally would using the standard MinGW/RBuild commands. - -The ReactOS Build Environment v1.0 contains the following packages: - -binutils-2.18.50-20071015 - patched with: - - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch -mingw-runtime-3.13 -w32api-3.10 -mingw32-make-3.81-2 -nasm-0.99.06-win32 -mingw-4.1.3-20071015-prerelease - patched with: - - GCC-v4.1-r129382-prerelease-w3seek.patch - - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch - - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch - -Websites: - -MinGW - Minimalist GNU for Windows -http://www.mingw.org - -GCC, the GNU Compiler Collection -http://www.gcc.org - -NASM, the Netwide Assembler -http://www.kernel.org/pub/software/devel/nasm -http://nasm.sourceforge.net - -NSIS (Nullsoft Scriptable Install System) -http://nsis.sourceforge.net - -Subversion Client -http://subversion.tigris.org - -Inspired by blight's ReactOS Build Environment v0.2-3.4.5 -Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org) -Icon made by ROSFan Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Dec 1 21:25:07 2007 @@ -104,12 +104,11 @@ SetOverwrite try File /r Icons\mingw.ico File /r Icons\rosbe.ico - File /r Root\readme.pdf + File /r Root\README.pdf File /r Root\RosBE.mac File /r Root\changelog.txt File /r Root\LICENSE.txt File /r Root\MinGW.cmd - File /r Root\README.txt File /r Root\Build.cmd File /r Root\Clean.cmd File /r Root\Help.cmd @@ -231,7 +230,7 @@ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\readme.pdf" + "$INSTDIR\README.pdf" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -307,7 +306,7 @@ Delete /REBOOTOK "$INSTDIR\scut.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\readme.pdf" + Delete /REBOOTOK "$INSTDIR\README.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" @@ -315,7 +314,6 @@ Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Delete /REBOOTOK "$INSTDIR\MinGW.cmd" Delete /REBOOTOK "$INSTDIR\mingw.ico" - Delete /REBOOTOK "$INSTDIR\README.txt" Delete /REBOOTOK "$INSTDIR\srclist.txt" Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"

1 0

[janderwald] 30934: - implemented adding programs to new open list - implemented assigning default file association - options still if'0
by janderwald＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: janderwald Date: Sat Dec 1 20:58:01 2007 New Revision: 30934 URL: http://svn.reactos.org/svn/reactos?rev=30934&view=rev Log: - implemented adding programs to new open list - implemented assigning default file association - options still if'0 Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Sat Dec 1 20:58:01 2007 @@ -329,6 +329,265 @@ } } +BOOL HideApplicationFromList(WCHAR * pFileName) +{ + WCHAR szBuffer[100]; + DWORD dwSize; + + wcscpy(szBuffer, L"Applications\\"); + wcscat(szBuffer, pFileName); + + if (RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, L"NoOpenWith", RRF_RT_REG_SZ, NULL, NULL, &dwSize) == ERROR_SUCCESS) + return TRUE; + else + return FALSE; +} + +BOOL WriteStaticShellExtensionKey(HKEY hRootKey, WCHAR * pVerb, WCHAR *pFullPath) +{ + HKEY hShell; + HKEY hVerb; + HKEY hCmd; + LONG result; + + if (RegCreateKeyExW(hRootKey, L"shell", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hShell, NULL) != ERROR_SUCCESS) + { + return FALSE; + } + + result = RegCreateKeyExW(hShell, pVerb, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hVerb, NULL); + RegCloseKey(hShell); + if (result != ERROR_SUCCESS) + { + return FALSE; + } + + result = RegCreateKeyExW(hVerb, L"command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hCmd, NULL); + RegCloseKey(hVerb); + if(result != ERROR_SUCCESS) + { + return FALSE; + } + + result = RegSetValueExW(hCmd, NULL, 0, REG_SZ, (const BYTE*)pFullPath, (strlenW(pFullPath)+1)* sizeof(WCHAR)); + RegCloseKey(hCmd); + if (result == ERROR_SUCCESS) + return TRUE; + else + return FALSE; +} + +BOOL StoreApplicationsPathForUser(WCHAR *pFileName, WCHAR* pFullPath) +{ + HKEY hKey; + HKEY hRootKey; + LONG result; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Classes\\Applications", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hRootKey, NULL) != ERROR_SUCCESS) + { + ERR("Error: failed to open HKCU\\Software\\Classes\\Applications key\n"); + return FALSE; + } + + if (RegCreateKeyExW(hRootKey, pFileName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + { + ERR("Error: failed to create HKCR\\Software\\Classes\\Applications\\%s key\n", debugstr_w(pFileName)); + RegCloseKey(hRootKey); + return FALSE; + } + RegCloseKey(hKey); + RegCloseKey(hRootKey); + + result = WriteStaticShellExtensionKey(hKey, L"open", pFullPath); + RegCloseKey(hKey); + + return (BOOL)result; +} +BOOL StoreNewSettings(WCHAR * pExt, WCHAR * pFileName, WCHAR * pFullPath) +{ + WCHAR szBuffer[70]; + WCHAR szVal[100]; + DWORD dwVal; + HKEY hRootKey; + HKEY hKey; + DWORD dwDisposition; + LONG result; + DWORD dwBuffer; + DWORD dwIndex; + DWORD dwMask; + WCHAR CurChar[2]; + + wcscpy(szBuffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\"); + wcscat(szBuffer, pExt); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, + szBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_QUERY_VALUE, + NULL, + &hRootKey, + NULL) != ERROR_SUCCESS) + { + ERR("Error: failed to create/open %s\n", szBuffer); + return FALSE; + } + + if (RegCreateKeyExW(hRootKey, + L"OpenWithList", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_QUERY_VALUE, + NULL, + &hKey, + &dwDisposition) != ERROR_SUCCESS) + { + ERR("Error: failed to create/open key dwDisposition %x\n", dwDisposition); + RegCloseKey(hRootKey); + return FALSE; + } + + RegCloseKey(hRootKey); + + if (dwDisposition & REG_CREATED_NEW_KEY) + { + result = RegSetValueExW(hKey, L"a", 0, REG_SZ, (const BYTE*)pFileName, (strlenW(pFileName)+1) * sizeof(WCHAR)); + + if (result != ERROR_SUCCESS) + { + ERR("Error: failed to set value\n"); + RegCloseKey(hKey); + return FALSE; + } + + result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)L"a", 2 * sizeof(WCHAR)); + RegCloseKey(hKey); + if (result == ERROR_SUCCESS) + return TRUE; + else + return FALSE; + } + + dwBuffer = sizeof(szBuffer); + result = RegGetValueW(hKey, NULL, L"MRUList", RRF_RT_REG_SZ, NULL, szBuffer, &dwBuffer); + if (result != ERROR_SUCCESS) + { + /* FIXME + * recreate info + */ + ERR("Failed to get value of MRUList\n"); + RegCloseKey(hKey); + return FALSE; + } + dwMask = 0; + CurChar[1] = 0; + dwBuffer = (dwBuffer / sizeof(WCHAR)); + for(dwIndex = 0; dwIndex < dwBuffer - 1; dwIndex++) + { + CurChar[0] = szBuffer[dwIndex]; + dwMask |= (1 << (CurChar[0] - L'a')); + + dwVal = sizeof(szVal); + if (RegGetValueW(hKey, NULL, CurChar, RRF_RT_REG_SZ, NULL, szVal, &dwVal) == ERROR_SUCCESS) + { + if (!wcsicmp(szVal, pFileName)) + { + memmove(&szBuffer[0], &szBuffer[1], dwIndex * sizeof(WCHAR)); + szBuffer[0] = CurChar[0]; + result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)szBuffer, dwBuffer * sizeof(WCHAR)); + RegCloseKey(hKey); + if (result == ERROR_SUCCESS) + return TRUE; + else + return FALSE; + } + } + } + + dwIndex = 0; + while(dwMask & (1 << dwIndex)) + dwIndex++; + + if (dwIndex >= sizeof(DWORD) * 8) + { + /* more than 32 progs in list */ + TRACE("no entry index available\n"); + RegCloseKey(hKey); + return FALSE; + } + + CurChar[0] = L'a' + dwIndex; + result = RegSetValueExW(hKey, CurChar, 0, REG_SZ, (const BYTE*)pFileName, (strlenW(pFileName) + 1) * sizeof(WCHAR)); + if (result == ERROR_SUCCESS) + { + memmove(&szBuffer[0], &szBuffer[1], dwBuffer * sizeof(WCHAR)); + szBuffer[0] = CurChar[0]; + result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)szBuffer, dwBuffer * sizeof(WCHAR)); + if (result == ERROR_SUCCESS) + { + StoreApplicationsPathForUser(pFileName, pFullPath); + } + } + + RegCloseKey(hKey); + + if (result == ERROR_SUCCESS) + return TRUE; + else + return FALSE; +} +BOOL +SetProgrammAsDefaultHandler(WCHAR *pFileExt, WCHAR* pFullPath) +{ + HKEY hExtKey; + HKEY hProgKey; + DWORD dwDisposition; + WCHAR szBuffer[20]; + DWORD dwSize; + BOOL result; + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pFileExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hExtKey, &dwDisposition) != ERROR_SUCCESS) + { + ERR("Error: failed to create HKCR\\%s key\n", debugstr_w(pFileExt)); + return FALSE; + } + + if (dwDisposition & REG_CREATED_NEW_KEY) + { + wcscpy(szBuffer, &pFileExt[1]); + wcscat(szBuffer, L"_auto_file"); + } + else + { + dwSize = sizeof(szBuffer); + if (!RegGetValueW(hExtKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szBuffer, &dwSize)) + { + ERR("Error: failed to retrieve subkey\n"); + RegCloseKey(hExtKey); + return FALSE; + } + } + + RegCloseKey(hExtKey); + TRACE("progkey %s\n", debugstr_w(szBuffer)); + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hProgKey, &dwDisposition) != ERROR_SUCCESS) + { + ERR("Error: failed to set progid key %s\n", debugstr_w(szBuffer)); + return FALSE; + } + + /* FIXME + * Should copy all verbs from HKCR\Classes\Applications\foo.exe\shell\* + */ + + result = WriteStaticShellExtensionKey(hProgKey, L"open", pFullPath); + RegCloseKey(hProgKey); + + return result; +} + static BOOL CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -337,8 +596,9 @@ LPFNOFN ofnProc; WCHAR szBuffer[MAX_PATH + 30] = { 0 }; WCHAR szPath[MAX_PATH * 2 +1] = { 0 }; + WCHAR * pExt; int res; - LVITEM lvItem; + LVITEMW lvItem; STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -395,22 +655,39 @@ This->iSelItem = 0; return TRUE; case 14005: /* ok */ - ZeroMemory(&lvItem, sizeof(LVITEM)); - lvItem.mask = LVIF_PARAM; + ZeroMemory(&lvItem, sizeof(LVITEMW)); + + lvItem.mask = LVIF_PARAM | LVIF_TEXT; lvItem.iItem = This->iSelItem; - - if (!ListView_GetItem(GetDlgItem(hwndDlg, 14002), &lvItem)) + lvItem.pszText = szBuffer; + if (!ListView_GetItemW(GetDlgItem(hwndDlg, 14002), &lvItem)) { ERR("Failed to get item index %d\n", This->iSelItem); DestroyWindow(hwndDlg); return FALSE; } - + pExt = wcsrchr(szBuffer, L'.'); + + if (!HideApplicationFromList(szBuffer)) + { +#if 0 + if (!StoreNewSettings(pExt, szBuffer, (WCHAR*)lvItem.lParam)) + { + /* failed to store setting */ + WARN("Error: failed to store settings for app %s\n", debugstr_w(szBuffer)); + } +#endif + } + if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) { - /* FIXME - * give selected program default invokation rights - */ +#if 0 + if (!SetProgrammAsDefaultHandler(pExt, (WCHAR*)lvItem.lParam)) + { + /* failed to associate programm */ + WARN("Error: failed to associate programm\n"); + } +#endif } ZeroMemory(&si, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); @@ -418,7 +695,7 @@ wcscat(szPath, L" "); wcscat(szPath, This->szPath); - //TRACE("exe: %s path %s\n", debugstr_w((WCHAR*)lvItem.lParam), debugstr_w(This->szPath)); + TRACE("exe: %s path %s\n", debugstr_w((WCHAR*)lvItem.lParam), debugstr_w(This->szPath)); if (CreateProcessW(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { CloseHandle(pi.hThread);

1 0

[hpoussin] 30933: Create required reg keys if needed
by hpoussin＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: hpoussin Date: Sat Dec 1 19:49:22 2007 New Revision: 30933 URL: http://svn.reactos.org/svn/reactos?rev=30933&view=rev Log: Create required reg keys if needed Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sat Dec 1 19:49:22 2007 @@ -3221,7 +3221,9 @@ static NTSTATUS INIT_FUNCTION IopUpdateRootKey(VOID) { - UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum\\Root"); + UNICODE_STRING ControlSetU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"Enum"); + UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root"); UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING DeviceDescU = RTL_CONSTANT_STRING(L"DeviceDesc"); UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); @@ -3231,17 +3233,30 @@ UNICODE_STRING HalAcpiDeviceDesc = RTL_CONSTANT_STRING(L"HAL ACPI"); UNICODE_STRING HalAcpiHardwareID = RTL_CONSTANT_STRING(L"*PNP0C08\0"); OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; + HANDLE hControlSet, hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - /* We are probably in 1st stage */ - return STATUS_SUCCESS; - } - else if (!NT_SUCCESS(Status)) + InitializeObjectAttributes(&ObjectAttributes, &ControlSetU, OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwCreateKey(&hControlSet, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); + return Status; + } + + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE, hControlSet, NULL); + Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + ZwClose(hControlSet); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); + return Status; + } + + InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE, hEnum, NULL); + Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + ZwClose(hEnum); + if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); return Status;

1 0

[fireball] 30932: - Sync with Wine.
by fireball＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: fireball Date: Sat Dec 1 18:56:03 2007 New Revision: 30932 URL: http://svn.reactos.org/svn/reactos?rev=30932&view=rev Log: - Sync with Wine. Modified: trunk/reactos/tools/wmc/lang.c trunk/reactos/tools/wmc/lang.h trunk/reactos/tools/wmc/mcl.c trunk/reactos/tools/wmc/mcy.tab.c trunk/reactos/tools/wmc/mcy.tab.h trunk/reactos/tools/wmc/mcy.y trunk/reactos/tools/wmc/utils.c trunk/reactos/tools/wmc/utils.h trunk/reactos/tools/wmc/wmc.c trunk/reactos/tools/wmc/wmc.h trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wmc/write.c trunk/reactos/tools/wmc/write.h Modified: trunk/reactos/tools/wmc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/lang.c?rev=30932… ============================================================================== --- trunk/reactos/tools/wmc/lang.c (original) +++ trunk/reactos/tools/wmc/lang.c Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdio.h> #include <stdlib.h> @@ -33,7 +33,47 @@ */ static const language_t languages[] = { - {0x0000, 437, 1252, "Neutral", "Neutral"}, + {0x0000, 437, 1252, "Neutral", NULL}, + {0x0002, 866, 1251, "Bulgarian", NULL}, + {0x0003, 850, 1252, "Catalan", NULL}, + {0x0005, 852, 1250, "Czech", NULL}, + {0x0006, 850, 1252, "Danish", NULL}, + {0x0007, 850, 1252, "German", NULL}, + {0x0008, 737, 1253, "Greek", NULL}, + {0x0009, 437, 1252, "English", NULL}, + {0x000A, 850, 1252, "Spanish - Traditional Sort", NULL}, + {0x000B, 850, 1252, "Finnish", NULL}, + {0x000C, 850, 1252, "French", NULL}, + {0x000E, 852, 1250, "Hungarian", NULL}, + {0x000F, 850, 1252, "Icelandic", NULL}, + {0x0010, 850, 1252, "Italian", NULL}, + {0x0011, 932, 932, "Japanese", NULL}, + {0x0012, 949, 949, "Korean", NULL}, + {0x0013, 850, 1252, "Dutch", NULL}, + {0x0014, 850, 1252, "Norwegian (Bokmål)", NULL}, + {0x0015, 852, 1250, "Polish", NULL}, + {0x0016, 850, 1252, "Portuguese", NULL}, + {0x0018, 852, 1250, "Romanian", NULL}, + {0x0019, 866, 1251, "Russian", NULL}, + {0x001A, 852, 1250, "Serbian", NULL}, + {0x001B, 852, 1250, "Slovak", NULL}, + {0x001C, 852, 1250, "Albanian", NULL}, + {0x001D, 850, 1252, "Swedish", NULL}, + {0x001F, 857, 1254, "Turkish", NULL}, + {0x0021, 850, 1252, "Indonesian", NULL}, + {0x0022, 866, 1251, "Ukrainian", NULL}, + {0x0023, 866, 1251, "Belarusian", NULL}, + {0x0024, 852, 1250, "Slovene", NULL}, + {0x0025, 775, 1257, "Estonian", NULL}, + {0x0026, 775, 1257, "Latvian", NULL}, + {0x0027, 775, 1257, "Lithuanian", NULL}, + {0x002A,1258, 1258, "Vietnamese", NULL}, + {0x002D, 850, 1252, "Basque", NULL}, + {0x002F, 866, 1251, "Macedonian", NULL}, + {0x0036, 850, 1252, "Afrikaans", NULL}, + {0x0038, 852, 1252, "Faroese", NULL}, + {0x003C, 437, 1252, "Irish", NULL}, + {0x003E, 850, 1252, "Malay", NULL}, {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, {0x0403, 850, 1252, "Catalan", "Spain"}, {0x0405, 852, 1250, "Czech", "Czech Republic"}, @@ -67,11 +107,11 @@ {0x0425, 775, 1257, "Estonian", "Estonia"}, {0x0426, 775, 1257, "Latvian", "Latvia"}, {0x0427, 775, 1257, "Lithuanian", "Lithuania"}, -/* {0x042A, ?, ?, "Vietnamese", "Vietnam"},*/ + {0x042A,1258, 1258, "Vietnamese", "Vietnam"}, {0x042D, 850, 1252, "Basque", "Spain"}, {0x042F, 866, 1251, "Macedonian", "Former Yugoslav Republic of Macedonia"}, {0x0436, 850, 1252, "Afrikaans", "South Africa"}, -/* {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, FIXME: Not sure about codepages */ + {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, {0x043C, 437, 1252, "Irish", "Ireland"}, {0x043E, 850, 1252, "Malay", "Malaysia"}, /* {0x048F, ?, ?, "Esperanto", "<none>"},*/ @@ -84,7 +124,7 @@ {0x0813, 850, 1252, "Dutch", "Belgium"}, {0x0814, 850, 1252, "Norwegian (Nynorsk)", "Norway"}, {0x0816, 850, 1252, "Portuguese", "Portugal"}, -/* {0x081A, ?, ?, "Serbian (latin)", "Yugoslavia"},*/ + {0x081A, 852, 1250, "Serbian (latin)", "Yugoslavia"}, {0x081D, 850, 1252, "Swedish (Finland)", "Finland"}, {0x0C07, 850, 1252, "German", "Austria"}, {0x0C09, 850, 1252, "English", "Australia"}, @@ -135,7 +175,7 @@ languages[i].doscp, languages[i].wincp, languages[i].name, - languages[i].country); + languages[i].country ? languages[i].country : "Neutral"); } static int langcmp(const void *p1, const void *p2) Modified: trunk/reactos/tools/wmc/lang.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/lang.h?rev=30932… ============================================================================== --- trunk/reactos/tools/wmc/lang.h (original) +++ trunk/reactos/tools/wmc/lang.h Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WMC_LANG_H Modified: trunk/reactos/tools/wmc/mcl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/mcl.c?rev=30932&… ============================================================================== --- trunk/reactos/tools/wmc/mcl.c (original) +++ trunk/reactos/tools/wmc/mcl.c Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -74,25 +74,25 @@ * The 'Codepages' keyword is a wmc extension. */ -static WCHAR ustr_application[] = { 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 0 }; -static WCHAR ustr_codepages[] = { 'C', 'o', 'd', 'e', 'p', 'a', 'g', 'e', 's', 0 }; -static WCHAR ustr_english[] = { 'E', 'n', 'g', 'l', 'i', 's', 'h', 0 }; -static WCHAR ustr_error[] = { 'E', 'r', 'r', 'o', 'r', 0 }; -static WCHAR ustr_facility[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 0 }; -static WCHAR ustr_facilitynames[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; -static WCHAR ustr_informational[] = { 'I', 'n', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 'a', 'l', 0 }; -static WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0}; -static WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; -static WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; -static WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; -static WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; -static WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; -static WCHAR ustr_severitynames[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; -static WCHAR ustr_success[] = { 'S', 'u', 'c', 'c', 'e', 's', 's', 0 }; -static WCHAR ustr_symbolicname[] = { 'S', 'y', 'm', 'b', 'o', 'l', 'i', 'c', 'N', 'a', 'm', 'e', 0 }; -static WCHAR ustr_system[] = { 'S', 'y', 's', 't', 'e', 'm', 0 }; -static WCHAR ustr_warning[] = { 'W', 'a', 'r', 'n', 'i', 'n', 'g', 0 }; -static WCHAR ustr_msg00001[] = { 'm', 's', 'g', '0', '0', '0', '0', '1', 0 }; +static const WCHAR ustr_application[] = { 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 0 }; +static const WCHAR ustr_codepages[] = { 'C', 'o', 'd', 'e', 'p', 'a', 'g', 'e', 's', 0 }; +static const WCHAR ustr_english[] = { 'E', 'n', 'g', 'l', 'i', 's', 'h', 0 }; +static const WCHAR ustr_error[] = { 'E', 'r', 'r', 'o', 'r', 0 }; +static const WCHAR ustr_facility[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 0 }; +static const WCHAR ustr_facilitynames[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; +static const WCHAR ustr_informational[] = { 'I', 'n', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 'a', 'l', 0 }; +static const WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0}; +static const WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; +static const WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; +static const WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static const WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; +static const WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; +static const WCHAR ustr_severitynames[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; +static const WCHAR ustr_success[] = { 'S', 'u', 'c', 'c', 'e', 's', 's', 0 }; +static const WCHAR ustr_symbolicname[] = { 'S', 'y', 'm', 'b', 'o', 'l', 'i', 'c', 'N', 'a', 'm', 'e', 0 }; +static const WCHAR ustr_system[] = { 'S', 'y', 's', 't', 'e', 'm', 0 }; +static const WCHAR ustr_warning[] = { 'W', 'a', 'r', 'n', 'i', 'n', 'g', 0 }; +static const WCHAR ustr_msg00001[] = { 'm', 's', 'g', '0', '0', '0', '0', '1', 0 }; /* * This table is to beat any form of "expression building" to check for * correct filename characters. It is also used for ident checks. @@ -156,7 +156,7 @@ codepage = cp; codepage_def = find_codepage(codepage); if(!codepage_def) - xyyerror("Codepage %d not found; cannot process", codepage); + xyyerror("Codepage %d not found; cannot process\n", codepage); } /* @@ -187,7 +187,7 @@ if(!inputbuffer) { - inputbuffer = xmalloc(INPUTBUFFER_SIZE); + inputbuffer = xmalloc(INPUTBUFFER_SIZE*sizeof(WCHAR)); xlatebuffer = xmalloc(INPUTBUFFER_SIZE); } @@ -203,7 +203,7 @@ assert(codepage_def != NULL); n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) - internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)", n); + internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) goto try_again; /* Should not hapen */ n--; /* Strip added conversion '\0' from input length */ @@ -224,7 +224,7 @@ if(!n && ferror(yyin)) xyyerror(err_fatalread); else - xyyerror("Fatal: file to short to determine byteorder (should never happen)"); + xyyerror("Fatal: file to short to determine byteorder (should never happen)\n"); } if(isisochar(inputbuffer[0]) && isisochar(inputbuffer[1]) && @@ -249,7 +249,7 @@ #endif } else - xyyerror("Fatal: cannot determine file's byteorder"); + xyyerror("Fatal: cannot determine file's byteorder\n"); /* FIXME: * Determine the file-endian with the leader-bytes * "FF FE..."; can't remember the exact sequence. @@ -302,7 +302,7 @@ if(!n) { - yywarning("Re-read line (input was or converted to zilch)"); + mcy_warning("Re-read line (input was or converted to zilch)\n"); goto try_again; /* Should not happen, but could be due to stdin reading and a signal */ } @@ -458,7 +458,7 @@ while(1) { if(!isisochar(ch)) - xyyerror("Invalid digit"); + xyyerror("Invalid digit\n"); switch(state) { @@ -472,7 +472,7 @@ state = 4; } else - internal_error(__FILE__, __LINE__, "Non-digit in first number-scanner state"); + internal_error(__FILE__, __LINE__, "Non-digit in first number-scanner state\n"); break; case 1: if(ch == 'x' || ch == 'X') @@ -486,11 +486,11 @@ state = 3; } else if(isalpha(ch) || ch == '_') - xyyerror("Invalid number digit"); + xyyerror("Invalid number digit\n"); else { unget_unichar(ch); - yylval.num = 0; + mcy_lval.num = 0; return tNUMBER; } break; @@ -498,7 +498,7 @@ if(isxdigit(ch)) push_char(ch); else if(isalpha(ch) || ch == '_' || !isxdigit(tos_char_stack())) - xyyerror("Invalid hex digit"); + xyyerror("Invalid hex digit\n"); else { base = 16; @@ -509,7 +509,7 @@ if(ch >= '0' && ch <= '7') push_char(ch); else if(isalnum(ch) || ch == '_') - xyyerror("Invalid octal digit"); + xyyerror("Invalid octal digit\n"); else { base = 8; @@ -520,7 +520,7 @@ if(isdigit(ch)) push_char(ch); else if(isalnum(ch) || ch == '_') - xyyerror("Invalid decimal digit"); + xyyerror("Invalid decimal digit\n"); else { base = 10; @@ -528,14 +528,14 @@ } break; default: - internal_error(__FILE__, __LINE__, "Invalid state in number-scanner"); + internal_error(__FILE__, __LINE__, "Invalid state in number-scanner\n"); } ch = get_unichar(); } finish: unget_unichar(ch); push_char(0); - yylval.num = strtoul(get_char_stack(), NULL, base); + mcy_lval.num = strtoul(get_char_stack(), NULL, base); return tNUMBER; } @@ -586,7 +586,7 @@ * The scanner * */ -int yylex(void) +int mcy_lex(void) { static const WCHAR ustr_dot1[] = { '.', '\n', 0 }; static const WCHAR ustr_dot2[] = { '.', '\r', '\n', 0 }; @@ -626,7 +626,7 @@ while((ch = get_unichar()) != '\n') { if(ch == EOF) - xyyerror("Unexpected EOF"); + xyyerror("Unexpected EOF\n"); push_unichar(ch); } newline(); @@ -639,7 +639,7 @@ set_codepage(WMC_DEFAULT_CODEPAGE); return tMSGEND; } - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tLINE; } @@ -677,7 +677,7 @@ unget_unichar(ch); push_unichar(0); want_file = 0; - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tFILE; } @@ -693,7 +693,7 @@ push_unichar(0); if(!(tok = lookup_token(get_unichar_stack()))) { - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tIDENT; } switch(tok->type) @@ -706,11 +706,11 @@ /* Fall through */ case tok_severity: case tok_facility: - yylval.tok = tok; + mcy_lval.tok = tok; return tTOKEN; default: - internal_error(__FILE__, __LINE__, "Invalid token type encountered"); + internal_error(__FILE__, __LINE__, "Invalid token type encountered\n"); } } @@ -738,10 +738,10 @@ newline(); push_unichar(ch); /* Include the newline */ push_unichar(0); - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tCOMMENT; default: - xyyerror("Invalid character '%c' (0x%04x)", isisochar(ch) && isprint(ch) ? ch : '.', ch); + xyyerror("Invalid character '%c' (0x%04x)\n", isisochar(ch) && isprint(ch) ? ch : '.', ch); } } } Modified: trunk/reactos/tools/wmc/mcy.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/mcy.tab.c?rev=30… ============================================================================== --- trunk/reactos/tools/wmc/mcy.tab.c (original) +++ trunk/reactos/tools/wmc/mcy.tab.c Sat Dec 1 18:56:03 2007 @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 2.1. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 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 @@ -15,8 +15,8 @@ You 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,6 +36,9 @@ /* Identify Bison output. */ #define YYBISON 1 +/* Bison version. */ +#define YYBISON_VERSION "2.1" + /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -45,6 +48,14 @@ /* Using locations. */ #define YYLSP_NEEDED 0 +/* Substitute the variable and function names. */ +#define yyparse mcy_parse +#define yylex mcy_lex +#define yyerror mcy_error +#define yylval mcy_lval +#define yychar mcy_char +#define yydebug mcy_debug +#define yynerrs mcy_nerrs /* Tokens. */ @@ -74,6 +85,7 @@ tTOKEN = 276 }; #endif +/* Tokens. */ #define tSEVNAMES 258 #define tFACNAMES 259 #define tLANNAMES 260 @@ -160,7 +172,7 @@ /* Enabling traces. */ #ifndef YYDEBUG -# define YYDEBUG 1 +# define YYDEBUG 0 #endif /* Enabling verbose error messages. */ @@ -171,8 +183,13 @@ # define YYERROR_VERBOSE 0 #endif +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 99 "tools/wmc/mcy.y" +#line 98 "tools/wmc/mcy.y" typedef union YYSTYPE { WCHAR *str; unsigned num; @@ -181,8 +198,8 @@ msg_t *msg; lan_cp_t lcp; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 186 "tools/wmc/mcy.tab.c" +/* Line 196 of yacc.c. */ +#line 203 "mcy.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -193,30 +210,49 @@ /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 198 "tools/wmc/mcy.tab.c" +/* Line 219 of yacc.c. */ +#line 215 "mcy.tab.c" + +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif #if ! defined (yyoverflow) || YYERROR_VERBOSE - -# ifndef YYFREE -# define YYFREE free -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# endif /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# else +# define YYSTACK_ALLOC alloca +# if defined (__STDC__) || defined (__cplusplus) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# define YYINCLUDED_STDLIB_H +# endif # endif # endif # endif @@ -224,13 +260,39 @@ # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ +# endif # else -# if defined (__STDC__) || defined (__cplusplus) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) +# endif +# ifdef __cplusplus +extern "C" { +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ @@ -242,7 +304,7 @@ /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; }; @@ -252,7 +314,7 @@ /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -265,7 +327,7 @@ # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -294,7 +356,7 @@ #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ @@ -315,7 +377,7 @@ #define YYUNDEFTOK 2 #define YYMAXUTOK 276 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -354,7 +416,7 @@ #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short yyprhs[] = +static const unsigned short int yyprhs[] = { 0, 0, 3, 5, 7, 10, 12, 14, 16, 18, 24, 30, 34, 37, 43, 49, 53, 56, 62, 68, @@ -411,24 +473,24 @@ }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = -{ - 0, 124, 124, 131, 132, 135, 136, 137, 138, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 172, - 173, 179, 180, 181, 184, 191, 192, 198, 199, 200, - 203, 210, 211, 214, 215, 216, 222, 223, 224, 227, - 235, 236, 237, 238, 241, 242, 243, 249, 250, 251, - 254, 264, 265, 266, 267, 270, 271, 281, 281, 284, - 289, 292, 293, 294, 295, 298, 299, 300, 301, 304, - 305, 306, 309, 317, 318, 321, 329, 330, 336, 337, - 338, 341, 349, 378, 379, 380, 383, 384, 385, 386, - 392, 393, 396, 399, 402 +static const unsigned short int yyrline[] = +{ + 0, 123, 123, 130, 131, 134, 135, 136, 137, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 171, + 172, 178, 179, 180, 183, 190, 191, 197, 198, 199, + 202, 209, 210, 213, 214, 215, 221, 222, 223, 226, + 234, 235, 236, 237, 240, 241, 242, 248, 249, 250, + 253, 263, 264, 265, 266, 269, 270, 280, 280, 283, + 288, 291, 292, 293, 294, 297, 298, 299, 300, 303, + 304, 305, 308, 316, 317, 320, 328, 329, 335, 336, + 337, 340, 348, 377, 378, 379, 382, 383, 384, 385, + 391, 392, 395, 398, 401 }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { @@ -447,7 +509,7 @@ # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -511,7 +573,7 @@ }; /* YYDEFGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +static const short int yydefgoto[] = { -1, 10, 11, 12, 13, 58, 59, 62, 63, 131, 66, 67, 152, 72, 73, 74, 14, 51, 15, 47, @@ -522,7 +584,7 @@ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ #define YYPACT_NINF -37 -static const short yypact[] = +static const short int yypact[] = { 132, -37, 18, 44, 46, 47, 48, 49, 50, -37, 10, 113, -37, -37, -37, -37, -37, 11, -37, 14, @@ -556,7 +618,7 @@ number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -105 -static const short yytable[] = +static const short int yytable[] = { 64, 133, 68, 135, 83, 149, 147, 45, 88, 93, 30, 84, 33, 46, 148, 35, 103, 84, 98, 16, @@ -620,22 +682,6 @@ 18, 25, 39, 1, 20 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -665,25 +711,58 @@ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up");\ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ - + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) -#endif +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (0) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + /* YYLEX -- calling `yylex' with the right arguments. */ @@ -707,19 +786,13 @@ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Token, Value); \ + yysymprint (stderr, \ + Type, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -731,12 +804,12 @@ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -766,13 +839,13 @@ #endif { int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -786,8 +859,7 @@ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -802,12 +874,8 @@ if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ - -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 @@ -830,7 +898,7 @@ const char *yystr; # endif { - register const char *yys = yystr; + const char *yys = yystr; while (*yys++ != '\0') continue; @@ -855,8 +923,8 @@ const char *yysrc; # endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -866,7 +934,55 @@ # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + size_t yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +#endif /* YYERROR_VERBOSE */ @@ -890,15 +1006,15 @@ (void) yyvaluep; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { default: @@ -914,16 +1030,21 @@ #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; #endif { /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); switch (yytype) { @@ -952,10 +1073,10 @@ -/* The lookahead symbol. */ +/* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -981,17 +1102,17 @@ #else int yyparse () - -#endif -#endif -{ - - register int yystate; - register int yyn; + ; +#endif +#endif +{ + + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1003,14 +1124,14 @@ to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; @@ -1067,14 +1188,14 @@ these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1085,21 +1206,21 @@ } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1131,18 +1252,18 @@ yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* Not known => get a look-ahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1157,7 +1278,7 @@ else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1177,8 +1298,8 @@ if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -1228,457 +1349,457 @@ switch (yyn) { case 2: -#line 124 "tools/wmc/mcy.y" +#line 123 "tools/wmc/mcy.y" { if(!check_languages(nodehead)) - xyyerror("No messages defined"); + xyyerror("No messages defined\n"); lanblockhead = block_messages(nodehead); ;} break; case 6: +#line 135 "tools/wmc/mcy.y" + { add_node(nd_msg, (yyvsp[0].msg)); ;} + break; + + case 7: #line 136 "tools/wmc/mcy.y" - { add_node(nd_msg, yyvsp[0].msg); ;} - break; - - case 7: + { add_node(nd_comment, (yyvsp[0].str)); ;} + break; + + case 8: #line 137 "tools/wmc/mcy.y" - { add_node(nd_comment, yyvsp[0].str); ;} - break; - - case 8: -#line 138 "tools/wmc/mcy.y" { xyyerror(err_syntax); /* `Catch all' error */ ;} break; case 10: +#line 141 "tools/wmc/mcy.y" + { xyyerror(err_pclose); ;} + break; + + case 11: #line 142 "tools/wmc/mcy.y" + { xyyerror(err_popen); ;} + break; + + case 12: +#line 143 "tools/wmc/mcy.y" + { xyyerror(err_assign); ;} + break; + + case 14: +#line 145 "tools/wmc/mcy.y" { xyyerror(err_pclose); ;} break; - case 11: -#line 143 "tools/wmc/mcy.y" + case 15: +#line 146 "tools/wmc/mcy.y" { xyyerror(err_popen); ;} break; - case 12: -#line 144 "tools/wmc/mcy.y" + case 16: +#line 147 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 14: -#line 146 "tools/wmc/mcy.y" + case 18: +#line 149 "tools/wmc/mcy.y" { xyyerror(err_pclose); ;} break; - case 15: -#line 147 "tools/wmc/mcy.y" + case 19: +#line 150 "tools/wmc/mcy.y" { xyyerror(err_popen); ;} break; - case 16: -#line 148 "tools/wmc/mcy.y" + case 20: +#line 151 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 18: -#line 150 "tools/wmc/mcy.y" + case 22: +#line 153 "tools/wmc/mcy.y" { xyyerror(err_pclose); ;} break; - case 19: -#line 151 "tools/wmc/mcy.y" + case 23: +#line 154 "tools/wmc/mcy.y" { xyyerror(err_popen); ;} break; - case 20: -#line 152 "tools/wmc/mcy.y" + case 24: +#line 155 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 22: -#line 154 "tools/wmc/mcy.y" - { xyyerror(err_pclose); ;} - break; - - case 23: -#line 155 "tools/wmc/mcy.y" - { xyyerror(err_popen); ;} - break; - - case 24: + case 25: #line 156 "tools/wmc/mcy.y" + { cast = (yyvsp[0].str); ;} + break; + + case 26: +#line 157 "tools/wmc/mcy.y" + { xyyerror(err_number); ;} + break; + + case 27: +#line 158 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 25: -#line 157 "tools/wmc/mcy.y" - { cast = yyvsp[0].str; ;} - break; - - case 26: -#line 158 "tools/wmc/mcy.y" - { xyyerror(err_number); ;} - break; - - case 27: + case 28: #line 159 "tools/wmc/mcy.y" - { xyyerror(err_assign); ;} - break; - - case 28: -#line 160 "tools/wmc/mcy.y" { switch(base) { case 8: case 10: case 16: - base = yyvsp[0].num; + base = (yyvsp[0].num); break; default: - xyyerror("Numberbase must be 8, 10 or 16"); + xyyerror("Numberbase must be 8, 10 or 16\n"); } ;} break; case 29: +#line 171 "tools/wmc/mcy.y" + { xyyerror(err_number); ;} + break; + + case 30: #line 172 "tools/wmc/mcy.y" + { xyyerror(err_assign); ;} + break; + + case 33: +#line 180 "tools/wmc/mcy.y" + { xyyerror(err_ident); ;} + break; + + case 34: +#line 183 "tools/wmc/mcy.y" + { + (yyvsp[-3].tok)->token = (yyvsp[-1].num); + (yyvsp[-3].tok)->alias = (yyvsp[0].str); + if((yyvsp[-1].num) & (~0x3)) + xyyerror("Severity value out of range (0x%08x > 0x3)\n", (yyvsp[-1].num)); + do_add_token(tok_severity, (yyvsp[-3].tok), "severity"); + ;} + break; + + case 35: +#line 190 "tools/wmc/mcy.y" { xyyerror(err_number); ;} break; - case 30: -#line 173 "tools/wmc/mcy.y" + case 36: +#line 191 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 33: -#line 181 "tools/wmc/mcy.y" + case 39: +#line 199 "tools/wmc/mcy.y" { xyyerror(err_ident); ;} break; - case 34: -#line 184 "tools/wmc/mcy.y" + case 40: +#line 202 "tools/wmc/mcy.y" { - yyvsp[-3].tok->token = yyvsp[-1].num; - yyvsp[-3].tok->alias = yyvsp[0].str; - if(yyvsp[-1].num & (~0x3)) - xyyerror("Severity value out of range (0x%08x > 0x3)", yyvsp[-1].num); - do_add_token(tok_severity, yyvsp[-3].tok, "severity"); + (yyvsp[-3].tok)->token = (yyvsp[-1].num); + (yyvsp[-3].tok)->alias = (yyvsp[0].str); + if((yyvsp[-1].num) & (~0xfff)) + xyyerror("Facility value out of range (0x%08x > 0xfff)\n", (yyvsp[-1].num)); + do_add_token(tok_facility, (yyvsp[-3].tok), "facility"); ;} break; - case 35: -#line 191 "tools/wmc/mcy.y" + case 41: +#line 209 "tools/wmc/mcy.y" { xyyerror(err_number); ;} break; - case 36: -#line 192 "tools/wmc/mcy.y" + case 42: +#line 210 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 39: -#line 200 "tools/wmc/mcy.y" + case 43: +#line 213 "tools/wmc/mcy.y" + { (yyval.str) = NULL; ;} + break; + + case 44: +#line 214 "tools/wmc/mcy.y" + { (yyval.str) = (yyvsp[0].str); ;} + break; + + case 45: +#line 215 "tools/wmc/mcy.y" { xyyerror(err_ident); ;} break; - case 40: -#line 203 "tools/wmc/mcy.y" + case 48: +#line 223 "tools/wmc/mcy.y" + { xyyerror(err_ident); ;} + break; + + case 49: +#line 226 "tools/wmc/mcy.y" { - yyvsp[-3].tok->token = yyvsp[-1].num; - yyvsp[-3].tok->alias = yyvsp[0].str; - if(yyvsp[-1].num & (~0xfff)) - xyyerror("Facility value out of range (0x%08x > 0xfff)", yyvsp[-1].num); - do_add_token(tok_facility, yyvsp[-3].tok, "facility"); + (yyvsp[-6].tok)->token = (yyvsp[-4].num); + (yyvsp[-6].tok)->alias = (yyvsp[-1].str); + (yyvsp[-6].tok)->codepage = (yyvsp[0].num); + do_add_token(tok_language, (yyvsp[-6].tok), "language"); + if(!find_language((yyvsp[-4].num)) && !find_cpxlat((yyvsp[-4].num))) + mcy_warning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override\n", (yyvsp[-4].num), WMC_DEFAULT_CODEPAGE); ;} break; - case 41: -#line 210 "tools/wmc/mcy.y" + case 50: +#line 234 "tools/wmc/mcy.y" + { xyyerror("Filename expected\n"); ;} + break; + + case 51: +#line 235 "tools/wmc/mcy.y" + { xyyerror(err_colon); ;} + break; + + case 52: +#line 236 "tools/wmc/mcy.y" { xyyerror(err_number); ;} break; - case 42: -#line 211 "tools/wmc/mcy.y" + case 53: +#line 237 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 43: -#line 214 "tools/wmc/mcy.y" - { yyval.str = NULL; ;} - break; - - case 44: -#line 215 "tools/wmc/mcy.y" - { yyval.str = yyvsp[0].str; ;} - break; - - case 45: -#line 216 "tools/wmc/mcy.y" + case 54: +#line 240 "tools/wmc/mcy.y" + { (yyval.num) = 0; ;} + break; + + case 55: +#line 241 "tools/wmc/mcy.y" + { (yyval.num) = (yyvsp[0].num); ;} + break; + + case 56: +#line 242 "tools/wmc/mcy.y" + { xyyerror("Codepage-number expected\n"); ;} + break; + + case 59: +#line 250 "tools/wmc/mcy.y" { xyyerror(err_ident); ;} break; - case 48: -#line 224 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - - case 49: -#line 227 "tools/wmc/mcy.y" - { - yyvsp[-6].tok->token = yyvsp[-4].num; - yyvsp[-6].tok->alias = yyvsp[-1].str; - yyvsp[-6].tok->codepage = yyvsp[0].num; - do_add_token(tok_language, yyvsp[-6].tok, "language"); - if(!find_language(yyvsp[-4].num) && !find_cpxlat(yyvsp[-4].num)) - yywarning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", yyvsp[-4].num, WMC_DEFAULT_CODEPAGE); - ;} - break; - - case 50: -#line 235 "tools/wmc/mcy.y" - { xyyerror("Filename expected"); ;} - break; - - case 51: -#line 236 "tools/wmc/mcy.y" - { xyyerror(err_colon); ;} - break; - - case 52: -#line 237 "tools/wmc/mcy.y" - { xyyerror(err_number); ;} - break; - - case 53: -#line 238 "tools/wmc/mcy.y" - { xyyerror(err_assign); ;} - break; - - case 54: -#line 241 "tools/wmc/mcy.y" - { yyval.num = 0; ;} - break; - - case 55: -#line 242 "tools/wmc/mcy.y" - { yyval.num = yyvsp[0].num; ;} - break; - - case 56: -#line 243 "tools/wmc/mcy.y" - { xyyerror("Codepage-number expected"); ;} - break; - - case 59: -#line 251 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - case 60: -#line 254 "tools/wmc/mcy.y" +#line 253 "tools/wmc/mcy.y" { static const char err_nocp[] = "Codepage %d not builtin; cannot convert"; - if(find_cpxlat(yyvsp[-4].num)) - xyyerror("Codepage translation already defined for language 0x%x", yyvsp[-4].num); - if(yyvsp[-2].num && !find_codepage(yyvsp[-2].num)) - xyyerror(err_nocp, yyvsp[-2].num); - if(yyvsp[0].num && !find_codepage(yyvsp[0].num)) - xyyerror(err_nocp, yyvsp[0].num); - add_cpxlat(yyvsp[-4].num, yyvsp[-2].num, yyvsp[0].num); + if(find_cpxlat((yyvsp[-4].num))) + xyyerror("Codepage translation already defined for language 0x%x\n", (yyvsp[-4].num)); + if((yyvsp[-2].num) && !find_codepage((yyvsp[-2].num))) + xyyerror(err_nocp, (yyvsp[-2].num)); + if((yyvsp[0].num) && !find_codepage((yyvsp[0].num))) + xyyerror(err_nocp, (yyvsp[0].num)); + add_cpxlat((yyvsp[-4].num), (yyvsp[-2].num), (yyvsp[0].num)); ;} break; case 61: +#line 263 "tools/wmc/mcy.y" + { xyyerror(err_number); ;} + break; + + case 62: #line 264 "tools/wmc/mcy.y" + { xyyerror(err_colon); ;} + break; + + case 63: +#line 265 "tools/wmc/mcy.y" { xyyerror(err_number); ;} break; - case 62: -#line 265 "tools/wmc/mcy.y" - { xyyerror(err_colon); ;} - break; - - case 63: + case 64: #line 266 "tools/wmc/mcy.y" + { xyyerror(err_assign); ;} + break; + + case 65: +#line 269 "tools/wmc/mcy.y" + { (yyval.num) = (yyvsp[0].num); ;} + break; + + case 66: +#line 270 "tools/wmc/mcy.y" + { + if((yyvsp[0].tok)->type != tok_language) + xyyerror("Language name or code expected\n"); + (yyval.num) = (yyvsp[0].tok)->token; + ;} + break; + + case 67: +#line 280 "tools/wmc/mcy.y" + { test_id((yyvsp[-1].num)); ;} + break; + + case 68: +#line 280 "tools/wmc/mcy.y" + { (yyval.msg) = complete_msg((yyvsp[0].msg), (yyvsp[-3].num)); ;} + break; + + case 69: +#line 283 "tools/wmc/mcy.y" + { + if((yyvsp[0].num) & (~0xffff)) + xyyerror("Message ID value out of range (0x%08x > 0xffff)\n", (yyvsp[0].num)); + (yyval.num) = (yyvsp[0].num); + ;} + break; + + case 70: +#line 288 "tools/wmc/mcy.y" + { xyyerror(err_assign); ;} + break; + + case 71: +#line 291 "tools/wmc/mcy.y" + { (yyval.num) = ++last_id; ;} + break; + + case 72: +#line 292 "tools/wmc/mcy.y" + { (yyval.num) = last_id = (yyvsp[0].num); ;} + break; + + case 73: +#line 293 "tools/wmc/mcy.y" + { (yyval.num) = last_id += (yyvsp[0].num); ;} + break; + + case 74: +#line 294 "tools/wmc/mcy.y" { xyyerror(err_number); ;} break; - case 64: -#line 267 "tools/wmc/mcy.y" + case 75: +#line 297 "tools/wmc/mcy.y" + { have_sev = have_fac = have_sym = 0; ;} + break; + + case 76: +#line 298 "tools/wmc/mcy.y" + { if(have_sev) xyyerror("Severity already defined\n"); have_sev = 1; ;} + break; + + case 77: +#line 299 "tools/wmc/mcy.y" + { if(have_fac) xyyerror("Facility already defined\n"); have_fac = 1; ;} + break; + + case 78: +#line 300 "tools/wmc/mcy.y" + { if(have_sym) xyyerror("Symbolname already defined\n"); have_sym = 1; ;} + break; + + case 79: +#line 303 "tools/wmc/mcy.y" + { last_sym = (yyvsp[0].str); ;} + break; + + case 80: +#line 304 "tools/wmc/mcy.y" + { xyyerror(err_ident); ;} + break; + + case 81: +#line 305 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; - case 65: -#line 270 "tools/wmc/mcy.y" - { yyval.num = yyvsp[0].num; ;} - break; - - case 66: -#line 271 "tools/wmc/mcy.y" + case 82: +#line 308 "tools/wmc/mcy.y" { - if(yyvsp[0].tok->type != tok_language) - xyyerror("Language name or code expected"); - yyval.num = yyvsp[0].tok->token; - ;} - break; - - case 67: -#line 281 "tools/wmc/mcy.y" - { test_id(yyvsp[-1].num); ;} - break; - - case 68: -#line 281 "tools/wmc/mcy.y" - { yyval.msg = complete_msg(yyvsp[0].msg, yyvsp[-3].num); ;} - break; - - case 69: -#line 284 "tools/wmc/mcy.y" - { - if(yyvsp[0].num & (~0xffff)) - xyyerror("Message ID value out of range (0x%08x > 0xffff)", yyvsp[0].num); - yyval.num = yyvsp[0].num; - ;} - break; - - case 70: -#line 289 "tools/wmc/mcy.y" - { xyyerror(err_assign); ;} - break; - - case 71: -#line 292 "tools/wmc/mcy.y" - { yyval.num = ++last_id; ;} - break; - - case 72: -#line 293 "tools/wmc/mcy.y" - { yyval.num = last_id = yyvsp[0].num; ;} - break; - - case 73: -#line 294 "tools/wmc/mcy.y" - { yyval.num = last_id += yyvsp[0].num; ;} - break; - - case 74: -#line 295 "tools/wmc/mcy.y" - { xyyerror(err_number); ;} - break; - - case 75: -#line 298 "tools/wmc/mcy.y" - { have_sev = have_fac = have_sym = 0; ;} - break; - - case 76: -#line 299 "tools/wmc/mcy.y" - { if(have_sev) xyyerror("Severity already defined"); have_sev = 1; ;} - break; - - case 77: -#line 300 "tools/wmc/mcy.y" - { if(have_fac) xyyerror("Facility already defined"); have_fac = 1; ;} - break; - - case 78: -#line 301 "tools/wmc/mcy.y" - { if(have_sym) xyyerror("Symbolname already defined"); have_sym = 1; ;} - break; - - case 79: -#line 304 "tools/wmc/mcy.y" - { last_sym = yyvsp[0].str; ;} - break; - - case 80: -#line 305 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - - case 81: -#line 306 "tools/wmc/mcy.y" - { xyyerror(err_assign); ;} - break; - - case 82: -#line 309 "tools/wmc/mcy.y" - { - token_t *tok = lookup_token(yyvsp[0].tok->name); + token_t *tok = lookup_token((yyvsp[0].tok)->name); if(!tok) - xyyerror("Undefined severityname"); + xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) - xyyerror("Identifier is not of class 'severity'"); + xyyerror("Identifier is not of class 'severity'\n"); last_sev = tok->token; ;} break; case 83: +#line 316 "tools/wmc/mcy.y" + { xyyerror(err_ident); ;} + break; + + case 84: #line 317 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - - case 84: -#line 318 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; case 85: -#line 321 "tools/wmc/mcy.y" +#line 320 "tools/wmc/mcy.y" { - token_t *tok = lookup_token(yyvsp[0].tok->name); + token_t *tok = lookup_token((yyvsp[0].tok)->name); if(!tok) - xyyerror("Undefined facilityname"); + xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) - xyyerror("Identifier is not of class 'facility'"); + xyyerror("Identifier is not of class 'facility'\n"); last_fac = tok->token; ;} break; case 86: +#line 328 "tools/wmc/mcy.y" + { xyyerror(err_ident); ;} + break; + + case 87: #line 329 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - - case 87: -#line 330 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; case 88: +#line 335 "tools/wmc/mcy.y" + { (yyval.msg) = add_lanmsg(NULL, (yyvsp[0].lmp)); ;} + break; + + case 89: #line 336 "tools/wmc/mcy.y" - { yyval.msg = add_lanmsg(NULL, yyvsp[0].lmp); ;} - break; - - case 89: + { (yyval.msg) = add_lanmsg((yyvsp[-1].msg), (yyvsp[0].lmp)); ;} + break; + + case 90: #line 337 "tools/wmc/mcy.y" - { yyval.msg = add_lanmsg(yyvsp[-1].msg, yyvsp[0].lmp); ;} - break; - - case 90: -#line 338 "tools/wmc/mcy.y" - { xyyerror("'Language=...' (start of message text-definition) expected"); ;} + { xyyerror("'Language=...' (start of message text-definition) expected\n"); ;} break; case 91: -#line 341 "tools/wmc/mcy.y" - { yyval.lmp = new_lanmsg(&yyvsp[-3].lcp, yyvsp[-1].str); ;} +#line 340 "tools/wmc/mcy.y" + { (yyval.lmp) = new_lanmsg(&(yyvsp[-3].lcp), (yyvsp[-1].str)); ;} break; case 92: -#line 349 "tools/wmc/mcy.y" +#line 348 "tools/wmc/mcy.y" { - token_t *tok = lookup_token(yyvsp[-1].tok->name); + token_t *tok = lookup_token((yyvsp[-1].tok)->name); cp_xlat_t *cpx; if(!tok) - xyyerror("Undefined language"); + xyyerror("Undefined language\n"); if(tok->type != tok_language) - xyyerror("Identifier is not of class 'language'"); + xyyerror("Identifier is not of class 'language'\n"); if((cpx = find_cpxlat(tok->token))) { - set_codepage(yyval.lcp.codepage = cpx->cpin); + set_codepage((yyval.lcp).codepage = cpx->cpin); } else if(!tok->codepage) { @@ -1686,85 +1807,86 @@ if(!lan) { /* Just set default; warning was given while parsing languagenames */ - set_codepage(yyval.lcp.codepage = WMC_DEFAULT_CODEPAGE); + set_codepage((yyval.lcp).codepage = WMC_DEFAULT_CODEPAGE); } else { /* The default seems to be to use the DOS codepage... */ - set_codepage(yyval.lcp.codepage = lan->doscp); + set_codepage((yyval.lcp).codepage = lan->doscp); } } else - set_codepage(yyval.lcp.codepage = tok->codepage); - yyval.lcp.language = tok->token; + set_codepage((yyval.lcp).codepage = tok->codepage); + (yyval.lcp).language = tok->token; ;} break; case 93: +#line 377 "tools/wmc/mcy.y" + { xyyerror("Missing newline\n"); ;} + break; + + case 94: #line 378 "tools/wmc/mcy.y" - { xyyerror("Missing newline"); ;} - break; - - case 94: + { xyyerror(err_ident); ;} + break; + + case 95: #line 379 "tools/wmc/mcy.y" - { xyyerror(err_ident); ;} - break; - - case 95: -#line 380 "tools/wmc/mcy.y" { xyyerror(err_assign); ;} break; case 96: +#line 382 "tools/wmc/mcy.y" + { (yyval.str) = (yyvsp[0].str); ;} + break; + + case 97: #line 383 "tools/wmc/mcy.y" - { yyval.str = yyvsp[0].str; ;} - break; - - case 97: + { (yyval.str) = merge((yyvsp[-1].str), (yyvsp[0].str)); ;} + break; + + case 98: #line 384 "tools/wmc/mcy.y" - { yyval.str = merge(yyvsp[-1].str, yyvsp[0].str); ;} - break; - - case 98: + { xyyerror(err_msg); ;} + break; + + case 99: #line 385 "tools/wmc/mcy.y" { xyyerror(err_msg); ;} break; - case 99: -#line 386 "tools/wmc/mcy.y" - { xyyerror(err_msg); ;} - break; - case 100: +#line 391 "tools/wmc/mcy.y" + { (yyval.tok) = xmalloc(sizeof(token_t)); memset((yyval.tok),0,sizeof(*(yyval.tok))); (yyval.tok)->name = (yyvsp[0].str); ;} + break; + + case 101: #line 392 "tools/wmc/mcy.y" - { yyval.tok = xmalloc(sizeof(token_t)); yyval.tok->name = yyvsp[0].str; ;} - break; - - case 101: -#line 393 "tools/wmc/mcy.y" - { yyval.tok = yyvsp[0].tok; ;} + { (yyval.tok) = (yyvsp[0].tok); ;} break; case 102: -#line 396 "tools/wmc/mcy.y" +#line 395 "tools/wmc/mcy.y" { want_nl = 1; ;} break; case 103: -#line 399 "tools/wmc/mcy.y" +#line 398 "tools/wmc/mcy.y" { want_line = 1; ;} break; case 104: -#line 402 "tools/wmc/mcy.y" +#line 401 "tools/wmc/mcy.y" { want_file = 1; ;} break; + default: break; } -/* Line 1000 of yacc.c. */ -#line 1768 "tools/wmc/mcy.tab.c" +/* Line 1126 of yacc.c. */ +#line 1890 "mcy.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -1803,11 +1925,35 @@ if (YYPACT_NINF < yyn && yyn < YYLAST) { - YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + char *yymsg = 0; +# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; int yyx; + +#if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +#endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ @@ -1816,81 +1962,91 @@ /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; - - yyprefix = ", expecting "; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { - yysize = 0; + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; break; } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + + if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg) { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); - - if (yycount < 5) + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yymsg; + int yyi = 0; + while ((*yyp = *yyf)) { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - yyerror ("syntax error; also virtual memory exhausted"); + { + yyerror (YY_("syntax error")); + goto yyexhaustedlab; + } } else #endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + yyerror (YY_("syntax error")); } if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + /* Return failure if at end of input. */ if (yychar == YYEOF) - for (;;) - { - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - } + YYABORT; } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); + yydestruct ("Error: discarding", yytoken, &yylval); yychar = YYEMPTY; - } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -1900,14 +2056,13 @@ `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ if (0) goto yyerrorlab; -#endif - - yyvsp -= yylen; + +yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; goto yyerrlab1; @@ -1937,8 +2092,8 @@ if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); + + yydestruct ("Error: popping", yystos[yystate], yyvsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1947,10 +2102,11 @@ if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1971,16 +2127,25 @@ goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK; + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); @@ -1989,7 +2154,7 @@ } -#line 405 "tools/wmc/mcy.y" +#line 404 "tools/wmc/mcy.y" static WCHAR *merge(WCHAR *s1, WCHAR *s2) @@ -2008,12 +2173,12 @@ if(tp) { if(tok->type != type) - yywarning("Type change in token"); + mcy_warning("Type change in token\n"); if(tp != tok) - xyyerror("Overlapping token not the same"); + xyyerror("Overlapping token not the same\n"); /* else its already defined and changed */ if(tok->fixed) - xyyerror("Redefinition of %s", code); + xyyerror("Redefinition of %s\n", code); tok->fixed = 1; } else @@ -2025,13 +2190,13 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) { - lanmsg_t *lmp = (lanmsg_t *)xmalloc(sizeof(lanmsg_t)); + lanmsg_t *lmp = xmalloc(sizeof(lanmsg_t)); lmp->lan = lcp->language; lmp->cp = lcp->codepage; lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ if(lmp->len > 4096) - yywarning("Message exceptionally long; might be a missing termination"); + mcy_warning("Message exceptionally long; might be a missing termination\n"); return lmp; } @@ -2039,21 +2204,24 @@ { int i; if(!msg) + { msg = xmalloc(sizeof(msg_t)); + memset( msg, 0, sizeof(*msg) ); + } msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); msg->msgs[msg->nmsgs] = lanmsg; msg->nmsgs++; for(i = 0; i < msg->nmsgs-1; i++) { if(msg->msgs[i]->lan == lanmsg->lan) - xyyerror("Message for language 0x%x already defined", lanmsg->lan); + xyyerror("Message for language 0x%x already defined\n", lanmsg->lan); } return msg; } static int sort_lanmsg(const void *p1, const void *p2) { - return (*(lanmsg_t **)p1)->lan - (*(lanmsg_t **)p2)->lan; + return (*(const lanmsg_t * const *)p1)->lan - (*(const lanmsg_t * const*)p2)->lan; } static msg_t *complete_msg(msg_t *mp, int id) @@ -2063,7 +2231,7 @@ if(have_sym) mp->sym = last_sym; else - xyyerror("No symbolic name defined for message id %d", id); + xyyerror("No symbolic name defined for message id %d\n", id); mp->sev = last_sev; mp->fac = last_fac; qsort(mp->msgs, mp->nmsgs, sizeof(*(mp->msgs)), sort_lanmsg); @@ -2077,7 +2245,8 @@ static void add_node(node_e type, void *p) { - node_t *ndp = (node_t *)xmalloc(sizeof(node_t)); + node_t *ndp = xmalloc(sizeof(node_t)); + memset( ndp, 0, sizeof(*ndp) ); ndp->type = type; ndp->u.all = p; @@ -2101,7 +2270,7 @@ if(ndp->type != nd_msg) continue; if(ndp->u.msg->id == id && ndp->u.msg->sev == last_sev && ndp->u.msg->fac == last_fac) - xyyerror("MessageId %d with facility 0x%x and severity 0x%x already defined", id, last_fac, last_sev); + xyyerror("MessageId %d with facility 0x%x and severity 0x%x already defined\n", id, last_fac, last_sev); } } @@ -2151,7 +2320,7 @@ return nm; } -#define MSGRID(x) ((*(msg_t **)(x))->realid) +#define MSGRID(x) ((*(const msg_t * const*)(x))->realid) static int sort_msg(const void *p1, const void *p2) { return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1); @@ -2189,7 +2358,7 @@ for(nl = 0; nl < msgtab[0]->nmsgs; nl++) /* This should be equal for all after check_languages() */ { lbp = xmalloc(sizeof(lan_blk_t)); - + memset( lbp, 0, sizeof(*lbp) ); if(!lblktail) { lblkhead = lblktail = lbp; @@ -2241,7 +2410,7 @@ static int sc_xlat(const void *p1, const void *p2) { - return ((cp_xlat_t *)p1)->lan - ((cp_xlat_t *)p2)->lan; + return ((const cp_xlat_t *)p1)->lan - ((const cp_xlat_t *)p2)->lan; } static void add_cpxlat(int lan, int cpin, int cpout) Modified: trunk/reactos/tools/wmc/mcy.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/mcy.tab.h?rev=30… ============================================================================== --- trunk/reactos/tools/wmc/mcy.tab.h (original) +++ trunk/reactos/tools/wmc/mcy.tab.h Sat Dec 1 18:56:03 2007 @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 2.1. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 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 @@ -15,8 +15,8 @@ You 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -50,6 +50,7 @@ tTOKEN = 276 }; #endif +/* Tokens. */ #define tSEVNAMES 258 #define tFACNAMES 259 #define tLANNAMES 260 @@ -74,7 +75,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 99 "tools/wmc/mcy.y" +#line 98 "tools/wmc/mcy.y" typedef union YYSTYPE { WCHAR *str; unsigned num; @@ -83,14 +84,14 @@ msg_t *msg; lan_cp_t lcp; } YYSTYPE; -/* Line 1275 of yacc.c. */ -#line 88 "tools/wmc/mcy.tab.h" +/* Line 1447 of yacc.c. */ +#line 89 "tools/wmc/mcy.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -extern YYSTYPE yylval; +extern YYSTYPE mcy_lval; Modified: trunk/reactos/tools/wmc/mcy.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/mcy.y?rev=30932&… ============================================================================== --- trunk/reactos/tools/wmc/mcy.y (original) +++ trunk/reactos/tools/wmc/mcy.y Sat Dec 1 18:56:03 2007 @@ -15,12 +15,12 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTES: * * The basic grammar of the file is yet another example of, humpf, - * design. There is is mix of context-insensitive and -sentitive + * design. There is a mix of context-insensitive and -sensitive * stuff, which makes it rather complicated. * The header definitions are all context-insensitive because they have * delimited arguments, whereas the message headers are (semi-) context- @@ -95,7 +95,6 @@ %} - %union { WCHAR *str; unsigned num; @@ -123,7 +122,7 @@ %% file : items { if(!check_languages(nodehead)) - xyyerror("No messages defined"); + xyyerror("No messages defined\n"); lanblockhead = block_messages(nodehead); } ; @@ -166,7 +165,7 @@ base = $3; break; default: - xyyerror("Numberbase must be 8, 10 or 16"); + xyyerror("Numberbase must be 8, 10 or 16\n"); } } | tBASE '=' error { xyyerror(err_number); } @@ -185,7 +184,7 @@ $1->token = $3; $1->alias = $4; if($3 & (~0x3)) - xyyerror("Severity value out of range (0x%08x > 0x3)", $3); + xyyerror("Severity value out of range (0x%08x > 0x3)\n", $3); do_add_token(tok_severity, $1, "severity"); } | token '=' error { xyyerror(err_number); } @@ -204,7 +203,7 @@ $1->token = $3; $1->alias = $4; if($3 & (~0xfff)) - xyyerror("Facility value out of range (0x%08x > 0xfff)", $3); + xyyerror("Facility value out of range (0x%08x > 0xfff)\n", $3); do_add_token(tok_facility, $1, "facility"); } | token '=' error { xyyerror(err_number); } @@ -230,9 +229,9 @@ $1->codepage = $7; do_add_token(tok_language, $1, "language"); if(!find_language($3) && !find_cpxlat($3)) - yywarning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", $3, WMC_DEFAULT_CODEPAGE); - } - | token '=' tNUMBER setfile ':' error { xyyerror("Filename expected"); } + mcy_warning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override\n", $3, WMC_DEFAULT_CODEPAGE); + } + | token '=' tNUMBER setfile ':' error { xyyerror("Filename expected\n"); } | token '=' tNUMBER error { xyyerror(err_colon); } | token '=' error { xyyerror(err_number); } | token error { xyyerror(err_assign); } @@ -240,7 +239,7 @@ optcp : /* Empty */ { $$ = 0; } | ':' tNUMBER { $$ = $2; } - | ':' error { xyyerror("Codepage-number expected"); } + | ':' error { xyyerror("Codepage-number expected\n"); } ; /*---------------------------------------------------------------------- @@ -254,7 +253,7 @@ cmap : clan '=' tNUMBER ':' tNUMBER { static const char err_nocp[] = "Codepage %d not builtin; cannot convert"; if(find_cpxlat($1)) - xyyerror("Codepage translation already defined for language 0x%x", $1); + xyyerror("Codepage translation already defined for language 0x%x\n", $1); if($3 && !find_codepage($3)) xyyerror(err_nocp, $3); if($5 && !find_codepage($5)) @@ -270,7 +269,7 @@ clan : tNUMBER { $$ = $1; } | tTOKEN { if($1->type != tok_language) - xyyerror("Language name or code expected"); + xyyerror("Language name or code expected\n"); $$ = $1->token; } ; @@ -283,7 +282,7 @@ msgid : tMSGID '=' id { if($3 & (~0xffff)) - xyyerror("Message ID value out of range (0x%08x > 0xffff)", $3); + xyyerror("Message ID value out of range (0x%08x > 0xffff)\n", $3); $$ = $3; } | tMSGID error { xyyerror(err_assign); } @@ -296,9 +295,9 @@ ; sevfacsym: /* Empty */ { have_sev = have_fac = have_sym = 0; } - | sevfacsym sev { if(have_sev) xyyerror("Severity already defined"); have_sev = 1; } - | sevfacsym fac { if(have_fac) xyyerror("Facility already defined"); have_fac = 1; } - | sevfacsym sym { if(have_sym) xyyerror("Symbolname already defined"); have_sym = 1; } + | sevfacsym sev { if(have_sev) xyyerror("Severity already defined\n"); have_sev = 1; } + | sevfacsym fac { if(have_fac) xyyerror("Facility already defined\n"); have_fac = 1; } + | sevfacsym sym { if(have_sym) xyyerror("Symbolname already defined\n"); have_sym = 1; } ; sym : tSYMNAME '=' tIDENT { last_sym = $3; } @@ -309,9 +308,9 @@ sev : tSEVERITY '=' token { token_t *tok = lookup_token($3->name); if(!tok) - xyyerror("Undefined severityname"); + xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) - xyyerror("Identifier is not of class 'severity'"); + xyyerror("Identifier is not of class 'severity'\n"); last_sev = tok->token; } | tSEVERITY '=' error { xyyerror(err_ident); } @@ -321,9 +320,9 @@ fac : tFACILITY '=' token { token_t *tok = lookup_token($3->name); if(!tok) - xyyerror("Undefined facilityname"); + xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) - xyyerror("Identifier is not of class 'facility'"); + xyyerror("Identifier is not of class 'facility'\n"); last_fac = tok->token; } | tFACILITY '=' error { xyyerror(err_ident); } @@ -335,7 +334,7 @@ */ bodies : body { $$ = add_lanmsg(NULL, $1); } | bodies body { $$ = add_lanmsg($1, $2); } - | error { xyyerror("'Language=...' (start of message text-definition) expected"); } + | error { xyyerror("'Language=...' (start of message text-definition) expected\n"); } ; body : lang setline lines tMSGEND { $$ = new_lanmsg(&$1, $3); } @@ -350,9 +349,9 @@ token_t *tok = lookup_token($4->name); cp_xlat_t *cpx; if(!tok) - xyyerror("Undefined language"); + xyyerror("Undefined language\n"); if(tok->type != tok_language) - xyyerror("Identifier is not of class 'language'"); + xyyerror("Identifier is not of class 'language'\n"); if((cpx = find_cpxlat(tok->token))) { set_codepage($$.codepage = cpx->cpin); @@ -375,7 +374,7 @@ set_codepage($$.codepage = tok->codepage); $$.language = tok->token; } - | tLANGUAGE setnl '=' token error { xyyerror("Missing newline"); } + | tLANGUAGE setnl '=' token error { xyyerror("Missing newline\n"); } | tLANGUAGE setnl '=' error { xyyerror(err_ident); } | tLANGUAGE error { xyyerror(err_assign); } ; @@ -389,7 +388,7 @@ /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -420,12 +419,12 @@ if(tp) { if(tok->type != type) - yywarning("Type change in token"); + mcy_warning("Type change in token\n"); if(tp != tok) - xyyerror("Overlapping token not the same"); + xyyerror("Overlapping token not the same\n"); /* else its already defined and changed */ if(tok->fixed) - xyyerror("Redefinition of %s", code); + xyyerror("Redefinition of %s\n", code); tok->fixed = 1; } else @@ -437,13 +436,13 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) { - lanmsg_t *lmp = (lanmsg_t *)xmalloc(sizeof(lanmsg_t)); + lanmsg_t *lmp = xmalloc(sizeof(lanmsg_t)); lmp->lan = lcp->language; lmp->cp = lcp->codepage; lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ if(lmp->len > 4096) - yywarning("Message exceptionally long; might be a missing termination"); + mcy_warning("Message exceptionally long; might be a missing termination\n"); return lmp; } @@ -451,21 +450,24 @@ { int i; if(!msg) + { msg = xmalloc(sizeof(msg_t)); + memset( msg, 0, sizeof(*msg) ); + } msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); msg->msgs[msg->nmsgs] = lanmsg; msg->nmsgs++; for(i = 0; i < msg->nmsgs-1; i++) { if(msg->msgs[i]->lan == lanmsg->lan) - xyyerror("Message for language 0x%x already defined", lanmsg->lan); + xyyerror("Message for language 0x%x already defined\n", lanmsg->lan); } return msg; } static int sort_lanmsg(const void *p1, const void *p2) { - return (*(lanmsg_t **)p1)->lan - (*(lanmsg_t **)p2)->lan; + return (*(const lanmsg_t * const *)p1)->lan - (*(const lanmsg_t * const*)p2)->lan; } static msg_t *complete_msg(msg_t *mp, int id) @@ -475,7 +477,7 @@ if(have_sym) mp->sym = last_sym; else - xyyerror("No symbolic name defined for message id %d", id); + xyyerror("No symbolic name defined for message id %d\n", id); mp->sev = last_sev; mp->fac = last_fac; qsort(mp->msgs, mp->nmsgs, sizeof(*(mp->msgs)), sort_lanmsg); @@ -489,7 +491,8 @@ static void add_node(node_e type, void *p) { - node_t *ndp = (node_t *)xmalloc(sizeof(node_t)); + node_t *ndp = xmalloc(sizeof(node_t)); + memset( ndp, 0, sizeof(*ndp) ); ndp->type = type; ndp->u.all = p; @@ -513,7 +516,7 @@ if(ndp->type != nd_msg) continue; if(ndp->u.msg->id == id && ndp->u.msg->sev == last_sev && ndp->u.msg->fac == last_fac) - xyyerror("MessageId %d with facility 0x%x and severity 0x%x already defined", id, last_fac, last_sev); + xyyerror("MessageId %d with facility 0x%x and severity 0x%x already defined\n", id, last_fac, last_sev); } } @@ -563,7 +566,7 @@ return nm; } -#define MSGRID(x) ((*(msg_t **)(x))->realid) +#define MSGRID(x) ((*(const msg_t * const*)(x))->realid) static int sort_msg(const void *p1, const void *p2) { return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1); @@ -601,7 +604,7 @@ for(nl = 0; nl < msgtab[0]->nmsgs; nl++) /* This should be equal for all after check_languages() */ { lbp = xmalloc(sizeof(lan_blk_t)); - + memset( lbp, 0, sizeof(*lbp) ); if(!lblktail) { lblkhead = lblktail = lbp; @@ -653,7 +656,7 @@ static int sc_xlat(const void *p1, const void *p2) { - return ((cp_xlat_t *)p1)->lan - ((cp_xlat_t *)p2)->lan; + return ((const cp_xlat_t *)p1)->lan - ((const cp_xlat_t *)p2)->lan; } static void add_cpxlat(int lan, int cpin, int cpout) Modified: trunk/reactos/tools/wmc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.c?rev=3093… ============================================================================== --- trunk/reactos/tools/wmc/utils.c (original) +++ trunk/reactos/tools/wmc/utils.c Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -36,9 +36,8 @@ static void generic_msg(const char *s, const char *t, va_list ap) { - fprintf(stderr, "%s %s: %d, %d: ", t, input_name ? input_name : "stdin", line_number, char_number); - vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); + fprintf(stderr, "%s:%d:%d: %s: ", input_name ? input_name : "stdin", line_number, char_number, t); + vfprintf(stderr, s, ap); } /* @@ -49,7 +48,7 @@ * The extra routine 'xyyerror' is used to exit after giving a real * message. */ -int yyerror(const char *s, ...) +int mcy_error(const char *s, ...) { #ifndef SUPPRESS_YACC_ERROR_MESSAGE va_list ap; @@ -70,7 +69,7 @@ return 1; } -int yywarning(const char *s, ...) +int mcy_warning(const char *s, ...) { va_list ap; va_start(ap, s); @@ -85,7 +84,6 @@ va_start(ap, s); fprintf(stderr, "Internal error (please report) %s %d: ", file, line); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); exit(3); } @@ -96,7 +94,6 @@ va_start(ap, s); fprintf(stderr, "Error: "); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); exit(2); } @@ -107,7 +104,6 @@ va_start(ap, s); fprintf(stderr, "Warning: "); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); } @@ -128,7 +124,7 @@ namelen = strlen(name); /* +4 for later extension and +1 for '\0' */ - base = (char *)xmalloc(namelen +4 +1); + base = xmalloc(namelen +4 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) { @@ -148,12 +144,7 @@ { error("Virtual memory exhausted.\n"); } - /* - * We set it to 0. - * This is *paramount* because we depend on it - * just about everywhere in the rest of the code. - */ - memset(res, 0, size); + memset(res, 0x55, size); return res; } @@ -177,7 +168,7 @@ char *s; assert(str != NULL); - s = (char *)xmalloc(strlen(str)+1); + s = xmalloc(strlen(str)+1); return strcpy(s, str); } @@ -203,7 +194,7 @@ WCHAR *s; assert(str != NULL); - s = (WCHAR *)xmalloc((unistrlen(str)+1) * sizeof(WCHAR)); + s = xmalloc((unistrlen(str)+1) * sizeof(WCHAR)); return unistrcpy(s, str); } @@ -220,7 +211,7 @@ if(!once) { once++; - yywarning(warn); + mcy_warning(warn); } i = *s1++ - *s2++; } @@ -233,7 +224,7 @@ if((*s1 & 0xffff) > 0x7f || (*s2 & 0xffff) > 0x7f) { if(!once) - yywarning(warn); + mcy_warning(warn); return *s1 - *s2; } else Modified: trunk/reactos/tools/wmc/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.h?rev=3093… ============================================================================== --- trunk/reactos/tools/wmc/utils.h (original) +++ trunk/reactos/tools/wmc/utils.h Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WMC_UTILS_H @@ -33,9 +33,9 @@ #define __attribute__(X) #endif -int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); -int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); Modified: trunk/reactos/tools/wmc/wmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.c?rev=30932&… ============================================================================== --- trunk/reactos/tools/wmc/wmc.c (original) +++ trunk/reactos/tools/wmc/wmc.c Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -31,7 +31,7 @@ #include "lang.h" #include "write.h" -static char usage[] = +static const char usage[] = "Usage: wmc [options...] [inputfile.mc]\n" " -B x Set output byte-order x={n[ative], l[ittle], b[ig]}\n" " (default is n[ative] which equals " @@ -58,7 +58,7 @@ "bytes read, which should be 0x0000..0x00ff.\n" ; -static char version_string[] = +static const char version_string[] = "Wine Message Compiler version " PACKAGE_VERSION "\n" "Copyright 2000 Bertho A. Stultiens\n" ; @@ -113,8 +113,21 @@ char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wmc */ +int mcy_debug; + int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig); + +static void cleanup_files(void) +{ + if (output_name) unlink( output_name ); + if (header_name) unlink( header_name ); +} + +static void exit_on_signal( int sig ) +{ + exit(1); /* this will call the atexit functions */ +} int main(int argc,char *argv[]) { @@ -126,7 +139,13 @@ int i; int cmdlen; + atexit( cleanup_files ); signal(SIGSEGV, segvhandler); + signal( SIGTERM, exit_on_signal ); + signal( SIGINT, exit_on_signal ); +#ifdef SIGHUP + signal( SIGHUP, exit_on_signal ); +#endif now = time(NULL); @@ -220,7 +239,7 @@ return 1; } - yydebug = dodebug; + mcy_debug = dodebug; if(dodebug) { setbuf(stdout, 0); @@ -254,7 +273,7 @@ else yyin = stdin; - ret = yyparse(); + ret = mcy_parse(); if(input_name) fclose(yyin); @@ -269,7 +288,8 @@ write_rc_file(output_name); if(!rcinline) write_bin_files(); - + output_name = NULL; + header_name = NULL; return 0; } Modified: trunk/reactos/tools/wmc/wmc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.h?rev=30932&… ============================================================================== --- trunk/reactos/tools/wmc/wmc.h (original) +++ trunk/reactos/tools/wmc/wmc.h Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WMC_WMC_H @@ -56,15 +56,15 @@ extern int line_number; extern int char_number; -int yyparse(void); -extern int yydebug; +int mcy_parse(void); +extern int mcy_debug; extern int want_nl; extern int want_line; extern int want_file; extern node_t *nodehead; extern lan_blk_t *lanblockhead; -int yylex(void); +int mcy_lex(void); FILE *yyin; void set_codepage(int cp); Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h (original) +++ trunk/reactos/tools/wmc/wmctypes.h Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WMC_WMCTYPES_H Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3093… ============================================================================== --- trunk/reactos/tools/wmc/write.c (original) +++ trunk/reactos/tools/wmc/write.c Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -87,7 +87,7 @@ * for normal character strings and 1 for unicode strings. */ -static char str_header[] = +static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" @@ -101,11 +101,11 @@ char *cptr; const union cptable *cpdef = find_codepage(cp); if(!cpdef) - internal_error(__FILE__, __LINE__, "Codepage %d not found (vanished?)", cp); + internal_error(__FILE__, __LINE__, "Codepage %d not found (vanished?)\n", cp); len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); cptr = xmalloc(len); if((len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d.", len); + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; } @@ -271,14 +271,14 @@ fprintf(fp, "#define %s\t0x%08xL\n\n", cptr, ndp->u.msg->realid); break; default: - internal_error(__FILE__, __LINE__, "Invalid base for number print"); + internal_error(__FILE__, __LINE__, "Invalid base for number print\n"); } free(cptr); if(cast) free(cast); break; default: - internal_error(__FILE__, __LINE__, "Invalid node type %d", ndp->type); + internal_error(__FILE__, __LINE__, "Invalid node type %d\n", ndp->type); } } fprintf(fp, "\n#endif\n"); @@ -308,7 +308,7 @@ } } if(!cptr) - internal_error(__FILE__, __LINE__, "Filename vanished for language 0x%0x", lbp->lan); + internal_error(__FILE__, __LINE__, "Filename vanished for language 0x%0x\n", lbp->lan); fprintf(fp, "1 MESSAGETABLE \"%s.bin\"\n", cptr); free(cptr); } @@ -390,7 +390,7 @@ mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); cc = tmp = xmalloc(mlen); if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d.", i); + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); *cptr++ = ' '; *cptr++ = '"'; for(i = b = 0; i < len; i++, cc++) Modified: trunk/reactos/tools/wmc/write.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.h?rev=3093… ============================================================================== --- trunk/reactos/tools/wmc/write.h (original) +++ trunk/reactos/tools/wmc/write.h Sat Dec 1 18:56:03 2007 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WMC_WRITE_H #define __WMC_WRITE_H

1 0

[jimtabor] 30931: Unbreak gdi batch... Sometimes dc is null.
by jimtabor＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: jimtabor Date: Sat Dec 1 16:26:45 2007 New Revision: 30931 URL: http://svn.reactos.org/svn/reactos?rev=30931&view=rev Log: Unbreak gdi batch... Sometimes dc is null. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Sat Dec 1 16:26:45 2007 @@ -23,10 +23,11 @@ if (hDC) { dc = DC_LockDc(hDC); - if (!dc) - return pHdr->Size; // Return the full size of the structure. - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if (dc) + { + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + } } // The thread is approaching the end of sunset. switch(pHdr->Cmd)

1 0

[tkreuzer] 30930: patch by jimtabor: add some usermode handling to SelectObject, currently if'ed out, as it doesn't properly work yet, add GDI_OBJECT_TYPE_COLORSPACE using SetColorSpace
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 05:14:35 2007 New Revision: 30930 URL: http://svn.reactos.org/svn/reactos?rev=30930&view=rev Log: patch by jimtabor: add some usermode handling to SelectObject, currently if'ed out, as it doesn't properly work yet, add GDI_OBJECT_TYPE_COLORSPACE using SetColorSpace Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Dec 1 05:14:35 2007 @@ -1344,6 +1344,7 @@ { PDC_ATTR pDc_Attr; // HGDIOBJ hOldObj = NULL; +// PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) { @@ -1352,35 +1353,79 @@ } hGdiObj = GdiFixUpHandle(hGdiObj); - if (!GdiIsHandleValid(hGdiObj)) - { - return NULL; - } + if (!GdiIsHandleValid(hGdiObj)) + { + return NULL; + } UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj); switch (uType) { + case GDI_OBJECT_TYPE_REGION: + return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); + + case GDI_OBJECT_TYPE_BITMAP: + return NtGdiSelectBitmap(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_BRUSH: +#if 0 // enable this when support is ready in win32k + hOldObj = pDc_Attr->hbrush; + pDc_Attr->ulDirty_ |= DC_BRUSH_DIRTY; + pDc_Attr->hbrush = hGdiObj; + return hOldObj; +#endif + return NtGdiSelectBrush(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_PEN: +// case GDI_OBJECT_TYPE_EXTPEN: +#if 0 // enable this when support is ready in win32k + hOldObj = pDc_Attr->hpen; + pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; + pDc_Attr->hpen = hGdiObj; + return hOldObj; +#endif + return NtGdiSelectPen(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_FONT: +#if 0 + pTeb = NtCurrentTeb(); + if (((pTeb->GdiTebBatch.HDC == 0) || + (pTeb->GdiTebBatch.HDC == (ULONG)hDC)) && + ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) && + (!(pDc_Attr->ulDirty_ & DC_DIBSECTION))) + { + PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + + pTeb->GdiTebBatch.Offset); + pgO->gbHdr.Cmd = GdiBCSelObj; + pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + pgO->hgdiobj = hGdiObj; + + pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); + pTeb->GdiTebBatch.HDC = (ULONG)hDC; + pTeb->GdiBatchCount++; + if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + return pDc_Attr->hlfntNew; + } +#endif + // default for select object font + return NtGdiSelectFont(hDC, hGdiObj); +#if 0 + case GDI_OBJECT_TYPE_METADC: + return MFDRV_SelectObject( hDC, hGdiObj); + case GDI_OBJECT_TYPE_EMF: + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) return NULL; + return EMFDRV_SelectObject( hDC, hGdiObj); +#endif + case GDI_OBJECT_TYPE_COLORSPACE: + SetColorSpace(hDC, (HCOLORSPACE) hGdiObj); + return NULL; + case GDI_OBJECT_TYPE_PALETTE: + default: SetLastError(ERROR_INVALID_FUNCTION); return NULL; - - case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); - - case GDI_OBJECT_TYPE_BITMAP: - return NtGdiSelectBitmap(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_BRUSH: - return NtGdiSelectBrush(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_PEN: -// case GDI_OBJECT_TYPE_EXTPEN: - return NtGdiSelectPen(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_FONT: - return NtGdiSelectFont(hDC, hGdiObj); - } return NULL;

1 0

[tkreuzer] 30929: patch by jimtabor: add GdiBCSelObj to GdiFlushUserBatch
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 05:09:39 2007 New Revision: 30929 URL: http://svn.reactos.org/svn/reactos?rev=30929&view=rev Log: patch by jimtabor: add GdiBCSelObj to GdiFlushUserBatch Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Sat Dec 1 05:09:39 2007 @@ -49,7 +49,13 @@ case GdiBCExtSelClipRgn: break; case GdiBCSelObj: - break; + { + PGDIBSOBJECT pgO; + if(!dc) break; + pgO = (PGDIBSOBJECT) pHdr; + if(NT_SUCCESS(TextIntRealizeFont((HFONT) pgO->hgdiobj))) + Dc_Attr->hlfntNew = (HFONT) pgO->hgdiobj; + } case GdiBCDelObj: case GdiBCDelRgn: { @@ -115,3 +121,4 @@ return STATUS_SUCCESS; } +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007