wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Alexandre Julliard : sidebar.html: Replace removed url_quote filter.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: bugzilla Branch: master Commit: 0733a7d0550a4079e7190a257cf6f0f3ea3cea2e URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0733a7d0550a4079e7190… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 14:02:02 2013 +0100 sidebar.html: Replace removed url_quote filter. --- template/en/default/global/sidebar.html.tmpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index f55a6f0..79344e6 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -39,14 +39,14 @@ %] [% print_pipe = 0 %] [% IF user.showmybugslink %] - [% filtered_username = user.login FILTER url_quote %] + [% filtered_username = user.login FILTER uri %] <li> <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [%+ terms.Bugs %]</a> </li> <li> - <a href="buglist.cgi?email1=[% user.email FILTER url_quote %]&emailtype1=exact&emailreporter1=1" + <a href="buglist.cgi?email1=[% user.email FILTER uri %]&emailtype1=exact&emailreporter1=1" >Bugs by Me</a> </li> [% print_pipe = 1 %] @@ -57,7 +57,7 @@ <li> <a href="buglist.cgi?cmdtype=runnamed&namedcmd= - [%- q.name FILTER url_quote %]">[% q.name FILTER html %]</a> + [%- q.name FILTER uri %]">[% q.name FILTER html %]</a> </li> [% print_pipe = 1 %] [% END %] @@ -74,8 +74,8 @@ <li> <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= - [% q.name FILTER url_quote %]&sharer_id= - [% q.user.id FILTER url_quote %]" + [% q.name FILTER uri %]&sharer_id= + [% q.user.id FILTER uri %]" class="shared" title="Shared by [% q.user.identity FILTER html %]" >[% q.name FILTER html FILTER no_break %]</a></li>

1 0

Lucas Zawacki : Portuguese translation for release 1.7.8
by Jeremy Newman 11 Dec '13

11 Dec '13

Module: website Branch: master Commit: 95c6fe3cc43acbe6223f5226b8ffee0c49bfde20 URL: http://source.winehq.org/git/website.git/?a=commit;h=95c6fe3cc43acbe6223f52… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Dec 10 21:04:25 2013 -0200 Portuguese translation for release 1.7.8 --- news/pt/2013120601.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013120601.xml b/news/pt/2013120601.xml new file mode 100644 index 0000000..e155fc8 --- /dev/null +++ b/news/pt/2013120601.xml @@ -0,0 +1,15 @@ +<news> +<date>6 de Dezembro de 2013</date> +<title>Wine 1.7.8 lançado</title> +<body> + A versão de desenvolvimento 1.7.8 já está disponível agora. + <a href="{$root}/announce/1.7.8">Novidades</a> desta versão: +<ul> + <li>Versão atualizada do pacote Mono.</li> + <li>Melhorias na implementação do serviço BITS.</li> + <li>Melhorias nas tabelas para suporte a fontes verticais em Japonês.</li> + <li>Melhores backtraces nas versões mais recentes do Mac OS X.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.2.7.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: bugzilla Branch: upstream Commit: a65e221e0f579a8607f751c91f847b1b10b1a2b2 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=a65e221e0f579a8607f75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 12:07:00 2013 +0100 Import of upstream bugzilla release 4.2.7. --- Bugzilla.pm | 96 +- Bugzilla/Attachment.pm | 200 +- Bugzilla/Attachment/PatchReader.pm | 2 - Bugzilla/Auth.pm | 12 +- Bugzilla/Auth/Login.pm | 9 + Bugzilla/Auth/Login/Cookie.pm | 6 +- Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 16 +- Bugzilla/Auth/Persist/Cookie.pm | 5 +- Bugzilla/Auth/Verify.pm | 9 + Bugzilla/Auth/Verify/Stack.pm | 10 +- Bugzilla/Bug.pm | 842 ++-- Bugzilla/BugMail.pm | 493 +-- Bugzilla/BugUrl.pm | 208 + Bugzilla/BugUrl/Bugzilla.pm | 67 + Bugzilla/BugUrl/Bugzilla/Local.pm | 111 + Bugzilla/BugUrl/Debian.pm | 63 + Bugzilla/BugUrl/Google.pm | 65 + Bugzilla/BugUrl/JIRA.pm | 54 + Bugzilla/BugUrl/Launchpad.pm | 59 + Bugzilla/BugUrl/MantisBT.pm | 51 + Bugzilla/BugUrl/SourceForge.pm | 58 + Bugzilla/BugUrl/Trac.pm | 54 + Bugzilla/CGI.pm | 93 +- Bugzilla/Comment.pm | 137 +- Bugzilla/Component.pm | 6 +- Bugzilla/Config.pm | 56 +- Bugzilla/Config/Attachment.pm | 5 - Bugzilla/Config/Auth.pm | 9 + Bugzilla/Config/GroupSecurity.pm | 8 + Bugzilla/Config/MTA.pm | 6 + Bugzilla/Config/Query.pm | 19 +- Bugzilla/Constants.pm | 76 +- Bugzilla/DB.pm | 264 +- Bugzilla/DB/Mysql.pm | 174 +- Bugzilla/DB/Oracle.pm | 126 +- Bugzilla/DB/Pg.pm | 76 +- Bugzilla/DB/Schema.pm | 243 +- Bugzilla/DB/Schema/Oracle.pm | 151 +- Bugzilla/DB/Schema/Pg.pm | 53 +- Bugzilla/DB/Schema/Sqlite.pm | 312 ++ Bugzilla/DB/Sqlite.pm | 311 ++ Bugzilla/Error.pm | 109 +- Bugzilla/Extension.pm | 12 +- Bugzilla/Field.pm | 212 +- Bugzilla/Field/ChoiceInterface.pm | 20 +- Bugzilla/Flag.pm | 16 +- Bugzilla/FlagType.pm | 341 ++- Bugzilla/Group.pm | 39 +- Bugzilla/Hook.pm | 141 +- Bugzilla/Install.pm | 36 +- Bugzilla/Install/CPAN.pm | 42 +- Bugzilla/Install/DB.pm | 391 ++- Bugzilla/Install/Filesystem.pm | 33 +- Bugzilla/Install/Localconfig.pm | 186 +- Bugzilla/Install/Requirements.pm | 101 +- Bugzilla/Install/Util.pm | 31 +- Bugzilla/JobQueue.pm | 18 +- Bugzilla/JobQueue/Runner.pm | 22 +- Bugzilla/Mailer.pm | 12 +- Bugzilla/Migrate.pm | 2 +- Bugzilla/Milestone.pm | 15 +- Bugzilla/Object.pm | 120 +- Bugzilla/Product.pm | 4 +- Bugzilla/RNG.pm | 233 ++ Bugzilla/Search.pm | 4086 +++++++++++-------- Bugzilla/Search/Clause.pm | 142 + Bugzilla/Search/Condition.pm | 89 + Bugzilla/Search/Quicksearch.pm | 258 +- Bugzilla/Search/Recent.pm | 18 +- Bugzilla/Search/Saved.pm | 18 +- Bugzilla/Template.pm | 168 +- Bugzilla/Token.pm | 75 +- Bugzilla/Update.pm | 26 +- Bugzilla/User.pm | 368 ++- Bugzilla/User/Setting.pm | 5 +- Bugzilla/Util.pm | 205 +- Bugzilla/Version.pm | 11 +- Bugzilla/WebService.pm | 22 +- Bugzilla/WebService/Bug.pm | 197 +- Bugzilla/WebService/Constants.pm | 38 +- Bugzilla/WebService/Group.pm | 141 + Bugzilla/WebService/Product.pm | 380 ++- Bugzilla/WebService/Server.pm | 3 + Bugzilla/WebService/Server/JSONRPC.pm | 25 +- Bugzilla/WebService/Server/XMLRPC.pm | 26 +- Bugzilla/WebService/User.pm | 31 +- Bugzilla/WebService/Util.pm | 2 +- attachment.cgi | 74 +- buglist.cgi | 221 +- bugzilla.dtd | 1 - checksetup.pl | 14 +- collectstats.pl | 97 +- contrib/README | 18 +- contrib/bugzilla_ldapsync.rb | 183 - contrib/bz_webservice_demo.pl | 30 +- contrib/bzdbcopy.pl | 20 +- contrib/convert-workflow.pl | 49 +- contrib/recode.pl | 55 +- contrib/sendunsentbugmail.pl | 3 +- contrib/yp_nomail.sh | 77 - createaccount.cgi | 6 + describecomponents.cgi | 2 +- docs/bugzilla.ent | 18 +- docs/en/xml/Bugzilla-Guide.xml | 10 +- docs/en/xml/about.xml | 2 + docs/en/xml/administration.xml | 101 +- docs/en/xml/bugzilla.ent | 18 +- docs/en/xml/customization.xml | 23 +- docs/en/xml/installation.xml | 196 +- docs/en/xml/modules.xml | 6 +- docs/en/xml/using.xml | 489 ++- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 3 +- duplicates.cgi | 4 +- editcomponents.cgi | 5 +- editfields.cgi | 4 +- editflagtypes.cgi | 833 ++--- editmilestones.cgi | 10 +- editparams.cgi | 6 + editusers.cgi | 16 +- editvalues.cgi | 4 +- editversions.cgi | 2 + email_in.pl | 30 +- enter_bug.cgi | 13 +- extensions/Example/Extension.pm | 91 +- extensions/Example/lib/Config.pm | 2 + .../params/editparams-current_panel.html.tmpl | 23 + .../admin/sanitycheck/messages-statuses.html.tmpl | 2 +- extensions/OldBugMove/Extension.pm | 4 +- extensions/Voting/Config.pm | 33 + extensions/Voting/Extension.pm | 31 +- .../hook/admin/products/updated-changes.html.tmpl | 18 +- .../admin/sanitycheck/messages-statuses.html.tmpl | 2 +- .../hook/bug/edit-after_importance.html.tmpl | 10 +- .../en/default/hook/bug/show-header-end.html.tmpl | 21 + .../template/en/default/pages/voting/bug.html.tmpl | 2 +- .../en/default/pages/voting/user.html.tmpl | 19 +- extensions/Voting/web/style.css | 4 + importxml.pl | 92 +- jobqueue.pl | 10 +- js/attachment.js | 17 +- js/comments.js | 54 +- js/custom-search.js | 216 + js/field.js | 76 +- js/history.js/license.txt | 10 + js/history.js/native.history.js | 1 + js/history.js/readme.txt | 2 + js/yui/animation/animation-min.js | 14 +- js/yui/assets/skins/sam/autocomplete.css | 6 +- js/yui/assets/skins/sam/button.css | 4 +- js/yui/assets/skins/sam/calendar.css | 8 +- js/yui/assets/skins/sam/carousel.css | 4 +- js/yui/assets/skins/sam/colorpicker.css | 6 +- js/yui/assets/skins/sam/container.css | 6 +- js/yui/assets/skins/sam/datatable.css | 8 +- js/yui/assets/skins/sam/editor.css | 4 +- js/yui/assets/skins/sam/imagecropper.css | 4 +- js/yui/assets/skins/sam/layout.css | 4 +- js/yui/assets/skins/sam/logger.css | 6 +- js/yui/assets/skins/sam/menu.css | 4 +- js/yui/assets/skins/sam/paginator.css | 6 +- js/yui/assets/skins/sam/profilerviewer.css | 6 +- js/yui/assets/skins/sam/progressbar.css | 6 +- js/yui/assets/skins/sam/resize.css | 4 +- js/yui/assets/skins/sam/simpleeditor.css | 6 +- js/yui/assets/skins/sam/slider.css | 4 +- js/yui/assets/skins/sam/tabview.css | 8 +- js/yui/assets/skins/sam/treeview.css | 6 +- js/yui/assets/skins/sam/yuitest.css | 4 +- js/yui/autocomplete/autocomplete-min.js | 16 +- js/yui/base/base-min.css | 6 +- js/yui/base/base.css | 18 +- js/yui/button/button-min.js | 14 +- js/yui/calendar/calendar-min.js | 28 +- js/yui/carousel/carousel-min.js | 16 +- js/yui/charts/charts-min.js | 10 +- js/yui/colorpicker/colorpicker-min.js | 10 +- js/yui/connection/connection-min.js | 10 +- js/yui/connection/connection_core-min.js | 8 +- js/yui/container/container-min.js | 30 +- js/yui/container/container_core-min.js | 20 +- js/yui/cookie/cookie-min.js | 6 +- js/yui/datasource/datasource-min.js | 16 +- js/yui/datatable/datatable-min.js | 54 +- js/yui/datemath/datemath-min.js | 6 +- js/yui/dom/dom-min.js | 10 +- js/yui/dragdrop/dragdrop-min.js | 12 +- js/yui/element-delegate/element-delegate-min.js | 6 +- js/yui/element/element-min.js | 8 +- js/yui/event-delegate/event-delegate-min.js | 6 +- js/yui/event-mouseenter/event-mouseenter-min.js | 6 +- js/yui/event-simulate/event-simulate-min.js | 6 +- js/yui/event/event-min.js | 14 +- js/yui/fonts/fonts-min.css | 6 +- js/yui/fonts/fonts.css | 5 +- js/yui/get/get-min.js | 6 +- js/yui/grids/grids-min.css | 6 +- js/yui/grids/grids.css | 14 +- js/yui/history/history-min.js | 6 +- js/yui/imagecropper/imagecropper-min.js | 6 +- js/yui/imageloader/imageloader-min.js | 6 +- js/yui/json/json-min.js | 6 +- js/yui/layout/layout-min.js | 12 +- js/yui/logger/logger-min.js | 10 +- js/yui/menu/menu-min.js | 24 +- js/yui/paginator/paginator-min.js | 13 +- js/yui/profiler/profiler-min.js | 6 +- js/yui/profilerviewer/profilerviewer-min.js | 8 +- js/yui/progressbar/progressbar-min.js | 8 +- js/yui/reset-fonts-grids/reset-fonts-grids.css | 6 +- js/yui/reset-fonts/reset-fonts.css | 6 +- js/yui/reset/reset-min.css | 6 +- js/yui/reset/reset.css | 41 +- js/yui/resize/resize-min.js | 6 +- js/yui/selector/selector-min.js | 8 +- js/yui/slider/slider-min.js | 6 +- js/yui/storage/storage-min.js | 8 +- js/yui/stylesheet/stylesheet-min.js | 6 +- js/yui/swf/swf-min.js | 6 +- js/yui/swfdetect/swfdetect-min.js | 6 +- js/yui/swfstore/swfstore-min.js | 6 +- js/yui/swfstore/swfstore.swf | Bin 4879 -> 4841 bytes js/yui/tabview/tabview-min.js | 8 +- js/yui/treeview/treeview-min.js | 16 +- js/yui/uploader/uploader-min.js | 10 +- js/yui/yahoo-dom-event/yahoo-dom-event.js | 20 +- js/yui/yahoo/yahoo-min.js | 7 +- js/yui/yuiloader/yuiloader-min.js | 13 +- js/yui/yuitest/yuitest-min.js | 13 +- js/yui/yuitest/yuitest_core-min.js | 10 +- lib/CGI.pm | 153 +- lib/CGI/Carp.pm | 69 +- lib/CGI/Cookie.pm | 2 +- lib/CGI/Fast.pm | 30 +- lib/CGI/Util.pm | 88 +- long_list.cgi | 36 - mod_perl.pl | 38 +- post_bug.cgi | 57 +- process_bug.cgi | 6 +- query.cgi | 127 +- quips.cgi | 10 +- relogin.cgi | 4 +- report.cgi | 140 +- reports.cgi | 43 +- sanitycheck.cgi | 10 +- show_bug.cgi | 15 +- showattachment.cgi | 40 - showdependencygraph.cgi | 96 +- sidebar.cgi | 49 - skins/contrib/Dusk/global.css | 6 - skins/standard/IE-fixes.css | 2 +- skins/standard/attachment.css | 18 +- skins/standard/buglist.css | 7 + skins/standard/global.css | 69 +- skins/standard/global/down.png | Bin 335 -> 0 bytes skins/standard/global/left.png | Bin 339 -> 0 bytes skins/standard/global/right.png | Bin 339 -> 0 bytes skins/standard/global/up.png | Bin 318 -> 0 bytes skins/standard/index.css | 29 +- skins/standard/panel.css | 37 - skins/standard/reports.css | 3 + skins/standard/search_form.css | 8 +- skins/standard/show_bug.css | 3 +- t/004template.t | 53 +- t/007util.t | 17 +- t/008filter.t | 6 +- t/Support/Templates.pm | 44 +- .../en/default/account/auth/login-small.html.tmpl | 16 +- template/en/default/account/auth/login.html.tmpl | 3 + template/en/default/account/create.html.tmpl | 1 + .../en/default/account/email/change-new.txt.tmpl | 4 +- .../en/default/account/email/change-old.txt.tmpl | 2 +- .../en/default/account/email/request-new.txt.tmpl | 4 +- .../account/password/forgotten-password.txt.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 18 +- .../en/default/account/profile-activity.html.tmpl | 2 +- template/en/default/admin/admin.html.tmpl | 3 +- .../default/admin/classifications/edit.html.tmpl | 2 +- .../default/admin/classifications/select.html.tmpl | 6 +- .../admin/components/confirm-delete.html.tmpl | 6 +- .../default/admin/components/edit-common.html.tmpl | 15 +- .../en/default/admin/components/edit.html.tmpl | 15 +- .../en/default/admin/components/footer.html.tmpl | 6 +- .../en/default/admin/components/list.html.tmpl | 15 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 4 +- .../default/admin/custom_fields/create.html.tmpl | 11 +- .../en/default/admin/custom_fields/edit.html.tmpl | 16 +- .../en/default/admin/custom_fields/list.html.tmpl | 2 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 14 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 8 +- .../en/default/admin/fieldvalues/list.html.tmpl | 4 +- template/en/default/admin/flag-type/edit.html.tmpl | 150 +- .../default/admin/groups/confirm-remove.html.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 8 +- template/en/default/admin/groups/edit.html.tmpl | 4 +- template/en/default/admin/keywords/edit.html.tmpl | 2 +- .../admin/milestones/confirm-delete.html.tmpl | 4 +- .../en/default/admin/milestones/edit.html.tmpl | 10 +- .../en/default/admin/milestones/footer.html.tmpl | 10 +- .../en/default/admin/milestones/list.html.tmpl | 13 +- .../en/default/admin/params/attachment.html.tmpl | 23 +- template/en/default/admin/params/auth.html.tmpl | 16 +- .../en/default/admin/params/editparams.html.tmpl | 16 +- .../default/admin/params/groupsecurity.html.tmpl | 3 + template/en/default/admin/params/index.html.tmpl | 2 +- template/en/default/admin/params/query.html.tmpl | 27 +- .../admin/products/confirm-delete.html.tmpl | 10 +- .../en/default/admin/products/create.html.tmpl | 2 +- template/en/default/admin/products/edit.html.tmpl | 12 +- .../en/default/admin/products/footer.html.tmpl | 6 +- .../admin/products/groupcontrol/updated.html.tmpl | 8 +- template/en/default/admin/products/list.html.tmpl | 2 +- .../en/default/admin/products/updated.html.tmpl | 4 +- .../default/admin/sanitycheck/messages.html.tmpl | 20 +- template/en/default/admin/sudo.html.tmpl | 2 +- template/en/default/admin/table.html.tmpl | 2 +- .../default/admin/users/confirm-delete.html.tmpl | 25 +- template/en/default/admin/users/list.html.tmpl | 6 +- .../default/admin/users/listselectvars.html.tmpl | 4 +- .../default/admin/users/responsibilities.html.tmpl | 4 +- template/en/default/admin/users/search.html.tmpl | 3 + template/en/default/admin/users/userdata.html.tmpl | 15 +- .../admin/versions/confirm-delete.html.tmpl | 4 +- template/en/default/admin/versions/edit.html.tmpl | 8 +- .../en/default/admin/versions/footer.html.tmpl | 10 +- template/en/default/admin/versions/list.html.tmpl | 13 +- .../en/default/admin/workflow/comment.html.tmpl | 2 +- template/en/default/admin/workflow/edit.html.tmpl | 2 +- .../attachment/cancel-create-dupe.html.tmpl | 48 - template/en/default/attachment/create.html.tmpl | 8 +- .../attachment/createformcontents.html.tmpl | 53 +- .../en/default/attachment/diff-header.html.tmpl | 6 +- template/en/default/attachment/edit.html.tmpl | 65 +- template/en/default/attachment/list.html.tmpl | 17 +- template/en/default/attachment/midair.html.tmpl | 2 +- .../en/default/attachment/show-multiple.html.tmpl | 7 +- template/en/default/bug/comments.html.tmpl | 43 +- .../bug/create/confirm-create-dupe.html.tmpl | 57 - .../en/default/bug/create/create-guided.html.tmpl | 4 +- template/en/default/bug/create/create.html.tmpl | 25 +- template/en/default/bug/dependency-graph.html.tmpl | 5 +- template/en/default/bug/dependency-tree.html.tmpl | 32 +- template/en/default/bug/edit.html.tmpl | 118 +- template/en/default/bug/field-events.js.tmpl | 32 +- template/en/default/bug/field-help.none.tmpl | 2 +- template/en/default/bug/field-label.html.tmpl | 5 +- template/en/default/bug/field.html.tmpl | 84 +- template/en/default/bug/format_comment.txt.tmpl | 2 +- template/en/default/bug/link.html.tmpl | 63 + template/en/default/bug/navigate.html.tmpl | 24 +- template/en/default/bug/process/midair.html.tmpl | 2 +- template/en/default/bug/show-header.html.tmpl | 12 + template/en/default/bug/show-multiple.html.tmpl | 14 +- template/en/default/bug/show.xml.tmpl | 3 +- template/en/default/config.rdf.tmpl | 28 +- template/en/default/email/bugmail-common.txt.tmpl | 38 + ...hangedmail.txt.tmpl => bugmail-header.txt.tmpl} | 33 +- template/en/default/email/bugmail.html.tmpl | 130 + .../{newchangedmail.txt.tmpl => bugmail.txt.tmpl} | 64 +- template/en/default/filterexceptions.pl | 25 +- .../default/global/choose-classification.html.tmpl | 12 +- .../en/default/global/choose-product.html.tmpl | 6 +- template/en/default/global/code-error.html.tmpl | 59 +- template/en/default/global/common-links.html.tmpl | 6 +- .../en/default/global/confirm-user-match.html.tmpl | 2 +- template/en/default/global/field-descs.none.tmpl | 36 +- template/en/default/global/header.html.tmpl | 14 +- template/en/default/global/messages.html.tmpl | 115 +- .../en/default/global/per-bug-queries.html.tmpl | 16 +- template/en/default/global/setting-descs.none.tmpl | 4 + .../en/default/global/site-navigation.html.tmpl | 6 +- template/en/default/global/useful-links.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 243 +- template/en/default/global/value-descs.js.tmpl | 2 +- template/en/default/global/value-descs.none.tmpl | 36 + template/en/default/index.html.tmpl | 63 +- template/en/default/list/change-columns.html.tmpl | 23 +- template/en/default/list/list.csv.tmpl | 14 +- template/en/default/list/list.html.tmpl | 67 +- template/en/default/list/list.ics.tmpl | 4 +- template/en/default/list/quips.html.tmpl | 12 +- template/en/default/list/server-push.html.tmpl | 13 +- template/en/default/list/table.html.tmpl | 9 +- template/en/default/pages/fields.html.tmpl | 46 +- template/en/default/pages/linked.html.tmpl | 4 +- template/en/default/pages/quicksearch.html.tmpl | 83 +- template/en/default/pages/release-notes.html.tmpl | 4348 ++++---------------- template/en/default/pages/release-notes3.html.tmpl | 3483 ++++++++++++++++ template/en/default/reports/components.html.tmpl | 11 +- template/en/default/reports/create-chart.html.tmpl | 6 +- .../en/default/reports/delete-series.html.tmpl | 2 +- .../en/default/reports/duplicates-table.html.tmpl | 8 +- template/en/default/reports/edit-series.html.tmpl | 6 +- template/en/default/reports/keywords.html.tmpl | 4 +- template/en/default/reports/menu.html.tmpl | 4 + template/en/default/reports/report-table.html.tmpl | 195 +- template/en/default/reports/report.html.tmpl | 11 +- template/en/default/request/email.txt.tmpl | 3 + .../en/default/search/boolean-charts.html.tmpl | 207 +- template/en/default/search/form.html.tmpl | 7 +- template/en/default/search/knob.html.tmpl | 26 +- .../en/default/search/search-advanced.html.tmpl | 11 +- .../default/search/search-create-series.html.tmpl | 2 +- .../default/search/search-report-select.html.tmpl | 7 - .../en/default/search/search-specific.html.tmpl | 27 +- template/en/default/search/type-select.html.tmpl | 3 +- template/en/default/setup/strings.txt.pl | 288 ++- template/en/default/sidebar.xul.tmpl | 128 - template/en/default/whine/mail.html.tmpl | 4 +- token.cgi | 14 +- userprefs.cgi | 30 +- whine.pl | 56 +- whineatnews.pl | 2 +- xml.cgi | 41 - xt/lib/Bugzilla/Test/Search.pm | 88 +- xt/lib/Bugzilla/Test/Search/AndTest.pm | 23 +- xt/lib/Bugzilla/Test/Search/Constants.pm | 834 +++-- xt/lib/Bugzilla/Test/Search/CustomTest.pm | 115 + xt/lib/Bugzilla/Test/Search/FakeCGI.pm | 61 - xt/lib/Bugzilla/Test/Search/FieldTest.pm | 136 +- xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm | 118 + xt/lib/Bugzilla/Test/Search/InjectionTest.pm | 26 +- xt/lib/Bugzilla/Test/Search/NotTest.pm | 75 + xt/lib/Bugzilla/Test/Search/OperatorTest.pm | 7 + xt/lib/Bugzilla/Test/Search/OrTest.pm | 79 +- 425 files changed, 19255 insertions(+), 12428 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=a65e221e0f579a860…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: bugzilla Branch: master Commit: 4afc6076fee29d641540378623073b99717bc2db URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4afc6076fee29d6415403… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 12:48:14 2013 +0100 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.2.7.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: bugzilla Branch: master Commit: a65e221e0f579a8607f751c91f847b1b10b1a2b2 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=a65e221e0f579a8607f75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 12:07:00 2013 +0100 Import of upstream bugzilla release 4.2.7. --- Bugzilla.pm | 96 +- Bugzilla/Attachment.pm | 200 +- Bugzilla/Attachment/PatchReader.pm | 2 - Bugzilla/Auth.pm | 12 +- Bugzilla/Auth/Login.pm | 9 + Bugzilla/Auth/Login/Cookie.pm | 6 +- Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 16 +- Bugzilla/Auth/Persist/Cookie.pm | 5 +- Bugzilla/Auth/Verify.pm | 9 + Bugzilla/Auth/Verify/Stack.pm | 10 +- Bugzilla/Bug.pm | 842 ++-- Bugzilla/BugMail.pm | 493 +-- Bugzilla/BugUrl.pm | 208 + Bugzilla/BugUrl/Bugzilla.pm | 67 + Bugzilla/BugUrl/Bugzilla/Local.pm | 111 + Bugzilla/BugUrl/Debian.pm | 63 + Bugzilla/BugUrl/Google.pm | 65 + Bugzilla/BugUrl/JIRA.pm | 54 + Bugzilla/BugUrl/Launchpad.pm | 59 + Bugzilla/BugUrl/MantisBT.pm | 51 + Bugzilla/BugUrl/SourceForge.pm | 58 + Bugzilla/BugUrl/Trac.pm | 54 + Bugzilla/CGI.pm | 93 +- Bugzilla/Comment.pm | 137 +- Bugzilla/Component.pm | 6 +- Bugzilla/Config.pm | 56 +- Bugzilla/Config/Attachment.pm | 5 - Bugzilla/Config/Auth.pm | 9 + Bugzilla/Config/GroupSecurity.pm | 8 + Bugzilla/Config/MTA.pm | 6 + Bugzilla/Config/Query.pm | 19 +- Bugzilla/Constants.pm | 76 +- Bugzilla/DB.pm | 264 +- Bugzilla/DB/Mysql.pm | 174 +- Bugzilla/DB/Oracle.pm | 126 +- Bugzilla/DB/Pg.pm | 76 +- Bugzilla/DB/Schema.pm | 243 +- Bugzilla/DB/Schema/Oracle.pm | 151 +- Bugzilla/DB/Schema/Pg.pm | 53 +- Bugzilla/DB/Schema/Sqlite.pm | 312 ++ Bugzilla/DB/Sqlite.pm | 311 ++ Bugzilla/Error.pm | 109 +- Bugzilla/Extension.pm | 12 +- Bugzilla/Field.pm | 212 +- Bugzilla/Field/ChoiceInterface.pm | 20 +- Bugzilla/Flag.pm | 16 +- Bugzilla/FlagType.pm | 341 ++- Bugzilla/Group.pm | 39 +- Bugzilla/Hook.pm | 141 +- Bugzilla/Install.pm | 36 +- Bugzilla/Install/CPAN.pm | 42 +- Bugzilla/Install/DB.pm | 391 ++- Bugzilla/Install/Filesystem.pm | 33 +- Bugzilla/Install/Localconfig.pm | 186 +- Bugzilla/Install/Requirements.pm | 101 +- Bugzilla/Install/Util.pm | 31 +- Bugzilla/JobQueue.pm | 18 +- Bugzilla/JobQueue/Runner.pm | 22 +- Bugzilla/Mailer.pm | 12 +- Bugzilla/Migrate.pm | 2 +- Bugzilla/Milestone.pm | 15 +- Bugzilla/Object.pm | 120 +- Bugzilla/Product.pm | 4 +- Bugzilla/RNG.pm | 233 ++ Bugzilla/Search.pm | 4086 +++++++++++-------- Bugzilla/Search/Clause.pm | 142 + Bugzilla/Search/Condition.pm | 89 + Bugzilla/Search/Quicksearch.pm | 258 +- Bugzilla/Search/Recent.pm | 18 +- Bugzilla/Search/Saved.pm | 18 +- Bugzilla/Template.pm | 168 +- Bugzilla/Token.pm | 75 +- Bugzilla/Update.pm | 26 +- Bugzilla/User.pm | 368 ++- Bugzilla/User/Setting.pm | 5 +- Bugzilla/Util.pm | 205 +- Bugzilla/Version.pm | 11 +- Bugzilla/WebService.pm | 22 +- Bugzilla/WebService/Bug.pm | 197 +- Bugzilla/WebService/Constants.pm | 38 +- Bugzilla/WebService/Group.pm | 141 + Bugzilla/WebService/Product.pm | 380 ++- Bugzilla/WebService/Server.pm | 3 + Bugzilla/WebService/Server/JSONRPC.pm | 25 +- Bugzilla/WebService/Server/XMLRPC.pm | 26 +- Bugzilla/WebService/User.pm | 31 +- Bugzilla/WebService/Util.pm | 2 +- attachment.cgi | 74 +- buglist.cgi | 221 +- bugzilla.dtd | 1 - checksetup.pl | 14 +- collectstats.pl | 97 +- contrib/README | 18 +- contrib/bugzilla_ldapsync.rb | 183 - contrib/bz_webservice_demo.pl | 30 +- contrib/bzdbcopy.pl | 20 +- contrib/convert-workflow.pl | 49 +- contrib/recode.pl | 55 +- contrib/sendunsentbugmail.pl | 3 +- contrib/yp_nomail.sh | 77 - createaccount.cgi | 6 + describecomponents.cgi | 2 +- docs/bugzilla.ent | 18 +- docs/en/xml/Bugzilla-Guide.xml | 10 +- docs/en/xml/about.xml | 2 + docs/en/xml/administration.xml | 101 +- docs/en/xml/bugzilla.ent | 18 +- docs/en/xml/customization.xml | 23 +- docs/en/xml/installation.xml | 196 +- docs/en/xml/modules.xml | 6 +- docs/en/xml/using.xml | 489 ++- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 3 +- duplicates.cgi | 4 +- editcomponents.cgi | 5 +- editfields.cgi | 4 +- editflagtypes.cgi | 833 ++--- editmilestones.cgi | 10 +- editparams.cgi | 6 + editusers.cgi | 16 +- editvalues.cgi | 4 +- editversions.cgi | 2 + email_in.pl | 30 +- enter_bug.cgi | 13 +- extensions/Example/Extension.pm | 91 +- extensions/Example/lib/Config.pm | 2 + .../params/editparams-current_panel.html.tmpl | 23 + .../admin/sanitycheck/messages-statuses.html.tmpl | 2 +- extensions/OldBugMove/Extension.pm | 4 +- extensions/Voting/Config.pm | 33 + extensions/Voting/Extension.pm | 31 +- .../hook/admin/products/updated-changes.html.tmpl | 18 +- .../admin/sanitycheck/messages-statuses.html.tmpl | 2 +- .../hook/bug/edit-after_importance.html.tmpl | 10 +- .../en/default/hook/bug/show-header-end.html.tmpl | 21 + .../template/en/default/pages/voting/bug.html.tmpl | 2 +- .../en/default/pages/voting/user.html.tmpl | 19 +- extensions/Voting/web/style.css | 4 + importxml.pl | 92 +- jobqueue.pl | 10 +- js/attachment.js | 17 +- js/comments.js | 54 +- js/custom-search.js | 216 + js/field.js | 76 +- js/history.js/license.txt | 10 + js/history.js/native.history.js | 1 + js/history.js/readme.txt | 2 + js/yui/animation/animation-min.js | 14 +- js/yui/assets/skins/sam/autocomplete.css | 6 +- js/yui/assets/skins/sam/button.css | 4 +- js/yui/assets/skins/sam/calendar.css | 8 +- js/yui/assets/skins/sam/carousel.css | 4 +- js/yui/assets/skins/sam/colorpicker.css | 6 +- js/yui/assets/skins/sam/container.css | 6 +- js/yui/assets/skins/sam/datatable.css | 8 +- js/yui/assets/skins/sam/editor.css | 4 +- js/yui/assets/skins/sam/imagecropper.css | 4 +- js/yui/assets/skins/sam/layout.css | 4 +- js/yui/assets/skins/sam/logger.css | 6 +- js/yui/assets/skins/sam/menu.css | 4 +- js/yui/assets/skins/sam/paginator.css | 6 +- js/yui/assets/skins/sam/profilerviewer.css | 6 +- js/yui/assets/skins/sam/progressbar.css | 6 +- js/yui/assets/skins/sam/resize.css | 4 +- js/yui/assets/skins/sam/simpleeditor.css | 6 +- js/yui/assets/skins/sam/slider.css | 4 +- js/yui/assets/skins/sam/tabview.css | 8 +- js/yui/assets/skins/sam/treeview.css | 6 +- js/yui/assets/skins/sam/yuitest.css | 4 +- js/yui/autocomplete/autocomplete-min.js | 16 +- js/yui/base/base-min.css | 6 +- js/yui/base/base.css | 18 +- js/yui/button/button-min.js | 14 +- js/yui/calendar/calendar-min.js | 28 +- js/yui/carousel/carousel-min.js | 16 +- js/yui/charts/charts-min.js | 10 +- js/yui/colorpicker/colorpicker-min.js | 10 +- js/yui/connection/connection-min.js | 10 +- js/yui/connection/connection_core-min.js | 8 +- js/yui/container/container-min.js | 30 +- js/yui/container/container_core-min.js | 20 +- js/yui/cookie/cookie-min.js | 6 +- js/yui/datasource/datasource-min.js | 16 +- js/yui/datatable/datatable-min.js | 54 +- js/yui/datemath/datemath-min.js | 6 +- js/yui/dom/dom-min.js | 10 +- js/yui/dragdrop/dragdrop-min.js | 12 +- js/yui/element-delegate/element-delegate-min.js | 6 +- js/yui/element/element-min.js | 8 +- js/yui/event-delegate/event-delegate-min.js | 6 +- js/yui/event-mouseenter/event-mouseenter-min.js | 6 +- js/yui/event-simulate/event-simulate-min.js | 6 +- js/yui/event/event-min.js | 14 +- js/yui/fonts/fonts-min.css | 6 +- js/yui/fonts/fonts.css | 5 +- js/yui/get/get-min.js | 6 +- js/yui/grids/grids-min.css | 6 +- js/yui/grids/grids.css | 14 +- js/yui/history/history-min.js | 6 +- js/yui/imagecropper/imagecropper-min.js | 6 +- js/yui/imageloader/imageloader-min.js | 6 +- js/yui/json/json-min.js | 6 +- js/yui/layout/layout-min.js | 12 +- js/yui/logger/logger-min.js | 10 +- js/yui/menu/menu-min.js | 24 +- js/yui/paginator/paginator-min.js | 13 +- js/yui/profiler/profiler-min.js | 6 +- js/yui/profilerviewer/profilerviewer-min.js | 8 +- js/yui/progressbar/progressbar-min.js | 8 +- js/yui/reset-fonts-grids/reset-fonts-grids.css | 6 +- js/yui/reset-fonts/reset-fonts.css | 6 +- js/yui/reset/reset-min.css | 6 +- js/yui/reset/reset.css | 41 +- js/yui/resize/resize-min.js | 6 +- js/yui/selector/selector-min.js | 8 +- js/yui/slider/slider-min.js | 6 +- js/yui/storage/storage-min.js | 8 +- js/yui/stylesheet/stylesheet-min.js | 6 +- js/yui/swf/swf-min.js | 6 +- js/yui/swfdetect/swfdetect-min.js | 6 +- js/yui/swfstore/swfstore-min.js | 6 +- js/yui/swfstore/swfstore.swf | Bin 4879 -> 4841 bytes js/yui/tabview/tabview-min.js | 8 +- js/yui/treeview/treeview-min.js | 16 +- js/yui/uploader/uploader-min.js | 10 +- js/yui/yahoo-dom-event/yahoo-dom-event.js | 20 +- js/yui/yahoo/yahoo-min.js | 7 +- js/yui/yuiloader/yuiloader-min.js | 13 +- js/yui/yuitest/yuitest-min.js | 13 +- js/yui/yuitest/yuitest_core-min.js | 10 +- lib/CGI.pm | 153 +- lib/CGI/Carp.pm | 69 +- lib/CGI/Cookie.pm | 2 +- lib/CGI/Fast.pm | 30 +- lib/CGI/Util.pm | 88 +- long_list.cgi | 36 - mod_perl.pl | 38 +- post_bug.cgi | 57 +- process_bug.cgi | 6 +- query.cgi | 127 +- quips.cgi | 10 +- relogin.cgi | 4 +- report.cgi | 140 +- reports.cgi | 43 +- sanitycheck.cgi | 10 +- show_bug.cgi | 15 +- showattachment.cgi | 40 - showdependencygraph.cgi | 96 +- sidebar.cgi | 49 - skins/contrib/Dusk/global.css | 6 - skins/standard/IE-fixes.css | 2 +- skins/standard/attachment.css | 18 +- skins/standard/buglist.css | 7 + skins/standard/global.css | 69 +- skins/standard/global/down.png | Bin 335 -> 0 bytes skins/standard/global/left.png | Bin 339 -> 0 bytes skins/standard/global/right.png | Bin 339 -> 0 bytes skins/standard/global/up.png | Bin 318 -> 0 bytes skins/standard/index.css | 29 +- skins/standard/panel.css | 37 - skins/standard/reports.css | 3 + skins/standard/search_form.css | 8 +- skins/standard/show_bug.css | 3 +- t/004template.t | 53 +- t/007util.t | 17 +- t/008filter.t | 6 +- t/Support/Templates.pm | 44 +- .../en/default/account/auth/login-small.html.tmpl | 16 +- template/en/default/account/auth/login.html.tmpl | 3 + template/en/default/account/create.html.tmpl | 1 + .../en/default/account/email/change-new.txt.tmpl | 4 +- .../en/default/account/email/change-old.txt.tmpl | 2 +- .../en/default/account/email/request-new.txt.tmpl | 4 +- .../account/password/forgotten-password.txt.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 18 +- .../en/default/account/profile-activity.html.tmpl | 2 +- template/en/default/admin/admin.html.tmpl | 3 +- .../default/admin/classifications/edit.html.tmpl | 2 +- .../default/admin/classifications/select.html.tmpl | 6 +- .../admin/components/confirm-delete.html.tmpl | 6 +- .../default/admin/components/edit-common.html.tmpl | 15 +- .../en/default/admin/components/edit.html.tmpl | 15 +- .../en/default/admin/components/footer.html.tmpl | 6 +- .../en/default/admin/components/list.html.tmpl | 15 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 4 +- .../default/admin/custom_fields/create.html.tmpl | 11 +- .../en/default/admin/custom_fields/edit.html.tmpl | 16 +- .../en/default/admin/custom_fields/list.html.tmpl | 2 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 14 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 8 +- .../en/default/admin/fieldvalues/list.html.tmpl | 4 +- template/en/default/admin/flag-type/edit.html.tmpl | 150 +- .../default/admin/groups/confirm-remove.html.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 8 +- template/en/default/admin/groups/edit.html.tmpl | 4 +- template/en/default/admin/keywords/edit.html.tmpl | 2 +- .../admin/milestones/confirm-delete.html.tmpl | 4 +- .../en/default/admin/milestones/edit.html.tmpl | 10 +- .../en/default/admin/milestones/footer.html.tmpl | 10 +- .../en/default/admin/milestones/list.html.tmpl | 13 +- .../en/default/admin/params/attachment.html.tmpl | 23 +- template/en/default/admin/params/auth.html.tmpl | 16 +- .../en/default/admin/params/editparams.html.tmpl | 16 +- .../default/admin/params/groupsecurity.html.tmpl | 3 + template/en/default/admin/params/index.html.tmpl | 2 +- template/en/default/admin/params/query.html.tmpl | 27 +- .../admin/products/confirm-delete.html.tmpl | 10 +- .../en/default/admin/products/create.html.tmpl | 2 +- template/en/default/admin/products/edit.html.tmpl | 12 +- .../en/default/admin/products/footer.html.tmpl | 6 +- .../admin/products/groupcontrol/updated.html.tmpl | 8 +- template/en/default/admin/products/list.html.tmpl | 2 +- .../en/default/admin/products/updated.html.tmpl | 4 +- .../default/admin/sanitycheck/messages.html.tmpl | 20 +- template/en/default/admin/sudo.html.tmpl | 2 +- template/en/default/admin/table.html.tmpl | 2 +- .../default/admin/users/confirm-delete.html.tmpl | 25 +- template/en/default/admin/users/list.html.tmpl | 6 +- .../default/admin/users/listselectvars.html.tmpl | 4 +- .../default/admin/users/responsibilities.html.tmpl | 4 +- template/en/default/admin/users/search.html.tmpl | 3 + template/en/default/admin/users/userdata.html.tmpl | 15 +- .../admin/versions/confirm-delete.html.tmpl | 4 +- template/en/default/admin/versions/edit.html.tmpl | 8 +- .../en/default/admin/versions/footer.html.tmpl | 10 +- template/en/default/admin/versions/list.html.tmpl | 13 +- .../en/default/admin/workflow/comment.html.tmpl | 2 +- template/en/default/admin/workflow/edit.html.tmpl | 2 +- .../attachment/cancel-create-dupe.html.tmpl | 48 - template/en/default/attachment/create.html.tmpl | 8 +- .../attachment/createformcontents.html.tmpl | 53 +- .../en/default/attachment/diff-header.html.tmpl | 6 +- template/en/default/attachment/edit.html.tmpl | 65 +- template/en/default/attachment/list.html.tmpl | 17 +- template/en/default/attachment/midair.html.tmpl | 2 +- .../en/default/attachment/show-multiple.html.tmpl | 7 +- template/en/default/bug/comments.html.tmpl | 43 +- .../bug/create/confirm-create-dupe.html.tmpl | 57 - .../en/default/bug/create/create-guided.html.tmpl | 4 +- template/en/default/bug/create/create.html.tmpl | 25 +- template/en/default/bug/dependency-graph.html.tmpl | 5 +- template/en/default/bug/dependency-tree.html.tmpl | 32 +- template/en/default/bug/edit.html.tmpl | 118 +- template/en/default/bug/field-events.js.tmpl | 32 +- template/en/default/bug/field-help.none.tmpl | 2 +- template/en/default/bug/field-label.html.tmpl | 5 +- template/en/default/bug/field.html.tmpl | 84 +- template/en/default/bug/format_comment.txt.tmpl | 2 +- template/en/default/bug/link.html.tmpl | 63 + template/en/default/bug/navigate.html.tmpl | 24 +- template/en/default/bug/process/midair.html.tmpl | 2 +- template/en/default/bug/show-header.html.tmpl | 12 + template/en/default/bug/show-multiple.html.tmpl | 14 +- template/en/default/bug/show.xml.tmpl | 3 +- template/en/default/config.rdf.tmpl | 28 +- template/en/default/email/bugmail-common.txt.tmpl | 38 + ...hangedmail.txt.tmpl => bugmail-header.txt.tmpl} | 33 +- template/en/default/email/bugmail.html.tmpl | 130 + .../{newchangedmail.txt.tmpl => bugmail.txt.tmpl} | 64 +- template/en/default/filterexceptions.pl | 25 +- .../default/global/choose-classification.html.tmpl | 12 +- .../en/default/global/choose-product.html.tmpl | 6 +- template/en/default/global/code-error.html.tmpl | 59 +- template/en/default/global/common-links.html.tmpl | 6 +- .../en/default/global/confirm-user-match.html.tmpl | 2 +- template/en/default/global/field-descs.none.tmpl | 36 +- template/en/default/global/header.html.tmpl | 14 +- template/en/default/global/messages.html.tmpl | 115 +- .../en/default/global/per-bug-queries.html.tmpl | 16 +- template/en/default/global/setting-descs.none.tmpl | 4 + .../en/default/global/site-navigation.html.tmpl | 6 +- template/en/default/global/useful-links.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 243 +- template/en/default/global/value-descs.js.tmpl | 2 +- template/en/default/global/value-descs.none.tmpl | 36 + template/en/default/index.html.tmpl | 63 +- template/en/default/list/change-columns.html.tmpl | 23 +- template/en/default/list/list.csv.tmpl | 14 +- template/en/default/list/list.html.tmpl | 67 +- template/en/default/list/list.ics.tmpl | 4 +- template/en/default/list/quips.html.tmpl | 12 +- template/en/default/list/server-push.html.tmpl | 13 +- template/en/default/list/table.html.tmpl | 9 +- template/en/default/pages/fields.html.tmpl | 46 +- template/en/default/pages/linked.html.tmpl | 4 +- template/en/default/pages/quicksearch.html.tmpl | 83 +- template/en/default/pages/release-notes.html.tmpl | 4348 ++++---------------- template/en/default/pages/release-notes3.html.tmpl | 3483 ++++++++++++++++ template/en/default/reports/components.html.tmpl | 11 +- template/en/default/reports/create-chart.html.tmpl | 6 +- .../en/default/reports/delete-series.html.tmpl | 2 +- .../en/default/reports/duplicates-table.html.tmpl | 8 +- template/en/default/reports/edit-series.html.tmpl | 6 +- template/en/default/reports/keywords.html.tmpl | 4 +- template/en/default/reports/menu.html.tmpl | 4 + template/en/default/reports/report-table.html.tmpl | 195 +- template/en/default/reports/report.html.tmpl | 11 +- template/en/default/request/email.txt.tmpl | 3 + .../en/default/search/boolean-charts.html.tmpl | 207 +- template/en/default/search/form.html.tmpl | 7 +- template/en/default/search/knob.html.tmpl | 26 +- .../en/default/search/search-advanced.html.tmpl | 11 +- .../default/search/search-create-series.html.tmpl | 2 +- .../default/search/search-report-select.html.tmpl | 7 - .../en/default/search/search-specific.html.tmpl | 27 +- template/en/default/search/type-select.html.tmpl | 3 +- template/en/default/setup/strings.txt.pl | 288 ++- template/en/default/sidebar.xul.tmpl | 128 - template/en/default/whine/mail.html.tmpl | 4 +- token.cgi | 14 +- userprefs.cgi | 30 +- whine.pl | 56 +- whineatnews.pl | 2 +- xml.cgi | 41 - xt/lib/Bugzilla/Test/Search.pm | 88 +- xt/lib/Bugzilla/Test/Search/AndTest.pm | 23 +- xt/lib/Bugzilla/Test/Search/Constants.pm | 834 +++-- xt/lib/Bugzilla/Test/Search/CustomTest.pm | 115 + xt/lib/Bugzilla/Test/Search/FakeCGI.pm | 61 - xt/lib/Bugzilla/Test/Search/FieldTest.pm | 136 +- xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm | 118 + xt/lib/Bugzilla/Test/Search/InjectionTest.pm | 26 +- xt/lib/Bugzilla/Test/Search/NotTest.pm | 75 + xt/lib/Bugzilla/Test/Search/OperatorTest.pm | 7 + xt/lib/Bugzilla/Test/Search/OrTest.pm | 79 +- 425 files changed, 19255 insertions(+), 12428 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=a65e221e0f579a860…

1 0

Stefan Dösinger : d3d9: shared_handle must be NULL in non-ex d3d9.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 58f16ddd4ef538d3dd66ca14ef6253092441c213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f16ddd4ef538d3dd66ca14e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:59 2013 +0100 d3d9: shared_handle must be NULL in non-ex d3d9. --- dlls/d3d9/device.c | 52 +++++++++++++++++++++++ dlls/d3d9/tests/device.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57252e7..ea49b0a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -740,6 +740,12 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool == D3DPOOL_SYSTEMMEM) { if (levels != 1) @@ -801,6 +807,12 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared volume texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared volume texture in pool %#x.\n", pool); @@ -841,6 +853,12 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared cube texture on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared cube texture in pool %#x.\n", pool); @@ -880,6 +898,12 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared vertex buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared vertex buffer in pool %#x.\n", pool); @@ -919,6 +943,12 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared index buffer on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool != D3DPOOL_DEFAULT) { WARN("Trying to create a shared index buffer in pool %#x.\n", pool); @@ -1011,7 +1041,15 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared render target on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (lockable) flags |= WINED3D_SURFACE_MAPPABLE; @@ -1034,7 +1072,15 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * *surface = NULL; if (shared_handle) + { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared depth stencil on a non-ex device.\n"); + return E_NOTIMPL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } if (discard) flags |= WINED3D_SURFACE_DISCARD; @@ -1239,6 +1285,12 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex if (shared_handle) { + if (!device->d3d_parent->extended) + { + WARN("Trying to create a shared or user memory surface on a non-ex device.\n"); + return E_NOTIMPL; + } + if (pool == D3DPOOL_SYSTEMMEM) user_mem = *shared_handle; else diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4040254..799f1c3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7329,6 +7329,110 @@ static void test_lockbox_invalid(void) DestroyWindow(window); } +static void test_shared_handle(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + /* Native d3d9ex refuses to create a shared texture if the texture pointer + * is not initialized to NULL. Make sure this doesn't cause issues here. */ + IDirect3DTexture9 *texture = NULL; + IDirect3DSurface9 *surface = NULL; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + IDirect3DIndexBuffer9 *index_buffer = NULL; + HANDLE handle = NULL; + void *mem; + D3DCAPS9 caps; + + if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create D3D object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + mem = HeapAlloc(GetProcessHeap(), 0, 128 * 128 * 4); + + /* Windows XP returns E_NOTIMPL, Windows 7 returns INVALIDCALL, except for + * CreateVertexBuffer, where it returns NOTAVAILABLE. */ + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_DEFAULT, + &vertex_buffer, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &vertex_buffer, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_NOTAVAILABLE), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, 0, 0, D3DPOOL_DEFAULT, + &index_buffer, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &index_buffer, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + IDirect3DCubeTexture9 *cube_texture = NULL; + hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &cube_texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + } + + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + IDirect3DVolumeTexture9 *volume_texture = NULL; + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &volume_texture, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, &mem); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, &handle); + ok(hr == E_NOTIMPL || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + + HeapFree(GetProcessHeap(), 0, mem); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -7423,6 +7527,7 @@ START_TEST(device) test_create_rt_ds_fail(); test_volume_blocks(); test_lockbox_invalid(); + test_shared_handle(); } out:

1 0

Stefan Dösinger : d3d9: Implement user memory for offscreen plain surfaces.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 62df35c312d9f65bb775e07d47ebab3ab8495110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62df35c312d9f65bb775e07d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:58 2013 +0100 d3d9: Implement user memory for offscreen plain surfaces. --- dlls/d3d9/device.c | 31 ++++++++++++++++++++++++------- dlls/d3d9/tests/d3d9ex.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 598fff0..57252e7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -947,7 +947,7 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width, UINT height, D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, - D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) + D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem) { struct wined3d_resource *sub_resource; struct wined3d_resource_desc desc; @@ -989,6 +989,9 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width IDirect3DSurface9_AddRef(*surface); wined3d_texture_decref(texture); + if (user_mem) + wined3d_surface_set_mem(surface_impl->wined3d_surface, user_mem, 0); + wined3d_mutex_unlock(); return D3D_OK; @@ -1014,7 +1017,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, flags |= WINED3D_SURFACE_MAPPABLE; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, UINT width, UINT height, @@ -1037,7 +1040,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * flags |= WINED3D_SURFACE_DISCARD; return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality); + D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } @@ -1222,24 +1225,38 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + void *user_mem = NULL; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", iface, width, height, format, pool, surface, shared_handle); *surface = NULL; - if (shared_handle) - FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - if (pool == D3DPOOL_MANAGED) { WARN("Attempting to create a managed offscreen plain surface.\n"); return D3DERR_INVALIDCALL; } + + if (shared_handle) + { + if (pool == D3DPOOL_SYSTEMMEM) + user_mem = *shared_handle; + else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared surface in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } + } + /* FIXME: Offscreen surfaces are supposed to be always lockable, * regardless of the pool they're created in. Should we set dynamic usage * here? */ return d3d9_device_create_surface(device, width, height, format, - WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0); + WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); } static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 *surface) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 22134c3..7f39d70 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -543,6 +543,7 @@ static void test_user_memory(void) IDirect3DVolumeTexture9 *volume_texture; IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; + IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; @@ -605,6 +606,36 @@ static void test_user_memory(void) &vertex_buffer, &mem); ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, &mem); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, &mem, 0); + todo_wine ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DSurface9_UnlockRect(surface); + IDirect3DSurface9_Release(surface); + } + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &surface, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &surface, &mem, 0); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9: Buffers do not support user memory.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 96c7a4d6ca2a6343fada379dc4229ebee0d940bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c7a4d6ca2a6343fada379dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:57 2013 +0100 d3d9: Buffers do not support user memory. --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/d3d9ex.c | 9 +++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 65fd377..598fff0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -879,7 +879,14 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, iface, size, usage, fvf, pool, buffer, shared_handle); if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared vertex buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -911,7 +918,14 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U iface, size, usage, format, pool, buffer, shared_handle); if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared index buffer in pool %#x.\n", pool); + return D3DERR_NOTAVAILABLE; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1df6eb8..22134c3 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -541,6 +541,8 @@ static void test_user_memory(void) IDirect3DTexture9 *texture; IDirect3DCubeTexture9 *cube_texture; IDirect3DVolumeTexture9 *volume_texture; + IDirect3DVertexBuffer9 *vertex_buffer; + IDirect3DIndexBuffer9 *index_buffer; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; @@ -596,6 +598,13 @@ static void test_user_memory(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, 0, D3DFMT_INDEX32, D3DPOOL_SYSTEMMEM, + &index_buffer, &mem); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, 0, 0, D3DPOOL_SYSTEMMEM, + &vertex_buffer, &mem); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9: Volume and cube textures do not support user memory.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: d9bd9a9a877f61d8082df4c0939a3c437b069fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bd9a9a877f61d8082df4c09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:56 2013 +0100 d3d9: Volume and cube textures do not support user memory. --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/d3d9ex.c | 21 ++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6721101..65fd377 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -800,7 +800,14 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared volume texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -833,7 +840,14 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, *texture = NULL; if (shared_handle) + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared cube texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 810d2a0..1df6eb8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -539,11 +539,14 @@ static void test_user_memory(void) { IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; + IDirect3DCubeTexture9 *cube_texture; + IDirect3DVolumeTexture9 *volume_texture; D3DLOCKED_RECT locked_rect; UINT refcount; HWND window; HRESULT hr; void *mem; + D3DCAPS9 caps; window = create_window(); if (!(device = create_device(window, window, TRUE))) @@ -552,6 +555,9 @@ static void test_user_memory(void) goto done; } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * 128 * 4); hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); @@ -576,8 +582,21 @@ static void test_user_memory(void) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - HeapFree(GetProcessHeap(), 0, mem); + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 2, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 2, 2, 2, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + + HeapFree(GetProcessHeap(), 0, mem); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9/tests: Test user memory with D3DPOOL_SCRATCH.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: b7b0b7d2e1f8a2fa73ce5e801a0e4f00cc9abc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b0b7d2e1f8a2fa73ce5e801… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 10 14:36:55 2013 +0100 d3d9/tests: Test user memory with D3DPOOL_SCRATCH. --- dlls/d3d9/device.c | 7 +++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5dc207a..6721101 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -747,7 +747,14 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, set_mem = TRUE; } else + { + if (pool != D3DPOOL_DEFAULT) + { + WARN("Trying to create a shared texture in pool %#x.\n", pool); + return D3DERR_INVALIDCALL; + } FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5825c35..810d2a0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -535,7 +535,7 @@ out: IDirect3D9Ex_Release(d3d9ex); } -static void test_texture_sysmem_create(void) +static void test_user_memory(void) { IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; @@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void) hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SCRATCH, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, &mem); @@ -1114,7 +1117,7 @@ START_TEST(d3d9ex) test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); - test_texture_sysmem_create(); + test_user_memory(); test_reset(); test_reset_resources(); test_vidmem_accounting();

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
47
Older →

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

2003

2002

2001

wine-commits December 2013