wine-commits September 2011

2 participants
996 discussions

Alexandre Julliard : Import of upstream bugzilla release 4.0.2.

by Alexandre Julliard

Module: bugzilla Branch: master Commit: 48ead63356288ccfcbbfbfa8e71b7042d3fe1104 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=48ead63356288ccfcbbfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 20:58:07 2011 +0200 Import of upstream bugzilla release 4.0.2. --- .bzrignore | 5 +- .bzrrev | 1 - .cvsignore | 6 - .htaccess | 25 + Bugzilla.pm | 69 +- Bugzilla/.cvsignore | 1 - Bugzilla/Attachment.pm | 41 +- Bugzilla/Auth.pm | 7 +- Bugzilla/Auth/Login.pm | 9 + Bugzilla/Auth/Login/Cookie.pm | 1 + Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 5 + Bugzilla/Bug.pm | 1276 ++-- Bugzilla/BugMail.pm | 289 +- Bugzilla/CGI.pm | 98 +- Bugzilla/Chart.pm | 2 +- Bugzilla/Classification.pm | 15 +- Bugzilla/Comment.pm | 42 +- Bugzilla/Component.pm | 68 +- Bugzilla/Config/Advanced.pm | 10 + Bugzilla/Config/BugFields.pm | 6 - Bugzilla/Config/Common.pm | 10 +- Bugzilla/Config/MTA.pm | 6 - Bugzilla/Config/Query.pm | 4 +- Bugzilla/Constants.pm | 88 +- Bugzilla/DB.pm | 216 +- Bugzilla/DB/Mysql.pm | 40 +- Bugzilla/DB/Oracle.pm | 14 +- Bugzilla/DB/Pg.pm | 45 +- Bugzilla/DB/Schema.pm | 121 +- Bugzilla/DB/Schema/Mysql.pm | 3 + Bugzilla/DB/Schema/Oracle.pm | 70 +- Bugzilla/Error.pm | 15 + Bugzilla/Extension.pm | 14 +- Bugzilla/Field.pm | 263 +- Bugzilla/Field/Choice.pm | 171 +- Bugzilla/Field/ChoiceInterface.pm | 273 + Bugzilla/Flag.pm | 52 +- Bugzilla/FlagType.pm | 53 +- Bugzilla/Group.pm | 58 +- Bugzilla/Hook.pm | 403 +- Bugzilla/Install.pm | 107 +- Bugzilla/Install/CPAN.pm | 20 +- Bugzilla/Install/DB.pm | 194 +- Bugzilla/Install/Filesystem.pm | 423 +- Bugzilla/Install/Requirements.pm | 300 +- Bugzilla/Install/Util.pm | 224 +- Bugzilla/JobQueue/Runner.pm | 9 +- Bugzilla/Keyword.pm | 13 +- Bugzilla/Mailer.pm | 10 +- Bugzilla/Migrate.pm | 16 +- Bugzilla/Migrate/Gnats.pm | 19 +- Bugzilla/Milestone.pm | 32 +- Bugzilla/Object.pm | 271 +- Bugzilla/Product.pm | 405 +- Bugzilla/Search.pm | 946 ++- Bugzilla/Search/Quicksearch.pm | 30 +- Bugzilla/Search/Recent.pm | 166 + Bugzilla/Search/Saved.pm | 36 +- Bugzilla/Series.pm | 5 + Bugzilla/Status.pm | 7 +- Bugzilla/Template.pm | 216 +- Bugzilla/Template/Plugin/Hook.pm | 14 +- Bugzilla/Token.pm | 3 - Bugzilla/User.pm | 242 +- Bugzilla/User/Setting/Timezone.pm | 1 + Bugzilla/Util.pm | 93 +- Bugzilla/Version.pm | 26 +- Bugzilla/WebService.pm | 26 +- Bugzilla/WebService/Bug.pm | 1325 +++- Bugzilla/WebService/Bugzilla.pm | 20 +- Bugzilla/WebService/Constants.pm | 41 +- Bugzilla/WebService/Product.pm | 22 +- Bugzilla/WebService/Server.pm | 5 + Bugzilla/WebService/Server/JSONRPC.pm | 274 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 +- Bugzilla/WebService/User.pm | 104 +- Bugzilla/WebService/Util.pm | 42 +- Bugzilla/Whine.pm | 132 + Bugzilla/Whine/Schedule.pm | 2 - attachment.cgi | 24 +- buglist.cgi | 121 +- bugzilla.dtd | 59 +- chart.cgi | 2 +- checksetup.pl | 7 +- colchange.cgi | 105 +- collectstats.pl | 18 +- config.cgi | 5 +- contrib/.cvsignore | 1 - contrib/{bugzilla-queue => bugzilla-queue.rhel} | 0 contrib/bugzilla-queue.suse | 174 + contrib/bugzilla-submit/bugzilla-submit | 2 +- contrib/bzdbcopy.pl | 8 +- contrib/console.pl | 2 +- contrib/convert-workflow.pl | 135 + contrib/jb2bz.py | 8 +- contrib/merge-users.pl | 38 +- contrib/new-yui.sh | 17 + contrib/sendbugmail.pl | 7 +- docs/bugzilla.ent | 11 +- docs/en/.cvsignore | 3 - docs/en/images/bzLifecycle.png | Bin 74447 -> 36761 bytes docs/en/images/bzLifecycle.xml | 1569 ++-- docs/en/rel_notes.txt | 12 +- docs/en/xml/.cvsignore | 1 - docs/en/xml/Bugzilla-Guide.xml | 6 +- docs/en/xml/administration.xml | 24 +- docs/en/xml/bugzilla.ent | 11 +- docs/en/xml/glossary.xml | 2 - docs/en/xml/installation.xml | 25 +- editclassifications.cgi | 2 +- editcomponents.cgi | 4 +- editfields.cgi | 8 +- editflagtypes.cgi | 13 +- editgroups.cgi | 7 +- editkeywords.cgi | 2 +- editmilestones.cgi | 9 +- editproducts.cgi | 27 +- editusers.cgi | 9 +- editvalues.cgi | 19 +- editversions.cgi | 6 +- editwhines.cgi | 37 +- editworkflow.cgi | 2 +- email_in.pl | 60 +- enter_bug.cgi | 123 +- extensions/Example/Extension.pm | 263 +- .../en/default/account/prefs/my_tab.html.tmpl | 30 + .../hook/account/prefs/prefs-tabs.html.tmpl | 23 + .../admin/sanitycheck/messages-statuses.html.tmpl | 3 +- .../hook/global/setting-descs-settings.none.tmpl | 6 + .../hook/global/user-error-errors.html.tmpl | 3 + .../template/en/default/pages/example.html.tmpl | 2 +- extensions/OldBugMove/Config.pm | 25 + extensions/OldBugMove/Extension.pm | 208 + .../OldBugMove/lib/Params.pm | 39 +- .../en/default/admin/params/oldbugmove.html.tmpl | 29 +- .../hook/bug/edit-after_comment_textarea.html.tmpl | 27 + .../default/hook/bug/format_comment-type.txt.tmpl | 29 + .../user-error-auth_failure_action.html.tmpl | 23 + .../hook/global/user-error-errors.html.tmpl | 29 + .../hook/list/edit-multiple-after_groups.html.tmpl | 28 + extensions/Voting/Extension.pm | 870 +++ .../account/prefs/email-relationships.html.tmpl | 22 + .../hook/admin/products/edit-common-rows.html.tmpl | 60 + .../hook/admin/products/updated-changes.html.tmpl | 102 + .../admin/sanitycheck/messages-statuses.html.tmpl | 41 + .../admin/users/confirm-delete-warn_safe.html.tmpl | 38 + .../hook/bug/edit-after_importance.html.tmpl | 41 + .../default/hook/bug/format_comment-type.txt.tmpl | 23 + .../hook/bug/process/header-title.html.tmpl | 24 + .../hook/bug/process/results-title.html.tmpl | 21 + .../hook/global/code-error-errors.html.tmpl | 25 + .../default/hook/global/field-descs-end.none.tmpl | 23 + .../default/hook/global/reason-descs-end.none.tmpl | 23 + .../hook/global/user-error-errors.html.tmpl | 55 + .../search/form-after_freetext_fields.html.tmpl | 28 + .../search-report-select-rep_fields.html.tmpl | 21 + .../template}/en/default/pages/voting.html.tmpl | 2 +- .../template/en/default/pages/voting/bug.html.tmpl | 15 +- .../en/default/pages/voting/user.html.tmpl | 36 +- .../en/default/voting}/delete-all.html.tmpl | 4 +- .../en/default/voting}/votes-removed.txt.tmpl | 0 .../voting.css => extensions/Voting/web/style.css | 0 extensions/create.pl | 3 +- importxml.pl | 148 +- install-module.pl | 9 +- js/TUI.js | 11 +- js/attachment.js | 37 +- js/bug.js | 131 + js/comments.js | 99 + js/field.js | 206 +- js/flag.js | 16 +- js/global.js | 10 + js/help.js | 108 - js/util.js | 13 +- js/yui/animation/animation-min.js | 23 + js/yui/assets/skins/sam/ajax-loader.gif | Bin 0 -> 3208 bytes js/yui/assets/skins/sam/asc.gif | Bin 0 -> 177 bytes js/yui/assets/skins/sam/autocomplete.css | 7 + js/yui/assets/skins/sam/back-h.png | Bin 0 -> 334 bytes js/yui/assets/skins/sam/back-v.png | Bin 0 -> 338 bytes js/yui/assets/skins/sam/bar-h.png | Bin 0 -> 365 bytes js/yui/assets/skins/sam/bar-v.png | Bin 0 -> 387 bytes js/yui/assets/skins/sam/bg-h.gif | Bin 0 -> 212 bytes js/yui/assets/skins/sam/bg-v.gif | Bin 0 -> 481 bytes js/yui/assets/skins/sam/blankimage.png | Bin 0 -> 2314 bytes js/yui/assets/skins/sam/button.css | 7 + js/yui/assets/skins/sam/calendar.css | 8 + js/yui/assets/skins/sam/carousel.css | 7 + js/yui/assets/skins/sam/check0.gif | Bin 0 -> 608 bytes js/yui/assets/skins/sam/check1.gif | Bin 0 -> 622 bytes js/yui/assets/skins/sam/check2.gif | Bin 0 -> 609 bytes js/yui/assets/skins/sam/colorpicker.css | 7 + js/yui/assets/skins/sam/container.css | 7 + js/yui/assets/skins/sam/datatable.css | 8 + js/yui/assets/skins/sam/desc.gif | Bin 0 -> 177 bytes js/yui/assets/skins/sam/dt-arrow-dn.png | Bin 0 -> 116 bytes js/yui/assets/skins/sam/dt-arrow-up.png | Bin 0 -> 116 bytes js/yui/assets/skins/sam/editor-knob.gif | Bin 0 -> 138 bytes js/yui/assets/skins/sam/editor-sprite-active.gif | Bin 0 -> 5614 bytes js/yui/assets/skins/sam/editor-sprite.gif | Bin 0 -> 5690 bytes js/yui/assets/skins/sam/editor.css | 10 + js/yui/assets/skins/sam/header_background.png | Bin 0 -> 158 bytes js/yui/assets/skins/sam/hue_bg.png | Bin 0 -> 1120 bytes js/yui/assets/skins/sam/imagecropper.css | 7 + js/yui/assets/skins/sam/layout.css | 7 + js/yui/assets/skins/sam/layout_sprite.png | Bin 0 -> 1409 bytes js/yui/assets/skins/sam/loading.gif | Bin 0 -> 2673 bytes js/yui/assets/skins/sam/logger.css | 7 + .../skins/sam/menu-button-arrow-disabled.png | Bin 0 -> 173 bytes js/yui/assets/skins/sam/menu-button-arrow.png | Bin 0 -> 173 bytes js/yui/assets/skins/sam/menu.css | 7 + .../skins/sam/menubaritem_submenuindicator.png | Bin 0 -> 3618 bytes .../sam/menubaritem_submenuindicator_disabled.png | Bin 0 -> 3618 bytes js/yui/assets/skins/sam/menuitem_checkbox.png | Bin 0 -> 3625 bytes .../skins/sam/menuitem_checkbox_disabled.png | Bin 0 -> 3625 bytes .../assets/skins/sam/menuitem_submenuindicator.png | Bin 0 -> 3617 bytes .../sam/menuitem_submenuindicator_disabled.png | Bin 0 -> 3617 bytes js/yui/assets/skins/sam/paginator.css | 7 + js/yui/assets/skins/sam/picker_mask.png | Bin 0 -> 12174 bytes js/yui/assets/skins/sam/profilerviewer.css | 7 + js/yui/assets/skins/sam/progressbar.css | 7 + js/yui/assets/skins/sam/resize.css | 7 + js/yui/assets/skins/sam/simpleeditor.css | 10 + js/yui/assets/skins/sam/slider.css | 7 + .../assets/skins/sam/split-button-arrow-active.png | Bin 0 -> 280 bytes .../skins/sam/split-button-arrow-disabled.png | Bin 0 -> 185 bytes .../assets/skins/sam/split-button-arrow-focus.png | Bin 0 -> 185 bytes .../assets/skins/sam/split-button-arrow-hover.png | Bin 0 -> 185 bytes js/yui/assets/skins/sam/split-button-arrow.png | Bin 0 -> 185 bytes .../yui => js/yui/assets/skins/sam}/sprite.png | Bin 3745 -> 3745 bytes js/yui/assets/skins/sam/tabview.css | 8 + js/yui/assets/skins/sam/treeview-loading.gif | Bin 0 -> 2673 bytes js/yui/assets/skins/sam/treeview-sprite.gif | Bin 0 -> 4326 bytes js/yui/assets/skins/sam/treeview.css | 7 + js/yui/assets/skins/sam/wait.gif | Bin 0 -> 1100 bytes js/yui/assets/skins/sam/yuitest.css | 7 + js/yui/autocomplete/autocomplete-min.js | 12 + js/yui/base/base-min.css | 7 + js/yui/base/base.css | 131 + js/yui/button/button-min.js | 11 + js/yui/calendar.js | 18 - js/yui/calendar/calendar-min.js | 18 + js/yui/carousel/carousel-min.js | 12 + js/yui/charts/charts-min.js | 9 + js/yui/colorpicker/colorpicker-min.js | 9 + js/yui/connection/connection-min.js | 9 + js/yui/connection/connection.swf | Bin 0 -> 2423 bytes js/yui/connection/connection_core-min.js | 8 + js/yui/container/container-min.js | 19 + js/yui/container/container_core-min.js | 14 + js/yui/cookie.js | 7 - js/yui/cookie/cookie-min.js | 7 + js/yui/datasource/datasource-min.js | 12 + js/yui/datatable/datatable-min.js | 29 + js/yui/datemath/datemath-min.js | 7 + js/yui/dom/dom-min.js | 9 + js/yui/dragdrop/dragdrop-min.js | 10 + js/yui/element-delegate/element-delegate-min.js | 7 + js/yui/element/element-min.js | 8 + js/yui/event-delegate/event-delegate-min.js | 7 + js/yui/event-mouseenter/event-mouseenter-min.js | 7 + js/yui/event-simulate/event-simulate-min.js | 7 + js/yui/event/event-min.js | 11 + js/yui/fonts/fonts-min.css | 7 + js/yui/fonts/fonts.css | 56 + js/yui/get/get-min.js | 7 + js/yui/grids/grids-min.css | 7 + js/yui/grids/grids.css | 467 ++ js/yui/history/history-min.js | 7 + js/yui/imagecropper/imagecropper-min.js | 8 + js/yui/imageloader/imageloader-min.js | 7 + js/yui/json/json-min.js | 7 + js/yui/layout/layout-min.js | 11 + js/yui/logger/logger-min.js | 9 + js/yui/menu/menu-min.js | 16 + js/yui/paginator/paginator-min.js | 10 + js/yui/profiler/profiler-min.js | 7 + js/yui/profilerviewer/profilerviewer-min.js | 9 + js/yui/progressbar/progressbar-min.js | 8 + js/yui/reset-fonts-grids/reset-fonts-grids.css | 7 + js/yui/reset-fonts/reset-fonts.css | 7 + js/yui/reset/reset-min.css | 7 + js/yui/reset/reset.css | 142 + js/yui/resize/resize-min.js | 10 + js/yui/selector/selector-min.js | 8 + js/yui/slider/slider-min.js | 9 + js/yui/storage/storage-min.js | 8 + js/yui/stylesheet/stylesheet-min.js | 7 + js/yui/swf/swf-min.js | 7 + js/yui/swfdetect/swfdetect-min.js | 7 + js/yui/swfstore/swfstore-min.js | 7 + js/yui/swfstore/swfstore.swf | Bin 0 -> 4879 bytes js/yui/tabview/tabview-min.js | 8 + js/yui/treeview/treeview-min.js | 12 + js/yui/uploader/uploader-min.js | 15 + js/yui/yahoo-dom-event.js | 12 - js/yui/yahoo-dom-event/yahoo-dom-event.js | 14 + js/yui/yahoo/yahoo-min.js | 7 + js/yui/yuiloader/yuiloader-min.js | 10 + js/yui/yuitest/yuitest-min.js | 10 + js/yui/yuitest/yuitest_core-min.js | 9 + lib/CGI.pm | 8146 ++++++++++++++++++++ lib/CGI/Apache.pm | 27 + lib/CGI/Carp.pm | 630 ++ lib/CGI/Cookie.pm | 540 ++ lib/CGI/Fast.pm | 224 + lib/CGI/Pretty.pm | 312 + lib/CGI/Push.pm | 325 + lib/CGI/Switch.pm | 28 + lib/CGI/Util.pm | 331 + long_list.cgi | 2 +- mod_perl.pl | 27 +- page.cgi | 2 +- post_bug.cgi | 23 +- process_bug.cgi | 480 +- query.cgi | 40 +- relogin.cgi | 4 +- report.cgi | 32 +- request.cgi | 13 +- sanitycheck.cgi | 197 +- showdependencygraph.cgi | 29 +- skins/.cvsignore | 1 - skins/README | 20 + skins/contrib/Dusk/.cvsignore | 17 - skins/contrib/Dusk/global.css | 8 +- skins/contrib/Dusk/index.css | 16 - skins/contrib/Dusk/index/account.gif | Bin 6869 -> 0 bytes skins/contrib/Dusk/index/bug.gif | Bin 6370 -> 0 bytes skins/contrib/Dusk/index/search.gif | Bin 6661 -> 0 bytes skins/standard/IE-fixes.css | 21 + skins/standard/admin.css | 12 + skins/standard/attachment.css | 246 + skins/standard/buglist.css | 9 +- skins/standard/create_attachment.css | 145 - skins/standard/enter_bug.css | 72 + skins/standard/global.css | 78 +- skins/standard/help.css | 41 - skins/standard/index.css | 23 +- skins/standard/index/account.gif | Bin 7130 -> 0 bytes skins/standard/index/bug.gif | Bin 6586 -> 0 bytes skins/standard/index/file-a-bug.png | Bin 0 -> 3534 bytes skins/standard/index/help.png | Bin 0 -> 4111 bytes skins/standard/index/new-account.png | Bin 0 -> 4082 bytes skins/standard/index/search.gif | Bin 6907 -> 0 bytes skins/standard/index/search.png | Bin 0 -> 4828 bytes skins/standard/page.css | 33 + skins/standard/search_form.css | 202 + skins/standard/show_bug.css | 15 +- skins/standard/yui/calendar.css | 7 - summarize_time.cgi | 12 +- t/.cvsignore | 1 - t/007util.t | 8 +- t/008filter.t | 28 +- t/010dependencies.t | 38 +- template/.cvsignore | 3 - template/en/.cvsignore | 2 - template/en/default/account/auth/login.html.tmpl | 3 +- .../en/default/account/email/confirm-new.html.tmpl | 2 +- template/en/default/account/prefs/email.html.tmpl | 84 +- template/en/default/account/prefs/prefs.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 16 +- .../en/default/admin/classifications/add.html.tmpl | 23 +- .../admin/classifications/edit-common.html.tmpl | 47 + .../default/admin/classifications/edit.html.tmpl | 24 +- .../en/default/admin/components/create.html.tmpl | 64 +- .../default/admin/components/edit-common.html.tmpl | 86 + .../en/default/admin/components/edit.html.tmpl | 66 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 20 +- .../default/admin/custom_fields/create.html.tmpl | 42 +- .../en/default/admin/custom_fields/edit.html.tmpl | 47 +- .../en/default/admin/custom_fields/list.html.tmpl | 4 + .../en/default/admin/fieldvalues/create.html.tmpl | 3 + .../en/default/admin/fieldvalues/edit.html.tmpl | 11 +- .../en/default/admin/params/advanced.html.tmpl | 31 + .../en/default/admin/params/attachment.html.tmpl | 2 +- template/en/default/admin/params/auth.html.tmpl | 4 +- .../en/default/admin/params/bugchange.html.tmpl | 10 +- .../en/default/admin/params/bugfields.html.tmpl | 5 - template/en/default/admin/params/bugmove.html.tmpl | 49 - template/en/default/admin/params/common.html.tmpl | 79 +- .../default/admin/params/dependencygraph.html.tmpl | 4 +- .../en/default/admin/params/editparams.html.tmpl | 2 +- template/en/default/admin/params/general.html.tmpl | 2 +- template/en/default/admin/params/index.html.tmpl | 2 +- template/en/default/admin/params/mta.html.tmpl | 12 +- template/en/default/admin/params/radius.html.tmpl | 8 +- .../en/default/admin/products/create.html.tmpl | 9 +- .../default/admin/products/edit-common.html.tmpl | 33 +- .../admin/products/list-classifications.html.tmpl | 13 +- template/en/default/admin/products/list.html.tmpl | 34 +- .../en/default/admin/products/updated.html.tmpl | 84 +- .../default/admin/sanitycheck/messages.html.tmpl | 60 +- .../default/admin/users/confirm-delete.html.tmpl | 23 +- .../default/admin/users/responsibilities.html.tmpl | 4 + template/en/default/attachment/create.html.tmpl | 8 +- .../attachment/createformcontents.html.tmpl | 18 +- template/en/default/attachment/diff-file.html.tmpl | 4 +- .../en/default/attachment/diff-header.html.tmpl | 8 +- template/en/default/attachment/edit.html.tmpl | 343 +- template/en/default/attachment/list.html.tmpl | 32 +- .../en/default/attachment/show-multiple.html.tmpl | 2 +- template/en/default/bug/activity/table.html.tmpl | 8 +- template/en/default/bug/comments.html.tmpl | 93 +- .../en/default/bug/create/create-guided.html.tmpl | 11 +- template/en/default/bug/create/create.html.tmpl | 358 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 181 +- template/en/default/bug/field-events.js.tmpl | 4 + template/en/default/bug/field-help.none.tmpl | 241 + template/en/default/bug/field-label.html.tmpl | 52 + template/en/default/bug/field.html.tmpl | 111 +- template/en/default/bug/format_comment.txt.tmpl | 12 +- template/en/default/bug/navigate.html.tmpl | 64 +- template/en/default/bug/process/header.html.tmpl | 4 +- template/en/default/bug/process/midair.html.tmpl | 3 +- template/en/default/bug/process/results.html.tmpl | 3 +- .../bug/process/verify-new-product.html.tmpl | 32 +- template/en/default/bug/show-header.html.tmpl | 9 +- template/en/default/bug/show-multiple.html.tmpl | 7 + template/en/default/bug/show.xml.tmpl | 8 +- template/en/default/bug/summarize-time.html.tmpl | 22 +- template/en/default/email/newchangedmail.txt.tmpl | 64 +- template/en/default/email/whine.txt.tmpl | 13 +- template/en/default/extensions/web-readme.txt.tmpl | 29 + template/en/default/filterexceptions.pl | 26 +- template/en/default/flag/list.html.tmpl | 77 +- template/en/default/global/code-error.html.tmpl | 53 +- template/en/default/global/common-links.html.tmpl | 3 +- .../en/default/global/confirm-action.html.tmpl | 1 + .../en/default/global/confirm-user-match.html.tmpl | 7 +- template/en/default/global/field-descs.none.tmpl | 13 +- template/en/default/global/header.html.tmpl | 237 +- template/en/default/global/help.html.tmpl | 5 +- template/en/default/global/hidden-fields.html.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 19 +- .../en/default/global/per-bug-queries.html.tmpl | 1 + template/en/default/global/reason-descs.none.tmpl | 40 + template/en/default/global/setting-descs.none.tmpl | 3 + .../en/default/global/site-navigation.html.tmpl | 13 +- template/en/default/global/textarea.html.tmpl | 6 + template/en/default/global/user-error.html.tmpl | 210 +- template/en/default/global/userselect.html.tmpl | 50 +- template/en/default/global/value-descs.js.tmpl | 33 + template/en/default/global/variables.none.tmpl | 2 + template/en/default/index.html.tmpl | 6 +- template/en/default/list/change-columns.html.tmpl | 38 +- template/en/default/list/edit-multiple.html.tmpl | 79 +- template/en/default/list/list-simple.html.tmpl | 3 +- template/en/default/list/list.html.tmpl | 6 +- template/en/default/list/list.ics.tmpl | 2 +- template/en/default/list/list.rdf.tmpl | 2 +- template/en/default/list/table.html.tmpl | 13 +- template/en/default/pages/fields.html.tmpl | 327 +- template/en/default/pages/quicksearch.html.tmpl | 10 +- template/en/default/pages/release-notes.html.tmpl | 1155 +++- template/en/default/reports/components.html.tmpl | 5 +- .../en/default/reports/duplicates-simple.html.tmpl | 4 +- template/en/default/reports/duplicates.html.tmpl | 8 +- template/en/default/reports/keywords.html.tmpl | 5 +- template/en/default/request/email.txt.tmpl | 1 + template/en/default/request/queue.html.tmpl | 34 +- .../en/default/search/boolean-charts.html.tmpl | 27 +- template/en/default/search/field.html.tmpl | 142 + template/en/default/search/form.html.tmpl | 704 +-- .../en/default/search/search-advanced.html.tmpl | 29 +- .../default/search/search-create-series.html.tmpl | 4 +- template/en/default/search/search-help.html.tmpl | 107 - .../default/search/search-report-graph.html.tmpl | 17 +- .../default/search/search-report-select.html.tmpl | 8 +- .../default/search/search-report-table.html.tmpl | 23 +- template/en/default/setup/strings.txt.pl | 20 + template/en/default/sidebar.xul.tmpl | 3 - template/en/default/welcome-admin.html.tmpl | 12 +- template/en/default/whine/mail.html.tmpl | 59 +- template/en/default/whine/mail.txt.tmpl | 15 +- token.cgi | 7 +- userprefs.cgi | 105 +- votes.cgi | 355 +- whine.pl | 1 - whineatnews.pl | 12 +- xt/README | 18 + xt/lib/Bugzilla/Test/Search.pm | 942 +++ xt/lib/Bugzilla/Test/Search/AndTest.pm | 69 + xt/lib/Bugzilla/Test/Search/Constants.pm | 1040 +++ xt/lib/Bugzilla/Test/Search/FakeCGI.pm | 61 + xt/lib/Bugzilla/Test/Search/FieldTest.pm | 582 ++ xt/lib/Bugzilla/Test/Search/InjectionTest.pm | 77 + xt/lib/Bugzilla/Test/Search/OperatorTest.pm | 110 + xt/lib/Bugzilla/Test/Search/OrTest.pm | 186 + xt/search.t | 96 + 491 files changed, 31142 insertions(+), 8450 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=48ead63356288ccfc…

12 years, 7 months

Alexandre Julliard : winecfg: Set the background color for the web link.

by Alexandre Julliard

Module: wine Branch: master Commit: 707efdc0f8c6d2735ecde8e47cb024e569681300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707efdc0f8c6d2735ecde8e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 22:53:14 2011 +0200 winecfg: Set the background color for the web link. --- programs/winecfg/about.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index 650603a..9b32582 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -170,6 +170,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetTextColor((HDC)wParam, 0x0000007F); case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: + case IDC_ABT_WEB_LINK: return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } break;

12 years, 7 months

Francois Gouget : comctl32: Send a WM_CTLCOLORSTATIC message and erase the background while painting.

by Alexandre Julliard

Module: wine Branch: master Commit: 76b6c8f5170f1f8d95ad38febc8c8cb1b606f067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b6c8f5170f1f8d95ad38feb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 26 16:22:40 2011 +0200 comctl32: Send a WM_CTLCOLORSTATIC message and erase the background while painting. --- dlls/comctl32/syslink.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 01d638c..b2dfdad 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -832,6 +832,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) PDOC_ITEM Current; HFONT hOldFont; COLORREF OldTextColor, OldBkColor; + HBRUSH hBrush; hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); @@ -843,6 +844,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) if(rc.right < 0 || rc.bottom < 0) return 0; + hBrush = (HBRUSH)SendMessageW(infoPtr->Notify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->Self); + if (!hBrush) + hBrush = CreateSolidBrush(infoPtr->BackColor); + FillRect(hdc, &rc, hBrush); + DeleteObject(hBrush); + for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) { int n; @@ -911,23 +919,6 @@ static LRESULT SYSLINK_Paint (const SYSLINK_INFO *infoPtr, HDC hdcParam) } /*********************************************************************** - * SYSLINK_EraseBkgnd - * Handles the WM_ERASEBKGND message. - */ -static LRESULT SYSLINK_EraseBkgnd (const SYSLINK_INFO *infoPtr, HDC hdc) -{ - HBRUSH hbr; - RECT r; - - GetClientRect(infoPtr->Self, &r); - hbr = CreateSolidBrush(infoPtr->BackColor); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); - - return 1; -} - -/*********************************************************************** * SYSLINK_SetFont * Set new Font for the SysLink control. */ @@ -1572,7 +1563,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_Paint (infoPtr, (HDC)wParam); case WM_ERASEBKGND: - return SYSLINK_EraseBkgnd(infoPtr, (HDC)wParam); + return 0; case WM_SETCURSOR: { @@ -1752,7 +1743,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; infoPtr->TextColor = comctl32_color.clrWindowText; - infoPtr->LinkColor = comctl32_color.clrHotTrackingColor; + infoPtr->LinkColor = comctl32_color.clrHighlight; infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? comctl32_color.clrWindow : comctl32_color.clrBtnFace;

12 years, 7 months

Francois Gouget : comctl32/tests: Add basic tests for the SysLink control.

by Alexandre Julliard

Module: wine Branch: master Commit: e6368a040c10b628d202ef5be9ff58cf3f220201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6368a040c10b628d202ef5be… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 26 16:21:39 2011 +0200 comctl32/tests: Add basic tests for the SysLink control. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/syslink.c | 257 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index cb4f3ff..145c125 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ rebar.c \ status.c \ subclass.c \ + syslink.c \ tab.c \ toolbar.c \ tooltips.c \ diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c new file mode 100644 index 0000000..ea92d42 --- /dev/null +++ b/dlls/comctl32/tests/syslink.c @@ -0,0 +1,257 @@ +/* Unit tests for the syslink control. + * + * Copyright 2011 Francois Gouget for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" +#include "v6util.h" +#include "msg.h" + +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define NUM_MSG_SEQUENCE 2 +#define PARENT_SEQ_INDEX 0 +#define SYSLINK_SEQ_INDEX 1 + +static HWND hWndParent; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; + +static const struct message empty_wnd_seq[] = { + {0} +}; + +static const struct message parent_create_syslink_wnd_seq[] = { + { WM_GETFONT, sent|optional}, /* Only on XP */ + { WM_QUERYUISTATE, sent|optional}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent|wparam, 0}, + { WM_PARENTNOTIFY, sent|wparam, WM_CREATE}, + {0} +}; + +static const struct message visible_syslink_wnd_seq[] = { + { WM_STYLECHANGING, sent|wparam, GWL_STYLE}, + { WM_STYLECHANGED, sent|wparam, GWL_STYLE}, + { WM_PAINT, sent}, + {0} +}; + +static const struct message parent_visible_syslink_wnd_seq[] = { + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent|wparam, 0}, + {0} +}; + +/* Try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + +static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCPAINT && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = DefWindowProcW(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static const WCHAR parentClassW[] = {'S','y','s','l','i','n','k',' ','t','e','s','t',' ','p','a','r','e','n','t',' ','c','l','a','s','s',0}; + +static BOOL register_parent_wnd_class(void) +{ + WNDCLASSW cls; + + cls.style = 0; + cls.lpfnWndProc = parent_wnd_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleW(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = parentClassW; + return RegisterClassW(&cls); +} + +static HWND create_parent_window(void) +{ + static const WCHAR titleW[] = {'S','y','s','l','i','n','k',' ','t','e','s','t',' ','p','a','r','e','n','t',' ','w','i','n','d','o','w',0}; + if (!register_parent_wnd_class()) + return NULL; + + return CreateWindowExW(0, parentClassW, titleW, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 0, 0, 200, 100, GetDesktopWindow(), + NULL, GetModuleHandleW(NULL), NULL); +} + +static WNDPROC syslink_oldproc; + +static LRESULT WINAPI syslink_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("syslink: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, SYSLINK_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = CallWindowProcW(syslink_oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static HWND create_syslink(DWORD style, HWND parent) +{ + HWND hWndSysLink; + static const WCHAR linkW[] = {'H','e','a','d',' ','<','a',' ','h','r','e','f','=','"','l','i','n','k','1','"','>','N','a','m','e','1','<','/','a','>',' ','M','i','d','d','l','e',' ','<','a',' ','h','r','e','f','=','"','l','i','n','k','2','"','>','N','a','m','e','2','<','/','a','>',' ','T','a','i','l',0}; + + /* Only Unicode will do here */ + hWndSysLink = CreateWindowExW(0, WC_LINK, linkW, + style, 0, 0, 150, 50, + parent, NULL, GetModuleHandleW(NULL), NULL); + if (!hWndSysLink) return NULL; + + if (GetWindowLongPtrW(hWndSysLink, GWLP_USERDATA)) + /* On Windows XP SysLink takes GWLP_USERDATA for itself! */ + trace("SysLink makes use of GWLP_USERDATA\n"); + + syslink_oldproc = (WNDPROC)SetWindowLongPtrW(hWndSysLink, GWLP_WNDPROC, (LONG_PTR)syslink_subclass_proc); + + return hWndSysLink; +} + + +START_TEST(syslink) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + HMODULE hComctl32; + BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + INITCOMMONCONTROLSEX iccex; + BOOL rc; + HWND hWndSysLink; + LONG oldstyle; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ + hComctl32 = LoadLibraryA("comctl32.dll"); + pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); + if (!pInitCommonControlsEx) + { + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + return; + } + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_LINK_CLASS; + rc = pInitCommonControlsEx(&iccex); + ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError()); + if (!rc) + { + skip("Could not register ICC_LINK_CLASS\n"); + return; + } + + init_msg_sequences(sequences, NUM_MSG_SEQUENCE); + + /* Create parent window */ + hWndParent = create_parent_window(); + ok(hWndParent != NULL, "Failed to create parent Window!\n"); + if (!hWndParent) + { + skip("Parent window not present\n"); + return; + } + flush_events(); + + /* Create an invisible SysLink control */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); + ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); + if (!hWndSysLink) + { + skip("SysLink control not present?\n"); + return; + } + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); + + /* Make the SysLink control visible */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE); + SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + + DestroyWindow(hWndSysLink); + DestroyWindow(hWndParent); + unload_v6_module(ctx_cookie, hCtx); +}

12 years, 7 months

André Hentschel : wininet: Fix UrlComponents initialisation.

by Alexandre Julliard

Module: wine Branch: master Commit: c09e6bf881eb647245eee637a7e943206b7c8176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09e6bf881eb647245eee637a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 26 19:40:15 2011 +0200 wininet: Fix UrlComponents initialisation. --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 79ec790..f9e8dea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -635,6 +635,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; UrlComponents.lpszPassword = password; UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + UrlComponents.dwUrlPathLength = 0; UrlComponents.dwExtraInfoLength = 0; if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents))

12 years, 7 months

Alistair Leslie-Hughes : mshtml: IID_IHTMLCurrentStyle4 isn' t supported on IE6.

by Alexandre Julliard

Module: wine Branch: master Commit: f8baa370523f6f3c5a2fe49c6ea0b173452d6d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8baa370523f6f3c5a2fe49c6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 26 20:19:45 2011 +1000 mshtml: IID_IHTMLCurrentStyle4 isn't supported on IE6. --- dlls/mshtml/tests/dom.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f585c45..0ce3ead 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -365,7 +365,6 @@ static const IID * const cstyle_iids[] = { &IID_IHTMLCurrentStyle, &IID_IHTMLCurrentStyle2, &IID_IHTMLCurrentStyle3, - &IID_IHTMLCurrentStyle4, NULL }; @@ -4568,8 +4567,20 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); if(SUCCEEDED(hres)) { + IUnknown *unk; + test_disp((IUnknown*)cstyle, &DIID_DispHTMLCurrentStyle, "[object]"); test_ifaces((IUnknown*)cstyle, cstyle_iids); + + hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCurrentStyle4, (void**)&unk); + if(SUCCEEDED(hres)) + IUnknown_Release(unk); + else + { + /*IE6 doesn't have interface */ + win_skip("IID_IHTMLCurrentStyle4 not supported\n"); + } + IHTMLCurrentStyle_Release(cstyle); } IHTMLElement2_Release(elem2);

12 years, 7 months

Alistair Leslie-Hughes : msxml3: Support creating IXMLParser Interface.

by Alexandre Julliard

Module: wine Branch: master Commit: 5df9ff3aa995f72f4f01289ae66b5908ffe48dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df9ff3aa995f72f4f01289ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 20:13:11 2011 +1000 msxml3: Support creating IXMLParser Interface. --- dlls/msxml3/Makefile.in | 5 +- dlls/msxml3/factory.c | 8 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmlparser.c | 62 ++++++ dlls/msxml3/xmlparser.c | 421 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/xmlparser.idl | 24 ++- 7 files changed, 517 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5df9ff3aa995f72f4f012…

12 years, 7 months

Frédéric Delanoy : cmd: Fix WCMD_fgets documentation.

by Alexandre Julliard

Module: wine Branch: master Commit: 83daee9a89f8bd72cecf93bec75d5c2176b3c5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83daee9a89f8bd72cecf93bec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 23:31:01 2011 +0200 cmd: Fix WCMD_fgets documentation. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 800f05e..c5e73c6 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -176,7 +176,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { /**************************************************************************** * WCMD_fgets * - * Get one line from a batch file. We can't use the native f* functions because + * Get one line from a batch file/console. We can't use the native f* functions because * of the filename syntax differences between DOS and Unix. Also need to lose * the LF (or CRLF) from the line. */

12 years, 7 months

Frédéric Delanoy : cmd: Output error messages to stderr where appropriate.

by Alexandre Julliard

Module: wine Branch: master Commit: 9c616563078fe14ed89e565c2ac9e887c04eeba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c616563078fe14ed89e565c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:56 2011 +0200 cmd: Output error messages to stderr where appropriate. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f988d95..800f05e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -585,7 +585,7 @@ void WCMD_call (WCHAR *command) { SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); } else { - WCMD_output_asis( WCMD_LoadMessage(WCMD_CALLINSCRIPT)); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); } } } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d8c69ba..33437d1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -524,7 +524,7 @@ void WCMD_create_dir (WCHAR *command) { WCHAR *argN = command; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } /* Loop through all args */ @@ -575,7 +575,7 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { case 'S': mask = FILE_ATTRIBUTE_SYSTEM; break; case 'A': mask = FILE_ATTRIBUTE_ARCHIVE; break; default: - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); } if (negate) *wantClear |= mask; @@ -843,14 +843,14 @@ BOOL WCMD_delete (WCHAR *command) { found = WCMD_delete_one(thisArg); if (!found) { errorlevel = 1; - WCMD_output (WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); } foundAny |= found; } /* Handle no valid args */ if (!argsProcessed) - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return foundAny; } @@ -1380,7 +1380,7 @@ void WCMD_goto (CMD_LIST **cmdList) { static const WCHAR eofW[] = {':','e','o','f','\0'}; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1408,7 +1408,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (lstrcmpiW (current, paramStart) == 0) return; } } - WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); } return; } @@ -1568,7 +1568,7 @@ void WCMD_move (void) { WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1760,7 +1760,7 @@ void WCMD_remove_dir (WCHAR *command) { /* Handle no valid args */ if (argsProcessed == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1789,7 +1789,7 @@ void WCMD_rename (void) { /* Must be at least two args */ if (param1[0] == 0x00 || param2[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); errorlevel = 1; return; } @@ -2256,7 +2256,7 @@ void WCMD_setshow_env (WCHAR *s) { /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2284,7 +2284,7 @@ void WCMD_setshow_env (WCHAR *s) { if (p == NULL) { env = GetEnvironmentStringsW(); if (WCMD_setshow_sortenv( env, s ) == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_MISSINGENV), s); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_MISSINGENV), s); errorlevel = 1; } return; @@ -2321,7 +2321,7 @@ void WCMD_setshow_path (const WCHAR *command) { WCMD_output_asis ( newline); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NOPATH)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOPATH)); } } else { @@ -2445,7 +2445,7 @@ void WCMD_type (WCHAR *command) { BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2467,7 +2467,7 @@ void WCMD_type (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */ errorlevel = 1; } else { if (writeHeaders) { @@ -2570,7 +2570,7 @@ void WCMD_more (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); errorlevel = 1; } else { ULONG64 curPos = 0; @@ -2626,7 +2626,7 @@ void WCMD_verify (const WCHAR *command) { verify_mode = FALSE; return; } - else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYERR)); + else WCMD_output_stderr(WCMD_LoadMessage(WCMD_VERIFYERR)); } /**************************************************************************** @@ -2667,7 +2667,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) else { static const WCHAR fmt[] = {'%','s','\\','\0'}; if ((path[1] != ':') || (strlenW(path) != 2)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); return 0; } wsprintfW (curdir, fmt, path); @@ -2916,7 +2916,7 @@ void WCMD_color (void) { HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); if (param1[0] != 0x00 && strlenW(param1) > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_ARGERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); return; }

12 years, 7 months

Frédéric Delanoy : cmd: Add WCMD_output_stderr function to output error messages to stderr.

by Alexandre Julliard

Module: wine Branch: master Commit: fbddecab774e8cc6c07b292b4b1034f55e4c95ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbddecab774e8cc6c07b292b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:55 2011 +0200 cmd: Add WCMD_output_stderr function to output error messages to stderr. --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 940cb6e..d370764 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -73,6 +73,7 @@ void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); void WCMD_output (const WCHAR *format, ...); +void WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b254728..8e222a3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -174,7 +174,7 @@ void WCMD_output (const WCHAR *format, ...) { va_start(ap,format); ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); if( ret >= (sizeof(string)/sizeof(WCHAR))) { - WINE_ERR("Output truncated in WCMD_output\n" ); + WINE_ERR("Output truncated\n" ); ret = (sizeof(string)/sizeof(WCHAR)) - 1; string[ret] = '\0'; } @@ -182,6 +182,27 @@ void WCMD_output (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_OUTPUT_HANDLE)); } +/******************************************************************* + * WCMD_output_stderr - send output to current standard error device. + * + */ + +void WCMD_output_stderr (const WCHAR *format, ...) { + + va_list ap; + WCHAR string[1024]; + int ret; + + va_start(ap,format); + ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); + if( ret >= (sizeof(string)/sizeof(WCHAR))) { + WINE_ERR("Output truncated\n" ); + ret = (sizeof(string)/sizeof(WCHAR)) - 1; + string[ret] = '\0'; + } + va_end(ap); + WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); +} static int line_count; static int max_height;

12 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
100
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011