wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Henri Verbeet : wined3d: Add missing GL locking to IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 639b2582006cbfdc1102ac64a57b516ab07b1fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639b2582006cbfdc1102ac64a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:55 2009 +0200 wined3d: Add missing GL locking to IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec6d3f0..83af654 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2834,11 +2834,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D * private data, it might contain opengl pointers */ if(This->depth_blt_texture) { + ENTER_GL(); glDeleteTextures(1, &This->depth_blt_texture); + LEAVE_GL(); This->depth_blt_texture = 0; } if (This->depth_blt_rb) { + ENTER_GL(); GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); + LEAVE_GL(); This->depth_blt_rb = 0; This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0;

1 0

Henri Verbeet : wined3d: Add missing GL locking to set_blit_dimension() calls.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: e26013270120a1cd3ee30e3250416a7f676e308e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26013270120a1cd3ee30e325… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:54 2009 +0200 wined3d: Add missing GL locking to set_blit_dimension() calls. --- dlls/wined3d/context.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a25d5ea..7e06b87 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1109,7 +1109,9 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { if(context->blit_w != width || context->blit_h != height) { + ENTER_GL(); set_blit_dimension(width, height); + LEAVE_GL(); context->blit_w = width; context->blit_h = height; /* No need to dirtify here, the states are still dirtified because they weren't * applied since the last SetupForBlit call. Otherwise last_was_blit would not @@ -1268,9 +1270,11 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING), StateTable); - LEAVE_GL(); set_blit_dimension(width, height); + + LEAVE_GL(); + context->blit_w = width; context->blit_h = height; Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable);

1 0

Henri Verbeet : wined3d: Add missing GL locking to calls to FBO functions.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 1070e075e49adde577e553dd6062f26847a7036f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1070e075e49adde577e553dd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:54 2009 +0200 wined3d: Add missing GL locking to calls to FBO functions. --- dlls/wined3d/context.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0fe00fc..a25d5ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -371,6 +371,8 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { struct fbo_entry *entry, *entry2; + ENTER_GL(); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->contexts[i]->fbo_list, struct fbo_entry, entry) { BOOL destroyed = FALSE; @@ -388,6 +390,8 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) context_destroy_fbo_entry(This, entry); } + + LEAVE_GL(); } break; @@ -1599,7 +1603,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_CLEAR: case CTXUSAGE_DRAWPRIM: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + ENTER_GL(); context_apply_fbo_state((IWineD3DDevice *)This); + LEAVE_GL(); } if (context->draw_buffer_dirty) { apply_draw_buffer(This, target, FALSE); @@ -1611,10 +1617,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (This->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); + ENTER_GL(); context_bind_fbo((IWineD3DDevice *)This, GL_FRAMEBUFFER_EXT, &context->dst_fbo); context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, target); - - ENTER_GL(); GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); checkGLcall("glFramebufferRenderbufferEXT"); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Add missing GL locking to delete_glsl_program_entry() calls.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 12c4af8dd8de539c346c7af77c370b30a9478ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c4af8dd8de539c346c7af77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:53 2009 +0200 wined3d: Add missing GL locking to delete_glsl_program_entry() calls. --- dlls/wined3d/glsl_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e0eea..7905492 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3911,6 +3911,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { if (linked_programs->next) { struct glsl_shader_prog_link *entry, *entry2; + ENTER_GL(); if(pshader) { LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { delete_glsl_program_entry(priv, gl_info, entry); @@ -3920,6 +3921,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { delete_glsl_program_entry(priv, gl_info, entry); } } + LEAVE_GL(); } if(pshader) {

1 0

Alexandre Julliard : Fix some merge glitches.
by Alexandre Julliard 13 May '09

13 May '09

Module: bugzilla Branch: master Commit: 9e26ae2d5b2a0c0f8aaec91c1ea24d7e6408ad6d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=9e26ae2d5b2a0c0f8aaec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 20:21:08 2009 +0200 Fix some merge glitches. --- template/en/default/global/header.html.tmpl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/admin.cgi b/admin.cgi old mode 100644 new mode 100755 diff --git a/editworkflow.cgi b/editworkflow.cgi old mode 100644 new mode 100755 diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index a247f6e..390902f 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -280,7 +280,6 @@ [% END %] </tr> </table> -</div> <div id="header"> [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.2.3.
by Alexandre Julliard 13 May '09

13 May '09

Module: bugzilla Branch: upstream Commit: e002e6fe6ed73d59ce9185f580bec35a2167b98a URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e002e6fe6ed73d59ce918… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 13:30:27 2009 +0200 Import of upstream bugzilla release 3.2.3. --- .cvsignore | 1 - Bugzilla.pm | 203 ++- Bugzilla/Attachment.pm | 161 +- Bugzilla/Attachment/PatchReader.pm | 36 +- Bugzilla/Auth.pm | 16 +- Bugzilla/Auth/Login/CGI.pm | 11 +- Bugzilla/Auth/Persist/Cookie.pm | 39 +- Bugzilla/Auth/Verify.pm | 7 +- Bugzilla/Auth/Verify/DB.pm | 5 + Bugzilla/Auth/Verify/LDAP.pm | 33 +- Bugzilla/Auth/Verify/RADIUS.pm | 64 + Bugzilla/Bug.pm | 2027 ++++++++++++++--- Bugzilla/BugMail.pm | 150 +- Bugzilla/CGI.pm | 97 +- Bugzilla/Chart.pm | 1 - Bugzilla/Component.pm | 428 ++++- Bugzilla/Config.pm | 45 +- Bugzilla/Config/Attachment.pm | 15 +- Bugzilla/Config/Auth.pm | 4 +- Bugzilla/Config/BugChange.pm | 66 +- Bugzilla/Config/BugFields.pm | 2 +- Bugzilla/Config/Common.pm | 115 +- Bugzilla/Config/Core.pm | 2 +- Bugzilla/Config/L10n.pm | 79 - Bugzilla/Config/MTA.pm | 11 + Bugzilla/Config/RADIUS.pm | 60 + Bugzilla/Constants.pm | 72 +- Bugzilla/DB.pm | 373 ++-- Bugzilla/DB/Mysql.pm | 208 ++- Bugzilla/DB/Oracle.pm | 608 +++++ Bugzilla/DB/Pg.pm | 64 +- Bugzilla/DB/Schema.pm | 389 +++- Bugzilla/DB/Schema/Mysql.pm | 26 +- Bugzilla/DB/Schema/Oracle.pm | 403 ++++ Bugzilla/DB/Schema/Pg.pm | 2 +- Bugzilla/Error.pm | 22 +- Bugzilla/Field.pm | 188 +- Bugzilla/Flag.pm | 213 +- Bugzilla/FlagType.pm | 18 + Bugzilla/Group.pm | 132 ++- Bugzilla/Hook.pm | 217 ++- Bugzilla/Install.pm | 76 +- Bugzilla/Install/CPAN.pm | 251 +++ Bugzilla/Install/DB.pm | 381 +++- Bugzilla/Install/Filesystem.pm | 75 +- Bugzilla/Install/Localconfig.pm | 57 +- Bugzilla/Install/Requirements.pm | 288 +-- Bugzilla/Install/Util.pm | 553 +++++ Bugzilla/Mailer.pm | 82 +- Bugzilla/Milestone.pm | 283 ++- Bugzilla/Object.pm | 286 ++- Bugzilla/Product.pm | 120 +- Bugzilla/Search.pm | 2008 ++++++++++------- Bugzilla/Search/Quicksearch.pm | 30 +- Bugzilla/Search/Saved.pm | 57 +- Bugzilla/Series.pm | 9 +- Bugzilla/Status.pm | 278 +++ Bugzilla/Template.pm | 249 +-- Bugzilla/Template/Parser.pm | 66 + Bugzilla/Template/Plugin/Hook.pm | 85 +- Bugzilla/Token.pm | 68 +- Bugzilla/User.pm | 102 +- Bugzilla/User/Setting.pm | 45 +- Bugzilla/User/Setting/Lang.pm | 60 + Bugzilla/User/Setting/Skin.pm | 1 + Bugzilla/Util.pm | 190 ++- Bugzilla/Version.pm | 28 +- Bugzilla/WebService.pm | 165 ++- Bugzilla/WebService/Bug.pm | 135 +- Bugzilla/WebService/Bugzilla.pm | 63 +- Bugzilla/WebService/Constants.pm | 27 +- Bugzilla/WebService/Product.pm | 30 +- Bugzilla/WebService/User.pm | 54 +- admin.cgi | 49 + attachment.cgi | 628 +++--- buglist.cgi | 214 ++- chart.cgi | 5 +- checksetup.pl | 44 +- colchange.cgi | 61 +- collectstats.pl | 46 +- config.cgi | 14 +- contrib/bz_webservice_demo.pl | 77 +- contrib/bzdbcopy.pl | 98 +- contrib/merge-users.pl | 16 +- contrib/recode.pl | 19 +- contrib/sendbugmail.pl | 4 +- contrib/sendunsentbugmail.pl | 2 +- contrib/syncLDAP.pl | 79 +- createaccount.cgi | 6 +- describecomponents.cgi | 2 +- describekeywords.cgi | 2 +- docs/.cvsignore | 2 - docs/bugzilla.ent | 39 + docs/en/.cvsignore | 3 + docs/{ => en}/README.docs | 0 docs/{ => en}/images/bzLifecycle.png | Bin 74447 -> 74447 bytes docs/{ => en}/images/bzLifecycle.xml | 0 docs/{ => en}/images/callouts/1.gif | Bin 890 -> 890 bytes docs/{ => en}/images/callouts/2.gif | Bin 907 -> 907 bytes docs/{ => en}/images/callouts/3.gif | Bin 914 -> 914 bytes docs/{ => en}/images/caution.gif | Bin 134 -> 134 bytes docs/{ => en}/images/note.gif | Bin 226 -> 226 bytes docs/{ => en}/images/tip.gif | Bin 1229 -> 1229 bytes docs/{ => en}/images/warning.gif | Bin 140 -> 140 bytes docs/{ => en}/rel_notes.txt | 0 docs/{ => en}/xml/.cvsignore | 0 docs/{ => en}/xml/Bugzilla-Guide.xml | 25 +- docs/{ => en}/xml/about.xml | 2 +- docs/{ => en}/xml/administration.xml | 831 +++---- docs/en/xml/bugzilla.ent | 39 + docs/{ => en}/xml/conventions.xml | 0 docs/{ => en}/xml/customization.xml | 8 - docs/{ => en}/xml/gfdl.xml | 0 docs/{ => en}/xml/glossary.xml | 0 docs/{ => en}/xml/index.xml | 0 docs/{ => en}/xml/installation.xml | 910 +++++--- docs/{ => en}/xml/integration.xml | 0 docs/{ => en}/xml/introduction.xml | 0 docs/{ => en}/xml/modules.xml | 0 docs/{ => en}/xml/patches.xml | 0 docs/{ => en}/xml/requiredsoftware.xml | 0 docs/{ => en}/xml/security.xml | 12 +- docs/{ => en}/xml/troubleshooting.xml | 18 +- docs/{ => en}/xml/using.xml | 73 +- docs/html/.cvsignore | 1 - docs/html/api/.cvsignore | 3 - docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 4 +- docs/makedocs.pl | 87 +- docs/{html/api => }/style.css | 0 docs/xml/faq.xml | 1676 -------------- duplicates.cgi | 2 +- editclassifications.cgi | 54 +- editcomponents.cgi | 290 +--- editfields.cgi | 45 +- editflagtypes.cgi | 67 +- editgroups.cgi | 497 ++--- editkeywords.cgi | 47 +- editmilestones.cgi | 232 +-- editparams.cgi | 31 +- editproducts.cgi | 92 +- editsettings.cgi | 93 +- editusers.cgi | 76 +- editvalues.cgi | 186 +- editversions.cgi | 57 +- editwhines.cgi | 28 +- editworkflow.cgi | 151 ++ email_in.pl | 89 +- enter_bug.cgi | 195 +- extensions/example/code/bug-end_of_update.pl | 56 + extensions/example/code/buglist-columns.pl | 26 + extensions/example/code/colchange-columns.pl | 27 + extensions/example/code/config.pl | 26 + extensions/example/code/flag-end_of_update.pl | 42 + .../example/code/install-before_final_checks.pl | 28 + extensions/example/code/product-confirm_delete.pl | 26 + extensions/example/code/webservice-error_codes.pl | 25 + extensions/example/code/webservice.pl | 25 + extensions/example/info.pl | 41 + extensions/example/lib/ConfigExample.pm | 41 + extensions/example/lib/WSExample.pm | 32 + .../en/default/admin/params/example.html.tmpl | 28 + .../template/en/global/user-error-errors.html.tmpl | 12 + images/favicon.ico | Bin 0 -> 4150 bytes importxml.pl | 198 ++- index.cgi | 6 +- install-module.pl | 161 ++ js/field.js | 339 +++ js/help.js | 108 + js/params.js | 61 + js/productform.js | 425 ++-- js/util.js | 156 ++ js/yui/calendar.js | 16 + js/yui/yahoo-dom-event.js | 10 + lib/README | 4 + long_list.cgi | 2 +- mod_perl.pl | 4 + page.cgi | 2 +- post_bug.cgi | 35 +- process_bug.cgi | 2347 ++++---------------- productmenu.js | 256 --- query.cgi | 26 +- quips.cgi | 24 +- relogin.cgi | 2 +- report.cgi | 7 +- reports.cgi | 6 +- request.cgi | 45 +- runtests.pl | 1 + sanitycheck.cgi | 503 +++-- sanitycheck.pl | 116 + search_plugin.cgi | 2 +- show_activity.cgi | 4 +- show_bug.cgi | 4 +- showattachment.cgi | 2 +- showdependencygraph.cgi | 75 +- showdependencytree.cgi | 6 +- sidebar.cgi | 2 +- skins/.cvsignore | 1 - skins/contrib/Dusk/.cvsignore | 17 + skins/contrib/Dusk/buglist.css | 24 + skins/contrib/Dusk/global.css | 279 +++ skins/standard/IE-fixes.css | 2 +- skins/standard/admin.css | 75 + skins/standard/buglist.css | 4 + skins/standard/editusers.css | 14 + skins/standard/global.css | 78 +- skins/standard/global/calendar.png | Bin 0 -> 718 bytes skins/standard/help.css | 41 + skins/standard/params.css | 6 + skins/standard/show_bug.css | 75 + skins/standard/yui/calendar.css | 7 + skins/standard/yui/sprite.png | Bin 0 -> 3123 bytes summarize_time.cgi | 322 +-- t/001compile.t | 22 +- t/004template.t | 16 +- t/006spellcheck.t | 6 + t/007util.t | 5 +- t/008filter.t | 6 +- t/Support/Files.pm | 1 + .../en/default/account/auth/login-small.html.tmpl | 3 +- template/en/default/account/auth/login.html.tmpl | 3 +- template/en/default/account/cancel-token.txt.tmpl | 11 +- template/en/default/account/create.html.tmpl | 28 +- template/en/default/account/created.html.tmpl | 8 +- .../en/default/account/email/change-new.txt.tmpl | 5 +- .../en/default/account/email/change-old.txt.tmpl | 3 +- .../en/default/account/email/confirm-new.html.tmpl | 29 +- .../en/default/account/email/confirm.html.tmpl | 1 - .../en/default/account/email/request-new.txt.tmpl | 30 +- .../account/password/forgotten-password.txt.tmpl | 5 +- .../password/set-forgotten-password.html.tmpl | 1 - .../en/default/account/prefs/account.html.tmpl | 7 +- template/en/default/account/prefs/email.html.tmpl | 1 - .../en/default/account/prefs/permissions.html.tmpl | 7 +- template/en/default/account/prefs/prefs.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 33 +- .../en/default/account/prefs/settings.html.tmpl | 1 - .../en/default/account/profile-activity.html.tmpl | 3 +- template/en/default/admin/admin.html.tmpl | 131 ++ .../en/default/admin/classifications/add.html.tmpl | 1 - .../en/default/admin/classifications/del.html.tmpl | 1 - .../default/admin/classifications/edit.html.tmpl | 1 - .../en/default/admin/classifications/new.html.tmpl | 32 - .../admin/classifications/reclassify.html.tmpl | 1 - .../default/admin/classifications/select.html.tmpl | 1 - .../default/admin/classifications/update.html.tmpl | 41 - .../admin/components/confirm-delete.html.tmpl | 4 +- .../en/default/admin/components/create.html.tmpl | 9 +- .../en/default/admin/components/created.html.tmpl | 41 - .../en/default/admin/components/deleted.html.tmpl | 59 - .../en/default/admin/components/edit.html.tmpl | 4 +- .../en/default/admin/components/footer.html.tmpl | 1 - .../en/default/admin/components/list.html.tmpl | 1 - .../admin/components/select-product.html.tmpl | 1 - .../en/default/admin/components/updated.html.tmpl | 98 - template/en/default/admin/confirm-action.html.tmpl | 7 +- .../admin/custom_fields/confirm-delete.html.tmpl | 66 + .../default/admin/custom_fields/create.html.tmpl | 5 +- .../en/default/admin/custom_fields/edit.html.tmpl | 17 +- .../en/default/admin/custom_fields/list.html.tmpl | 24 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 27 +- .../en/default/admin/fieldvalues/create.html.tmpl | 35 +- .../en/default/admin/fieldvalues/created.html.tmpl | 37 - .../en/default/admin/fieldvalues/deleted.html.tmpl | 36 - .../en/default/admin/fieldvalues/edit.html.tmpl | 20 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 14 +- .../en/default/admin/fieldvalues/list.html.tmpl | 11 +- .../admin/fieldvalues/select-field.html.tmpl | 1 - .../en/default/admin/fieldvalues/updated.html.tmpl | 55 - .../admin/flag-type/confirm-delete.html.tmpl | 19 +- template/en/default/admin/flag-type/edit.html.tmpl | 32 +- template/en/default/admin/flag-type/list.html.tmpl | 8 +- template/en/default/admin/groups/change.html.tmpl | 111 - .../default/admin/groups/confirm-remove.html.tmpl | 66 + template/en/default/admin/groups/create.html.tmpl | 27 +- template/en/default/admin/groups/created.html.tmpl | 38 - template/en/default/admin/groups/delete.html.tmpl | 2 +- template/en/default/admin/groups/deleted.html.tmpl | 38 - template/en/default/admin/groups/edit.html.tmpl | 321 ++-- template/en/default/admin/groups/list.html.tmpl | 2 +- template/en/default/admin/groups/remove.html.tmpl | 62 - .../admin/keywords/confirm-delete.html.tmpl | 4 +- .../en/default/admin/keywords/create.html.tmpl | 1 - .../en/default/admin/keywords/created.html.tmpl | 36 - template/en/default/admin/keywords/edit.html.tmpl | 3 +- template/en/default/admin/keywords/list.html.tmpl | 3 +- .../default/admin/keywords/rebuild-cache.html.tmpl | 56 - .../admin/milestones/confirm-delete.html.tmpl | 6 +- .../en/default/admin/milestones/create.html.tmpl | 1 - .../en/default/admin/milestones/created.html.tmpl | 44 - .../en/default/admin/milestones/deleted.html.tmpl | 58 - .../en/default/admin/milestones/edit.html.tmpl | 3 +- .../en/default/admin/milestones/footer.html.tmpl | 1 - .../en/default/admin/milestones/list.html.tmpl | 1 - .../admin/milestones/select-product.html.tmpl | 1 - .../en/default/admin/milestones/updated.html.tmpl | 51 - template/en/default/admin/params/admin.html.tmpl | 1 - .../en/default/admin/params/attachment.html.tmpl | 34 +- template/en/default/admin/params/auth.html.tmpl | 14 +- .../en/default/admin/params/bugchange.html.tmpl | 29 +- .../en/default/admin/params/bugfields.html.tmpl | 1 - template/en/default/admin/params/bugmove.html.tmpl | 1 - template/en/default/admin/params/common.html.tmpl | 71 +- template/en/default/admin/params/core.html.tmpl | 8 +- .../default/admin/params/dependencygraph.html.tmpl | 1 - .../en/default/admin/params/editparams.html.tmpl | 3 +- .../default/admin/params/groupsecurity.html.tmpl | 3 +- template/en/default/admin/params/index.html.tmpl | 1 - template/en/default/admin/params/l10n.html.tmpl | 46 - template/en/default/admin/params/ldap.html.tmpl | 9 +- template/en/default/admin/params/mta.html.tmpl | 7 +- .../en/default/admin/params/patchviewer.html.tmpl | 1 - template/en/default/admin/params/query.html.tmpl | 3 +- template/en/default/admin/params/radius.html.tmpl | 54 + .../en/default/admin/params/shadowdb.html.tmpl | 1 - .../en/default/admin/params/usermatch.html.tmpl | 1 - .../admin/products/confirm-delete.html.tmpl | 3 +- .../en/default/admin/products/create.html.tmpl | 1 - .../en/default/admin/products/created.html.tmpl | 36 - .../en/default/admin/products/deleted.html.tmpl | 50 - .../default/admin/products/edit-common.html.tmpl | 3 +- template/en/default/admin/products/edit.html.tmpl | 21 +- .../en/default/admin/products/footer.html.tmpl | 1 - .../products/groupcontrol/confirm-edit.html.tmpl | 1 - .../admin/products/groupcontrol/edit.html.tmpl | 3 +- .../admin/products/groupcontrol/updated.html.tmpl | 1 - .../admin/products/list-classifications.html.tmpl | 1 - template/en/default/admin/products/list.html.tmpl | 1 - .../en/default/admin/products/updated.html.tmpl | 9 +- .../en/default/admin/sanitycheck/list.html.tmpl | 37 + .../default/admin/sanitycheck/messages.html.tmpl | 330 +++ template/en/default/admin/settings/edit.html.tmpl | 6 +- .../en/default/admin/settings/updated.html.tmpl | 27 - template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/admin/table.html.tmpl | 3 +- .../default/admin/users/confirm-delete.html.tmpl | 136 +- template/en/default/admin/users/create.html.tmpl | 2 +- template/en/default/admin/users/edit.html.tmpl | 31 +- template/en/default/admin/users/list.html.tmpl | 4 +- .../default/admin/users/listselectvars.html.tmpl | 1 - .../default/admin/users/responsibilities.html.tmpl | 61 + template/en/default/admin/users/search.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 9 +- .../admin/versions/confirm-delete.html.tmpl | 1 - .../en/default/admin/versions/create.html.tmpl | 1 - .../en/default/admin/versions/created.html.tmpl | 43 - .../en/default/admin/versions/deleted.html.tmpl | 41 - template/en/default/admin/versions/edit.html.tmpl | 3 +- .../en/default/admin/versions/footer.html.tmpl | 1 - template/en/default/admin/versions/list.html.tmpl | 1 - .../admin/versions/select-product.html.tmpl | 1 - .../en/default/admin/versions/updated.html.tmpl | 45 - .../en/default/admin/workflow/comment.html.tmpl | 92 + template/en/default/admin/workflow/edit.html.tmpl | 110 + .../attachment/cancel-create-dupe.html.tmpl | 48 + template/en/default/attachment/choose.html.tmpl | 1 - .../en/default/attachment/confirm-delete.html.tmpl | 9 +- .../en/default/attachment/content-types.html.tmpl | 1 - template/en/default/attachment/create.html.tmpl | 20 +- template/en/default/attachment/created.html.tmpl | 42 +- .../attachment/createformcontents.html.tmpl | 1 - .../en/default/attachment/delete_reason.txt.tmpl | 5 +- template/en/default/attachment/diff-file.html.tmpl | 56 +- .../en/default/attachment/diff-footer.html.tmpl | 1 - .../en/default/attachment/diff-header.html.tmpl | 24 +- template/en/default/attachment/edit.html.tmpl | 82 +- template/en/default/attachment/list.html.tmpl | 7 +- template/en/default/attachment/midair.html.tmpl | 78 + .../en/default/attachment/show-multiple.html.tmpl | 3 +- template/en/default/attachment/updated.html.tmpl | 34 +- template/en/default/bug/activity/show.html.tmpl | 25 +- template/en/default/bug/activity/table.html.tmpl | 5 +- template/en/default/bug/choose.html.tmpl | 1 - template/en/default/bug/comments.html.tmpl | 141 +- .../en/default/bug/create/comment-guided.txt.tmpl | 3 +- template/en/default/bug/create/comment.txt.tmpl | 1 - .../bug/create/confirm-create-dupe.html.tmpl | 1 - .../en/default/bug/create/create-guided.html.tmpl | 58 +- template/en/default/bug/create/create.html.tmpl | 299 ++-- template/en/default/bug/create/created.html.tmpl | 8 +- .../en/default/bug/create/make-template.html.tmpl | 1 - .../en/default/bug/create/user-message.html.tmpl | 1 - template/en/default/bug/dependency-graph.html.tmpl | 48 +- template/en/default/bug/dependency-tree.html.tmpl | 4 +- template/en/default/bug/edit.html.tmpl | 1356 +++++++----- template/en/default/bug/field.html.tmpl | 58 +- template/en/default/bug/knob.html.tmpl | 258 +-- template/en/default/bug/navigate.html.tmpl | 18 +- template/en/default/bug/process/bugmail.html.tmpl | 1 - .../bug/process/confirm-duplicate.html.tmpl | 1 - template/en/default/bug/process/header.html.tmpl | 8 +- template/en/default/bug/process/midair.html.tmpl | 14 +- template/en/default/bug/process/results.html.tmpl | 1 - .../bug/process/verify-new-product.html.tmpl | 218 ++- template/en/default/bug/show-multiple.html.tmpl | 24 +- template/en/default/bug/show.html.tmpl | 24 +- template/en/default/bug/show.xml.tmpl | 28 +- template/en/default/bug/summarize-time.html.tmpl | 165 +- template/en/default/bug/time.html.tmpl | 1 - template/en/default/bug/votes/delete-all.html.tmpl | 1 - .../en/default/bug/votes/list-for-bug.html.tmpl | 1 - .../en/default/bug/votes/list-for-user.html.tmpl | 16 +- template/en/default/config.js.tmpl | 12 +- template/en/default/config.rdf.tmpl | 59 +- template/en/default/email/newchangedmail.txt.tmpl | 10 +- .../sanitycheck.txt.tmpl} | 23 +- template/en/default/email/sudo.txt.tmpl | 3 +- template/en/default/email/votes-removed.txt.tmpl | 3 +- template/en/default/email/whine.txt.tmpl | 21 +- template/en/default/filterexceptions.pl | 68 +- template/en/default/flag/list.html.tmpl | 81 +- template/en/default/global/banner.html.tmpl | 1 - .../default/global/choose-classification.html.tmpl | 1 - .../en/default/global/choose-product.html.tmpl | 1 - template/en/default/global/code-error.html.tmpl | 34 +- template/en/default/global/common-links.html.tmpl | 43 +- .../en/default/global/confirm-action.html.tmpl | 63 + .../en/default/global/confirm-user-match.html.tmpl | 18 +- template/en/default/global/docslinks.html.tmpl | 3 +- template/en/default/global/field-descs.none.tmpl | 126 +- template/en/default/global/footer.html.tmpl | 1 - template/en/default/global/header.html.tmpl | 43 +- template/en/default/global/help-header.html.tmpl | 91 - template/en/default/global/help.html.tmpl | 14 +- template/en/default/global/hidden-fields.html.tmpl | 1 - template/en/default/global/initialize.none.tmpl | 1 - template/en/default/global/js-products.html.tmpl | 11 +- template/en/default/global/message.html.tmpl | 1 - template/en/default/global/message.txt.tmpl | 1 - template/en/default/global/messages.html.tmpl | 412 ++++- .../en/default/global/per-bug-queries.html.tmpl | 3 +- template/en/default/global/select-menu.html.tmpl | 1 - template/en/default/global/setting-descs.none.tmpl | 4 +- .../en/default/global/site-navigation.html.tmpl | 26 +- template/en/default/global/tabs.html.tmpl | 1 - template/en/default/global/textarea.html.tmpl | 1 - template/en/default/global/useful-links.html.tmpl | 64 +- template/en/default/global/user-error.html.tmpl | 286 ++- template/en/default/global/userselect.html.tmpl | 32 +- template/en/default/global/variables.none.tmpl | 3 - template/en/default/index.html.tmpl | 7 +- template/en/default/list/change-columns.html.tmpl | 24 +- template/en/default/list/edit-multiple.html.tmpl | 191 +- template/en/default/list/list-simple.html.tmpl | 3 +- template/en/default/list/list.atom.tmpl | 48 +- template/en/default/list/list.csv.tmpl | 3 +- template/en/default/list/list.html.tmpl | 68 +- template/en/default/list/list.ics.tmpl | 5 +- template/en/default/list/list.js.tmpl | 1 - template/en/default/list/list.rdf.tmpl | 7 +- template/en/default/list/quips.html.tmpl | 6 +- template/en/default/list/server-push.html.tmpl | 1 - template/en/default/list/table.html.tmpl | 52 +- template/en/default/pages/bug-writing.html.tmpl | 1 - template/en/default/pages/fields.html.tmpl | 69 +- template/en/default/pages/linked.html.tmpl | 1 - template/en/default/pages/linkify.html.tmpl | 1 - template/en/default/pages/quicksearch.html.tmpl | 1 - .../en/default/pages/quicksearchhack.html.tmpl | 35 +- template/en/default/pages/release-notes.html.tmpl | 850 +++++++- template/en/default/pages/sudo.html.tmpl | 1 - template/en/default/pages/voting.html.tmpl | 7 +- template/en/default/reports/chart.csv.tmpl | 1 - template/en/default/reports/chart.html.tmpl | 1 - template/en/default/reports/chart.png.tmpl | 1 - template/en/default/reports/components.html.tmpl | 1 - template/en/default/reports/create-chart.html.tmpl | 1 - .../en/default/reports/duplicates-simple.html.tmpl | 1 - .../en/default/reports/duplicates-table.html.tmpl | 1 - template/en/default/reports/duplicates.html.tmpl | 7 +- template/en/default/reports/duplicates.rdf.tmpl | 5 +- template/en/default/reports/edit-series.html.tmpl | 1 - template/en/default/reports/keywords.html.tmpl | 1 - template/en/default/reports/menu.html.tmpl | 2 +- template/en/default/reports/old-charts.html.tmpl | 8 +- template/en/default/reports/report-bar.png.tmpl | 5 +- template/en/default/reports/report-line.png.tmpl | 5 +- template/en/default/reports/report-pie.png.tmpl | 3 +- .../en/default/reports/report-simple.html.tmpl | 1 - template/en/default/reports/report-table.csv.tmpl | 5 +- template/en/default/reports/report-table.html.tmpl | 5 +- template/en/default/reports/report.csv.tmpl | 1 - template/en/default/reports/report.html.tmpl | 1 - .../en/default/reports/series-common.html.tmpl | 1 - template/en/default/reports/series.html.tmpl | 3 +- template/en/default/request/email.txt.tmpl | 19 +- template/en/default/request/queue.html.tmpl | 15 +- .../en/default/search/boolean-charts.html.tmpl | 8 +- template/en/default/search/form.html.tmpl | 12 +- template/en/default/search/knob.html.tmpl | 1 - .../en/default/search/search-advanced.html.tmpl | 34 +- .../default/search/search-create-series.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 1 - template/en/default/search/search-plugin.xml.tmpl | 3 +- .../default/search/search-report-graph.html.tmpl | 4 +- .../default/search/search-report-select.html.tmpl | 1 - .../default/search/search-report-table.html.tmpl | 4 +- .../en/default/search/search-specific.html.tmpl | 1 - template/en/default/search/tabs.html.tmpl | 1 - template/en/default/setup/strings.txt.pl | 69 + template/en/default/sidebar.xul.tmpl | 7 +- template/en/default/welcome-admin.html.tmpl | 11 +- template/en/default/whine/mail.html.tmpl | 7 +- template/en/default/whine/mail.txt.tmpl | 7 +- template/en/default/whine/multipart-mime.txt.tmpl | 1 - template/en/default/whine/schedule.html.tmpl | 71 +- testserver.pl | 14 +- token.cgi | 34 +- userprefs.cgi | 43 +- votes.cgi | 20 +- whine.pl | 15 +- whineatnews.pl | 2 +- xml.cgi | 2 +- xmlrpc.cgi | 39 +- 513 files changed, 22035 insertions(+), 14534 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e002e6fe6ed73d59c…

1 0

Alexandre Julliard : Merge branch 'master' of www.winehq.org:/home/winehq/ opt/source/git/bugzilla.
by Alexandre Julliard 13 May '09

13 May '09

Module: bugzilla Branch: master Commit: 4177d8d1b960f88d151d4ca3136a0ec7a567568b URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4177d8d1b960f88d151d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 18:04:29 2009 +0200 Merge branch 'master' of www.winehq.org:/home/winehq/opt/source/git/bugzilla. Conflicts: template/en/default/account/create.html.tmpl template/en/default/bug/create/create.html.tmpl ---

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 13 May '09

13 May '09

Module: bugzilla Branch: master Commit: 5b845939ebe1c3b88252f51522beb5787ebabf72 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=5b845939ebe1c3b88252f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 14:38:41 2009 +0200 Merge branch 'upstream'. Conflicts: .cvsignore docs/en/xml/.cvsignore skins/.cvsignore skins/standard/global.css template/en/default/bug/edit.html.tmpl template/en/default/email/newchangedmail.txt.tmpl template/en/default/global/common-links.html.tmpl template/en/default/global/header.html.tmpl template/en/default/global/useful-links.html.tmpl template/en/default/global/user-error.html.tmpl template/en/default/index.html.tmpl ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.2.3.
by Alexandre Julliard 13 May '09

13 May '09

Module: bugzilla Branch: master Commit: e002e6fe6ed73d59ce9185f580bec35a2167b98a URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e002e6fe6ed73d59ce918… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 13:30:27 2009 +0200 Import of upstream bugzilla release 3.2.3. --- .cvsignore | 1 - Bugzilla.pm | 203 ++- Bugzilla/Attachment.pm | 161 +- Bugzilla/Attachment/PatchReader.pm | 36 +- Bugzilla/Auth.pm | 16 +- Bugzilla/Auth/Login/CGI.pm | 11 +- Bugzilla/Auth/Persist/Cookie.pm | 39 +- Bugzilla/Auth/Verify.pm | 7 +- Bugzilla/Auth/Verify/DB.pm | 5 + Bugzilla/Auth/Verify/LDAP.pm | 33 +- Bugzilla/Auth/Verify/RADIUS.pm | 64 + Bugzilla/Bug.pm | 2027 ++++++++++++++--- Bugzilla/BugMail.pm | 150 +- Bugzilla/CGI.pm | 97 +- Bugzilla/Chart.pm | 1 - Bugzilla/Component.pm | 428 ++++- Bugzilla/Config.pm | 45 +- Bugzilla/Config/Attachment.pm | 15 +- Bugzilla/Config/Auth.pm | 4 +- Bugzilla/Config/BugChange.pm | 66 +- Bugzilla/Config/BugFields.pm | 2 +- Bugzilla/Config/Common.pm | 115 +- Bugzilla/Config/Core.pm | 2 +- Bugzilla/Config/L10n.pm | 79 - Bugzilla/Config/MTA.pm | 11 + Bugzilla/Config/RADIUS.pm | 60 + Bugzilla/Constants.pm | 72 +- Bugzilla/DB.pm | 373 ++-- Bugzilla/DB/Mysql.pm | 208 ++- Bugzilla/DB/Oracle.pm | 608 +++++ Bugzilla/DB/Pg.pm | 64 +- Bugzilla/DB/Schema.pm | 389 +++- Bugzilla/DB/Schema/Mysql.pm | 26 +- Bugzilla/DB/Schema/Oracle.pm | 403 ++++ Bugzilla/DB/Schema/Pg.pm | 2 +- Bugzilla/Error.pm | 22 +- Bugzilla/Field.pm | 188 +- Bugzilla/Flag.pm | 213 +- Bugzilla/FlagType.pm | 18 + Bugzilla/Group.pm | 132 ++- Bugzilla/Hook.pm | 217 ++- Bugzilla/Install.pm | 76 +- Bugzilla/Install/CPAN.pm | 251 +++ Bugzilla/Install/DB.pm | 381 +++- Bugzilla/Install/Filesystem.pm | 75 +- Bugzilla/Install/Localconfig.pm | 57 +- Bugzilla/Install/Requirements.pm | 288 +-- Bugzilla/Install/Util.pm | 553 +++++ Bugzilla/Mailer.pm | 82 +- Bugzilla/Milestone.pm | 283 ++- Bugzilla/Object.pm | 286 ++- Bugzilla/Product.pm | 120 +- Bugzilla/Search.pm | 2008 ++++++++++------- Bugzilla/Search/Quicksearch.pm | 30 +- Bugzilla/Search/Saved.pm | 57 +- Bugzilla/Series.pm | 9 +- Bugzilla/Status.pm | 278 +++ Bugzilla/Template.pm | 249 +-- Bugzilla/Template/Parser.pm | 66 + Bugzilla/Template/Plugin/Hook.pm | 85 +- Bugzilla/Token.pm | 68 +- Bugzilla/User.pm | 102 +- Bugzilla/User/Setting.pm | 45 +- Bugzilla/User/Setting/Lang.pm | 60 + Bugzilla/User/Setting/Skin.pm | 1 + Bugzilla/Util.pm | 190 ++- Bugzilla/Version.pm | 28 +- Bugzilla/WebService.pm | 165 ++- Bugzilla/WebService/Bug.pm | 135 +- Bugzilla/WebService/Bugzilla.pm | 63 +- Bugzilla/WebService/Constants.pm | 27 +- Bugzilla/WebService/Product.pm | 30 +- Bugzilla/WebService/User.pm | 54 +- admin.cgi | 49 + attachment.cgi | 628 +++--- buglist.cgi | 214 ++- chart.cgi | 5 +- checksetup.pl | 44 +- colchange.cgi | 61 +- collectstats.pl | 46 +- config.cgi | 14 +- contrib/bz_webservice_demo.pl | 77 +- contrib/bzdbcopy.pl | 98 +- contrib/merge-users.pl | 16 +- contrib/recode.pl | 19 +- contrib/sendbugmail.pl | 4 +- contrib/sendunsentbugmail.pl | 2 +- contrib/syncLDAP.pl | 79 +- createaccount.cgi | 6 +- describecomponents.cgi | 2 +- describekeywords.cgi | 2 +- docs/.cvsignore | 2 - docs/bugzilla.ent | 39 + docs/en/.cvsignore | 3 + docs/{ => en}/README.docs | 0 docs/{ => en}/images/bzLifecycle.png | Bin 74447 -> 74447 bytes docs/{ => en}/images/bzLifecycle.xml | 0 docs/{ => en}/images/callouts/1.gif | Bin 890 -> 890 bytes docs/{ => en}/images/callouts/2.gif | Bin 907 -> 907 bytes docs/{ => en}/images/callouts/3.gif | Bin 914 -> 914 bytes docs/{ => en}/images/caution.gif | Bin 134 -> 134 bytes docs/{ => en}/images/note.gif | Bin 226 -> 226 bytes docs/{ => en}/images/tip.gif | Bin 1229 -> 1229 bytes docs/{ => en}/images/warning.gif | Bin 140 -> 140 bytes docs/{ => en}/rel_notes.txt | 0 docs/{ => en}/xml/.cvsignore | 0 docs/{ => en}/xml/Bugzilla-Guide.xml | 25 +- docs/{ => en}/xml/about.xml | 2 +- docs/{ => en}/xml/administration.xml | 831 +++---- docs/en/xml/bugzilla.ent | 39 + docs/{ => en}/xml/conventions.xml | 0 docs/{ => en}/xml/customization.xml | 8 - docs/{ => en}/xml/gfdl.xml | 0 docs/{ => en}/xml/glossary.xml | 0 docs/{ => en}/xml/index.xml | 0 docs/{ => en}/xml/installation.xml | 910 +++++--- docs/{ => en}/xml/integration.xml | 0 docs/{ => en}/xml/introduction.xml | 0 docs/{ => en}/xml/modules.xml | 0 docs/{ => en}/xml/patches.xml | 0 docs/{ => en}/xml/requiredsoftware.xml | 0 docs/{ => en}/xml/security.xml | 12 +- docs/{ => en}/xml/troubleshooting.xml | 18 +- docs/{ => en}/xml/using.xml | 73 +- docs/html/.cvsignore | 1 - docs/html/api/.cvsignore | 3 - docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 4 +- docs/makedocs.pl | 87 +- docs/{html/api => }/style.css | 0 docs/xml/faq.xml | 1676 -------------- duplicates.cgi | 2 +- editclassifications.cgi | 54 +- editcomponents.cgi | 290 +--- editfields.cgi | 45 +- editflagtypes.cgi | 67 +- editgroups.cgi | 497 ++--- editkeywords.cgi | 47 +- editmilestones.cgi | 232 +-- editparams.cgi | 31 +- editproducts.cgi | 92 +- editsettings.cgi | 93 +- editusers.cgi | 76 +- editvalues.cgi | 186 +- editversions.cgi | 57 +- editwhines.cgi | 28 +- editworkflow.cgi | 151 ++ email_in.pl | 89 +- enter_bug.cgi | 195 +- extensions/example/code/bug-end_of_update.pl | 56 + extensions/example/code/buglist-columns.pl | 26 + extensions/example/code/colchange-columns.pl | 27 + extensions/example/code/config.pl | 26 + extensions/example/code/flag-end_of_update.pl | 42 + .../example/code/install-before_final_checks.pl | 28 + extensions/example/code/product-confirm_delete.pl | 26 + extensions/example/code/webservice-error_codes.pl | 25 + extensions/example/code/webservice.pl | 25 + extensions/example/info.pl | 41 + extensions/example/lib/ConfigExample.pm | 41 + extensions/example/lib/WSExample.pm | 32 + .../en/default/admin/params/example.html.tmpl | 28 + .../template/en/global/user-error-errors.html.tmpl | 12 + images/favicon.ico | Bin 0 -> 4150 bytes importxml.pl | 198 ++- index.cgi | 6 +- install-module.pl | 161 ++ js/field.js | 339 +++ js/help.js | 108 + js/params.js | 61 + js/productform.js | 425 ++-- js/util.js | 156 ++ js/yui/calendar.js | 16 + js/yui/yahoo-dom-event.js | 10 + lib/README | 4 + long_list.cgi | 2 +- mod_perl.pl | 4 + page.cgi | 2 +- post_bug.cgi | 35 +- process_bug.cgi | 2347 ++++---------------- productmenu.js | 256 --- query.cgi | 26 +- quips.cgi | 24 +- relogin.cgi | 2 +- report.cgi | 7 +- reports.cgi | 6 +- request.cgi | 45 +- runtests.pl | 1 + sanitycheck.cgi | 503 +++-- sanitycheck.pl | 116 + search_plugin.cgi | 2 +- show_activity.cgi | 4 +- show_bug.cgi | 4 +- showattachment.cgi | 2 +- showdependencygraph.cgi | 75 +- showdependencytree.cgi | 6 +- sidebar.cgi | 2 +- skins/.cvsignore | 1 - skins/contrib/Dusk/.cvsignore | 17 + skins/contrib/Dusk/buglist.css | 24 + skins/contrib/Dusk/global.css | 279 +++ skins/standard/IE-fixes.css | 2 +- skins/standard/admin.css | 75 + skins/standard/buglist.css | 4 + skins/standard/editusers.css | 14 + skins/standard/global.css | 78 +- skins/standard/global/calendar.png | Bin 0 -> 718 bytes skins/standard/help.css | 41 + skins/standard/params.css | 6 + skins/standard/show_bug.css | 75 + skins/standard/yui/calendar.css | 7 + skins/standard/yui/sprite.png | Bin 0 -> 3123 bytes summarize_time.cgi | 322 +-- t/001compile.t | 22 +- t/004template.t | 16 +- t/006spellcheck.t | 6 + t/007util.t | 5 +- t/008filter.t | 6 +- t/Support/Files.pm | 1 + .../en/default/account/auth/login-small.html.tmpl | 3 +- template/en/default/account/auth/login.html.tmpl | 3 +- template/en/default/account/cancel-token.txt.tmpl | 11 +- template/en/default/account/create.html.tmpl | 28 +- template/en/default/account/created.html.tmpl | 8 +- .../en/default/account/email/change-new.txt.tmpl | 5 +- .../en/default/account/email/change-old.txt.tmpl | 3 +- .../en/default/account/email/confirm-new.html.tmpl | 29 +- .../en/default/account/email/confirm.html.tmpl | 1 - .../en/default/account/email/request-new.txt.tmpl | 30 +- .../account/password/forgotten-password.txt.tmpl | 5 +- .../password/set-forgotten-password.html.tmpl | 1 - .../en/default/account/prefs/account.html.tmpl | 7 +- template/en/default/account/prefs/email.html.tmpl | 1 - .../en/default/account/prefs/permissions.html.tmpl | 7 +- template/en/default/account/prefs/prefs.html.tmpl | 4 +- .../default/account/prefs/saved-searches.html.tmpl | 33 +- .../en/default/account/prefs/settings.html.tmpl | 1 - .../en/default/account/profile-activity.html.tmpl | 3 +- template/en/default/admin/admin.html.tmpl | 131 ++ .../en/default/admin/classifications/add.html.tmpl | 1 - .../en/default/admin/classifications/del.html.tmpl | 1 - .../default/admin/classifications/edit.html.tmpl | 1 - .../en/default/admin/classifications/new.html.tmpl | 32 - .../admin/classifications/reclassify.html.tmpl | 1 - .../default/admin/classifications/select.html.tmpl | 1 - .../default/admin/classifications/update.html.tmpl | 41 - .../admin/components/confirm-delete.html.tmpl | 4 +- .../en/default/admin/components/create.html.tmpl | 9 +- .../en/default/admin/components/created.html.tmpl | 41 - .../en/default/admin/components/deleted.html.tmpl | 59 - .../en/default/admin/components/edit.html.tmpl | 4 +- .../en/default/admin/components/footer.html.tmpl | 1 - .../en/default/admin/components/list.html.tmpl | 1 - .../admin/components/select-product.html.tmpl | 1 - .../en/default/admin/components/updated.html.tmpl | 98 - template/en/default/admin/confirm-action.html.tmpl | 7 +- .../admin/custom_fields/confirm-delete.html.tmpl | 66 + .../default/admin/custom_fields/create.html.tmpl | 5 +- .../en/default/admin/custom_fields/edit.html.tmpl | 17 +- .../en/default/admin/custom_fields/list.html.tmpl | 24 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 27 +- .../en/default/admin/fieldvalues/create.html.tmpl | 35 +- .../en/default/admin/fieldvalues/created.html.tmpl | 37 - .../en/default/admin/fieldvalues/deleted.html.tmpl | 36 - .../en/default/admin/fieldvalues/edit.html.tmpl | 20 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 14 +- .../en/default/admin/fieldvalues/list.html.tmpl | 11 +- .../admin/fieldvalues/select-field.html.tmpl | 1 - .../en/default/admin/fieldvalues/updated.html.tmpl | 55 - .../admin/flag-type/confirm-delete.html.tmpl | 19 +- template/en/default/admin/flag-type/edit.html.tmpl | 32 +- template/en/default/admin/flag-type/list.html.tmpl | 8 +- template/en/default/admin/groups/change.html.tmpl | 111 - .../default/admin/groups/confirm-remove.html.tmpl | 66 + template/en/default/admin/groups/create.html.tmpl | 27 +- template/en/default/admin/groups/created.html.tmpl | 38 - template/en/default/admin/groups/delete.html.tmpl | 2 +- template/en/default/admin/groups/deleted.html.tmpl | 38 - template/en/default/admin/groups/edit.html.tmpl | 321 ++-- template/en/default/admin/groups/list.html.tmpl | 2 +- template/en/default/admin/groups/remove.html.tmpl | 62 - .../admin/keywords/confirm-delete.html.tmpl | 4 +- .../en/default/admin/keywords/create.html.tmpl | 1 - .../en/default/admin/keywords/created.html.tmpl | 36 - template/en/default/admin/keywords/edit.html.tmpl | 3 +- template/en/default/admin/keywords/list.html.tmpl | 3 +- .../default/admin/keywords/rebuild-cache.html.tmpl | 56 - .../admin/milestones/confirm-delete.html.tmpl | 6 +- .../en/default/admin/milestones/create.html.tmpl | 1 - .../en/default/admin/milestones/created.html.tmpl | 44 - .../en/default/admin/milestones/deleted.html.tmpl | 58 - .../en/default/admin/milestones/edit.html.tmpl | 3 +- .../en/default/admin/milestones/footer.html.tmpl | 1 - .../en/default/admin/milestones/list.html.tmpl | 1 - .../admin/milestones/select-product.html.tmpl | 1 - .../en/default/admin/milestones/updated.html.tmpl | 51 - template/en/default/admin/params/admin.html.tmpl | 1 - .../en/default/admin/params/attachment.html.tmpl | 34 +- template/en/default/admin/params/auth.html.tmpl | 14 +- .../en/default/admin/params/bugchange.html.tmpl | 29 +- .../en/default/admin/params/bugfields.html.tmpl | 1 - template/en/default/admin/params/bugmove.html.tmpl | 1 - template/en/default/admin/params/common.html.tmpl | 71 +- template/en/default/admin/params/core.html.tmpl | 8 +- .../default/admin/params/dependencygraph.html.tmpl | 1 - .../en/default/admin/params/editparams.html.tmpl | 3 +- .../default/admin/params/groupsecurity.html.tmpl | 3 +- template/en/default/admin/params/index.html.tmpl | 1 - template/en/default/admin/params/l10n.html.tmpl | 46 - template/en/default/admin/params/ldap.html.tmpl | 9 +- template/en/default/admin/params/mta.html.tmpl | 7 +- .../en/default/admin/params/patchviewer.html.tmpl | 1 - template/en/default/admin/params/query.html.tmpl | 3 +- template/en/default/admin/params/radius.html.tmpl | 54 + .../en/default/admin/params/shadowdb.html.tmpl | 1 - .../en/default/admin/params/usermatch.html.tmpl | 1 - .../admin/products/confirm-delete.html.tmpl | 3 +- .../en/default/admin/products/create.html.tmpl | 1 - .../en/default/admin/products/created.html.tmpl | 36 - .../en/default/admin/products/deleted.html.tmpl | 50 - .../default/admin/products/edit-common.html.tmpl | 3 +- template/en/default/admin/products/edit.html.tmpl | 21 +- .../en/default/admin/products/footer.html.tmpl | 1 - .../products/groupcontrol/confirm-edit.html.tmpl | 1 - .../admin/products/groupcontrol/edit.html.tmpl | 3 +- .../admin/products/groupcontrol/updated.html.tmpl | 1 - .../admin/products/list-classifications.html.tmpl | 1 - template/en/default/admin/products/list.html.tmpl | 1 - .../en/default/admin/products/updated.html.tmpl | 9 +- .../en/default/admin/sanitycheck/list.html.tmpl | 37 + .../default/admin/sanitycheck/messages.html.tmpl | 330 +++ template/en/default/admin/settings/edit.html.tmpl | 6 +- .../en/default/admin/settings/updated.html.tmpl | 27 - template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/admin/table.html.tmpl | 3 +- .../default/admin/users/confirm-delete.html.tmpl | 136 +- template/en/default/admin/users/create.html.tmpl | 2 +- template/en/default/admin/users/edit.html.tmpl | 31 +- template/en/default/admin/users/list.html.tmpl | 4 +- .../default/admin/users/listselectvars.html.tmpl | 1 - .../default/admin/users/responsibilities.html.tmpl | 61 + template/en/default/admin/users/search.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 9 +- .../admin/versions/confirm-delete.html.tmpl | 1 - .../en/default/admin/versions/create.html.tmpl | 1 - .../en/default/admin/versions/created.html.tmpl | 43 - .../en/default/admin/versions/deleted.html.tmpl | 41 - template/en/default/admin/versions/edit.html.tmpl | 3 +- .../en/default/admin/versions/footer.html.tmpl | 1 - template/en/default/admin/versions/list.html.tmpl | 1 - .../admin/versions/select-product.html.tmpl | 1 - .../en/default/admin/versions/updated.html.tmpl | 45 - .../en/default/admin/workflow/comment.html.tmpl | 92 + template/en/default/admin/workflow/edit.html.tmpl | 110 + .../attachment/cancel-create-dupe.html.tmpl | 48 + template/en/default/attachment/choose.html.tmpl | 1 - .../en/default/attachment/confirm-delete.html.tmpl | 9 +- .../en/default/attachment/content-types.html.tmpl | 1 - template/en/default/attachment/create.html.tmpl | 20 +- template/en/default/attachment/created.html.tmpl | 42 +- .../attachment/createformcontents.html.tmpl | 1 - .../en/default/attachment/delete_reason.txt.tmpl | 5 +- template/en/default/attachment/diff-file.html.tmpl | 56 +- .../en/default/attachment/diff-footer.html.tmpl | 1 - .../en/default/attachment/diff-header.html.tmpl | 24 +- template/en/default/attachment/edit.html.tmpl | 82 +- template/en/default/attachment/list.html.tmpl | 7 +- template/en/default/attachment/midair.html.tmpl | 78 + .../en/default/attachment/show-multiple.html.tmpl | 3 +- template/en/default/attachment/updated.html.tmpl | 34 +- template/en/default/bug/activity/show.html.tmpl | 25 +- template/en/default/bug/activity/table.html.tmpl | 5 +- template/en/default/bug/choose.html.tmpl | 1 - template/en/default/bug/comments.html.tmpl | 141 +- .../en/default/bug/create/comment-guided.txt.tmpl | 3 +- template/en/default/bug/create/comment.txt.tmpl | 1 - .../bug/create/confirm-create-dupe.html.tmpl | 1 - .../en/default/bug/create/create-guided.html.tmpl | 58 +- template/en/default/bug/create/create.html.tmpl | 299 ++-- template/en/default/bug/create/created.html.tmpl | 8 +- .../en/default/bug/create/make-template.html.tmpl | 1 - .../en/default/bug/create/user-message.html.tmpl | 1 - template/en/default/bug/dependency-graph.html.tmpl | 48 +- template/en/default/bug/dependency-tree.html.tmpl | 4 +- template/en/default/bug/edit.html.tmpl | 1356 +++++++----- template/en/default/bug/field.html.tmpl | 58 +- template/en/default/bug/knob.html.tmpl | 258 +-- template/en/default/bug/navigate.html.tmpl | 18 +- template/en/default/bug/process/bugmail.html.tmpl | 1 - .../bug/process/confirm-duplicate.html.tmpl | 1 - template/en/default/bug/process/header.html.tmpl | 8 +- template/en/default/bug/process/midair.html.tmpl | 14 +- template/en/default/bug/process/results.html.tmpl | 1 - .../bug/process/verify-new-product.html.tmpl | 218 ++- template/en/default/bug/show-multiple.html.tmpl | 24 +- template/en/default/bug/show.html.tmpl | 24 +- template/en/default/bug/show.xml.tmpl | 28 +- template/en/default/bug/summarize-time.html.tmpl | 165 +- template/en/default/bug/time.html.tmpl | 1 - template/en/default/bug/votes/delete-all.html.tmpl | 1 - .../en/default/bug/votes/list-for-bug.html.tmpl | 1 - .../en/default/bug/votes/list-for-user.html.tmpl | 16 +- template/en/default/config.js.tmpl | 12 +- template/en/default/config.rdf.tmpl | 59 +- template/en/default/email/newchangedmail.txt.tmpl | 10 +- .../sanitycheck.txt.tmpl} | 23 +- template/en/default/email/sudo.txt.tmpl | 3 +- template/en/default/email/votes-removed.txt.tmpl | 3 +- template/en/default/email/whine.txt.tmpl | 21 +- template/en/default/filterexceptions.pl | 68 +- template/en/default/flag/list.html.tmpl | 81 +- template/en/default/global/banner.html.tmpl | 1 - .../default/global/choose-classification.html.tmpl | 1 - .../en/default/global/choose-product.html.tmpl | 1 - template/en/default/global/code-error.html.tmpl | 34 +- template/en/default/global/common-links.html.tmpl | 43 +- .../en/default/global/confirm-action.html.tmpl | 63 + .../en/default/global/confirm-user-match.html.tmpl | 18 +- template/en/default/global/docslinks.html.tmpl | 3 +- template/en/default/global/field-descs.none.tmpl | 126 +- template/en/default/global/footer.html.tmpl | 1 - template/en/default/global/header.html.tmpl | 43 +- template/en/default/global/help-header.html.tmpl | 91 - template/en/default/global/help.html.tmpl | 14 +- template/en/default/global/hidden-fields.html.tmpl | 1 - template/en/default/global/initialize.none.tmpl | 1 - template/en/default/global/js-products.html.tmpl | 11 +- template/en/default/global/message.html.tmpl | 1 - template/en/default/global/message.txt.tmpl | 1 - template/en/default/global/messages.html.tmpl | 412 ++++- .../en/default/global/per-bug-queries.html.tmpl | 3 +- template/en/default/global/select-menu.html.tmpl | 1 - template/en/default/global/setting-descs.none.tmpl | 4 +- .../en/default/global/site-navigation.html.tmpl | 26 +- template/en/default/global/tabs.html.tmpl | 1 - template/en/default/global/textarea.html.tmpl | 1 - template/en/default/global/useful-links.html.tmpl | 64 +- template/en/default/global/user-error.html.tmpl | 286 ++- template/en/default/global/userselect.html.tmpl | 32 +- template/en/default/global/variables.none.tmpl | 3 - template/en/default/index.html.tmpl | 7 +- template/en/default/list/change-columns.html.tmpl | 24 +- template/en/default/list/edit-multiple.html.tmpl | 191 +- template/en/default/list/list-simple.html.tmpl | 3 +- template/en/default/list/list.atom.tmpl | 48 +- template/en/default/list/list.csv.tmpl | 3 +- template/en/default/list/list.html.tmpl | 68 +- template/en/default/list/list.ics.tmpl | 5 +- template/en/default/list/list.js.tmpl | 1 - template/en/default/list/list.rdf.tmpl | 7 +- template/en/default/list/quips.html.tmpl | 6 +- template/en/default/list/server-push.html.tmpl | 1 - template/en/default/list/table.html.tmpl | 52 +- template/en/default/pages/bug-writing.html.tmpl | 1 - template/en/default/pages/fields.html.tmpl | 69 +- template/en/default/pages/linked.html.tmpl | 1 - template/en/default/pages/linkify.html.tmpl | 1 - template/en/default/pages/quicksearch.html.tmpl | 1 - .../en/default/pages/quicksearchhack.html.tmpl | 35 +- template/en/default/pages/release-notes.html.tmpl | 850 +++++++- template/en/default/pages/sudo.html.tmpl | 1 - template/en/default/pages/voting.html.tmpl | 7 +- template/en/default/reports/chart.csv.tmpl | 1 - template/en/default/reports/chart.html.tmpl | 1 - template/en/default/reports/chart.png.tmpl | 1 - template/en/default/reports/components.html.tmpl | 1 - template/en/default/reports/create-chart.html.tmpl | 1 - .../en/default/reports/duplicates-simple.html.tmpl | 1 - .../en/default/reports/duplicates-table.html.tmpl | 1 - template/en/default/reports/duplicates.html.tmpl | 7 +- template/en/default/reports/duplicates.rdf.tmpl | 5 +- template/en/default/reports/edit-series.html.tmpl | 1 - template/en/default/reports/keywords.html.tmpl | 1 - template/en/default/reports/menu.html.tmpl | 2 +- template/en/default/reports/old-charts.html.tmpl | 8 +- template/en/default/reports/report-bar.png.tmpl | 5 +- template/en/default/reports/report-line.png.tmpl | 5 +- template/en/default/reports/report-pie.png.tmpl | 3 +- .../en/default/reports/report-simple.html.tmpl | 1 - template/en/default/reports/report-table.csv.tmpl | 5 +- template/en/default/reports/report-table.html.tmpl | 5 +- template/en/default/reports/report.csv.tmpl | 1 - template/en/default/reports/report.html.tmpl | 1 - .../en/default/reports/series-common.html.tmpl | 1 - template/en/default/reports/series.html.tmpl | 3 +- template/en/default/request/email.txt.tmpl | 19 +- template/en/default/request/queue.html.tmpl | 15 +- .../en/default/search/boolean-charts.html.tmpl | 8 +- template/en/default/search/form.html.tmpl | 12 +- template/en/default/search/knob.html.tmpl | 1 - .../en/default/search/search-advanced.html.tmpl | 34 +- .../default/search/search-create-series.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 1 - template/en/default/search/search-plugin.xml.tmpl | 3 +- .../default/search/search-report-graph.html.tmpl | 4 +- .../default/search/search-report-select.html.tmpl | 1 - .../default/search/search-report-table.html.tmpl | 4 +- .../en/default/search/search-specific.html.tmpl | 1 - template/en/default/search/tabs.html.tmpl | 1 - template/en/default/setup/strings.txt.pl | 69 + template/en/default/sidebar.xul.tmpl | 7 +- template/en/default/welcome-admin.html.tmpl | 11 +- template/en/default/whine/mail.html.tmpl | 7 +- template/en/default/whine/mail.txt.tmpl | 7 +- template/en/default/whine/multipart-mime.txt.tmpl | 1 - template/en/default/whine/schedule.html.tmpl | 71 +- testserver.pl | 14 +- token.cgi | 34 +- userprefs.cgi | 43 +- votes.cgi | 20 +- whine.pl | 15 +- whineatnews.pl | 2 +- xml.cgi | 2 +- xmlrpc.cgi | 39 +- 513 files changed, 22035 insertions(+), 14534 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=e002e6fe6ed73d59c…

1 0

Paul Vriens : user32/tests: Fix test failures on Win9x/WinME.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 334efcde130e77b372c7e21539d3e3fd1ff44674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334efcde130e77b372c7e2153… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 15:13:02 2009 +0200 user32/tests: Fix test failures on Win9x/WinME. --- dlls/user32/tests/scroll.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 55fb6f6..03725b9 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -222,25 +222,27 @@ static void scrollbar_test_default( DWORD style) ret = GetScrollRange( hwnd, SB_VERT, &min, &max); ok( ret || - broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + broken( !ret) /* Win 9x/ME */ , "GetScrollRange failed.\n"); /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else todo_wine - ok( min == 0 && max == 100, + ok(( min == 0 && max == 100) || + broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); ret = GetScrollRange( hwnd, SB_HORZ, &min, &max); ok( ret || - broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + broken( !ret) /* Win 9x/ME */ , "GetScrollRange failed.\n"); /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else todo_wine - ok( min == 0 && max == 100, + ok(( min == 0 && max == 100) || + broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); /* test GetScrollInfo, vist for vertical SB */ ret = GetScrollInfo( hwnd, SB_VERT, &si); @@ -249,7 +251,9 @@ todo_wine ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else todo_wine - ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ok( ret || + broken( !ret), /* Win 9x/ME */ + "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* Same for Horizontal SB */ ret = GetScrollInfo( hwnd, SB_HORZ, &si); /* should fail if no H orV scroll bar styles are present. Succeed otherwise */ @@ -257,7 +261,9 @@ todo_wine ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else todo_wine - ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ok( ret || + broken( !ret), /* Win 9x/ME */ + "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* now set the Vertical Scroll range to something that could be the default value it * already has */; ret = SetScrollRange( hwnd, SB_VERT, 0, 100, FALSE); @@ -276,7 +282,7 @@ todo_wine /* should succeed in ALL cases */ ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* report the windows style */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); /* WS_VSCROLL added to the window style */ if( !(style & WS_VSCROLL)) { @@ -286,7 +292,8 @@ todo_wine "unexpected style change %8lx expected %8lx\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || + broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ "unexpected style change %8lx expected %8x\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); } @@ -314,7 +321,7 @@ todo_wine /* should succeed in ALL cases */ ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); /* report the windows style */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); /* WS_HSCROLL added to the window style */ if( !(style & WS_HSCROLL)) { @@ -324,7 +331,8 @@ todo_wine "unexpected style change %8lx expected %8lx\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || + broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ "unexpected style change %8lx expected %8x\n", (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); } @@ -372,7 +380,7 @@ todo_wine /* should fail */ ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); /* add scroll styles */ - winstyle = GetWindowLongW( hwnd, GWL_STYLE ); + winstyle = GetWindowLongA( hwnd, GWL_STYLE ); SetWindowLongW( hwnd, GWL_STYLE, winstyle | WS_VSCROLL | WS_HSCROLL); ret = GetScrollInfo( hwnd, SB_VERT, &si); /* should still fail */

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
80
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 May 2009