wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Alexandre Julliard : d3dx10: Fix typo in a forward name.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 3f4573cc725a4f2b1f3af488f214d9e0b4564d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4573cc725a4f2b1f3af488f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 29 12:02:02 2010 +0200 d3dx10: Fix typo in a forward name. --- dlls/d3dx10_33/d3dx10_33.spec | 2 +- dlls/d3dx10_34/d3dx10_34.spec | 2 +- dlls/d3dx10_35/d3dx10_35.spec | 2 +- dlls/d3dx10_36/d3dx10_36.spec | 2 +- dlls/d3dx10_37/d3dx10_37.spec | 2 +- dlls/d3dx10_38/d3dx10_38.spec | 2 +- dlls/d3dx10_39/d3dx10_39.spec | 2 +- dlls/d3dx10_40/d3dx10_40.spec | 2 +- dlls/d3dx10_41/d3dx10_41.spec | 2 +- dlls/d3dx10_42/d3dx10_42.spec | 2 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_33/d3dx10_33.spec b/dlls/d3dx10_33/d3dx10_33.spec index 33c7f88..940260f 100644 --- a/dlls/d3dx10_33/d3dx10_33.spec +++ b/dlls/d3dx10_33/d3dx10_33.spec @@ -67,7 +67,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_34/d3dx10_34.spec b/dlls/d3dx10_34/d3dx10_34.spec index 33c7f88..940260f 100644 --- a/dlls/d3dx10_34/d3dx10_34.spec +++ b/dlls/d3dx10_34/d3dx10_34.spec @@ -67,7 +67,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_35/d3dx10_35.spec b/dlls/d3dx10_35/d3dx10_35.spec index b34cd87..fa1a351 100644 --- a/dlls/d3dx10_35/d3dx10_35.spec +++ b/dlls/d3dx10_35/d3dx10_35.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_36/d3dx10_36.spec b/dlls/d3dx10_36/d3dx10_36.spec index b34cd87..fa1a351 100644 --- a/dlls/d3dx10_36/d3dx10_36.spec +++ b/dlls/d3dx10_36/d3dx10_36.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_37/d3dx10_37.spec b/dlls/d3dx10_37/d3dx10_37.spec index e444dfa..68adcca 100644 --- a/dlls/d3dx10_37/d3dx10_37.spec +++ b/dlls/d3dx10_37/d3dx10_37.spec @@ -71,7 +71,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_38/d3dx10_38.spec b/dlls/d3dx10_38/d3dx10_38.spec index 952d4ec..1c88e2e 100644 --- a/dlls/d3dx10_38/d3dx10_38.spec +++ b/dlls/d3dx10_38/d3dx10_38.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_39/d3dx10_39.spec b/dlls/d3dx10_39/d3dx10_39.spec index 496441f..bb0a4c6 100644 --- a/dlls/d3dx10_39/d3dx10_39.spec +++ b/dlls/d3dx10_39/d3dx10_39.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_40/d3dx10_40.spec b/dlls/d3dx10_40/d3dx10_40.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_40/d3dx10_40.spec +++ b/dlls/d3dx10_40/d3dx10_40.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_41/d3dx10_41.spec b/dlls/d3dx10_41/d3dx10_41.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_41/d3dx10_41.spec +++ b/dlls/d3dx10_41/d3dx10_41.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_42/d3dx10_42.spec b/dlls/d3dx10_42/d3dx10_42.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_42/d3dx10_42.spec +++ b/dlls/d3dx10_42/d3dx10_42.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index c5068c3..1ea80a2 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -66,7 +66,7 @@ @ stub D3DX10SaveTextureToMemory @ stub D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx9_36.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere

1 0

Vitaliy Margolen : Import of upstream bugzilla release 3.4.5.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: bugzilla Branch: upstream Commit: 882e3667548ff1733f7b0835e29060ccda013437 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=882e3667548ff1733f7b0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Aug 27 19:19:38 2010 +0200 Import of upstream bugzilla release 3.4.5. --- Bugzilla.pm | 88 ++- Bugzilla/Attachment.pm | 189 ++-- Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 14 +- Bugzilla/Auth/Persist/Cookie.pm | 1 + Bugzilla/Auth/Verify/DB.pm | 17 +- Bugzilla/Auth/Verify/Stack.pm | 14 +- Bugzilla/Bug.pm | 574 +++++++---- Bugzilla/BugMail.pm | 143 +-- Bugzilla/CGI.pm | 123 ++- Bugzilla/Chart.pm | 9 +- Bugzilla/Classification.pm | 206 ++--- Bugzilla/Config.pm | 23 +- Bugzilla/Config/Admin.pm | 10 +- Bugzilla/Config/Attachment.pm | 6 - Bugzilla/Config/BugChange.pm | 12 - Bugzilla/Config/BugFields.pm | 12 +- Bugzilla/Config/Common.pm | 30 +- Bugzilla/Config/Core.pm | 7 - Bugzilla/Config/MTA.pm | 8 +- Bugzilla/Config/Query.pm | 2 +- Bugzilla/Constants.pm | 40 +- Bugzilla/DB.pm | 163 +++- Bugzilla/DB/Mysql.pm | 123 ++- Bugzilla/DB/Oracle.pm | 52 +- Bugzilla/DB/Pg.pm | 36 +- Bugzilla/DB/Schema.pm | 444 ++++++-- Bugzilla/DB/Schema/Oracle.pm | 2 +- Bugzilla/Field.pm | 385 ++++++- Bugzilla/Field/Choice.pm | 445 ++++++++ Bugzilla/Flag.pm | 58 +- Bugzilla/Group.pm | 91 ++- Bugzilla/Hook.pm | 172 +++ Bugzilla/Install.pm | 6 +- Bugzilla/Install/DB.pm | 104 ++- Bugzilla/Install/Filesystem.pm | 130 ++- Bugzilla/Install/Localconfig.pm | 116 ++- Bugzilla/Install/Requirements.pm | 225 ++-- Bugzilla/Install/Util.pm | 29 +- Bugzilla/Job/Mailer.pm | 57 + Bugzilla/JobQueue.pm | 110 ++ Bugzilla/JobQueue/Runner.pm | 223 ++++ Bugzilla/Mailer.pm | 22 +- Bugzilla/Object.pm | 165 +++- Bugzilla/Product.pm | 675 ++++++++++++- Bugzilla/Search.pm | 464 ++++++--- Bugzilla/Search/Quicksearch.pm | 2 +- Bugzilla/Series.pm | 33 +- Bugzilla/Status.pm | 90 ++- Bugzilla/Template.pm | 72 +- Bugzilla/Template/Parser.pm | 66 -- Bugzilla/Token.pm | 16 +- Bugzilla/User.pm | 396 ++++---- Bugzilla/User/Setting/Timezone.pm | 71 ++ Bugzilla/Util.pm | 223 +++-- Bugzilla/WebService.pm | 195 ++-- Bugzilla/WebService/Bug.pm | 1086 ++++++++++++++++++-- Bugzilla/WebService/Bugzilla.pm | 120 ++- Bugzilla/WebService/Constants.pm | 43 +- Bugzilla/WebService/Product.pm | 10 +- Bugzilla/WebService/Server.pm | 42 + Bugzilla/WebService/Server/XMLRPC.pm | 244 +++++ Bugzilla/WebService/User.pm | 235 +++++- Bugzilla/WebService/Util.pm | 101 ++ QUICKSTART | 84 -- README | 101 ++- UPGRADING | 3 - UPGRADING-pre-2.8 | 412 -------- attachment.cgi | 74 +- buglist.cgi | 325 +++---- chart.cgi | 2 +- checksetup.pl | 9 +- colchange.cgi | 33 +- collectstats.pl | 144 ++-- config.cgi | 6 +- contrib/bugzilla-queue | 109 ++ contrib/bzdbcopy.pl | 2 - describecomponents.cgi | 7 +- describekeywords.cgi | 3 + docs/bugzilla.ent | 13 +- docs/en/xml/Bugzilla-Guide.xml | 11 +- docs/en/xml/about.xml | 2 +- docs/en/xml/administration.xml | 48 +- docs/en/xml/bugzilla.ent | 13 +- docs/en/xml/customization.xml | 23 +- docs/en/xml/glossary.xml | 3 +- docs/en/xml/installation.xml | 108 +-- docs/en/xml/integration.xml | 120 --- docs/en/xml/modules.xml | 8 - docs/en/xml/requiredsoftware.xml | 77 -- docs/en/xml/security.xml | 98 +-- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 14 +- docs/makedocs.pl | 7 - duplicates.cgi | 29 +- duplicates.xul | 133 --- editclassifications.cgi | 130 +-- editfields.cgi | 8 +- editflagtypes.cgi | 27 +- editgroups.cgi | 79 +-- editkeywords.cgi | 6 +- editparams.cgi | 7 +- editproducts.cgi | 862 ++-------------- editusers.cgi | 45 +- editvalues.cgi | 396 +------- editwhines.cgi | 2 +- email_in.pl | 16 +- enter_bug.cgi | 30 +- extensions/example/code/auth-login_methods.pl | 27 + extensions/example/code/auth-verify_methods.pl | 27 + extensions/example/code/bug-columns.pl | 27 + extensions/example/code/bug-end_of_create.pl | 35 + extensions/example/code/bug-fields.pl | 27 + extensions/example/code/config-add_panels.pl | 25 + extensions/example/code/config-modify_panels.pl | 32 + extensions/example/code/mailer-before_send.pl | 28 + extensions/example/code/page-before_template.pl | 33 + extensions/example/code/product-confirm_delete.pl | 2 +- extensions/example/lib/AuthLogin.pm | 32 + extensions/example/lib/AuthVerify.pm | 31 + .../template/en/default/pages/example.html.tmpl | 32 + importxml.pl | 11 +- index.cgi | 17 +- install-module.pl | 18 +- jobqueue.pl | 79 ++ js/TUI.js | 208 ++--- js/attachment.js | 106 ++- js/change-columns.js | 142 +++ js/duplicates.js | 153 --- js/field.js | 239 ++++- js/global.js | 112 ++ js/util.js | 117 +++ js/yui/calendar.js | 26 +- js/yui/cookie.js | 7 + js/yui/yahoo-dom-event.js | 14 +- page.cgi | 7 +- post_bug.cgi | 2 +- process_bug.cgi | 59 +- query.cgi | 24 +- relogin.cgi | 22 +- report.cgi | 58 +- request.cgi | 28 +- sanitycheck.cgi | 36 +- sanitycheck.pl | 2 - search_plugin.cgi | 12 +- show_activity.cgi | 12 +- show_bug.cgi | 12 +- showdependencygraph.cgi | 4 +- showdependencytree.cgi | 9 +- skins/contrib/Dusk/.cvsignore | 1 - skins/contrib/Dusk/global.css | 49 +- skins/contrib/Dusk/index.css | 25 + skins/contrib/Dusk/index/account.gif | Bin 0 -> 6869 bytes skins/contrib/Dusk/index/bug.gif | Bin 0 -> 6370 bytes skins/contrib/Dusk/index/search.gif | Bin 0 -> 6661 bytes skins/standard/buglist.css | 32 + skins/standard/create_attachment.css | 70 ++ skins/standard/global.css | 130 ++- skins/standard/global/down.png | Bin 0 -> 335 bytes skins/standard/global/left.png | Bin 0 -> 339 bytes skins/standard/global/right.png | Bin 0 -> 339 bytes skins/standard/global/up.png | Bin 0 -> 318 bytes skins/standard/index.css | 124 ++- skins/standard/index/account.gif | Bin 0 -> 7130 bytes skins/standard/index/bug.gif | Bin 0 -> 6586 bytes skins/standard/index/front.png | Bin 47235 -> 0 bytes skins/standard/index/search.gif | Bin 0 -> 6907 bytes skins/standard/show_bug.css | 28 +- skins/standard/yui/calendar.css | 6 +- skins/standard/yui/sprite.png | Bin 3123 -> 3745 bytes summarize_time.cgi | 34 +- t/{005no_tabs.t => 005whitespace.t} | 31 +- t/007util.t | 44 +- t/008filter.t | 2 +- t/009bugwords.t | 2 +- .../en/default/account/auth/login-small.html.tmpl | 143 ++- template/en/default/account/auth/login.html.tmpl | 2 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/account/create.html.tmpl | 2 +- .../en/default/account/email/change-new.txt.tmpl | 5 +- .../en/default/account/email/change-old.txt.tmpl | 5 +- .../en/default/account/email/confirm-new.html.tmpl | 5 +- .../en/default/account/email/request-new.txt.tmpl | 7 +- .../account/password/forgotten-password.txt.tmpl | 5 +- template/en/default/account/prefs/email.html.tmpl | 6 +- .../en/default/account/prefs/permissions.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 3 +- .../en/default/account/profile-activity.html.tmpl | 1 + template/en/default/admin/admin.html.tmpl | 20 +- .../en/default/admin/components/list.html.tmpl | 16 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 59 ++ .../default/admin/custom_fields/create.html.tmpl | 60 +- .../en/default/admin/custom_fields/edit.html.tmpl | 75 +- .../en/default/admin/custom_fields/list.html.tmpl | 26 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 113 ++- .../en/default/admin/fieldvalues/create.html.tmpl | 36 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 57 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 9 +- .../en/default/admin/fieldvalues/list.html.tmpl | 35 +- template/en/default/admin/flag-type/list.html.tmpl | 30 +- template/en/default/admin/groups/edit.html.tmpl | 2 +- template/en/default/admin/groups/list.html.tmpl | 116 +-- .../en/default/admin/milestones/list.html.tmpl | 9 +- template/en/default/admin/params/admin.html.tmpl | 6 +- .../en/default/admin/params/attachment.html.tmpl | 7 +- .../en/default/admin/params/bugchange.html.tmpl | 6 - .../en/default/admin/params/bugfields.html.tmpl | 11 +- template/en/default/admin/params/core.html.tmpl | 4 - template/en/default/admin/params/index.html.tmpl | 9 +- template/en/default/admin/params/mta.html.tmpl | 10 + .../admin/products/confirm-delete.html.tmpl | 28 +- .../en/default/admin/products/create.html.tmpl | 2 - template/en/default/admin/products/edit.html.tmpl | 7 +- .../en/default/admin/products/footer.html.tmpl | 7 +- .../admin/products/groupcontrol/edit.html.tmpl | 48 +- .../admin/products/groupcontrol/updated.html.tmpl | 14 +- template/en/default/admin/products/list.html.tmpl | 29 +- .../en/default/admin/products/updated.html.tmpl | 93 +-- .../default/admin/sanitycheck/messages.html.tmpl | 15 +- template/en/default/admin/table.html.tmpl | 76 +- .../default/admin/users/confirm-delete.html.tmpl | 4 +- template/en/default/admin/users/list.html.tmpl | 39 +- template/en/default/admin/users/userdata.html.tmpl | 2 +- template/en/default/attachment/create.html.tmpl | 3 +- template/en/default/attachment/created.html.tmpl | 4 +- .../attachment/createformcontents.html.tmpl | 15 +- .../en/default/attachment/diff-header.html.tmpl | 184 +---- template/en/default/attachment/edit.html.tmpl | 10 +- template/en/default/attachment/list.html.tmpl | 46 +- template/en/default/attachment/updated.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 9 +- template/en/default/bug/comments.html.tmpl | 103 +- template/en/default/bug/create/create.html.tmpl | 84 ++- template/en/default/bug/create/created.html.tmpl | 8 +- template/en/default/bug/dependency-tree.html.tmpl | 4 +- template/en/default/bug/edit.html.tmpl | 205 ++-- template/en/default/bug/field-events.js.tmpl | 40 + template/en/default/bug/field.html.tmpl | 129 +++- template/en/default/bug/format_comment.txt.tmpl | 60 ++ template/en/default/bug/knob.html.tmpl | 5 +- template/en/default/bug/process/header.html.tmpl | 3 +- template/en/default/bug/process/midair.html.tmpl | 12 + template/en/default/bug/show-multiple.html.tmpl | 4 +- template/en/default/bug/show.html.tmpl | 4 +- template/en/default/bug/show.xml.tmpl | 52 +- template/en/default/bug/summarize-time.html.tmpl | 49 +- .../en/default/bug/votes/list-for-bug.html.tmpl | 5 +- template/en/default/config.js.tmpl | 2 +- template/en/default/config.rdf.tmpl | 8 +- template/en/default/email/newchangedmail.txt.tmpl | 13 +- template/en/default/email/sanitycheck.txt.tmpl | 2 +- template/en/default/email/whine.txt.tmpl | 6 +- template/en/default/filterexceptions.pl | 47 +- template/en/default/flag/list.html.tmpl | 17 +- .../default/global/choose-classification.html.tmpl | 3 - template/en/default/global/code-error.html.tmpl | 49 +- template/en/default/global/common-links.html.tmpl | 55 +- template/en/default/global/field-descs.none.tmpl | 35 +- template/en/default/global/header.html.tmpl | 63 +- template/en/default/global/messages.html.tmpl | 128 ++- template/en/default/global/setting-descs.none.tmpl | 4 + .../en/default/global/site-navigation.html.tmpl | 16 +- template/en/default/global/useful-links.html.tmpl | 4 - template/en/default/global/user-error.html.tmpl | 273 +++-- template/en/default/global/user.html.tmpl | 39 + template/en/default/global/variables.none.tmpl | 1 + template/en/default/index.html.tmpl | 158 ++-- template/en/default/list/change-columns.html.tmpl | 60 +- template/en/default/list/edit-multiple.html.tmpl | 39 +- template/en/default/list/list.atom.tmpl | 9 +- template/en/default/list/list.csv.tmpl | 3 +- template/en/default/list/list.html.tmpl | 51 +- template/en/default/list/list.ics.tmpl | 6 +- template/en/default/list/list.rdf.tmpl | 1 + template/en/default/list/quips.html.tmpl | 4 +- template/en/default/list/table.html.tmpl | 77 ++- template/en/default/pages/fields.html.tmpl | 14 + template/en/default/pages/release-notes.html.tmpl | 773 ++++++++++++++- template/en/default/pages/sudo.html.tmpl | 4 +- template/en/default/reports/chart.html.tmpl | 4 +- template/en/default/reports/components.html.tmpl | 6 +- template/en/default/reports/create-chart.html.tmpl | 30 +- template/en/default/reports/duplicates.rdf.tmpl | 50 - template/en/default/reports/report-table.csv.tmpl | 39 +- template/en/default/reports/report-table.html.tmpl | 34 +- template/en/default/reports/report.html.tmpl | 6 +- .../en/default/reports/series-common.html.tmpl | 10 +- template/en/default/request/email.txt.tmpl | 3 +- template/en/default/request/queue.html.tmpl | 11 +- .../en/default/search/boolean-charts.html.tmpl | 58 +- template/en/default/search/form.html.tmpl | 63 +- template/en/default/search/knob.html.tmpl | 4 + .../en/default/search/search-advanced.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 4 +- template/en/default/search/search-plugin.xml.tmpl | 6 +- .../default/search/search-report-select.html.tmpl | 7 + template/en/default/search/type-select.html.tmpl | 29 + template/en/default/setup/strings.txt.pl | 62 ++ template/en/default/sidebar.xul.tmpl | 19 +- template/en/default/whine/mail.html.tmpl | 6 +- template/en/default/whine/mail.txt.tmpl | 6 +- template/en/default/whine/multipart-mime.txt.tmpl | 1 + template/en/default/whine/schedule.html.tmpl | 6 +- testserver.pl | 16 +- token.cgi | 162 ++-- userprefs.cgi | 60 +- votes.cgi | 34 +- whine.pl | 22 +- xmlrpc.cgi | 37 +- 308 files changed, 13014 insertions(+), 7031 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=882e3667548ff1733…

1 0

Vitaliy Margolen : Merge branch 'upstream'.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: bugzilla Branch: master Commit: 30911fe9c374329ff1afdbe3c5fe59444eac58ff URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=30911fe9c374329ff1afd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Aug 27 19:30:44 2010 +0200 Merge branch 'upstream'. Conflicts: Bugzilla/DB/Mysql.pm skins/contrib/Dusk/.cvsignore skins/standard/global.css skins/standard/index.css template/en/default/global/header.html.tmpl template/en/default/index.html.tmpl ---

1 0

Vitaliy Margolen : Import of upstream bugzilla release 3.4.5.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: bugzilla Branch: master Commit: 882e3667548ff1733f7b0835e29060ccda013437 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=882e3667548ff1733f7b0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Aug 27 19:19:38 2010 +0200 Import of upstream bugzilla release 3.4.5. --- Bugzilla.pm | 88 ++- Bugzilla/Attachment.pm | 189 ++-- Bugzilla/Auth/Login/Env.pm | 1 + Bugzilla/Auth/Login/Stack.pm | 14 +- Bugzilla/Auth/Persist/Cookie.pm | 1 + Bugzilla/Auth/Verify/DB.pm | 17 +- Bugzilla/Auth/Verify/Stack.pm | 14 +- Bugzilla/Bug.pm | 574 +++++++---- Bugzilla/BugMail.pm | 143 +-- Bugzilla/CGI.pm | 123 ++- Bugzilla/Chart.pm | 9 +- Bugzilla/Classification.pm | 206 ++--- Bugzilla/Config.pm | 23 +- Bugzilla/Config/Admin.pm | 10 +- Bugzilla/Config/Attachment.pm | 6 - Bugzilla/Config/BugChange.pm | 12 - Bugzilla/Config/BugFields.pm | 12 +- Bugzilla/Config/Common.pm | 30 +- Bugzilla/Config/Core.pm | 7 - Bugzilla/Config/MTA.pm | 8 +- Bugzilla/Config/Query.pm | 2 +- Bugzilla/Constants.pm | 40 +- Bugzilla/DB.pm | 163 +++- Bugzilla/DB/Mysql.pm | 123 ++- Bugzilla/DB/Oracle.pm | 52 +- Bugzilla/DB/Pg.pm | 36 +- Bugzilla/DB/Schema.pm | 444 ++++++-- Bugzilla/DB/Schema/Oracle.pm | 2 +- Bugzilla/Field.pm | 385 ++++++- Bugzilla/Field/Choice.pm | 445 ++++++++ Bugzilla/Flag.pm | 58 +- Bugzilla/Group.pm | 91 ++- Bugzilla/Hook.pm | 172 +++ Bugzilla/Install.pm | 6 +- Bugzilla/Install/DB.pm | 104 ++- Bugzilla/Install/Filesystem.pm | 130 ++- Bugzilla/Install/Localconfig.pm | 116 ++- Bugzilla/Install/Requirements.pm | 225 ++-- Bugzilla/Install/Util.pm | 29 +- Bugzilla/Job/Mailer.pm | 57 + Bugzilla/JobQueue.pm | 110 ++ Bugzilla/JobQueue/Runner.pm | 223 ++++ Bugzilla/Mailer.pm | 22 +- Bugzilla/Object.pm | 165 +++- Bugzilla/Product.pm | 675 ++++++++++++- Bugzilla/Search.pm | 464 ++++++--- Bugzilla/Search/Quicksearch.pm | 2 +- Bugzilla/Series.pm | 33 +- Bugzilla/Status.pm | 90 ++- Bugzilla/Template.pm | 72 +- Bugzilla/Template/Parser.pm | 66 -- Bugzilla/Token.pm | 16 +- Bugzilla/User.pm | 396 ++++---- Bugzilla/User/Setting/Timezone.pm | 71 ++ Bugzilla/Util.pm | 223 +++-- Bugzilla/WebService.pm | 195 ++-- Bugzilla/WebService/Bug.pm | 1086 ++++++++++++++++++-- Bugzilla/WebService/Bugzilla.pm | 120 ++- Bugzilla/WebService/Constants.pm | 43 +- Bugzilla/WebService/Product.pm | 10 +- Bugzilla/WebService/Server.pm | 42 + Bugzilla/WebService/Server/XMLRPC.pm | 244 +++++ Bugzilla/WebService/User.pm | 235 +++++- Bugzilla/WebService/Util.pm | 101 ++ QUICKSTART | 84 -- README | 101 ++- UPGRADING | 3 - UPGRADING-pre-2.8 | 412 -------- attachment.cgi | 74 +- buglist.cgi | 325 +++---- chart.cgi | 2 +- checksetup.pl | 9 +- colchange.cgi | 33 +- collectstats.pl | 144 ++-- config.cgi | 6 +- contrib/bugzilla-queue | 109 ++ contrib/bzdbcopy.pl | 2 - describecomponents.cgi | 7 +- describekeywords.cgi | 3 + docs/bugzilla.ent | 13 +- docs/en/xml/Bugzilla-Guide.xml | 11 +- docs/en/xml/about.xml | 2 +- docs/en/xml/administration.xml | 48 +- docs/en/xml/bugzilla.ent | 13 +- docs/en/xml/customization.xml | 23 +- docs/en/xml/glossary.xml | 3 +- docs/en/xml/installation.xml | 108 +-- docs/en/xml/integration.xml | 120 --- docs/en/xml/modules.xml | 8 - docs/en/xml/requiredsoftware.xml | 77 -- docs/en/xml/security.xml | 98 +-- docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 14 +- docs/makedocs.pl | 7 - duplicates.cgi | 29 +- duplicates.xul | 133 --- editclassifications.cgi | 130 +-- editfields.cgi | 8 +- editflagtypes.cgi | 27 +- editgroups.cgi | 79 +-- editkeywords.cgi | 6 +- editparams.cgi | 7 +- editproducts.cgi | 862 ++-------------- editusers.cgi | 45 +- editvalues.cgi | 396 +------- editwhines.cgi | 2 +- email_in.pl | 16 +- enter_bug.cgi | 30 +- extensions/example/code/auth-login_methods.pl | 27 + extensions/example/code/auth-verify_methods.pl | 27 + extensions/example/code/bug-columns.pl | 27 + extensions/example/code/bug-end_of_create.pl | 35 + extensions/example/code/bug-fields.pl | 27 + extensions/example/code/config-add_panels.pl | 25 + extensions/example/code/config-modify_panels.pl | 32 + extensions/example/code/mailer-before_send.pl | 28 + extensions/example/code/page-before_template.pl | 33 + extensions/example/code/product-confirm_delete.pl | 2 +- extensions/example/lib/AuthLogin.pm | 32 + extensions/example/lib/AuthVerify.pm | 31 + .../template/en/default/pages/example.html.tmpl | 32 + importxml.pl | 11 +- index.cgi | 17 +- install-module.pl | 18 +- jobqueue.pl | 79 ++ js/TUI.js | 208 ++--- js/attachment.js | 106 ++- js/change-columns.js | 142 +++ js/duplicates.js | 153 --- js/field.js | 239 ++++- js/global.js | 112 ++ js/util.js | 117 +++ js/yui/calendar.js | 26 +- js/yui/cookie.js | 7 + js/yui/yahoo-dom-event.js | 14 +- page.cgi | 7 +- post_bug.cgi | 2 +- process_bug.cgi | 59 +- query.cgi | 24 +- relogin.cgi | 22 +- report.cgi | 58 +- request.cgi | 28 +- sanitycheck.cgi | 36 +- sanitycheck.pl | 2 - search_plugin.cgi | 12 +- show_activity.cgi | 12 +- show_bug.cgi | 12 +- showdependencygraph.cgi | 4 +- showdependencytree.cgi | 9 +- skins/contrib/Dusk/.cvsignore | 1 - skins/contrib/Dusk/global.css | 49 +- skins/contrib/Dusk/index.css | 25 + skins/contrib/Dusk/index/account.gif | Bin 0 -> 6869 bytes skins/contrib/Dusk/index/bug.gif | Bin 0 -> 6370 bytes skins/contrib/Dusk/index/search.gif | Bin 0 -> 6661 bytes skins/standard/buglist.css | 32 + skins/standard/create_attachment.css | 70 ++ skins/standard/global.css | 130 ++- skins/standard/global/down.png | Bin 0 -> 335 bytes skins/standard/global/left.png | Bin 0 -> 339 bytes skins/standard/global/right.png | Bin 0 -> 339 bytes skins/standard/global/up.png | Bin 0 -> 318 bytes skins/standard/index.css | 124 ++- skins/standard/index/account.gif | Bin 0 -> 7130 bytes skins/standard/index/bug.gif | Bin 0 -> 6586 bytes skins/standard/index/front.png | Bin 47235 -> 0 bytes skins/standard/index/search.gif | Bin 0 -> 6907 bytes skins/standard/show_bug.css | 28 +- skins/standard/yui/calendar.css | 6 +- skins/standard/yui/sprite.png | Bin 3123 -> 3745 bytes summarize_time.cgi | 34 +- t/{005no_tabs.t => 005whitespace.t} | 31 +- t/007util.t | 44 +- t/008filter.t | 2 +- t/009bugwords.t | 2 +- .../en/default/account/auth/login-small.html.tmpl | 143 ++- template/en/default/account/auth/login.html.tmpl | 2 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/account/create.html.tmpl | 2 +- .../en/default/account/email/change-new.txt.tmpl | 5 +- .../en/default/account/email/change-old.txt.tmpl | 5 +- .../en/default/account/email/confirm-new.html.tmpl | 5 +- .../en/default/account/email/request-new.txt.tmpl | 7 +- .../account/password/forgotten-password.txt.tmpl | 5 +- template/en/default/account/prefs/email.html.tmpl | 6 +- .../en/default/account/prefs/permissions.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 3 +- .../en/default/account/profile-activity.html.tmpl | 1 + template/en/default/admin/admin.html.tmpl | 20 +- .../en/default/admin/components/list.html.tmpl | 16 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 59 ++ .../default/admin/custom_fields/create.html.tmpl | 60 +- .../en/default/admin/custom_fields/edit.html.tmpl | 75 +- .../en/default/admin/custom_fields/list.html.tmpl | 26 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 113 ++- .../en/default/admin/fieldvalues/create.html.tmpl | 36 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 57 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 9 +- .../en/default/admin/fieldvalues/list.html.tmpl | 35 +- template/en/default/admin/flag-type/list.html.tmpl | 30 +- template/en/default/admin/groups/edit.html.tmpl | 2 +- template/en/default/admin/groups/list.html.tmpl | 116 +-- .../en/default/admin/milestones/list.html.tmpl | 9 +- template/en/default/admin/params/admin.html.tmpl | 6 +- .../en/default/admin/params/attachment.html.tmpl | 7 +- .../en/default/admin/params/bugchange.html.tmpl | 6 - .../en/default/admin/params/bugfields.html.tmpl | 11 +- template/en/default/admin/params/core.html.tmpl | 4 - template/en/default/admin/params/index.html.tmpl | 9 +- template/en/default/admin/params/mta.html.tmpl | 10 + .../admin/products/confirm-delete.html.tmpl | 28 +- .../en/default/admin/products/create.html.tmpl | 2 - template/en/default/admin/products/edit.html.tmpl | 7 +- .../en/default/admin/products/footer.html.tmpl | 7 +- .../admin/products/groupcontrol/edit.html.tmpl | 48 +- .../admin/products/groupcontrol/updated.html.tmpl | 14 +- template/en/default/admin/products/list.html.tmpl | 29 +- .../en/default/admin/products/updated.html.tmpl | 93 +-- .../default/admin/sanitycheck/messages.html.tmpl | 15 +- template/en/default/admin/table.html.tmpl | 76 +- .../default/admin/users/confirm-delete.html.tmpl | 4 +- template/en/default/admin/users/list.html.tmpl | 39 +- template/en/default/admin/users/userdata.html.tmpl | 2 +- template/en/default/attachment/create.html.tmpl | 3 +- template/en/default/attachment/created.html.tmpl | 4 +- .../attachment/createformcontents.html.tmpl | 15 +- .../en/default/attachment/diff-header.html.tmpl | 184 +---- template/en/default/attachment/edit.html.tmpl | 10 +- template/en/default/attachment/list.html.tmpl | 46 +- template/en/default/attachment/updated.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 9 +- template/en/default/bug/comments.html.tmpl | 103 +- template/en/default/bug/create/create.html.tmpl | 84 ++- template/en/default/bug/create/created.html.tmpl | 8 +- template/en/default/bug/dependency-tree.html.tmpl | 4 +- template/en/default/bug/edit.html.tmpl | 205 ++-- template/en/default/bug/field-events.js.tmpl | 40 + template/en/default/bug/field.html.tmpl | 129 +++- template/en/default/bug/format_comment.txt.tmpl | 60 ++ template/en/default/bug/knob.html.tmpl | 5 +- template/en/default/bug/process/header.html.tmpl | 3 +- template/en/default/bug/process/midair.html.tmpl | 12 + template/en/default/bug/show-multiple.html.tmpl | 4 +- template/en/default/bug/show.html.tmpl | 4 +- template/en/default/bug/show.xml.tmpl | 52 +- template/en/default/bug/summarize-time.html.tmpl | 49 +- .../en/default/bug/votes/list-for-bug.html.tmpl | 5 +- template/en/default/config.js.tmpl | 2 +- template/en/default/config.rdf.tmpl | 8 +- template/en/default/email/newchangedmail.txt.tmpl | 13 +- template/en/default/email/sanitycheck.txt.tmpl | 2 +- template/en/default/email/whine.txt.tmpl | 6 +- template/en/default/filterexceptions.pl | 47 +- template/en/default/flag/list.html.tmpl | 17 +- .../default/global/choose-classification.html.tmpl | 3 - template/en/default/global/code-error.html.tmpl | 49 +- template/en/default/global/common-links.html.tmpl | 55 +- template/en/default/global/field-descs.none.tmpl | 35 +- template/en/default/global/header.html.tmpl | 63 +- template/en/default/global/messages.html.tmpl | 128 ++- template/en/default/global/setting-descs.none.tmpl | 4 + .../en/default/global/site-navigation.html.tmpl | 16 +- template/en/default/global/useful-links.html.tmpl | 4 - template/en/default/global/user-error.html.tmpl | 273 +++-- template/en/default/global/user.html.tmpl | 39 + template/en/default/global/variables.none.tmpl | 1 + template/en/default/index.html.tmpl | 158 ++-- template/en/default/list/change-columns.html.tmpl | 60 +- template/en/default/list/edit-multiple.html.tmpl | 39 +- template/en/default/list/list.atom.tmpl | 9 +- template/en/default/list/list.csv.tmpl | 3 +- template/en/default/list/list.html.tmpl | 51 +- template/en/default/list/list.ics.tmpl | 6 +- template/en/default/list/list.rdf.tmpl | 1 + template/en/default/list/quips.html.tmpl | 4 +- template/en/default/list/table.html.tmpl | 77 ++- template/en/default/pages/fields.html.tmpl | 14 + template/en/default/pages/release-notes.html.tmpl | 773 ++++++++++++++- template/en/default/pages/sudo.html.tmpl | 4 +- template/en/default/reports/chart.html.tmpl | 4 +- template/en/default/reports/components.html.tmpl | 6 +- template/en/default/reports/create-chart.html.tmpl | 30 +- template/en/default/reports/duplicates.rdf.tmpl | 50 - template/en/default/reports/report-table.csv.tmpl | 39 +- template/en/default/reports/report-table.html.tmpl | 34 +- template/en/default/reports/report.html.tmpl | 6 +- .../en/default/reports/series-common.html.tmpl | 10 +- template/en/default/request/email.txt.tmpl | 3 +- template/en/default/request/queue.html.tmpl | 11 +- .../en/default/search/boolean-charts.html.tmpl | 58 +- template/en/default/search/form.html.tmpl | 63 +- template/en/default/search/knob.html.tmpl | 4 + .../en/default/search/search-advanced.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 4 +- template/en/default/search/search-plugin.xml.tmpl | 6 +- .../default/search/search-report-select.html.tmpl | 7 + template/en/default/search/type-select.html.tmpl | 29 + template/en/default/setup/strings.txt.pl | 62 ++ template/en/default/sidebar.xul.tmpl | 19 +- template/en/default/whine/mail.html.tmpl | 6 +- template/en/default/whine/mail.txt.tmpl | 6 +- template/en/default/whine/multipart-mime.txt.tmpl | 1 + template/en/default/whine/schedule.html.tmpl | 6 +- testserver.pl | 16 +- token.cgi | 162 ++-- userprefs.cgi | 60 +- votes.cgi | 34 +- whine.pl | 22 +- xmlrpc.cgi | 37 +- 308 files changed, 13014 insertions(+), 7031 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=882e3667548ff1733…

1 0

Louis Lenders : wer: Add new stubbed wer.dll.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 7ab48e8ef0fc4a47bc8d606b53065754ac38143e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab48e8ef0fc4a47bc8d606b5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Aug 27 12:46:09 2010 +0200 wer: Add new stubbed wer.dll. --- configure | 1 + configure.ac | 1 + dlls/wer/Makefile.in | 10 ++++++ dlls/wer/main.c | 45 +++++++++++++++++++++++++++++ dlls/wer/wer.spec | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e3d16c3..b74fa72 100755 --- a/configure +++ b/configure @@ -14915,6 +14915,7 @@ wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox +wine_fn_config_dll wer enable_wer wine_fn_config_dll wiaservc enable_wiaservc wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index cd8229c..dba7565 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,6 +2694,7 @@ WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) +WINE_CONFIG_DLL(wer) WINE_CONFIG_DLL(wiaservc) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in new file mode 100644 index 0000000..9a35e41 --- /dev/null +++ b/dlls/wer/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wer.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/wer/main.c b/dlls/wer/main.c new file mode 100644 index 0000000..d015d27 --- /dev/null +++ b/dlls/wer/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wer); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec new file mode 100644 index 0000000..b2edb3a --- /dev/null +++ b/dlls/wer/wer.spec @@ -0,0 +1,77 @@ +@ stub WerSysprepCleanup +@ stub WerSysprepGeneralize +@ stub WerSysprepSpecialize +@ stub WerUnattendedSetup +@ stub WerpAddAppCompatData +@ stub WerpAddFile +@ stub WerpAddMemoryBlock +@ stub WerpAddRegisteredDataToReport +@ stub WerpAddSecondaryParameter +@ stub WerpAddTextToReport +@ stub WerpArchiveReport +@ stub WerpCancelResponseDownload +@ stub WerpCancelUpload +@ stub WerpCloseStore +@ stub WerpCreateMachineStore +@ stub WerpDeleteReport +@ stub WerpDestroyWerString +@ stub WerpDownloadResponse +@ stub WerpDownloadResponseTemplate +@ stub WerpEnumerateStoreNext +@ stub WerpEnumerateStoreStart +@ stub WerpExtractReportFiles +@ stub WerpGetBucketId +@ stub WerpGetDynamicParameter +@ stub WerpGetEventType +@ stub WerpGetFileByIndex +@ stub WerpGetFilePathByIndex +@ stub WerpGetNumFiles +@ stub WerpGetNumSecParams +@ stub WerpGetNumSigParams +@ stub WerpGetReportFinalConsent +@ stub WerpGetReportFlags +@ stub WerpGetReportInformation +@ stub WerpGetReportTime +@ stub WerpGetReportType +@ stub WerpGetResponseId +@ stub WerpGetResponseUrl +@ stub WerpGetSecParamByIndex +@ stub WerpGetSigParamByIndex +@ stub WerpGetStoreLocation +@ stub WerpGetStoreType +@ stub WerpGetTextFromReport +@ stub WerpGetUIParamByIndex +@ stub WerpGetUploadTime +@ stub WerpGetWerStringData +@ stub WerpIsTransportAvailable +@ stub WerpLoadReport +@ stub WerpOpenMachineArchive +@ stub WerpOpenMachineQueue +@ stub WerpOpenUserArchive +@ stub WerpReportCancel +@ stub WerpRestartApplication +@ stub WerpSetDynamicParameter +@ stub WerpSetEventName +@ stub WerpSetReportFlags +@ stub WerpSetReportInformation +@ stub WerpSetReportTime +@ stub WerpSetReportUploadContextToken +@ stub WerpShowNXNotification +@ stub WerpShowSecondLevelConsent +@ stub WerpShowUpsellUI +@ stub WerpSubmitReportFromStore +@ stub WerpSvcReportFromMachineQueue +@ stub WerAddExcludedApplication +@ stub WerRemoveExcludedApplication +@ stub WerReportAddDump +@ stub WerReportAddFile +@ stub WerReportCloseHandle +@ stub WerReportCreate +@ stub WerReportSetParameter +@ stub WerReportSetUIOption +@ stub WerReportSubmit +@ stub WerpGetReportConsent +@ stub WerpIsDisabled +@ stub WerpOpenUserQueue +@ stub WerpPromtUser +@ stub WerpSetCallBack

1 0

Louis Lenders : rstrtmgr: Add new stubbed dll rstrtmgr.dll.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 85b3f299ff16cca125fc76cc03e6baa86232723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b3f299ff16cca125fc76cc0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Aug 27 11:45:11 2010 +0200 rstrtmgr: Add new stubbed dll rstrtmgr.dll. --- configure | 1 + configure.ac | 1 + dlls/rstrtmgr/Makefile.in | 10 +++++++++ dlls/rstrtmgr/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/rstrtmgr/rstrtmgr.spec | 12 ++++++++++ 5 files changed, 72 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f7156d9..e3d16c3 100755 --- a/configure +++ b/configure @@ -14833,6 +14833,7 @@ wine_fn_config_test dlls/rpcrt4/tests rpcrt4_test wine_fn_config_dll rsabase enable_rsabase wine_fn_config_dll rsaenh enable_rsaenh rsaenh wine_fn_config_test dlls/rsaenh/tests rsaenh_test +wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils rtutils wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds diff --git a/configure.ac b/configure.ac index dc3fb29..cd8229c 100644 --- a/configure.ac +++ b/configure.ac @@ -2612,6 +2612,7 @@ WINE_CONFIG_TEST(dlls/rpcrt4/tests) WINE_CONFIG_DLL(rsabase) WINE_CONFIG_DLL(rsaenh,,[rsaenh]) WINE_CONFIG_TEST(dlls/rsaenh/tests) +WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[rtutils]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in new file mode 100644 index 0000000..513c3a7 --- /dev/null +++ b/dlls/rstrtmgr/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rstrtmgr.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c new file mode 100644 index 0000000..6d2603c --- /dev/null +++ b/dlls/rstrtmgr/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec new file mode 100644 index 0000000..03c0b66 --- /dev/null +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -0,0 +1,12 @@ +@ stub RmAddFilter +@ stub RmCancelCurrentTask +@ stub RmEndSession +@ stub RmGetFilterList +@ stub RmGetList +@ stub RmJoinSession +@ stub RmRegisterResources +@ stub RmRemoveFilter +@ stub RmReserveHeap +@ stub RmRestart +@ stub RmShutdown +@ stub RmStartSession

1 0

Alexandre Julliard : mscoree/tests: Comment out a couple of tests that crash on Windows.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 67d0195fd9070660c5342edeee4f17482933a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d0195fd9070660c5342edee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 15:17:29 2010 +0200 mscoree/tests: Comment out a couple of tests that crash on Windows. --- dlls/mscoree/tests/mscoree.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 59ba58e..0536ba1 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -60,8 +60,11 @@ static void test_versioninfo(void) DWORD size, path_len; HRESULT hr; - hr = pGetCORVersion(NULL, MAX_PATH, &size); - ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + if (0) /* crashes on <= w2k3 */ + { + hr = pGetCORVersion(NULL, MAX_PATH, &size); + ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + } hr = pGetCORVersion(version, 1, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); @@ -81,8 +84,11 @@ static void test_versioninfo(void) hr = pGetCORSystemDirectory(path, path_len-1 , &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); - hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + if (0) /* crashes on <= w2k3 */ + { + hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + } hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr);

1 0

Huw Davies : shell32: Add a few printer icon resource ids.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 3e9f0ca2270bb91e07b0c24ec584d92bba32f5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9f0ca2270bb91e07b0c24ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 13:13:49 2010 +0100 shell32: Add a few printer icon resource ids. --- dlls/shell32/shresdef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 88c93c8..b8a456b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -174,8 +174,13 @@ #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_REMOTE_PRINTER 140 +#define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_CONFIRM_DELETE 161 +#define IDI_SHELL_DEFAULT_PRINTER 168 +#define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 +#define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_MY_DOCUMENTS 235 /*

1 0

Alexandre Julliard : include: Specify calling convention explicitly in idl files where needed.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: a919735870c38f2c18748427394a593c60ee18e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a919735870c38f2c187484273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 13:53:17 2010 +0200 include: Specify calling convention explicitly in idl files where needed. --- include/dxgi.idl | 2 +- include/wine/wined3d.idl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index b67674e..8a7b092 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -329,7 +329,7 @@ interface IDXGIFactory : IDXGIObject ); } -[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory); +[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory); [ object, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b6e73ec..62810db 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2107,7 +2107,7 @@ struct wined3d_shader_signature struct wined3d_parent_ops { - void (*wined3d_object_destroyed)(void *parent); + void (__stdcall *wined3d_object_destroyed)(void *parent); }; interface IWineD3DResource; @@ -2177,8 +2177,8 @@ interface IWineD3DDeviceParent : IUnknown [out] IWineD3DSwapChain **swapchain ); } -typedef ULONG (*D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); -typedef HRESULT (*D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData); +typedef ULONG (__stdcall *D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); +typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData); [ object, @@ -3399,7 +3399,7 @@ interface IWineD3DDevice : IWineD3DBase ); } -IWineD3D *WineDirect3DCreate(UINT dxVersion, IUnknown *parent); -IWineD3DClipper *WineDirect3DCreateClipper(IUnknown *parent); -void wined3d_mutex_lock(void); -void wined3d_mutex_unlock(void); +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, IUnknown *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(IUnknown *parent); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void);

1 0

Alexandre Julliard : widl: Set the default calling convention at header generation time, not at parsing time.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: c6668089a494492e0b5f9d28b878fbd02a1cea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6668089a494492e0b5f9d28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 13:52:09 2010 +0200 widl: Set the default calling convention at header generation time, not at parsing time. --- tools/widl/header.c | 17 +++++++++++------ tools/widl/header.h | 1 - tools/widl/parser.y | 11 +---------- tools/widl/proxy.c | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 91ea2a0..b9b750a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -39,10 +39,13 @@ typedef struct _user_type_t generic_handle_t; static int indentation = 0; +static int is_object_interface = 0; user_type_list_t user_type_list = LIST_INIT(user_type_list); static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); static struct list generic_handle_list = LIST_INIT(generic_handle_list); +static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name); + static void indent(FILE *h, int delta) { int c; @@ -366,12 +369,12 @@ static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const c if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { int i; const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv && is_object_interface) callconv = "STDMETHODCALLTYPE"; if (is_attr(pt->attrs, ATTR_INLINE)) fprintf(h, "inline "); write_type_left(h, type_function_get_rettype(pt), declonly); fputc(' ', h); if (ptr_level) fputc('(', h); - fprintf(h, "%s ", callconv); + if (callconv) fprintf(h, "%s ", callconv); for (i = 0; i < ptr_level; i++) fputc('*', h); } else @@ -396,7 +399,7 @@ static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const c } } -void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) +static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) { write_type_v(f, t, field, FALSE, name); } @@ -785,7 +788,7 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); fprintf(header, "virtual "); write_type_decl_left(header, type_function_get_rettype(func->type)); @@ -815,7 +818,7 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char } if (!is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); @@ -846,7 +849,7 @@ static void write_method_proto(FILE *header, const type_t *iface) if (!is_local(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; /* proxy prototype */ write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); @@ -1217,6 +1220,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; + if (is_object(iface)) is_object_interface++; if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { write_com_interface_start(header, iface); @@ -1229,6 +1233,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_header_stmts(header, type_iface_get_stmts(iface), iface, FALSE); write_rpc_interface_end(header, iface); } + if (is_object(iface)) is_object_interface++; } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass(header, stmt->u.type); diff --git a/tools/widl/header.h b/tools/widl/header.h index 97a2726..2175f5e 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -34,7 +34,6 @@ extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); -extern void write_type_def_or_decl(FILE *h, type_t *t, int is_field, const char *name); extern void write_type_decl(FILE *f, type_t *t, const char *name); extern void write_type_decl_left(FILE *f, type_t *t); extern int needs_space_after(type_t *t); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1900d77..5b4c823 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -66,7 +66,6 @@ #define YYERROR_VERBOSE static unsigned char pointer_default = RPC_FC_UP; -static int is_object_interface = FALSE; typedef struct list typelist_t; struct typenode { @@ -806,7 +805,6 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, 0) ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; - is_object_interface = TRUE; $$ = $2; check_def($$); attrs = make_attr(ATTR_DISPINTERFACE); @@ -836,7 +834,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); is_object_interface = 1; } + | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, 0); } @@ -849,7 +847,6 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); check_def($2); $2->attrs = check_iface_attrs($2->name, $1); - is_object_interface = is_object($2); $2->defined = TRUE; } ; @@ -1575,12 +1572,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl * function node */ for (t = v->type; is_ptr(t); t = type_pointer_get_ref(t)) ft->attrs = move_attr(ft->attrs, t->attrs, ATTR_CALLCONV); - if (is_object_interface && !is_attr(ft->attrs, ATTR_CALLCONV)) - { - static char *stdmethodcalltype; - if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); - ft->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); - } } else { diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 30feca8..8cbdf8f 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -280,7 +280,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, int has_ret = !is_void(type_function_get_rettype(func->type)); int has_full_pointer = is_full_pointer_function(func); const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent = 0; print_proxy( "static void __finally_%s_%s_Proxy( struct __proxy_frame *__frame )\n",

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
89
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 August 2010